Add reference for MasterUserSecretKMSKeyID (#146)

For DBCluster and DBInstance resources, the MasterUserSecretKMSKeyID field can refer to a KMS Key resource. By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
aws-controllers-k8s · Mar 30, 2023 · c337fbc · c337fbc
1 parent a531fd6
commit c337fbc
Show file tree

Hide file tree

Showing 14 changed files with 163 additions and 7 deletions.
diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml
@@ -1,13 +1,13 @@
 ack_generate_info:
-  build_date: "2023-03-30T14:52:36Z"
+  build_date: "2023-03-30T18:50:28Z"
   build_hash: fa24753ea8b657d8815ae3eac7accd0958f5f9fb
   go_version: go1.19.4
   version: v0.25.0
-api_directory_checksum: c260842c2919b6d1d7ddc4b1dc40cacea82dc551
+api_directory_checksum: 54ea7e387b74b590907eb5136a9a802b0e97a738
 api_version: v1alpha1
 aws_sdk_go_version: v1.44.232
 generator_config_info:
-  file_checksum: c3a80c129c39b07e24dd80a830d5254626362121
+  file_checksum: 1c65701c9ae781dcda0fb8c04fed4de60e25a9ef
   original_file_name: generator.yaml
 last_modification:
   reason: API generation
diff --git a/apis/v1alpha1/db_cluster.go b/apis/v1alpha1/db_cluster.go
diff --git a/apis/v1alpha1/db_instance.go b/apis/v1alpha1/db_instance.go
diff --git a/apis/v1alpha1/generator.yaml b/apis/v1alpha1/generator.yaml
@@ -114,6 +114,11 @@ resources:
           resource: Key
           service_name: kms
           path: Status.ACKResourceMetadata.ARN
+      MasterUserSecretKmsKeyId:
+        references:
+          resource: Key
+          service_name: kms
+          path: Status.ACKResourceMetadata.ARN
       DBClusterParameterGroupName:
         references:
           resource: DBClusterParameterGroup
@@ -241,6 +246,11 @@ resources:
           resource: Key
           service_name: kms
           path: Status.ACKResourceMetadata.ARN
+      MasterUserSecretKmsKeyId:
+        references:
+          resource: Key
+          service_name: kms
+          path: Status.ACKResourceMetadata.ARN
       DBParameterGroupName:
         references:
           resource: DBParameterGroup

diff --git a/apis/v1alpha1/zz_generated.deepcopy.go b/apis/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/rds.services.k8s.aws_dbclusters.yaml b/config/crd/bases/rds.services.k8s.aws_dbclusters.yaml
@@ -391,6 +391,19 @@ spec:
                   account has a different default KMS key for each Amazon Web Services
                   Region. \n Valid for: Aurora DB clusters and Multi-AZ DB clusters"
                 type: string
+              masterUserSecretKMSKeyRef:
+                description: "AWSResourceReferenceWrapper provides a wrapper around
+                  *AWSResourceReference type to provide more user friendly syntax
+                  for references using 'from' field Ex: APIIDRef: \n from: name: my-api"
+                properties:
+                  from:
+                    description: AWSResourceReference provides all the values necessary
+                      to reference another k8s resource for finding the identifier(Id/ARN/Name)
+                    properties:
+                      name:
+                        type: string
+                    type: object
+                type: object
               masterUsername:
                 description: "The name of the master user for the DB cluster. \n Constraints:
                   \n * Must be 1 to 16 letters or numbers. \n * First character must

diff --git a/config/crd/bases/rds.services.k8s.aws_dbinstances.yaml b/config/crd/bases/rds.services.k8s.aws_dbinstances.yaml
@@ -500,6 +500,19 @@ spec:
                   account has a different default KMS key for each Amazon Web Services
                   Region."
                 type: string
+              masterUserSecretKMSKeyRef:
+                description: "AWSResourceReferenceWrapper provides a wrapper around
+                  *AWSResourceReference type to provide more user friendly syntax
+                  for references using 'from' field Ex: APIIDRef: \n from: name: my-api"
+                properties:
+                  from:
+                    description: AWSResourceReference provides all the values necessary
+                      to reference another k8s resource for finding the identifier(Id/ARN/Name)
+                    properties:
+                      name:
+                        type: string
+                    type: object
+                type: object
               masterUsername:
                 description: "The name for the master user. \n Amazon Aurora \n Not
                   applicable. The name for the master user is managed by the DB cluster.

diff --git a/generator.yaml b/generator.yaml
@@ -114,6 +114,11 @@ resources:
           resource: Key
           service_name: kms
           path: Status.ACKResourceMetadata.ARN
+      MasterUserSecretKmsKeyId:
+        references:
+          resource: Key
+          service_name: kms
+          path: Status.ACKResourceMetadata.ARN
       DBClusterParameterGroupName:
         references:
           resource: DBClusterParameterGroup
@@ -241,6 +246,11 @@ resources:
           resource: Key
           service_name: kms
           path: Status.ACKResourceMetadata.ARN
+      MasterUserSecretKmsKeyId:
+        references:
+          resource: Key
+          service_name: kms
+          path: Status.ACKResourceMetadata.ARN
       DBParameterGroupName:
         references:
           resource: DBParameterGroup

diff --git a/helm/crds/rds.services.k8s.aws_dbclusters.yaml b/helm/crds/rds.services.k8s.aws_dbclusters.yaml
@@ -391,6 +391,19 @@ spec:
                   account has a different default KMS key for each Amazon Web Services
                   Region. \n Valid for: Aurora DB clusters and Multi-AZ DB clusters"
                 type: string
+              masterUserSecretKMSKeyRef:
+                description: "AWSResourceReferenceWrapper provides a wrapper around
+                  *AWSResourceReference type to provide more user friendly syntax
+                  for references using 'from' field Ex: APIIDRef: \n from: name: my-api"
+                properties:
+                  from:
+                    description: AWSResourceReference provides all the values necessary
+                      to reference another k8s resource for finding the identifier(Id/ARN/Name)
+                    properties:
+                      name:
+                        type: string
+                    type: object
+                type: object
               masterUsername:
                 description: "The name of the master user for the DB cluster. \n Constraints:
                   \n - Must be 1 to 16 letters or numbers. \n - First character must

diff --git a/helm/crds/rds.services.k8s.aws_dbinstances.yaml b/helm/crds/rds.services.k8s.aws_dbinstances.yaml
@@ -502,6 +502,19 @@ spec:
                   account has a different default KMS key for each Amazon Web Services
                   Region."
                 type: string
+              masterUserSecretKMSKeyRef:
+                description: "AWSResourceReferenceWrapper provides a wrapper around
+                  *AWSResourceReference type to provide more user friendly syntax
+                  for references using 'from' field Ex: APIIDRef: \n from: name: my-api"
+                properties:
+                  from:
+                    description: AWSResourceReference provides all the values necessary
+                      to reference another k8s resource for finding the identifier(Id/ARN/Name)
+                    properties:
+                      name:
+                        type: string
+                    type: object
+                type: object
               masterUsername:
                 description: "The name for the master user. \n # Amazon Aurora \n
                   Not applicable. The name for the master user is managed by the DB

diff --git a/pkg/resource/db_cluster/delta.go b/pkg/resource/db_cluster/delta.go
diff --git a/pkg/resource/db_cluster/references.go b/pkg/resource/db_cluster/references.go
diff --git a/pkg/resource/db_instance/delta.go b/pkg/resource/db_instance/delta.go
diff --git a/pkg/resource/db_instance/references.go b/pkg/resource/db_instance/references.go