Merge pull request #1961 from crossplane-contrib/backport-1957-to-rel…

…ease-0.45
crossplane-contrib · Nov 27, 2023 · 426ad52 · 426ad52
2 parents 2dfb9a7 + 67577f3
commit 426ad52
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/pkg/clients/database/rds.go b/pkg/clients/database/rds.go
@@ -720,6 +720,7 @@ func IsUpToDate(ctx context.Context, kube client.Client, r *v1beta1.RDSInstance,
 		cmpopts.IgnoreTypes(&xpv1.Reference{}, &xpv1.Selector{}, []xpv1.Reference{}),
 		cmpopts.IgnoreFields(v1beta1.RDSInstanceParameters{}, "Region"),
 		cmpopts.IgnoreFields(v1beta1.RDSInstanceParameters{}, "Tags"),
+		cmpopts.IgnoreFields(v1beta1.RDSInstanceParameters{}, "DBName"),
 		cmpopts.IgnoreFields(v1beta1.RDSInstanceParameters{}, "EngineVersion"),
 		cmpopts.IgnoreFields(v1beta1.RDSInstanceParameters{}, "SkipFinalSnapshotBeforeDeletion"),
 		cmpopts.IgnoreFields(v1beta1.RDSInstanceParameters{}, "FinalDBSnapshotIdentifier"),

diff --git a/pkg/clients/database/rds_test.go b/pkg/clients/database/rds_test.go
@@ -335,6 +335,21 @@ func TestIsUpToDate(t *testing.T) {
 			},
 			want: true,
 		},
+		"IgnoresDBName": {
+			args: args{
+				db: rdstypes.DBInstance{
+					DBName: nil,
+				},
+				r: v1beta1.RDSInstance{
+					Spec: v1beta1.RDSInstanceSpec{
+						ForProvider: v1beta1.RDSInstanceParameters{
+							DBName: &dbName,
+						},
+					},
+				},
+			},
+			want: true,
+		},
 		"SamePassword": {
 			args: args{
 				db: rdstypes.DBInstance{