ignore IDs in comparison

Signed-off-by: smcavallo <smcavallo@hotmail.com>
crossplane-contrib · Nov 9, 2021 · 05634a7 · 05634a7
1 parent 6d585be
commit 05634a7
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 3 deletions.
diff --git a/pkg/controller/s3/bucket/notificationConfig.go b/pkg/controller/s3/bucket/notificationConfig.go
@@ -93,9 +93,9 @@ func IsNotificationConfigurationUpToDate(cr *v1beta1.NotificationConfiguration,
 	sortTopic(generated.TopicConfigurations)
 	sortTopic(external.TopicConfigurations)
 
-	if cmp.Equal(external.LambdaFunctionConfigurations, generated.LambdaFunctionConfigurations, cmpopts.IgnoreTypes(document.NoSerde{}), cmpopts.EquateEmpty()) &&
-		cmp.Equal(external.QueueConfigurations, generated.QueueConfigurations, cmpopts.IgnoreTypes(document.NoSerde{}), cmpopts.EquateEmpty()) &&
-		cmp.Equal(external.TopicConfigurations, generated.TopicConfigurations, cmpopts.IgnoreTypes(document.NoSerde{}), cmpopts.EquateEmpty()) {
+	if cmp.Equal(external.LambdaFunctionConfigurations, generated.LambdaFunctionConfigurations, cmpopts.IgnoreTypes(document.NoSerde{}, types.LambdaFunctionConfiguration{}.Id), cmpopts.EquateEmpty()) &&
+		cmp.Equal(external.QueueConfigurations, generated.QueueConfigurations, cmpopts.IgnoreTypes(document.NoSerde{}, types.QueueConfiguration{}.Id), cmpopts.EquateEmpty()) &&
+		cmp.Equal(external.TopicConfigurations, generated.TopicConfigurations, cmpopts.IgnoreTypes(document.NoSerde{}, types.TopicConfiguration{}.Id), cmpopts.EquateEmpty()) {
 		return Updated, nil
 	}
 

diff --git a/pkg/controller/s3/bucket/notificationConfig_test.go b/pkg/controller/s3/bucket/notificationConfig_test.go
@@ -440,6 +440,53 @@ func TestIsNotificationConfigurationUpToDate(t *testing.T) {
 				isUpToDate: 0,
 			},
 		},
+		"IsUpToDateIgnoreIds": {
+			args: args{
+				cr: &v1beta1.NotificationConfiguration{
+					LambdaFunctionConfigurations: []v1beta1.LambdaFunctionConfiguration{{
+						Events:            generateNotificationEvents(),
+						Filter:            generateNotificationFilter(),
+						ID:                awsclient.String("lambda-id-1"),
+						LambdaFunctionArn: lambdaArn,
+					}},
+					QueueConfigurations: []v1beta1.QueueConfiguration{{
+						Events:   generateNotificationEvents(),
+						Filter:   generateNotificationFilter(),
+						ID:       awsclient.String("queue-id-1"),
+						QueueArn: queueArn,
+					}},
+					TopicConfigurations: []v1beta1.TopicConfiguration{{
+						Events:   generateNotificationEvents(),
+						Filter:   generateNotificationFilter(),
+						ID:       awsclient.String("topic-id-1"),
+						TopicArn: &topicArn,
+					}},
+				},
+				b: &s3.GetBucketNotificationConfigurationOutput{
+					LambdaFunctionConfigurations: []s3types.LambdaFunctionConfiguration{{
+						Events:            generateNotificationAWSEvents(),
+						Filter:            generateAWSNotificationFilter(),
+						Id:                awsclient.String("lambda-id-2"),
+						LambdaFunctionArn: &lambdaArn,
+					}},
+					QueueConfigurations: []s3types.QueueConfiguration{{
+						Events:   generateNotificationAWSEvents(),
+						Filter:   generateAWSNotificationFilter(),
+						Id:       awsclient.String("queue-id-2"),
+						QueueArn: &queueArn,
+					}},
+					TopicConfigurations: []s3types.TopicConfiguration{{
+						Events:   generateNotificationAWSEvents(),
+						Filter:   generateAWSNotificationFilter(),
+						Id:       awsclient.String("topic-id-2"),
+						TopicArn: &topicArn,
+					}},
+				},
+			},
+			want: want{
+				isUpToDate: 0,
+			},
+		},
 		"IsUpToDateRulesOutOfOrder": {
 			args: args{
 				cr: &v1beta1.NotificationConfiguration{