Merge pull request #2202 from crossplane-contrib/backport-2201-to-release-0.52

[Backport release-0.52] feat(rds): add kmsKeyId to status

Author: anagarlau

apis/database/v1beta1/rdsinstance_types.go

@@ -1245,6 +1245,12 @@ type RDSInstanceObservation struct {
 	// VPCSecurityGroups provides a list of VPC security group elements that the DB instance belongs
 	// to.
 	VPCSecurityGroups []VPCSecurityGroupMembership `json:"vpcSecurityGroups,omitempty"`
+	// If StorageEncrypted is enabled, the Amazon Web Services KMS key identifier
+	// for the encrypted DB cluster.
+	//
+	// The Amazon Web Services KMS key identifier is the key ARN, key ID, alias
+	// ARN, or alias name for the KMS key.
+	KMSKeyID string `json:"kmsKeyID,omitempty"`
 }
 
 // An RDSInstanceStatus represents the observed state of an RDSInstance.

apis/rds/generator-config.yaml

@@ -18,12 +18,22 @@ resources:
         from:
           operation: DescribeDBInstances
           path: DBInstances.DBClusterIdentifier
+      KmsKeyId:
+        is_read_only: true
+        from:
+          operation: DescribeDBInstances
+          path: DBInstances.KmsKeyId
   DBCluster:
     fields:
       AllowMajorVersionUpgrade:
         from:
           operation: ModifyDBCluster
           path: AllowMajorVersionUpgrade
+      KmsKeyId:
+        is_read_only: true
+        from:
+          operation: DescribeDBClusters
+          path: DBClusters.KmsKeyId
   DBInstanceRoleAssociation:
     exceptions:
       errors:

apis/rds/v1alpha1/zz_db_cluster.go

@@ -1701,6 +1701,14 @@ spec:
                       DB instance was created.
                     format: date-time
                     type: string
+                  kmsKeyID:
+                    description: |-
+                      If StorageEncrypted is enabled, the Amazon Web Services KMS key identifier
+                      for the encrypted DB cluster.
+
+                      The Amazon Web Services KMS key identifier is the key ARN, key ID, alias
+                      ARN, or alias name for the KMS key.
+                    type: string
                   latestRestorableTime:
                     description: |-
                       LatestRestorableTime specifies the latest time to which a database can be

apis/rds/v1alpha1/zz_db_instance.go

@@ -1836,6 +1836,14 @@ spec:
                       Indicates whether the mapping of Amazon Web Services Identity and Access
                       Management (IAM) accounts to database accounts is enabled.
                     type: boolean
+                  kmsKeyID:
+                    description: |-
+                      If StorageEncrypted is enabled, the Amazon Web Services KMS key identifier
+                      for the encrypted DB cluster.
+
+                      The Amazon Web Services KMS key identifier is the key ARN, key ID, alias
+                      ARN, or alias name for the KMS key.
+                    type: string
                   latestRestorableTime:
                     description: The latest time to which a database can be restored
                       with point-in-time restore.

apis/rds/v1alpha1/zz_generated.deepcopy.go

@@ -2350,6 +2350,14 @@ spec:
                       For more information, see Upgrading the storage file system for a DB instance
                       (https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_PIOPS.StorageTypes.html#USER_PIOPS.UpgradeFileSystem).
                     type: boolean
+                  kmsKeyID:
+                    description: |-
+                      If StorageEncrypted is enabled, the Amazon Web Services KMS key identifier
+                      for the encrypted DB instance.
+
+                      The Amazon Web Services KMS key identifier is the key ARN, key ID, alias
+                      ARN, or alias name for the KMS key.
+                    type: string
                   latestRestorableTime:
                     description: |-
                       The latest time to which a database in this DB instance can be restored with

package/crds/database.aws.crossplane.io_rdsinstances.yaml

@@ -469,6 +469,7 @@ func GenerateObservation(db rdstypes.DBInstance) v1beta1.RDSInstanceObservation
 		ReadReplicaDBInstanceIdentifiers:      db.ReadReplicaDBInstanceIdentifiers,
 		ReadReplicaSourceDBInstanceIdentifier: aws.ToString(db.ReadReplicaSourceDBInstanceIdentifier),
 		SecondaryAvailabilityZone:             aws.ToString(db.SecondaryAvailabilityZone),
+		KMSKeyID:                              aws.ToString(db.KmsKeyId),
 	}
 	if db.LatestRestorableTime != nil {
 		t := metav1.NewTime(*db.LatestRestorableTime)

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

@@ -106,6 +106,9 @@ func (e *custom) postObserve(ctx context.Context, cr *svcapitypes.DBCluster, res
 	if err != nil {
 		return managed.ExternalObservation{}, err
 	}
+
+	cr.Status.AtProvider.KMSKeyID = resp.DBClusters[0].KmsKeyId
+
 	switch pointer.StringValue(resp.DBClusters[0].Status) {
 	case "available", "storage-optimization", "backing-up":
 		cr.SetConditions(xpv1.Available())

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

@@ -351,6 +351,8 @@ func (e *custom) postObserve(ctx context.Context, cr *svcapitypes.DBInstance, re
 		return obs, err
 	}
 
+	cr.Status.AtProvider.KMSKeyID = resp.DBInstances[0].KmsKeyId
+
 	cr.Spec.ForProvider.DBClusterIdentifier = resp.DBInstances[0].DBClusterIdentifier
 
 	switch pointer.StringValue(resp.DBInstances[0].DBInstanceStatus) {