MGDAPI-5690 CRO Redis snapshots tagging logics update

Author: valerymo

pkg/providers/aws/aws_interfaces.go

@@ -74,6 +74,7 @@ type ElastiCacheAPI interface {
 	CreateReplicationGroup(ctx context.Context, input *elasticache.CreateReplicationGroupInput, optFns ...func(*elasticache.Options)) (*elasticache.CreateReplicationGroupOutput, error)
 	CreateCacheSubnetGroup(ctx context.Context, input *elasticache.CreateCacheSubnetGroupInput, optFns ...func(*elasticache.Options)) (*elasticache.CreateCacheSubnetGroupOutput, error)
 	DeleteReplicationGroup(ctx context.Context, input *elasticache.DeleteReplicationGroupInput, optFns ...func(*elasticache.Options)) (*elasticache.DeleteReplicationGroupOutput, error)
+	ListTagsForResource(ctx context.Context, input *elasticache.ListTagsForResourceInput, optFns ...func(*elasticache.Options)) (*elasticache.ListTagsForResourceOutput, error)
 }
 
 type S3API interface {

pkg/providers/aws/aws_mock.go

@@ -465,6 +465,11 @@ func (m *mock_ElasticacheClient) CreateReplicationGroup(ctx context.Context, inp
 	return args.Get(0).(*elasticache.CreateReplicationGroupOutput), args.Error(1)
 }
 
+func (m *mock_ElasticacheClient) ListTagsForResource(ctx context.Context, input *elasticache.ListTagsForResourceInput, optFns ...func(*elasticache.Options)) (*elasticache.ListTagsForResourceOutput, error) {
+	args := m.Called(ctx, input, optFns)
+	return args.Get(0).(*elasticache.ListTagsForResourceOutput), args.Error(1)
+}
+
 // S3 Mock
 type mock_S3Client struct {
 	mock.Mock

pkg/providers/aws/aws_wrapper.go

@@ -274,6 +274,10 @@ func (r *RealElasticacheClient) CreateReplicationGroup(ctx context.Context, inpu
 	return r.Client.CreateReplicationGroup(ctx, input, optFns...)
 }
 
+func (r *RealElasticacheClient) ListTagsForResource(ctx context.Context, input *elasticache.ListTagsForResourceInput, optFns ...func(*elasticache.Options)) (*elasticache.ListTagsForResourceOutput, error) {
+	return r.Client.ListTagsForResource(ctx, input, optFns...)
+}
+
 // ---------- S3 ----------
 func NewS3Client(cfg aws.Config) S3API {
 	return &RealS3Client{

pkg/providers/aws/credentials.go

@@ -81,6 +81,7 @@ var (
 				"elasticache:ModifyCacheSubnetGroup",
 				"elasticache:DeleteCacheSubnetGroup",
 				"elasticache:ModifyReplicationGroup",
+				"elasticache:ListTagsForResource",
 				"rds:DescribeDBInstances",
 				"rds:CreateDBInstance",
 				"rds:DeleteDBInstance",

pkg/providers/aws/provider_redis.go

@@ -455,16 +455,24 @@ func (p *RedisProvider) TagElasticacheNode(ctx context.Context, elasticacheClien
 	// need arn in the following format arn:aws:elasticache:us-east-1:1234567890:cluster:my-mem-cluster
 	arn := fmt.Sprintf("arn:aws:elasticache:%s:%s:cluster:%s", region, *id.Account, *cache.CacheClusterId)
 
+	// Get default tags
 	cacheTags, clusterID, err := p.getDefaultElasticacheTags(ctx, r)
 	if err != nil {
 		msg := "Failed to build default tags"
 		return croType.StatusMessage(msg), errorUtil.Wrapf(err, msg)
 	}
 
-	// add tags
+	// Filter out already applied tags
+	filteredTags, err := filterAlreadyAppliedTags(ctx, elasticacheClient, arn, cacheTags)
+	if err != nil {
+		msg := "Failed to filter already applied tags"
+		return croType.StatusMessage(msg), errorUtil.Wrapf(err, msg)
+	}
+
+	// Add only new/changed tags
 	_, err = elasticacheClient.AddTagsToResource(ctx, &elasticache.AddTagsToResourceInput{
 		ResourceName: aws.String(arn),
-		Tags:         cacheTags,
+		Tags:         filteredTags,
 	})
 	if err != nil {
 		msg := "failed to add tags to aws elasticache :"
@@ -1278,3 +1286,32 @@ func validServiceUpdateStates(status string) bool {
 	}
 	return false
 }
+
+// filterAlreadyAppliedTags removes tags from `desired` that already exist (same key and value) on the resource.
+func filterAlreadyAppliedTags(ctx context.Context, client ElastiCacheAPI, resourceARN string, desired []elasticachetypes.Tag) ([]elasticachetypes.Tag, error) {
+	// List current tags on the resource
+	resp, err := client.ListTagsForResource(ctx, &elasticache.ListTagsForResourceInput{
+		ResourceName: aws.String(resourceARN),
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	// Build a map of current tags
+	currentTags := make(map[string]string)
+	for _, tag := range resp.TagList {
+		currentTags[*tag.Key] = *tag.Value
+	}
+
+	// Filter out tags that are already applied with same value
+	var filtered []elasticachetypes.Tag
+	for _, tag := range desired {
+		val, exists := currentTags[*tag.Key]
+		if !exists || val != *tag.Value {
+			// Either tag doesn't exist or value is different — keep it
+			filtered = append(filtered, tag)
+		}
+	}
+
+	return filtered, nil
+}