Merge pull request #2291 from crossplane-contrib/backport-2286-to-release-0.57

[Backport release-0.57] fix(rds): correct nil-check for RestoreType in point-in-time restore

Author: kkendzia

pkg/controller/rds/dbcluster/setup.go

@@ -502,7 +502,7 @@ func generateRestoreDBClusterToPointInTimeInput(cr *svcapitypes.DBCluster) *svcs
 	if p.RestoreFrom.PointInTime != nil && p.RestoreFrom.PointInTime.RestoreTime != nil {
 		res.RestoreToTime = &p.RestoreFrom.PointInTime.RestoreTime.Time
 	}
-	if p.RestoreFrom.PointInTime != nil && p.RestoreFrom.PointInTime.RestoreTime != nil {
+	if p.RestoreFrom.PointInTime != nil && p.RestoreFrom.PointInTime.RestoreType != nil {
 		res.RestoreType = p.RestoreFrom.PointInTime.RestoreType
 	}
 	if p.RestoreFrom.PointInTime != nil && p.RestoreFrom.PointInTime.SourceDBClusterIdentifier != nil {

pkg/controller/rds/dbcluster/setup_test.go

@@ -928,3 +928,69 @@ func TestIsUpToDate(t *testing.T) {
 		})
 	}
 }
+
+func TestGenerateRestoreDBClusterToPointInTimeInput(t *testing.T) {
+	type args struct {
+		cr *svcapitypes.DBCluster
+	}
+
+	type want struct {
+		restoreType *string
+	}
+
+	cases := map[string]struct {
+		args
+		want
+	}{
+		"RestoreTypeSet": {
+			args: args{
+				cr: &svcapitypes.DBCluster{
+					Spec: svcapitypes.DBClusterSpec{
+						ForProvider: svcapitypes.DBClusterParameters{
+							CustomDBClusterParameters: svcapitypes.CustomDBClusterParameters{
+								RestoreFrom: &svcapitypes.RestoreDBClusterBackupConfiguration{
+									PointInTime: &svcapitypes.PointInTimeRestoreDBClusterBackupConfiguration{
+										RestoreType:               ptr.To("copy-on-write"),
+										SourceDBClusterIdentifier: ptr.To("source-cluster"),
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+			want: want{
+				restoreType: ptr.To("copy-on-write"),
+			},
+		},
+		"RestoreTypeNotSet": {
+			args: args{
+				cr: &svcapitypes.DBCluster{
+					Spec: svcapitypes.DBClusterSpec{
+						ForProvider: svcapitypes.DBClusterParameters{
+							CustomDBClusterParameters: svcapitypes.CustomDBClusterParameters{
+								RestoreFrom: &svcapitypes.RestoreDBClusterBackupConfiguration{
+									PointInTime: &svcapitypes.PointInTimeRestoreDBClusterBackupConfiguration{
+										SourceDBClusterIdentifier: ptr.To("source-cluster"),
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+			want: want{
+				restoreType: nil,
+			},
+		},
+	}
+
+	for name, tc := range cases {
+		t.Run(name, func(t *testing.T) {
+			result := generateRestoreDBClusterToPointInTimeInput(tc.args.cr)
+			if diff := cmp.Diff(tc.want.restoreType, result.RestoreType); diff != "" {
+				t.Errorf("RestoreType: -want, +got:\n%s", diff)
+			}
+		})
+	}
+}