Merge pull request #2289 from crossplane-contrib/backport-2288-to-release-0.57

[Backport release-0.57] feat(dbcluster.rds): add pit restore from cluster resource id

Author: kkendzia

apis/rds/v1alpha1/custom_types.go

@@ -438,6 +438,7 @@ type PointInTimeRestoreDBClusterBackupConfiguration struct {
 	// +optional
 	UseLatestRestorableTime bool `json:"useLatestRestorableTime"`
 
+	// Deprecated: Use SourceDBClusterResourceID instead. This field never had any effect.
 	// SourceDBInstanceAutomatedBackupsArn specifies the Amazon Resource Name (ARN) of the replicated automated backups
 	// from which to restore. Example: arn:aws:rds:useast-1:123456789012:auto-backup:ab-L2IJCEXJP7XQ7HOJ4SIEXAMPLE
 	// +optional
@@ -448,7 +449,13 @@ type PointInTimeRestoreDBClusterBackupConfiguration struct {
 	// +optional
 	SourceDBClusterIdentifier *string `json:"sourceDBClusterIdentifier,omitempty"`
 
-	// SourceDbiResourceID specifies the resource ID of the source DB instance from which to restore.
+	// The resource ID of the source DB cluster from which to restore.
+	// e.g. "cluster-EXAMPLE1234567890"
+	// +optional
+	SourceDBClusterResourceID *string `json:"sourceDBClusterResourceId,omitempty"`
+
+	// Deprecated: Use SourceDBClusterResourceID instead. This field never had any effect.
+	// The resource ID of the source DB instance from which to restore.
 	// +optional
 	SourceDbiResourceID *string `json:"sourceDbiResourceId,omitempty"`
 

apis/rds/v1alpha1/zz_generated.deepcopy.go

@@ -1187,14 +1187,21 @@ spec:
                               SourceDBClusterIdentifier specifies the identifier of the source DB cluster from which to restore. Constraints:
                               Must match the identifier of an existing DB instance.
                             type: string
+                          sourceDBClusterResourceId:
+                            description: |-
+                              The resource ID of the source DB cluster from which to restore.
+                              e.g. "cluster-EXAMPLE1234567890"
+                            type: string
                           sourceDBInstanceAutomatedBackupsArn:
                             description: |-
+                              Deprecated: Use SourceDBClusterResourceID instead. This field never had any effect.
                               SourceDBInstanceAutomatedBackupsArn specifies the Amazon Resource Name (ARN) of the replicated automated backups
                               from which to restore. Example: arn:aws:rds:useast-1:123456789012:auto-backup:ab-L2IJCEXJP7XQ7HOJ4SIEXAMPLE
                             type: string
                           sourceDbiResourceId:
-                            description: SourceDbiResourceID specifies the resource
-                              ID of the source DB instance from which to restore.
+                            description: |-
+                              Deprecated: Use SourceDBClusterResourceID instead. This field never had any effect.
+                              The resource ID of the source DB instance from which to restore.
                             type: string
                           useLatestRestorableTime:
                             description: |-

package/crds/rds.aws.crossplane.io_dbclusters.yaml

@@ -508,6 +508,9 @@ func generateRestoreDBClusterToPointInTimeInput(cr *svcapitypes.DBCluster) *svcs
 	if p.RestoreFrom.PointInTime != nil && p.RestoreFrom.PointInTime.SourceDBClusterIdentifier != nil {
 		res.SourceDBClusterIdentifier = p.RestoreFrom.PointInTime.SourceDBClusterIdentifier
 	}
+	if p.RestoreFrom.PointInTime != nil && p.RestoreFrom.PointInTime.SourceDBClusterResourceID != nil {
+		res.SourceDbClusterResourceId = p.RestoreFrom.PointInTime.SourceDBClusterResourceID
+	}
 	if cr.Spec.ForProvider.Tags != nil {
 		var tags []*svcsdk.Tag
 		for _, tag := range cr.Spec.ForProvider.Tags {