Skip to content

Commit b5e6b1d

Browse files
committed
Prepare repository for tag conversion function signature update
The To/FromACKTags function signatures are changing with the next code-gen release. This PR aims to ensure custom code adapts as well.
1 parent 7fed419 commit b5e6b1d

File tree

7 files changed

+83
-59
lines changed

7 files changed

+83
-59
lines changed

apis/v1alpha1/ack-generate-metadata.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
ack_generate_info:
2-
build_date: "2025-02-20T18:23:50Z"
3-
build_hash: a326346bd3a6973254d247c9ab2dc76790c36241
2+
build_date: "2025-03-13T21:31:30Z"
3+
build_hash: e173c488067c368725a671a9e7ced476d6134219
44
go_version: go1.24.0
5-
version: v0.43.2
5+
version: v0.43.2-5-ge173c48
66
api_directory_checksum: 73ba0942f1950c4700c2bff40dda380d5994ca6b
77
api_version: v1alpha1
88
aws_sdk_go_version: 1.32.6

pkg/resource/domain/hooks.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,12 @@ func (rm *resourceManager) syncTags(
6363

6464
resourceArn := latest.ko.Status.ACKResourceMetadata.ARN
6565

66-
desiredTags := ToACKTags(desired.ko.Spec.Tags)
67-
latestTags := ToACKTags(latest.ko.Spec.Tags)
66+
desiredTags, _ := convertToOrderedACKTags(desired.ko.Spec.Tags)
67+
latestTags, _ := convertToOrderedACKTags(latest.ko.Spec.Tags)
6868

6969
added, _, removed := ackcompare.GetTagsDifference(latestTags, desiredTags)
7070

71-
toAdd := FromACKTags(added)
71+
toAdd := fromACKTags(added, nil)
7272

7373
var toDeleteTagKeys []string
7474
for k, _ := range removed {
@@ -128,13 +128,13 @@ func compareTags(
128128
if len(a.ko.Spec.Tags) != len(b.ko.Spec.Tags) {
129129
delta.Add("Spec.Tags", a.ko.Spec.Tags, b.ko.Spec.Tags)
130130
} else if len(a.ko.Spec.Tags) > 0 {
131-
desiredTags := ToACKTags(a.ko.Spec.Tags)
132-
latestTags := ToACKTags(b.ko.Spec.Tags)
131+
desiredTags, _ := convertToOrderedACKTags(a.ko.Spec.Tags)
132+
latestTags, _ := convertToOrderedACKTags(b.ko.Spec.Tags)
133133

134134
added, _, removed := ackcompare.GetTagsDifference(latestTags, desiredTags)
135135

136-
toAdd := FromACKTags(added)
137-
toDelete := FromACKTags(removed)
136+
toAdd := fromACKTags(added, nil)
137+
toDelete := fromACKTags(removed, nil)
138138

139139
if len(toAdd) != 0 || len(toDelete) != 0 {
140140
delta.Add("Spec.Tags", a.ko.Spec.Tags, b.ko.Spec.Tags)

pkg/resource/domain/manager.go

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

pkg/resource/domain/tags.go

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

pkg/resource/package_group/hooks.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ func (rm *resourceManager) syncTags(
3838

3939
resourceArn := latest.ko.Status.ACKResourceMetadata.ARN
4040

41-
desiredTags := ToACKTags(desired.ko.Spec.Tags)
42-
latestTags := ToACKTags(latest.ko.Spec.Tags)
41+
desiredTags, _ := convertToOrderedACKTags(desired.ko.Spec.Tags)
42+
latestTags, _ := convertToOrderedACKTags(latest.ko.Spec.Tags)
4343

4444
added, _, removed := ackcompare.GetTagsDifference(latestTags, desiredTags)
4545

46-
toAdd := FromACKTags(added)
46+
toAdd := fromACKTags(added, nil)
4747

4848
var toDeleteTagKeys []string
4949
for k, _ := range removed {
@@ -103,13 +103,13 @@ func compareTags(
103103
if len(a.ko.Spec.Tags) != len(b.ko.Spec.Tags) {
104104
delta.Add("Spec.Tags", a.ko.Spec.Tags, b.ko.Spec.Tags)
105105
} else if len(a.ko.Spec.Tags) > 0 {
106-
desiredTags := ToACKTags(a.ko.Spec.Tags)
107-
latestTags := ToACKTags(b.ko.Spec.Tags)
106+
desiredTags, _ := convertToOrderedACKTags(a.ko.Spec.Tags)
107+
latestTags, _ := convertToOrderedACKTags(b.ko.Spec.Tags)
108108

109109
added, _, removed := ackcompare.GetTagsDifference(latestTags, desiredTags)
110110

111-
toAdd := FromACKTags(added)
112-
toDelete := FromACKTags(removed)
111+
toAdd := fromACKTags(added, nil)
112+
toDelete := fromACKTags(removed, nil)
113113

114114
if len(toAdd) != 0 || len(toDelete) != 0 {
115115
delta.Add("Spec.Tags", a.ko.Spec.Tags, b.ko.Spec.Tags)

pkg/resource/package_group/manager.go

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

pkg/resource/package_group/tags.go

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

0 commit comments

Comments
 (0)