Fixes flaky tests

Author: Kyrie Chen

apis/v1alpha1/ack-generate-metadata.yaml

@@ -1,8 +1,8 @@
 ack_generate_info:
-  build_date: "2023-01-10T21:58:28Z"
-  build_hash: 1b20baf45a0b73a11b296050322a384c705fa897
-  go_version: go1.17.5
-  version: v0.22.0
+  build_date: "2023-02-01T22:07:34Z"
+  build_hash: c6651c200ba136e5c7f50ad8be751fae060a38e6
+  go_version: go1.19
+  version: v0.22.0-1-gc6651c2
 api_directory_checksum: ee32acc4d4a0ba7e2823dd20fdbe2c4ef1d9e0f4
 api_version: v1alpha1
 aws_sdk_go_version: v1.44.93

apis/v1alpha1/subnet_group.go

@@ -34,8 +34,8 @@ spec:
             type: object
           spec:
             description: "SubnetGroupSpec defines the desired state of SubnetGroup.
-              \n Represents the output of one of the following operations: \n * CreateSubnetGroup
-              \n * UpdateSubnetGroup \n A subnet group is a collection of subnets
+              \n Represents the output of one of the following operations: \n - CreateSubnetGroup
+              \n - UpdateSubnetGroup \n A subnet group is a collection of subnets
               (typically private) that you can designate for your clusters running
               in an Amazon Virtual Private Cloud (VPC) environment."
             properties:

apis/v1alpha1/types.go

@@ -41,6 +41,14 @@ func (rm *resourceManager) validateACLNeedsUpdate(
 	return nil
 }
 
+// aclActive returns true when the status of the given ACL is set to `active`
+func (rm *resourceManager) aclActive(
+	latest *resource,
+) bool {
+	latestStatus := latest.ko.Status.Status
+	return latestStatus != nil && *latestStatus == "active"
+}
+
 // getTags gets tags from given ParameterGroup.
 func (rm *resourceManager) getTags(
 	ctx context.Context,
@@ -114,17 +122,23 @@ func computeTagsDelta(
 	latest []*svcapitypes.Tag,
 ) (addedOrUpdated []*svcapitypes.Tag, removed []*string) {
 	var visitedIndexes []string
+	var hasSameKey bool
 
 	for _, latestElement := range latest {
+		hasSameKey = false
 		visitedIndexes = append(visitedIndexes, *latestElement.Key)
 		for _, desiredElement := range desired {
 			if equalStrings(latestElement.Key, desiredElement.Key) {
+				hasSameKey = true
 				if !equalStrings(latestElement.Value, desiredElement.Value) {
 					addedOrUpdated = append(addedOrUpdated, desiredElement)
 				}
-				continue
+				break
 			}
 		}
+		if hasSameKey {
+			continue
+		}
 		removed = append(removed, latestElement.Key)
 	}
 	for _, desiredElement := range desired {

helm/crds/memorydb.services.k8s.aws_subnetgroups.yaml

@@ -264,6 +264,14 @@ func (rm *resourceManager) newMemoryDBClusterUploadPayload(
 	return res
 }
 
+// clusterActive returns true when the status of the given Cluster is set to `active`
+func (rm *resourceManager) clusterActive(
+	latest *resource,
+) bool {
+	latestStatus := latest.ko.Status.Status
+	return latestStatus != nil && *latestStatus == "active"
+}
+
 // getTags gets tags from given ParameterGroup.
 func (rm *resourceManager) getTags(
 	ctx context.Context,
@@ -337,17 +345,23 @@ func computeTagsDelta(
 	latest []*svcapitypes.Tag,
 ) (addedOrUpdated []*svcapitypes.Tag, removed []*string) {
 	var visitedIndexes []string
+	var hasSameKey bool
 
 	for _, latestElement := range latest {
+		hasSameKey = false
 		visitedIndexes = append(visitedIndexes, *latestElement.Key)
 		for _, desiredElement := range desired {
 			if equalStrings(latestElement.Key, desiredElement.Key) {
+				hasSameKey = true
 				if !equalStrings(latestElement.Value, desiredElement.Value) {
 					addedOrUpdated = append(addedOrUpdated, desiredElement)
 				}
-				continue
+				break
 			}
 		}
+		if hasSameKey {
+			continue
+		}
 		removed = append(removed, latestElement.Key)
 	}
 	for _, desiredElement := range desired {

pkg/resource/acl/hooks.go

@@ -15,6 +15,7 @@ package parameter_group
 
 import (
 	"context"
+	ackutil "github.com/aws-controllers-k8s/runtime/pkg/util"
 
 	ackv1alpha1 "github.com/aws-controllers-k8s/runtime/apis/core/v1alpha1"
 	ackerr "github.com/aws-controllers-k8s/runtime/pkg/errors"
@@ -173,13 +174,7 @@ func (rm *resourceManager) getTags(
 	if err != nil {
 		return nil, err
 	}
-	tags := make([]*svcapitypes.Tag, 0, len(resp.TagList))
-	for _, tag := range resp.TagList {
-		tags = append(tags, &svcapitypes.Tag{
-			Key:   tag.Key,
-			Value: tag.Value,
-		})
-	}
+	tags := resourceTagsFromSDKTags(resp.TagList)
 	return tags, nil
 }
 
@@ -235,34 +230,33 @@ func (rm *resourceManager) updateTags(
 func computeTagsDelta(
 	desired []*svcapitypes.Tag,
 	latest []*svcapitypes.Tag,
-) (added []*svcapitypes.Tag, removed []*string) {
-	toDelete := []*string{}
-	toAdd := []*svcapitypes.Tag{}
-
-	desiredTags := map[string]string{}
-	key := ""
-	value := ""
-	for _, tag := range desired {
-		if tag.Key != nil {
-			key = *tag.Key
-			value = ""
-			if tag.Value != nil {
-				value = *tag.Value
+) (addedOrUpdated []*svcapitypes.Tag, removed []*string) {
+	var visitedIndexes []string
+	var hasSameKey bool
+
+	for _, latestElement := range latest {
+		hasSameKey = false
+		visitedIndexes = append(visitedIndexes, *latestElement.Key)
+		for _, desiredElement := range desired {
+			if equalStrings(latestElement.Key, desiredElement.Key) {
+				hasSameKey = true
+				if !equalStrings(latestElement.Value, desiredElement.Value) {
+					addedOrUpdated = append(addedOrUpdated, desiredElement)
+				}
+				break
 			}
-			desiredTags[key] = value
 		}
+		if hasSameKey {
+			continue
+		}
+		removed = append(removed, latestElement.Key)
 	}
-
-	for _, tag := range desired {
-		toAdd = append(toAdd, tag)
-	}
-	for _, tag := range latest {
-		_, ok := desiredTags[*tag.Key]
-		if !ok {
-			toDelete = append(toDelete, tag.Key)
+	for _, desiredElement := range desired {
+		if !ackutil.InStrings(*desiredElement.Key, visitedIndexes) {
+			addedOrUpdated = append(addedOrUpdated, desiredElement)
 		}
 	}
-	return toAdd, toDelete
+	return addedOrUpdated, removed
 }
 
 func sdkTagsFromResourceTags(
@@ -277,3 +271,23 @@ func sdkTagsFromResourceTags(
 	}
 	return tags
 }
+
+func resourceTagsFromSDKTags(
+	sdkTags []*svcsdk.Tag,
+) []*svcapitypes.Tag {
+	tags := make([]*svcapitypes.Tag, len(sdkTags))
+	for i := range sdkTags {
+		tags[i] = &svcapitypes.Tag{
+			Key:   sdkTags[i].Key,
+			Value: sdkTags[i].Value,
+		}
+	}
+	return tags
+}
+
+func equalStrings(a, b *string) bool {
+	if a == nil {
+		return b == nil || *b == ""
+	}
+	return (*a == "" && b == nil) || *a == *b
+}