Generate ACM reference for DistributionConfig.ViewerCertificate (#29)

a-hilaly · web-flow · commit 58dc7b4d5f6c · 2024-02-19T22:46:28.000Z
Description of changes:
- Adding a new reference for ACM certificate ARN
- Fix `acmCertificateARN` camel case name

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
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: "2024-02-14T04:03:15Z"
-  build_hash: 947081ffebdeefcf2c61c4ca6d7e68810bdf9d08
+  build_date: "2024-02-19T19:45:25Z"
+  build_hash: 9c8a01fdcb2bcf7448cd9f9549c8b480e424e927
   go_version: go1.22.0
-  version: v0.30.0
-api_directory_checksum: 0772737bbcb79c3ab3ac8aa6b8d0e723ee28c401
+  version: v0.30.0-6-g9c8a01f-dirty
+api_directory_checksum: 86a18c0bfcc849ad234f64249fd8951ce418dd14
 api_version: v1alpha1
 aws_sdk_go_version: v1.44.214
 generator_config_info:
-  file_checksum: b865d43d27deaab5980043ea80d2fc0c34f779fc
+  file_checksum: 4faafc515699468a833ad70b7cbc8d2260477ea1
   original_file_name: generator.yaml
 last_modification:
   reason: API generation
diff --git a/apis/v1alpha1/generator.yaml b/apis/v1alpha1/generator.yaml
@@ -193,6 +193,11 @@ resources:
       CallerReference:
         type: string
         is_read_only: true
+      DistributionConfig.ViewerCertificate.ACMCertificateARN:
+        references:
+          service_name: acm
+          resource: Certificate
+          path: Status.ACKResourceMetadata.ARN
   Function:
     tags:
       ignore: true
diff --git a/apis/v1alpha1/types.go b/apis/v1alpha1/types.go
diff --git a/apis/v1alpha1/zz_generated.deepcopy.go b/apis/v1alpha1/zz_generated.deepcopy.go
diff --git a/cmd/controller/main.go b/cmd/controller/main.go
diff --git a/config/crd/bases/cloudfront.services.k8s.aws_distributions.yaml b/config/crd/bases/cloudfront.services.k8s.aws_distributions.yaml
@@ -885,8 +885,20 @@ spec:
                       and Using Alternate Domain Names and HTTPS (https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/using-https-alternate-domain-names.html)
                       in the Amazon CloudFront Developer Guide.
                     properties:
-                      aCMCertificateARN:
+                      acmCertificateARN:
                         type: string
+                      acmCertificateRef:
+                        description: Reference field for ACMCertificateARN
+                        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
                       certificate:
                         type: string
                       certificateSource:
diff --git a/config/rbac/cluster-role-controller.yaml b/config/rbac/cluster-role-controller.yaml
@@ -30,6 +30,20 @@ rules:
   - list
   - patch
   - watch
+- apiGroups:
+  - acm.services.k8s.aws
+  resources:
+  - certificates
+  verbs:
+  - get
+  - list
+- apiGroups:
+  - acm.services.k8s.aws
+  resources:
+  - certificates/status
+  verbs:
+  - get
+  - list
 - apiGroups:
   - cloudfront.services.k8s.aws
   resources:
diff --git a/generator.yaml b/generator.yaml
@@ -193,6 +193,11 @@ resources:
       CallerReference:
         type: string
         is_read_only: true
+      DistributionConfig.ViewerCertificate.ACMCertificateARN:
+        references:
+          service_name: acm
+          resource: Certificate
+          path: Status.ACKResourceMetadata.ARN
   Function:
     tags:
       ignore: true
diff --git a/go.mod b/go.mod
@@ -5,6 +5,7 @@ go 1.21
 toolchain go1.21.5
 
 require (
+	github.com/aws-controllers-k8s/acm-controller v0.0.13
 	github.com/aws-controllers-k8s/runtime v0.30.0
 	github.com/aws/aws-sdk-go v1.49.0
 	github.com/go-logr/logr v1.4.1
diff --git a/go.sum b/go.sum
@@ -1,3 +1,5 @@
+github.com/aws-controllers-k8s/acm-controller v0.0.13 h1:MweVMF9lAV9PpimS6L5NWVsoFfkmAfHUgoC/Msl887w=
+github.com/aws-controllers-k8s/acm-controller v0.0.13/go.mod h1:hUc8oa8RtxUk49svAoegfscFzhgmJvRCh2FklskrEwg=
 github.com/aws-controllers-k8s/runtime v0.30.0 h1:AibYRdi/7xUA3t8BA0u8g+J+OioaTAT6R4Vq8hxLiYw=
 github.com/aws-controllers-k8s/runtime v0.30.0/go.mod h1:Pv1ozlUaO11KO2mwPN/HzhAtZ70ZDE9UP24mjsbkul0=
 github.com/aws/aws-sdk-go v1.49.0 h1:g9BkW1fo9GqKfwg2+zCD+TW/D36Ux+vtfJ8guF4AYmY=
diff --git a/helm/crds/cloudfront.services.k8s.aws_distributions.yaml b/helm/crds/cloudfront.services.k8s.aws_distributions.yaml
@@ -885,8 +885,20 @@ spec:
                       and Using Alternate Domain Names and HTTPS (https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/using-https-alternate-domain-names.html)
                       in the Amazon CloudFront Developer Guide.
                     properties:
-                      aCMCertificateARN:
+                      acmCertificateARN:
                         type: string
+                      acmCertificateRef:
+                        description: Reference field for ACMCertificateARN
+                        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
                       certificate:
                         type: string
                       certificateSource:
diff --git a/helm/templates/_helpers.tpl b/helm/templates/_helpers.tpl
@@ -76,6 +76,20 @@ rules:
   - list
   - patch
   - watch
+- apiGroups:
+  - acm.services.k8s.aws
+  resources:
+  - certificates
+  verbs:
+  - get
+  - list
+- apiGroups:
+  - acm.services.k8s.aws
+  resources:
+  - certificates/status
+  verbs:
+  - get
+  - list
 - apiGroups:
   - cloudfront.services.k8s.aws
   resources:
diff --git a/pkg/resource/distribution/references.go b/pkg/resource/distribution/references.go

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+github.com/aws-controllers-k8s/acm-controller v0.0.13 h1:MweVMF9lAV9PpimS6L5NWVsoFfkmAfHUgoC/Msl887w=`
	`2`	`+github.com/aws-controllers-k8s/acm-controller v0.0.13/go.mod h1:hUc8oa8RtxUk49svAoegfscFzhgmJvRCh2FklskrEwg=`
`1`	`3`	`github.com/aws-controllers-k8s/runtime v0.30.0 h1:AibYRdi/7xUA3t8BA0u8g+J+OioaTAT6R4Vq8hxLiYw=`
`2`	`4`	`github.com/aws-controllers-k8s/runtime v0.30.0/go.mod h1:Pv1ozlUaO11KO2mwPN/HzhAtZ70ZDE9UP24mjsbkul0=`
`3`	`5`	`github.com/aws/aws-sdk-go v1.49.0 h1:g9BkW1fo9GqKfwg2+zCD+TW/D36Ux+vtfJ8guF4AYmY=`