Merge branch 'main' into ack-bot/rt-v0.44.0-codegen-v0.44.0

Author: rushmash91

pkg/resource/cache_cluster/hooks.go

@@ -93,7 +93,7 @@ func (rm *resourceManager) syncTags(
 	desired *resource,
 	latest *resource,
 ) (err error) {
-	return util.SyncTags(ctx, desired.ko.Spec.Tags, latest.ko.Spec.Tags, latest.ko.Status.ACKResourceMetadata, ToACKTags, rm.sdkapi, rm.metrics)
+	return util.SyncTags(ctx, desired.ko.Spec.Tags, latest.ko.Spec.Tags, latest.ko.Status.ACKResourceMetadata, convertToOrderedACKTags, rm.sdkapi, rm.metrics)
 }
 
 func (rm *resourceManager) updateCacheClusterPayload(input *svcsdk.ModifyCacheClusterInput, desired, latest *resource, delta *ackcompare.Delta) error {

pkg/resource/replication_group/hooks.go

@@ -131,7 +131,7 @@ func (rm *resourceManager) syncTags(
 	desired *resource,
 	latest *resource,
 ) (err error) {
-	return util.SyncTags(ctx, desired.ko.Spec.Tags, latest.ko.Spec.Tags, latest.ko.Status.ACKResourceMetadata, ToACKTags, rm.sdkapi, rm.metrics)
+	return util.SyncTags(ctx, desired.ko.Spec.Tags, latest.ko.Spec.Tags, latest.ko.Status.ACKResourceMetadata, convertToOrderedACKTags, rm.sdkapi, rm.metrics)
 }
 
 const (

pkg/util/tags.go

@@ -84,7 +84,7 @@ func SyncTags(
 	desiredTags []*svcapitypes.Tag,
 	latestTags []*svcapitypes.Tag,
 	latestACKResourceMetadata *ackv1alpha1.ResourceMetadata,
-	toACKTags func(tags []*svcapitypes.Tag) acktags.Tags,
+	toACKTags func(tags []*svcapitypes.Tag) (acktags.Tags, []string),
 	sdkapi *svcsdk.Client,
 	metrics *metrics.Metrics,
 ) (err error) {
@@ -94,8 +94,8 @@ func SyncTags(
 
 	arn := (*string)(latestACKResourceMetadata.ARN)
 
-	from := toACKTags(latestTags)
-	to := toACKTags(desiredTags)
+	from, _ := toACKTags(latestTags)
+	to, _ := toACKTags(desiredTags)
 
 	added, _, removed := ackcompare.GetTagsDifference(from, to)