Skip to content

Commit e24b227

Browse files
committed
generate controller using aws-sdk-go-v2
1 parent 83b0fc9 commit e24b227

18 files changed

+242
-188
lines changed

apis/v1alpha1/ack-generate-metadata.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
ack_generate_info:
2-
build_date: "2025-01-23T02:24:37Z"
3-
build_hash: 2442aa071c05fcdf54841e63abd5f91d1951e152
2+
build_date: "2025-02-01T11:27:05Z"
3+
build_hash: 65286bfbc6ad93e8ed432d51679d12b940b4f094
44
go_version: go1.23.5
5-
version: v0.41.0
6-
api_directory_checksum: fba8f2df2f037c855b2aebd81297560cce781ce9
5+
version: v0.39.1-24-g65286bf
6+
api_directory_checksum: f270c984b74c17a284f359c89569a088ef705750
77
api_version: v1alpha1
8-
aws_sdk_go_version: v1.55.5
8+
aws_sdk_go_version: 1.32.6
99
generator_config_info:
1010
file_checksum: 7bc5705ede319cdeedb65aa32d05cf9805069592
1111
original_file_name: generator.yaml

apis/v1alpha1/enums.go

+22-22
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apis/v1alpha1/types.go

+15-9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/controller/main.go

+8-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/crd/bases/athena.services.k8s.aws_workgroups.yaml

+5-3
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,11 @@ spec:
125125
aclConfiguration:
126126
description: |-
127127
Indicates that an Amazon S3 canned ACL should be set to control ownership
128-
of stored query results. When Athena stores query results in Amazon S3, the
129-
canned ACL is set with the x-amz-acl request header. For more information
130-
about S3 Object Ownership, see Object Ownership settings (https://docs.aws.amazon.com/AmazonS3/latest/userguide/about-object-ownership.html#object-ownership-overview)
128+
of stored query results, including data files inserted by Athena as the result
129+
of statements like CTAS or INSERT INTO. When Athena stores query results
130+
in Amazon S3, the canned ACL is set with the x-amz-acl request header. For
131+
more information about S3 Object Ownership, see Object Ownership settings
132+
(https://docs.aws.amazon.com/AmazonS3/latest/userguide/about-object-ownership.html#object-ownership-overview)
131133
in the Amazon S3 User Guide.
132134
properties:
133135
s3ACLOption:

go.mod

+16-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ toolchain go1.22.3
77
require (
88
github.com/aws-controllers-k8s/runtime v0.41.0
99
github.com/aws/aws-sdk-go v1.55.5
10+
github.com/aws/aws-sdk-go-v2 v1.35.0
11+
github.com/aws/aws-sdk-go-v2/service/athena v1.49.7
12+
github.com/aws/smithy-go v1.22.2
1013
github.com/go-logr/logr v1.4.2
1114
github.com/spf13/pflag v1.0.5
1215
k8s.io/api v0.31.0
@@ -16,6 +19,17 @@ require (
1619
)
1720

1821
require (
22+
github.com/aws/aws-sdk-go-v2/config v1.28.6 // indirect
23+
github.com/aws/aws-sdk-go-v2/credentials v1.17.47 // indirect
24+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.21 // indirect
25+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30 // indirect
26+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30 // indirect
27+
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
28+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1 // indirect
29+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.6 // indirect
30+
github.com/aws/aws-sdk-go-v2/service/sso v1.24.7 // indirect
31+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.6 // indirect
32+
github.com/aws/aws-sdk-go-v2/service/sts v1.33.2 // indirect
1933
github.com/beorn7/perks v1.0.1 // indirect
2034
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
2135
github.com/cespare/xxhash/v2 v2.3.0 // indirect
@@ -39,7 +53,6 @@ require (
3953
github.com/itchyny/gojq v0.12.6 // indirect
4054
github.com/itchyny/timefmt-go v0.1.3 // indirect
4155
github.com/jaypipes/envutil v1.0.0 // indirect
42-
github.com/jmespath/go-jmespath v0.4.0 // indirect
4356
github.com/josharian/intern v1.0.0 // indirect
4457
github.com/json-iterator/go v1.1.12 // indirect
4558
github.com/mailru/easyjson v0.7.7 // indirect
@@ -75,3 +88,5 @@ require (
7588
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
7689
sigs.k8s.io/yaml v1.4.0 // indirect
7790
)
91+
92+
replace github.com/aws-controllers-k8s/runtime => github.com/michaelhtm/ack-runtime v0.40.1-0.20250130234502-3f0eb0b7ed16

go.sum

+30-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,33 @@
1-
github.com/aws-controllers-k8s/runtime v0.41.0 h1:WumDnUiVlqnYYGEIGSOUBgDPWTIEozW8HT0qwGapDgA=
2-
github.com/aws-controllers-k8s/runtime v0.41.0/go.mod h1:Tuq5AFGJQcU00MY+J5hBYbLctpR50I8iGs5TPLox+u8=
31
github.com/aws/aws-sdk-go v1.55.5 h1:KKUZBfBoyqy5d3swXyiC7Q76ic40rYcbqH7qjh59kzU=
42
github.com/aws/aws-sdk-go v1.55.5/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU=
3+
github.com/aws/aws-sdk-go-v2 v1.35.0 h1:jTPxEJyzjSuuz0wB+302hr8Eu9KUI+Zv8zlujMGJpVI=
4+
github.com/aws/aws-sdk-go-v2 v1.35.0/go.mod h1:JgstGg0JjWU1KpVJjD5H0y0yyAIpSdKEq556EI6yOOM=
5+
github.com/aws/aws-sdk-go-v2/config v1.28.6 h1:D89IKtGrs/I3QXOLNTH93NJYtDhm8SYa9Q5CsPShmyo=
6+
github.com/aws/aws-sdk-go-v2/config v1.28.6/go.mod h1:GDzxJ5wyyFSCoLkS+UhGB0dArhb9mI+Co4dHtoTxbko=
7+
github.com/aws/aws-sdk-go-v2/credentials v1.17.47 h1:48bA+3/fCdi2yAwVt+3COvmatZ6jUDNkDTIsqDiMUdw=
8+
github.com/aws/aws-sdk-go-v2/credentials v1.17.47/go.mod h1:+KdckOejLW3Ks3b0E3b5rHsr2f9yuORBum0WPnE5o5w=
9+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.21 h1:AmoU1pziydclFT/xRV+xXE/Vb8fttJCLRPv8oAkprc0=
10+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.21/go.mod h1:AjUdLYe4Tgs6kpH4Bv7uMZo7pottoyHMn4eTcIcneaY=
11+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30 h1:+7AzSGNhHoY53di13lvztf9Dyd/9ofzoYGBllkWp3a0=
12+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30/go.mod h1:Jxd/FrCny99yURiQiMywgXvBhd7tmgdv6KdlUTNzMSo=
13+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30 h1:Ex06eY6I5rO7IX0HalGfa5nGjpBoOsS1Qm3xfjkuszs=
14+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30/go.mod h1:AvyEMA9QcX59kFhVizBpIBpEMThUTXssuJe+emBdcGM=
15+
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 h1:VaRN3TlFdd6KxX1x3ILT5ynH6HvKgqdiXoTxAF4HQcQ=
16+
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1/go.mod h1:FbtygfRFze9usAadmnGJNc8KsP346kEe+y2/oyhGAGc=
17+
github.com/aws/aws-sdk-go-v2/service/athena v1.49.7 h1:mg+ahSclN7dPZI069X3quz4Dwyvor1wdw7+/iDP4vWA=
18+
github.com/aws/aws-sdk-go-v2/service/athena v1.49.7/go.mod h1:AW+bzuf/55GlvQIWTvN9BH+hUWag3ioH1Nc8IFuvC88=
19+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1 h1:iXtILhvDxB6kPvEXgsDhGaZCSC6LQET5ZHSdJozeI0Y=
20+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1/go.mod h1:9nu0fVANtYiAePIBh2/pFUSwtJ402hLnp854CNoDOeE=
21+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.6 h1:50+XsN70RS7dwJ2CkVNXzj7U2L1HKP8nqTd3XWEXBN4=
22+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.6/go.mod h1:WqgLmwY7so32kG01zD8CPTJWVWM+TzJoOVHwTg4aPug=
23+
github.com/aws/aws-sdk-go-v2/service/sso v1.24.7 h1:rLnYAfXQ3YAccocshIH5mzNNwZBkBo+bP6EhIxak6Hw=
24+
github.com/aws/aws-sdk-go-v2/service/sso v1.24.7/go.mod h1:ZHtuQJ6t9A/+YDuxOLnbryAmITtr8UysSny3qcyvJTc=
25+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.6 h1:JnhTZR3PiYDNKlXy50/pNeix9aGMo6lLpXwJ1mw8MD4=
26+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.6/go.mod h1:URronUEGfXZN1VpdktPSD1EkAL9mfrV+2F4sjH38qOY=
27+
github.com/aws/aws-sdk-go-v2/service/sts v1.33.2 h1:s4074ZO1Hk8qv65GqNXqDjmkf4HSQqJukaLuuW0TpDA=
28+
github.com/aws/aws-sdk-go-v2/service/sts v1.33.2/go.mod h1:mVggCnIWoM09jP71Wh+ea7+5gAp53q+49wDFs1SW5z8=
29+
github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
30+
github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
531
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
632
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
733
github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
@@ -65,8 +91,6 @@ github.com/jaypipes/envutil v1.0.0 h1:u6Vwy9HwruFihoZrL0bxDLCa/YNadGVwKyPElNmZWo
6591
github.com/jaypipes/envutil v1.0.0/go.mod h1:vgIRDly+xgBq0eeZRcflOHMMobMwgC6MkMbxo/Nw65M=
6692
github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
6793
github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
68-
github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
69-
github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
7094
github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
7195
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
7296
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
@@ -84,6 +108,8 @@ github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0
84108
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
85109
github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
86110
github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
111+
github.com/michaelhtm/ack-runtime v0.40.1-0.20250130234502-3f0eb0b7ed16 h1:1kYCQttvN3vR4gcRKhD1jpxxWCm0QvcM0tBwjahuVNI=
112+
github.com/michaelhtm/ack-runtime v0.40.1-0.20250130234502-3f0eb0b7ed16/go.mod h1:X0vuDLFbyCH6pAsWWADEAyw4f5c+KtQkKXkhWEamYkw=
87113
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
88114
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
89115
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=

0 commit comments

Comments
 (0)