[Backport release-0.50] fix(ec2): Fix tags compare

pkg/clients/ec2/address.go

@@ -3,7 +3,6 @@ package ec2
 import (
 	"context"
 	"errors"
-	"sort"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/ec2"
@@ -101,31 +100,3 @@ func BuildFromEC2Tags(tags []ec2types.Tag) []v1beta1.Tag {
 
 	return res
 }
-
-// CompareTags compares arrays of v1beta1.Tag and ec2types.Tag
-func CompareTags(tags []v1beta1.Tag, ec2Tags []ec2types.Tag) bool {
-	if len(tags) != len(ec2Tags) {
-		return false
-	}
-
-	SortTags(tags, ec2Tags)
-
-	for i, t := range tags {
-		if t.Key != *ec2Tags[i].Key || t.Value != *ec2Tags[i].Value {
-			return false
-		}
-	}
-
-	return true
-}
-
-// SortTags sorts array of v1beta1.Tag and ec2types.Tag on 'Key'
-func SortTags(tags []v1beta1.Tag, ec2Tags []ec2types.Tag) {
-	sort.Slice(tags, func(i, j int) bool {
-		return tags[i].Key < tags[j].Key
-	})
-
-	sort.Slice(ec2Tags, func(i, j int) bool {
-		return *ec2Tags[i].Key < *ec2Tags[j].Key
-	})
-}

pkg/clients/ec2/internetgateway.go

@@ -96,7 +96,7 @@ func IsIgUpToDate(p v1beta1.InternetGatewayParameters, ig ec2types.InternetGatew
 	// if the attachment in spec exists in ig.Attachments, compare the tags and return
 	for _, a := range ig.Attachments {
 		if aws.ToString(p.VPCID) == aws.ToString(a.VpcId) {
-			return CompareTagsV1Beta1(p.Tags, ig.Tags)
+			return CompareTags(p.Tags, ig.Tags)
 		}
 	}
 

pkg/clients/ec2/routetable.go

@@ -160,7 +160,7 @@ func CreateRTPatch(in ec2types.RouteTable, target v1beta1.RouteTableParameters)
 	targetCopy := target.DeepCopy()
 	currentParams := &v1beta1.RouteTableParameters{}
 
-	SortTagsV1Beta1(target.Tags, in.Tags)
+	CompareTags(target.Tags, in.Tags)
 
 	if !pointer.BoolValue(target.IgnoreRoutes) {
 		// Add the default route for fair comparison.

pkg/clients/ec2/subnet.go

@@ -85,5 +85,5 @@ func IsSubnetUpToDate(p v1beta1.SubnetParameters, s ec2types.Subnet) bool {
 	if aws.ToBool(p.AssignIPv6AddressOnCreation) != aws.ToBool(s.AssignIpv6AddressOnCreation) {
 		return false
 	}
-	return CompareTagsV1Beta1(p.Tags, s.Tags)
+	return CompareTags(p.Tags, s.Tags)
 }

pkg/clients/ec2/tags_test.go

@@ -70,6 +70,34 @@ func TestDiffEC2Tags(t *testing.T) {
 				remove: []ec2types.Tag{},
 			},
 		},
+		"TagsWithSameKeyValuesButDifferentOrder": {
+			args: args{
+				local: []ec2types.Tag{
+					{
+						Key:   aws.String("val"),
+						Value: aws.String("key"),
+					},
+					{
+						Key:   aws.String("name"),
+						Value: aws.String("somename"),
+					},
+				},
+				remote: []ec2types.Tag{
+					{
+						Key:   aws.String("name"),
+						Value: aws.String("somename"),
+					},
+					{
+						Key:   aws.String("val"),
+						Value: aws.String("key"),
+					},
+				},
+			},
+			want: want{
+				add:    []ec2types.Tag{},
+				remove: []ec2types.Tag{},
+			},
+		},
 		"TagsWithSameKeyDifferentValuesAndSameLength": {
 			args: args{
 				local: []ec2types.Tag{

pkg/clients/ec2/tags_v1beta1.go

@@ -17,8 +17,6 @@ limitations under the License.
 package ec2
 
 import (
-	"sort"
-
 	"github.com/aws/aws-sdk-go-v2/aws"
 	ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types"
 
@@ -47,30 +45,11 @@ func GenerateEC2TagsV1Beta1(tags []svcapitypes.Tag) []ec2types.Tag {
 	return res
 }
 
-// CompareTags compares arrays of v1beta1.Tag and ec2type.Tag
-func CompareTagsV1Beta1(tags []svcapitypes.Tag, ec2Tags []ec2types.Tag) bool {
-	if len(tags) != len(ec2Tags) {
+// CompareTags compares arrays of v1beta1.Tag and ec2types.Tag
+func CompareTags(spec []svcapitypes.Tag, current []ec2types.Tag) bool {
+	if len(spec) != len(current) {
 		return false
 	}
-
-	SortTagsV1Beta1(tags, ec2Tags)
-
-	for i, t := range tags {
-		if t.Key != *ec2Tags[i].Key || t.Value != *ec2Tags[i].Value {
-			return false
-		}
-	}
-
-	return true
-}
-
-// SortTags sorts array of v1beta1.Tag and ec2type.Tag on 'Key'
-func SortTagsV1Beta1(tags []svcapitypes.Tag, ec2Tags []ec2types.Tag) {
-	sort.Slice(tags, func(i, j int) bool {
-		return tags[i].Key < tags[j].Key
-	})
-
-	sort.Slice(ec2Tags, func(i, j int) bool {
-		return *ec2Tags[i].Key < *ec2Tags[j].Key
-	})
+	toAdd, toRemove := DiffEC2Tags(GenerateEC2TagsV1Beta1(spec), current)
+	return len(toAdd) == 0 && len(toRemove) == 0
 }

pkg/clients/ec2/vpc.go

@@ -53,7 +53,7 @@ func IsVpcUpToDate(spec v1beta1.VPCParameters, vpc ec2types.Vpc, attributes ec2.
 		return false
 	}
 
-	return CompareTagsV1Beta1(spec.Tags, vpc.Tags)
+	return CompareTags(spec.Tags, vpc.Tags)
 }
 
 // GenerateVpcObservation is used to produce v1beta1.VPCObservation from

pkg/controller/ec2/natgateway/controller.go

@@ -142,7 +142,7 @@ func (e *external) Observe(ctx context.Context, mgd resource.Managed) (managed.E
 
 	return managed.ExternalObservation{
 		ResourceExists:   true,
-		ResourceUpToDate: ec2.CompareTagsV1Beta1(cr.Spec.ForProvider.Tags, observed.Tags),
+		ResourceUpToDate: ec2.CompareTags(cr.Spec.ForProvider.Tags, observed.Tags),
 	}, nil
 }