Skip to content

Commit 9ada1a2

Browse files
michaelhtmmichaelhtm
authored
Generate with SDK-V2 model (#27)
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent faaadbf commit 9ada1a2

23 files changed

+430
-488
lines changed

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
ack_generate_info:
2-
build_date: "2025-01-23T02:26:08Z"
3-
build_hash: 2442aa071c05fcdf54841e63abd5f91d1951e152
2+
build_date: "2025-02-04T23:52:02Z"
3+
build_hash: d2d639403dd853736e63c2bc1e3ca51251fd1bd1
44
go_version: go1.23.5
5-
version: v0.41.0
6-
api_directory_checksum: ad41ea4266e719ebbe78d5625a0d5a114839f84e
5+
version: v0.41.0-16-gd2d6394-dirty
6+
api_directory_checksum: f04a17564dd6ec2c7467565bf2a6a072f1298b38
77
api_version: v1alpha1
8-
aws_sdk_go_version: v1.50.0
8+
aws_sdk_go_version: v1.32.6
99
generator_config_info:
10-
file_checksum: 4928b1e60c051e2bf7bcb96021cc8d5c7f736d75
10+
file_checksum: 2864a51f260d3f454ac70c47ed147e7b3b57d443
1111
original_file_name: generator.yaml
1212
last_modification:
1313
reason: API generation

‎apis/v1alpha1/enums.go

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

‎apis/v1alpha1/generator.yaml

+8-5
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ operations:
1717
# Clearly this is not ideal, but will suffice until we add custom hook
1818
# points to the build_request methods to enable a genmeration of the
1919
# final snapshot identifier to use.
20-
SkipFinalSnapshot: true
20+
SkipFinalSnapshot: aws.Bool(true)
2121
ModifyDBCluster:
2222
override_values:
2323
# The whole concept of a "maintenance window" isn't aligned with the
@@ -31,12 +31,12 @@ operations:
3131
# operations to "true" because we want changes that a Kubernetes user
3232
# makes to a resource's Spec to be reconciled by the ACK service
3333
# controller, not a different service.
34-
ApplyImmediately: true
34+
ApplyImmediately: aws.Bool(true)
3535
# We override the value of AllowMajorVersionUpgrade field in the modify
3636
# call since any engine version change should apply directly.
3737
# This flag was designed as a protect flag but not necessary in controller
3838
# side when customer need to make the engine version change
39-
AllowMajorVersionUpgrade: true
39+
AllowMajorVersionUpgrade: aws.Bool(true)
4040
ModifyDBInstance:
4141
override_values:
4242
# The whole concept of a "maintenance window" isn't aligned with the
@@ -50,12 +50,12 @@ operations:
5050
# operations to "true" because we want changes that a Kubernetes user
5151
# makes to a resource's Spec to be reconciled by the ACK service
5252
# controller, not a different service.
53-
ApplyImmediately: true
53+
ApplyImmediately: aws.Bool(true)
5454
# We override the value of the ApplyImmediately field in the modify
5555
# operations to "true" because we want changes that a Kubernetes user
5656
# makes to a resource's Spec to be reconciled by the ACK service
5757
# controller, not a different service.
58-
AllowMajorVersionUpgrade: true
58+
AllowMajorVersionUpgrade: aws.Bool(true)
5959
DeleteDBInstance:
6060
override_values:
6161
# Clearly this is not ideal, but will suffice until we add custom hook
@@ -88,6 +88,9 @@ resources:
8888
update_operation:
8989
custom_method_name: customUpdate
9090
fields:
91+
DestinationRegion:
92+
set:
93+
- ignore: all
9194
DBClusterIdentifier:
9295
is_primary_key: true
9396
MasterUserPassword:

‎cmd/controller/main.go

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

‎generator.yaml

+8-5
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ operations:
1717
# Clearly this is not ideal, but will suffice until we add custom hook
1818
# points to the build_request methods to enable a genmeration of the
1919
# final snapshot identifier to use.
20-
SkipFinalSnapshot: true
20+
SkipFinalSnapshot: aws.Bool(true)
2121
ModifyDBCluster:
2222
override_values:
2323
# The whole concept of a "maintenance window" isn't aligned with the
@@ -31,12 +31,12 @@ operations:
3131
# operations to "true" because we want changes that a Kubernetes user
3232
# makes to a resource's Spec to be reconciled by the ACK service
3333
# controller, not a different service.
34-
ApplyImmediately: true
34+
ApplyImmediately: aws.Bool(true)
3535
# We override the value of AllowMajorVersionUpgrade field in the modify
3636
# call since any engine version change should apply directly.
3737
# This flag was designed as a protect flag but not necessary in controller
3838
# side when customer need to make the engine version change
39-
AllowMajorVersionUpgrade: true
39+
AllowMajorVersionUpgrade: aws.Bool(true)
4040
ModifyDBInstance:
4141
override_values:
4242
# The whole concept of a "maintenance window" isn't aligned with the
@@ -50,12 +50,12 @@ operations:
5050
# operations to "true" because we want changes that a Kubernetes user
5151
# makes to a resource's Spec to be reconciled by the ACK service
5252
# controller, not a different service.
53-
ApplyImmediately: true
53+
ApplyImmediately: aws.Bool(true)
5454
# We override the value of the ApplyImmediately field in the modify
5555
# operations to "true" because we want changes that a Kubernetes user
5656
# makes to a resource's Spec to be reconciled by the ACK service
5757
# controller, not a different service.
58-
AllowMajorVersionUpgrade: true
58+
AllowMajorVersionUpgrade: aws.Bool(true)
5959
DeleteDBInstance:
6060
override_values:
6161
# Clearly this is not ideal, but will suffice until we add custom hook
@@ -88,6 +88,9 @@ resources:
8888
update_operation:
8989
custom_method_name: customUpdate
9090
fields:
91+
DestinationRegion:
92+
set:
93+
- ignore: all
9194
DBClusterIdentifier:
9295
is_primary_key: true
9396
MasterUserPassword:

‎go.mod

+15-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,11 @@ toolchain go1.22.5
77
require (
88
github.com/aws-controllers-k8s/ec2-controller v1.2.2
99
github.com/aws-controllers-k8s/kms-controller v1.0.9
10-
github.com/aws-controllers-k8s/runtime v0.41.0
10+
github.com/aws-controllers-k8s/runtime v0.41.1-0.20250204215244-e48dd7b2d6d0
1111
github.com/aws/aws-sdk-go v1.49.24
12+
github.com/aws/aws-sdk-go-v2 v1.36.0
13+
github.com/aws/aws-sdk-go-v2/service/docdb v1.40.8
14+
github.com/aws/smithy-go v1.22.2
1215
github.com/go-logr/logr v1.4.2
1316
github.com/spf13/pflag v1.0.5
1417
k8s.io/api v0.31.0
@@ -18,6 +21,17 @@ require (
1821
)
1922

2023
require (
24+
github.com/aws/aws-sdk-go-v2/config v1.28.6 // indirect
25+
github.com/aws/aws-sdk-go-v2/credentials v1.17.47 // indirect
26+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.21 // indirect
27+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31 // indirect
28+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31 // indirect
29+
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
30+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.2 // indirect
31+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.12 // indirect
32+
github.com/aws/aws-sdk-go-v2/service/sso v1.24.7 // indirect
33+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.6 // indirect
34+
github.com/aws/aws-sdk-go-v2/service/sts v1.33.2 // indirect
2135
github.com/beorn7/perks v1.0.1 // indirect
2236
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
2337
github.com/cespare/xxhash/v2 v2.3.0 // indirect
@@ -41,7 +55,6 @@ require (
4155
github.com/itchyny/gojq v0.12.6 // indirect
4256
github.com/itchyny/timefmt-go v0.1.3 // indirect
4357
github.com/jaypipes/envutil v1.0.0 // indirect
44-
github.com/jmespath/go-jmespath v0.4.0 // indirect
4558
github.com/josharian/intern v1.0.0 // indirect
4659
github.com/json-iterator/go v1.1.12 // indirect
4760
github.com/mailru/easyjson v0.7.7 // indirect

‎go.sum

+30-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,38 @@ github.com/aws-controllers-k8s/ec2-controller v1.2.2 h1:ek/cGd76XTWQXe6185nxrmEm
22
github.com/aws-controllers-k8s/ec2-controller v1.2.2/go.mod h1:4e2L1aHo1fk3ihVTRmnhA6VJ2NSSoYPEf1GZNYYPwLw=
33
github.com/aws-controllers-k8s/kms-controller v1.0.9 h1:GZHSnuZBoWp9r6RaJ3siyDn5BRhDuaZJXtdBKeAiLSw=
44
github.com/aws-controllers-k8s/kms-controller v1.0.9/go.mod h1:Pnz0d5sly7dUgmYMDJWSRIKASOujJFi/b8N2q1qCLqU=
5-
github.com/aws-controllers-k8s/runtime v0.41.0 h1:WumDnUiVlqnYYGEIGSOUBgDPWTIEozW8HT0qwGapDgA=
6-
github.com/aws-controllers-k8s/runtime v0.41.0/go.mod h1:Tuq5AFGJQcU00MY+J5hBYbLctpR50I8iGs5TPLox+u8=
5+
github.com/aws-controllers-k8s/runtime v0.41.1-0.20250204215244-e48dd7b2d6d0 h1:ygZwhPfearlE8/P0HY8rXpFsbarwJ5tzBIov+3xgQfk=
6+
github.com/aws-controllers-k8s/runtime v0.41.1-0.20250204215244-e48dd7b2d6d0/go.mod h1:Oy0JKvDxZMZ+SVupm4NZVqP00KLIIAMfk93KnOwlt5c=
77
github.com/aws/aws-sdk-go v1.49.24 h1:2ekq9ZvaoB2aRbTDfARzgVGUBB9N8XD2QYhFmTBlp+c=
88
github.com/aws/aws-sdk-go v1.49.24/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
9+
github.com/aws/aws-sdk-go-v2 v1.36.0 h1:b1wM5CcE65Ujwn565qcwgtOTT1aT4ADOHHgglKjG7fk=
10+
github.com/aws/aws-sdk-go-v2 v1.36.0/go.mod h1:5PMILGVKiW32oDzjj6RU52yrNrDPUHcbZQYr1sM7qmM=
11+
github.com/aws/aws-sdk-go-v2/config v1.28.6 h1:D89IKtGrs/I3QXOLNTH93NJYtDhm8SYa9Q5CsPShmyo=
12+
github.com/aws/aws-sdk-go-v2/config v1.28.6/go.mod h1:GDzxJ5wyyFSCoLkS+UhGB0dArhb9mI+Co4dHtoTxbko=
13+
github.com/aws/aws-sdk-go-v2/credentials v1.17.47 h1:48bA+3/fCdi2yAwVt+3COvmatZ6jUDNkDTIsqDiMUdw=
14+
github.com/aws/aws-sdk-go-v2/credentials v1.17.47/go.mod h1:+KdckOejLW3Ks3b0E3b5rHsr2f9yuORBum0WPnE5o5w=
15+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.21 h1:AmoU1pziydclFT/xRV+xXE/Vb8fttJCLRPv8oAkprc0=
16+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.21/go.mod h1:AjUdLYe4Tgs6kpH4Bv7uMZo7pottoyHMn4eTcIcneaY=
17+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31 h1:lWm9ucLSRFiI4dQQafLrEOmEDGry3Swrz0BIRdiHJqQ=
18+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31/go.mod h1:Huu6GG0YTfbPphQkDSo4dEGmQRTKb9k9G7RdtyQWxuI=
19+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31 h1:ACxDklUKKXb48+eg5ROZXi1vDgfMyfIA/WyvqHcHI0o=
20+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31/go.mod h1:yadnfsDwqXeVaohbGc/RaD287PuyRw2wugkh5ZL2J6k=
21+
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 h1:VaRN3TlFdd6KxX1x3ILT5ynH6HvKgqdiXoTxAF4HQcQ=
22+
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1/go.mod h1:FbtygfRFze9usAadmnGJNc8KsP346kEe+y2/oyhGAGc=
23+
github.com/aws/aws-sdk-go-v2/service/docdb v1.40.8 h1:dCFoU7DPI8Rx18HaOUFYMs71AFSLXybWtTeoG6S9Mtk=
24+
github.com/aws/aws-sdk-go-v2/service/docdb v1.40.8/go.mod h1:5tfvl8W23l+tN1hJ7Kp2VOmGqZoQcEu65GppEPJJQc4=
25+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.2 h1:D4oz8/CzT9bAEYtVhSBmFj2dNOtaHOtMKc2vHBwYizA=
26+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.2/go.mod h1:Za3IHqTQ+yNcRHxu1OFucBh0ACZT4j4VQFF0BqpZcLY=
27+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.12 h1:O+8vD2rGjfihBewr5bT+QUfYUHIxCVgG61LHoT59shM=
28+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.12/go.mod h1:usVdWJaosa66NMvmCrr08NcWDBRv4E6+YFG2pUdw1Lk=
29+
github.com/aws/aws-sdk-go-v2/service/sso v1.24.7 h1:rLnYAfXQ3YAccocshIH5mzNNwZBkBo+bP6EhIxak6Hw=
30+
github.com/aws/aws-sdk-go-v2/service/sso v1.24.7/go.mod h1:ZHtuQJ6t9A/+YDuxOLnbryAmITtr8UysSny3qcyvJTc=
31+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.6 h1:JnhTZR3PiYDNKlXy50/pNeix9aGMo6lLpXwJ1mw8MD4=
32+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.6/go.mod h1:URronUEGfXZN1VpdktPSD1EkAL9mfrV+2F4sjH38qOY=
33+
github.com/aws/aws-sdk-go-v2/service/sts v1.33.2 h1:s4074ZO1Hk8qv65GqNXqDjmkf4HSQqJukaLuuW0TpDA=
34+
github.com/aws/aws-sdk-go-v2/service/sts v1.33.2/go.mod h1:mVggCnIWoM09jP71Wh+ea7+5gAp53q+49wDFs1SW5z8=
35+
github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
36+
github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
937
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
1038
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
1139
github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
@@ -69,8 +97,6 @@ github.com/jaypipes/envutil v1.0.0 h1:u6Vwy9HwruFihoZrL0bxDLCa/YNadGVwKyPElNmZWo
6997
github.com/jaypipes/envutil v1.0.0/go.mod h1:vgIRDly+xgBq0eeZRcflOHMMobMwgC6MkMbxo/Nw65M=
7098
github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
7199
github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
72-
github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
73-
github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
74100
github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
75101
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
76102
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=

0 commit comments

Comments
 (0)