Merge pull request #2042 from crossplane-contrib/backport-2038-to-rel…

…ease-0.47 [Backport release-0.47] Fix changes detection for route53.ResourceRecordSet
crossplane-contrib · Apr 15, 2024 · 3739ae7 · 3739ae7
2 parents 90551c8 + b517610
commit 3739ae7
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 4 deletions.
diff --git a/pkg/clients/resourcerecordset/resourcerecordset.go b/pkg/clients/resourcerecordset/resourcerecordset.go
@@ -175,6 +175,8 @@ func LateInitialize(in *v1alpha1.ResourceRecordSetParameters, rrSet *route53type
 	rrType := string(rrSet.Type)
 	in.Type = pointer.LateInitializeValueFromPtr(in.Type, &rrType)
 	in.TTL = pointer.LateInitialize(in.TTL, rrSet.TTL)
+	in.MultiValueAnswer = pointer.LateInitialize(in.MultiValueAnswer, rrSet.MultiValueAnswer)
+	in.SetIdentifier = pointer.LateInitialize(in.SetIdentifier, rrSet.SetIdentifier)
 	if len(in.ResourceRecords) == 0 && len(rrSet.ResourceRecords) != 0 {
 		in.ResourceRecords = make([]v1alpha1.ResourceRecord, len(rrSet.ResourceRecords))
 		for i, val := range rrSet.ResourceRecords {

diff --git a/pkg/clients/resourcerecordset/resourcerecordset_test.go b/pkg/clients/resourcerecordset/resourcerecordset_test.go
@@ -59,19 +59,43 @@ func TestCreatePatch(t *testing.T) {
 				patch: &v1alpha1.ResourceRecordSetParameters{},
 			},
 		},
+		"SameFieldsWithMultiValueAnswer": {
+			args: args{
+				rrSet: route53types.ResourceRecordSet{
+					Name:             &resourceRecordSetName,
+					TTL:              &ttl,
+					MultiValueAnswer: aws.Bool(true),
+					SetIdentifier:    aws.String("id"),
+				},
+				p: v1alpha1.ResourceRecordSetParameters{
+					TTL:              &ttl,
+					MultiValueAnswer: aws.Bool(true),
+					SetIdentifier:    aws.String("id"),
+				},
+			},
+			want: want{
+				patch: &v1alpha1.ResourceRecordSetParameters{},
+			},
+		},
 		"DifferentFields": {
 			args: args{
 				rrSet: route53types.ResourceRecordSet{
-					Name: &resourceRecordSetName,
-					TTL:  &ttl,
+					Name:             &resourceRecordSetName,
+					TTL:              &ttl,
+					MultiValueAnswer: aws.Bool(true),
+					SetIdentifier:    aws.String("id"),
 				},
 				p: v1alpha1.ResourceRecordSetParameters{
-					TTL: &ttl2,
+					TTL:              &ttl2,
+					MultiValueAnswer: aws.Bool(false),
+					SetIdentifier:    aws.String("id2"),
 				},
 			},
 			want: want{
 				patch: &v1alpha1.ResourceRecordSetParameters{
-					TTL: &ttl2,
+					TTL:              &ttl2,
+					MultiValueAnswer: aws.Bool(false),
+					SetIdentifier:    aws.String("id2"),
 				},
 			},
 		},