Skip to content

Commit 93960f3

Browse files
authored
Prepare repository for tag conversion function signature update (#40)
Description of changes: The To/FromACKTags function signatures are changing with the next code-gen release. This PR aims to ensure custom code adapts as well. By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent feeaeb2 commit 93960f3

File tree

10 files changed

+86
-55
lines changed

10 files changed

+86
-55
lines changed

apis/v1alpha1/ack-generate-metadata.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
ack_generate_info:
2-
build_date: "2025-03-06T01:58:25Z"
3-
build_hash: a326346bd3a6973254d247c9ab2dc76790c36241
2+
build_date: "2025-03-14T20:34:11Z"
3+
build_hash: 0ab258c51775fd52af32e649da00d57373b20869
44
go_version: go1.24.0
5-
version: v0.43.2
5+
version: v0.43.2-6-g0ab258c
66
api_directory_checksum: 4b40afb9ed679f81061b976518fa76adedec1288
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.32.6

pkg/resource/account/delta.go

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

pkg/resource/account/hooks.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,15 @@ func (rm *resourceManager) customUpdateAccount(
2929

3030
updated = rm.concreteResource(desired.DeepCopy())
3131

32+
desiredTags, _ := convertToOrderedACKTags(desired.ko.Spec.Tags)
33+
latestTags, _ := convertToOrderedACKTags(latest.ko.Spec.Tags)
34+
3235
if delta.DifferentAt("Spec.Tags") {
3336
if err := tags.SyncTags(
3437
ctx, rm.sdkapi, rm.metrics,
3538
*latest.ko.Status.AccountID,
36-
ToACKTags(desired.ko.Spec.Tags),
37-
ToACKTags(latest.ko.Spec.Tags),
39+
desiredTags,
40+
latestTags,
3841
); err != nil {
3942
return nil, err
4043
}

pkg/resource/account/manager.go

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

pkg/resource/account/sdk.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/resource/account/tags.go

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

pkg/resource/organizational_unit/delta.go

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

pkg/resource/organizational_unit/manager.go

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

pkg/resource/organizational_unit/tags.go

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

templates/hooks/account/sdk_read_one_post_set_output.go.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
if err != nil {
44
return nil, err
55
}
6-
ko.Spec.Tags = FromACKTags(tags)
6+
ko.Spec.Tags = fromACKTags(tags, nil)
77
}

0 commit comments

Comments
 (0)