Check for RequestInProgressException when creating CA resource (#46)

Description of changes: 1. Check for RequestInProgressException when creating CA resources 2. Release artifacts for release v0.0.11 By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
aws-controllers-k8s · Apr 23, 2024 · 43a62bc · 43a62bc
1 parent fbe19ea
commit 43a62bc
Show file tree

Hide file tree

Showing 20 changed files with 294 additions and 85 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: "2024-04-19T16:18:58Z"
+  build_date: "2024-04-23T13:51:34Z"
   build_hash: af8006cb7248f0177e2a14b709c69c3a99a016ad
   go_version: go1.22.0
   version: v0.33.0
-api_directory_checksum: 804becfbeaa4f4dee31721a37049a05b7c904de7
+api_directory_checksum: 14ee2b48df20458271bcddc87436760812fd6ccd
 api_version: v1alpha1
 aws_sdk_go_version: v1.49.6
 generator_config_info:
-  file_checksum: 86a608ca2c8bf34d5bb49a64b4eaa7a055f0b4f7
+  file_checksum: 5e732471cd7372bbdab8104a11bf3ac2c0dd6511
   original_file_name: generator.yaml
 last_modification:
   reason: API generation
diff --git a/apis/v1alpha1/certificate_authority.go b/apis/v1alpha1/certificate_authority.go
diff --git a/apis/v1alpha1/generator.yaml b/apis/v1alpha1/generator.yaml
@@ -5,7 +5,6 @@ ignore:
       - Permission
   field_paths:
   - CreateCertificateAuthorityInput.IdempotencyToken
-  - CreateCertificateAuthorityInput.CertificateAuthorityType
   - IssueCertificateInput.IdempotencyToken
   - IssueCertificateInput.Csr
   - ImportCertificateAuthorityCertificateInput.Certificate
@@ -28,13 +27,16 @@ model_name: acm-pca
 prefix_config: {}
 resources:
   CertificateAuthority:
+    reconcile: 
+      requeue_on_success_seconds: 30
+    renames:
+      operations:
+        CreateCertificateAuthority:
+          input_fields:
+            CertificateAuthorityType: Type
     hooks:
       delta_pre_compare:
         code: customSetDefaults(a, b)
-      sdk_create_post_build_request:
-        template_path: hooks/certificate_authority/sdk_create_post_build_request.go.tpl
-      sdk_create_post_set_output:
-        template_path: hooks/certificate_authority/sdk_create_post_set_output.go.tpl
       sdk_update_pre_build_request:
         template_path: hooks/certificate_authority/sdk_update_pre_build_request.go.tpl
       sdk_read_one_post_set_output:
@@ -56,7 +58,6 @@ resources:
       CertificateAuthorityConfiguration:
         is_immutable: true
       Type:
-        type: string
         is_immutable: true
         go_tag: json:"type,omitempty"
       KeyStorageSecurityStandard:
@@ -130,6 +131,11 @@ resources:
       - MissingParameter
       - ValidationError
       - ValidationException
+      - InvalidArgsException
+      - InvalidArnException
+      - InvalidStateException
+      - LimitExceededException
+      - MalformedCSRException
     fields:
       CertificateAuthorityARN:
         references:
@@ -157,6 +163,21 @@ resources:
     tags:
       ignore: true
   CertificateAuthorityActivation:
+    exceptions:
+      terminal_codes:
+      - InvalidAction
+      - InvalidParameterCombination
+      - InvalidParameterValue
+      - InvalidQueryParameter
+      - MissingParameter
+      - ValidationError
+      - ValidationException
+      - CertificateMismatchException
+      - InvalidArnException
+      - InvalidRequestException
+      - InvalidStateException
+      - MalformedCertificateException
+      - RequestFailedException
     hooks:
       delta_pre_compare:
         code: customSetDefaults(a, b)

diff --git a/config/controller/kustomization.yaml b/config/controller/kustomization.yaml
@@ -6,4 +6,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: public.ecr.aws/aws-controllers-k8s/acmpca-controller
-  newTag: 0.0.10
+  newTag: 0.0.11
diff --git a/config/crd/bases/acmpca.services.k8s.aws_certificateauthorities.yaml b/config/crd/bases/acmpca.services.k8s.aws_certificateauthorities.yaml
@@ -429,6 +429,7 @@ spec:
                   type: object
                 type: array
               type:
+                description: The type of the certificate authority.
                 type: string
               usageMode:
                 description: |-

diff --git a/generator.yaml b/generator.yaml
@@ -5,7 +5,6 @@ ignore:
       - Permission
   field_paths:
   - CreateCertificateAuthorityInput.IdempotencyToken
-  - CreateCertificateAuthorityInput.CertificateAuthorityType
   - IssueCertificateInput.IdempotencyToken
   - IssueCertificateInput.Csr
   - ImportCertificateAuthorityCertificateInput.Certificate
@@ -28,13 +27,16 @@ model_name: acm-pca
 prefix_config: {}
 resources:
   CertificateAuthority:
+    reconcile: 
+      requeue_on_success_seconds: 30
+    renames:
+      operations:
+        CreateCertificateAuthority:
+          input_fields:
+            CertificateAuthorityType: Type
     hooks:
       delta_pre_compare:
         code: customSetDefaults(a, b)
-      sdk_create_post_build_request:
-        template_path: hooks/certificate_authority/sdk_create_post_build_request.go.tpl
-      sdk_create_post_set_output:
-        template_path: hooks/certificate_authority/sdk_create_post_set_output.go.tpl
       sdk_update_pre_build_request:
         template_path: hooks/certificate_authority/sdk_update_pre_build_request.go.tpl
       sdk_read_one_post_set_output:
@@ -56,7 +58,6 @@ resources:
       CertificateAuthorityConfiguration:
         is_immutable: true
       Type:
-        type: string
         is_immutable: true
         go_tag: json:"type,omitempty"
       KeyStorageSecurityStandard:
@@ -130,6 +131,11 @@ resources:
       - MissingParameter
       - ValidationError
       - ValidationException
+      - InvalidArgsException
+      - InvalidArnException
+      - InvalidStateException
+      - LimitExceededException
+      - MalformedCSRException
     fields:
       CertificateAuthorityARN:
         references:
@@ -157,6 +163,21 @@ resources:
     tags:
       ignore: true
   CertificateAuthorityActivation:
+    exceptions:
+      terminal_codes:
+      - InvalidAction
+      - InvalidParameterCombination
+      - InvalidParameterValue
+      - InvalidQueryParameter
+      - MissingParameter
+      - ValidationError
+      - ValidationException
+      - CertificateMismatchException
+      - InvalidArnException
+      - InvalidRequestException
+      - InvalidStateException
+      - MalformedCertificateException
+      - RequestFailedException
     hooks:
       delta_pre_compare:
         code: customSetDefaults(a, b)

diff --git a/helm/Chart.yaml b/helm/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
 name: acmpca-chart
 description: A Helm chart for the ACK service controller for AWS Private Certificate Authority (PCA)
-version: 0.0.10
-appVersion: 0.0.10
+version: 0.0.11
+appVersion: 0.0.11
 home: https://github.com/aws-controllers-k8s/acmpca-controller
 icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
 sources:

diff --git a/helm/crds/acmpca.services.k8s.aws_certificateauthorities.yaml b/helm/crds/acmpca.services.k8s.aws_certificateauthorities.yaml
@@ -429,6 +429,7 @@ spec:
                   type: object
                 type: array
               type:
+                description: The type of the certificate authority.
                 type: string
               usageMode:
                 description: |-

diff --git a/helm/templates/NOTES.txt b/helm/templates/NOTES.txt
@@ -1,5 +1,5 @@
 {{ .Chart.Name }} has been installed.
-This chart deploys "public.ecr.aws/aws-controllers-k8s/acmpca-controller:0.0.10".
+This chart deploys "public.ecr.aws/aws-controllers-k8s/acmpca-controller:0.0.11".
 
 Check its status by running:
   kubectl --namespace {{ .Release.Namespace }} get pods -l "app.kubernetes.io/instance={{ .Release.Name }}"

diff --git a/helm/values.yaml b/helm/values.yaml
@@ -4,7 +4,7 @@
 
 image:
   repository: public.ecr.aws/aws-controllers-k8s/acmpca-controller
-  tag: 0.0.10
+  tag: 0.0.11
   pullPolicy: IfNotPresent
   pullSecrets: []
 

diff --git a/pkg/resource/certificate/sdk.go b/pkg/resource/certificate/sdk.go
diff --git a/pkg/resource/certificate_authority/manager_factory.go b/pkg/resource/certificate_authority/manager_factory.go
diff --git a/pkg/resource/certificate_authority/sdk.go b/pkg/resource/certificate_authority/sdk.go