Fix several GCP Infra issues

Author: William Chrisp

.github/workflows/aws_cicd.yaml

@@ -39,7 +39,7 @@ jobs:
         with:
           node-version: 18
       - name: Install cdktf
-        run: npm install --global cdktf-cli@0.15.5
+        run: npm install --global cdktf-cli@latest
 
       - name: Install pip packages
         run: make install-dependencies

.github/workflows/gcp_cicd.yaml

@@ -40,7 +40,7 @@ jobs:
         with:
           node-version: 18
       - name: Install cdktf
-        run: npm install --global cdktf-cli@0.15.5
+        run: npm install --global cdktf-cli@latest
 
       - name: Install pip packages
         run: make install-dependencies
@@ -53,6 +53,7 @@ jobs:
         with:
           directory: infrastructure/gcp/cdktf.out/stacks/ 
           framework: terraform_plan
+          # skip_check: CKV_GCP_102
 
       - name: Deploy base infrastructure
         run: make gcp-deploy-base INFRA_ARGS=--auto-approve

Makefile

@@ -116,7 +116,7 @@ gcp-build-image:
 	@echo "\n\n---GCP-BUILD-IMAGE---\n"
 	gcloud auth configure-docker australia-southeast1-docker.pkg.dev
 	pipenv requirements | tee requirements.txt
-	docker buildx build --platform=linux/amd64 --push . -t australia-southeast1-docker.pkg.dev/contino-squad0-fc/flight-contoller-event-receiver/event_receiver:latest
+	docker buildx build --platform=linux/amd64 --push . -t australia-southeast1-docker.pkg.dev/contino-squad0-fc/flight-controller-event-receiver/event_receiver:latest
 
 gcp-synth: gcp-build-dependencies
 	@echo "\n\n---GCP-SYNTH---\n"

Pipfile

@@ -24,9 +24,7 @@ behave = "*"
 constructs = "*"
 cdktf = "*"
 cdktf-cdktf-provider-aws = "*"
-cdktf-cdktf-provider-archive = "*"
 cdktf-cdktf-provider-google = "*"
-cdktf-cdktf-provider-external = "*"
 pytest-watch = "*"
 dirhash = "*"
 

Pipfile.lock

@@ -1,76 +1,70 @@
-from constructs import Construct
 from cdktf_cdktf_provider_google import (
-    artifact_registry_repository,
-    artifact_registry_repository_iam_binding,
-    service_account,
-    kms_key_ring,
-    kms_crypto_key,
-    kms_crypto_key_iam_binding
-)
+    artifact_registry_repository, artifact_registry_repository_iam_binding,
+    kms_crypto_key, kms_crypto_key_iam_binding, kms_key_ring, service_account)
+from constructs import Construct
 
 
 class ArtifactRegistryComponent(Construct):
     def __init__(
-            self, 
-            scope: Construct, 
-            id: str, 
-            project_id: str, 
-            project_number: str,
-            location: str, 
-            name: str,
-            cloudrun_account: service_account.ServiceAccount,
-            flight_controller_key_ring: kms_key_ring.KmsKeyRing):
+        self,
+        scope: Construct,
+        id: str,
+        project_id: str,
+        project_number: str,
+        name_prefix: str,
+        location: str,
+        cloudrun_account: service_account.ServiceAccount,
+        flight_controller_key_ring: kms_key_ring.KmsKeyRing,
+    ):
         super().__init__(scope, id)
 
         registry_key = kms_crypto_key.KmsCryptoKey(
             self,
             "registry_key",
-            name="flight_controller_registry_key",
+            name="registry_key",
             key_ring=flight_controller_key_ring.id,
             rotation_period="7776000s",
+            lifecycle= {
+                "prevent_destroy": True
+            }
         )
 
         registry_key_iam = kms_crypto_key_iam_binding.KmsCryptoKeyIamBinding(
             self,
             "registry_key_iam_binding",
             crypto_key_id=registry_key.id,
             role="roles/cloudkms.cryptoKeyEncrypterDecrypter",
-
-            members= [
+            members=[
                 f"serviceAccount:service-{project_number}@gcp-sa-artifactregistry.iam.gserviceaccount.com"
-            ]
+            ],
         )
 
         self.registry = artifact_registry_repository.ArtifactRegistryRepository(
             self,
             "registry",
-            repository_id=name,
+            repository_id=f"{name_prefix}-event-receiver",
             description="Registry to store event_receiver docker images",
             format="DOCKER",
             project=project_id,
             location=location,
             kms_key_name=registry_key.id,
-            depends_on = [
-                registry_key
-            ]
+            depends_on=[registry_key, registry_key_iam],
         )
 
-        self.adminbinding = artifact_registry_repository_iam_binding.ArtifactRegistryRepositoryIamBinding(
+        self.admin_binding = artifact_registry_repository_iam_binding.ArtifactRegistryRepositoryIamBinding(
             self,
             "admin",
             repository=self.registry.id,
             role="roles/artifactregistry.repoAdmin",
             members=[
-            "domain:contino.io",
-            ]
+                "domain:contino.io",
+            ],
         )
 
-        self.readerbinding = artifact_registry_repository_iam_binding.ArtifactRegistryRepositoryIamBinding(
+        self.reader_binding = artifact_registry_repository_iam_binding.ArtifactRegistryRepositoryIamBinding(
             self,
             "reader",
             repository=self.registry.id,
             role="roles/artifactregistry.reader",
-            members=[
-            f"serviceAccount:{cloudrun_account.email}"
-            ]
-        )
+            members=[f"serviceAccount:{cloudrun_account.email}"],
+        )