Skip to content

Commit 45bc5a3

Browse files
michaelhtmmichaelhtm
committed
Generate with SDK-V2 model
1 parent 586b5e3 commit 45bc5a3

File tree

13 files changed

+124
-73
lines changed

13 files changed

+124
-73
lines changed

‎apis/v1alpha1/ack-generate-metadata.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
ack_generate_info:
2-
build_date: "2025-01-23T02:38:00Z"
3-
build_hash: 2442aa071c05fcdf54841e63abd5f91d1951e152
2+
build_date: "2025-02-04T22:01:03Z"
3+
build_hash: 2000316d2ccfc925ada4158b595e99aa9c8005bb
44
go_version: go1.23.5
5-
version: v0.41.0
6-
api_directory_checksum: 1ff28961ea131c72aec52d21636fd2cf5addf6ce
5+
version: v0.41.0-16-g2000316
6+
api_directory_checksum: dce3b3d892f7d14bb0c6346e782b1a284bd92856
77
api_version: v1alpha1
8-
aws_sdk_go_version: v1.55.5
8+
aws_sdk_go_version: v1.32.6
99
generator_config_info:
10-
file_checksum: c0f3cf20e3cbb8f12f970fd8369c50bb6fc837c2
10+
file_checksum: 4f4491963ef6cbb188ccacfdcd75bb2bc9ca8611
1111
original_file_name: generator.yaml
1212
last_modification:
1313
reason: API generation

‎apis/v1alpha1/enums.go‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎apis/v1alpha1/generator.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ ignore:
33
# - Repository
44
field_paths:
55
- CreateRepositoryInput.CatalogData
6-
model_name: ecr-public
6+
sdk_names:
7+
model_name: ecr-public
78
operations:
89
CreateRepository:
910
output_wrapper_field_path: Repository

‎cmd/controller/main.go‎

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎generator.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ ignore:
33
# - Repository
44
field_paths:
55
- CreateRepositoryInput.CatalogData
6-
model_name: ecr-public
6+
sdk_names:
7+
model_name: ecr-public
78
operations:
89
CreateRepository:
910
output_wrapper_field_path: Repository

‎go.mod‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,11 @@ go 1.22.0
55
toolchain go1.23.2
66

77
require (
8-
github.com/aws-controllers-k8s/runtime v0.41.0
8+
github.com/aws-controllers-k8s/runtime v0.41.1-0.20250204215244-e48dd7b2d6d0
99
github.com/aws/aws-sdk-go v1.55.5
10+
github.com/aws/aws-sdk-go-v2 v1.36.0
11+
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.31.1
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.31 // indirect
26+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31 // 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.20250204211822-39cd4988861e

‎go.sum‎

Lines changed: 30 additions & 4 deletions
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.36.0 h1:b1wM5CcE65Ujwn565qcwgtOTT1aT4ADOHHgglKjG7fk=
4+
github.com/aws/aws-sdk-go-v2 v1.36.0/go.mod h1:5PMILGVKiW32oDzjj6RU52yrNrDPUHcbZQYr1sM7qmM=
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.31 h1:lWm9ucLSRFiI4dQQafLrEOmEDGry3Swrz0BIRdiHJqQ=
12+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31/go.mod h1:Huu6GG0YTfbPphQkDSo4dEGmQRTKb9k9G7RdtyQWxuI=
13+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31 h1:ACxDklUKKXb48+eg5ROZXi1vDgfMyfIA/WyvqHcHI0o=
14+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31/go.mod h1:yadnfsDwqXeVaohbGc/RaD287PuyRw2wugkh5ZL2J6k=
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/ecrpublic v1.31.1 h1:IFun/sorD0FfWaYly6SD66Xxjhi9n2tx1vjE/rfElsc=
18+
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.31.1/go.mod h1:y0R67UnDdzXZvghaOf4tkJxswDWFKQKSy0awtNMwwyg=
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.20250204211822-39cd4988861e h1:yae7Du4mJFz1cRI6Vj4hTZE3P42YxrQvwMynKaDABfk=
112+
github.com/michaelhtm/ack-runtime v0.40.1-0.20250204211822-39cd4988861e/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=

‎pkg/resource/repository/hooks.go‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ import (
88
ackcompare "github.com/aws-controllers-k8s/runtime/pkg/compare"
99
ackerr "github.com/aws-controllers-k8s/runtime/pkg/errors"
1010
ackrtlog "github.com/aws-controllers-k8s/runtime/pkg/runtime/log"
11-
svcsdk "github.com/aws/aws-sdk-go/service/ecrpublic"
11+
svcsdk "github.com/aws/aws-sdk-go-v2/service/ecrpublic"
12+
svcsdktypes "github.com/aws/aws-sdk-go-v2/service/ecrpublic/types"
1213
)
1314

1415
func (rm *resourceManager) customUpdateRepository(
@@ -54,14 +55,15 @@ func (rm *resourceManager) syncTags(
5455

5556
toAdd := FromACKTags(added)
5657

57-
var toDeleteTagKeys []*string
58+
var toDeleteTagKeys []string
5859
for k, _ := range removed {
59-
toDeleteTagKeys = append(toDeleteTagKeys, &k)
60+
toDeleteTagKeys = append(toDeleteTagKeys, k)
6061
}
6162

6263
if len(toDeleteTagKeys) > 0 {
6364
rlog.Debug("removing tags from Repository resource", "tags", toDeleteTagKeys)
6465
_, err = rm.sdkapi.UntagResource(
66+
ctx,
6567
&svcsdk.UntagResourceInput{
6668
ResourceArn: (*string)(resourceArn),
6769
TagKeys: toDeleteTagKeys,
@@ -73,6 +75,7 @@ func (rm *resourceManager) syncTags(
7375
if len(toAdd) > 0 {
7476
rlog.Debug("adding tags to Repository resource", "tags", toAdd)
7577
_, err := rm.sdkapi.TagResource(
78+
ctx,
7679
&svcsdk.TagResourceInput{
7780
ResourceArn: (*string)(resourceArn),
7881
Tags: rm.sdkTags(toAdd),
@@ -90,7 +93,7 @@ func (rm *resourceManager) syncTags(
9093
// sdkTags converts *svcapitypes.Tag array to a *svcsdk.Tag array
9194
func (rm *resourceManager) sdkTags(
9295
tags []*svcapitypes.Tag,
93-
) (sdktags []*svcsdk.Tag) {
96+
) (sdktags []svcsdktypes.Tag) {
9497

9598
for _, i := range tags {
9699
sdktag := rm.newTag(*i)
@@ -126,13 +129,13 @@ func compareTags(
126129

127130
func (rm *resourceManager) newTag(
128131
c svcapitypes.Tag,
129-
) *svcsdk.Tag {
130-
res := &svcsdk.Tag{}
132+
) svcsdktypes.Tag {
133+
res := svcsdktypes.Tag{}
131134
if c.Key != nil {
132-
res.SetKey(*c.Key)
135+
res.Key = c.Key
133136
}
134137
if c.Value != nil {
135-
res.SetValue(*c.Value)
138+
res.Value = c.Value
136139
}
137140
return res
138141
}
@@ -168,7 +171,7 @@ func (rm *resourceManager) getTags(
168171
}()
169172

170173
var listTagsResponse *svcsdk.ListTagsForResourceOutput
171-
listTagsResponse, err = rm.sdkapi.ListTagsForResourceWithContext(
174+
listTagsResponse, err = rm.sdkapi.ListTagsForResource(
172175
ctx,
173176
&svcsdk.ListTagsForResourceInput{
174177
ResourceArn: &resourceARN,

‎pkg/resource/repository/manager.go‎

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/resource/repository/manager_factory.go‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)