Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare repository for tag conversion function signature update #14

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Prepare repository for tag conversion function signature update #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions apis/v1alpha1/ack-generate-metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
ack_generate_info:
build_date: "2025-02-20T18:23:50Z"
build_hash: a326346bd3a6973254d247c9ab2dc76790c36241
build_date: "2025-03-14T20:19:48Z"
build_hash: 0ab258c51775fd52af32e649da00d57373b20869
go_version: go1.24.0
version: v0.43.2
version: v0.43.2-6-g0ab258c
api_directory_checksum: 73ba0942f1950c4700c2bff40dda380d5994ca6b
api_version: v1alpha1
aws_sdk_go_version: 1.32.6
Expand Down
14 changes: 7 additions & 7 deletions pkg/resource/domain/hooks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,12 @@ func (rm *resourceManager) syncTags(

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

desiredTags := ToACKTags(desired.ko.Spec.Tags)
latestTags := ToACKTags(latest.ko.Spec.Tags)
desiredTags, _ := convertToOrderedACKTags(desired.ko.Spec.Tags)
latestTags, _ := convertToOrderedACKTags(latest.ko.Spec.Tags)

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

toAdd := FromACKTags(added)
toAdd := fromACKTags(added, nil)

var toDeleteTagKeys []string
for k, _ := range removed {
Expand Down Expand Up @@ -128,13 +128,13 @@ func compareTags(
if len(a.ko.Spec.Tags) != len(b.ko.Spec.Tags) {
delta.Add("Spec.Tags", a.ko.Spec.Tags, b.ko.Spec.Tags)
} else if len(a.ko.Spec.Tags) > 0 {
desiredTags := ToACKTags(a.ko.Spec.Tags)
latestTags := ToACKTags(b.ko.Spec.Tags)
desiredTags, _ := convertToOrderedACKTags(a.ko.Spec.Tags)
latestTags, _ := convertToOrderedACKTags(b.ko.Spec.Tags)

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

toAdd := FromACKTags(added)
toDelete := FromACKTags(removed)
toAdd := fromACKTags(added, nil)
toDelete := fromACKTags(removed, nil)

if len(toAdd) != 0 || len(toDelete) != 0 {
delta.Add("Spec.Tags", a.ko.Spec.Tags, b.ko.Spec.Tags)
Expand Down
14 changes: 7 additions & 7 deletions pkg/resource/domain/manager.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

44 changes: 28 additions & 16 deletions pkg/resource/domain/tags.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions pkg/resource/package_group/hooks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ func (rm *resourceManager) syncTags(

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

desiredTags := ToACKTags(desired.ko.Spec.Tags)
latestTags := ToACKTags(latest.ko.Spec.Tags)
desiredTags, _ := convertToOrderedACKTags(desired.ko.Spec.Tags)
latestTags, _ := convertToOrderedACKTags(latest.ko.Spec.Tags)

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

toAdd := FromACKTags(added)
toAdd := fromACKTags(added, nil)

var toDeleteTagKeys []string
for k, _ := range removed {
Expand Down Expand Up @@ -103,13 +103,13 @@ func compareTags(
if len(a.ko.Spec.Tags) != len(b.ko.Spec.Tags) {
delta.Add("Spec.Tags", a.ko.Spec.Tags, b.ko.Spec.Tags)
} else if len(a.ko.Spec.Tags) > 0 {
desiredTags := ToACKTags(a.ko.Spec.Tags)
latestTags := ToACKTags(b.ko.Spec.Tags)
desiredTags, _ := convertToOrderedACKTags(a.ko.Spec.Tags)
latestTags, _ := convertToOrderedACKTags(b.ko.Spec.Tags)

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

toAdd := FromACKTags(added)
toDelete := FromACKTags(removed)
toAdd := fromACKTags(added, nil)
toDelete := fromACKTags(removed, nil)

if len(toAdd) != 0 || len(toDelete) != 0 {
delta.Add("Spec.Tags", a.ko.Spec.Tags, b.ko.Spec.Tags)
Expand Down
14 changes: 7 additions & 7 deletions pkg/resource/package_group/manager.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

44 changes: 28 additions & 16 deletions pkg/resource/package_group/tags.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.