Merge branch 'main' into feat/add-release-please

GoogleCloudPlatform · May 20, 2024 · c92af91 · c92af91
2 parents da9467e + 3dbda29
commit c92af91
Show file tree

Hide file tree

Showing 13 changed files with 46 additions and 1 deletion.
diff --git a/ekm-over-vpc-onboarding/modules/create_vpc_kms_project/versions.tf b/ekm-over-vpc-onboarding/modules/create_vpc_kms_project/versions.tf
@@ -23,4 +23,8 @@ terraform {
       version = ">= 5.23.0"
     }
   }
+
+  provider_meta "google" {
+    module_name = "blueprints/terraform/kms-solutions:ekm-over-vpc-onboarding-submodule-create-projects"
+  }
 }
diff --git a/ekm-over-vpc-onboarding/modules/ekm_resources_creation/versions.tf b/ekm-over-vpc-onboarding/modules/ekm_resources_creation/versions.tf
@@ -29,4 +29,8 @@ terraform {
       version = "5.29.1"
     }
   }
+
+  provider_meta "google" {
+    module_name = "blueprints/terraform/kms-solutions:ekm-over-vpc-onboarding-submodule-ekm-creation"
+  }
 }
diff --git a/ekm-over-vpc-onboarding/versions.tf b/ekm-over-vpc-onboarding/versions.tf
@@ -16,4 +16,8 @@
 
 terraform {
   required_version = ">= 1.5.7"
+
+  provider_meta "google" {
+    module_name = "blueprints/terraform/kms-solutions:ekm-over-vpc-onboarding"
+  }
 }
diff --git a/oss-terraform-automation/1-apache-web-server/versions.tf b/oss-terraform-automation/1-apache-web-server/versions.tf
@@ -23,4 +23,8 @@ terraform {
       version = ">= 5.11, < 6"
     }
   }
+
+  provider_meta "google" {
+    module_name = "blueprints/terraform/kms-solutions:oss-apache-web-server"
+  }
 }
diff --git a/oss-terraform-automation/2-nginx-ssl-offloading/versions.tf b/oss-terraform-automation/2-nginx-ssl-offloading/versions.tf
@@ -23,4 +23,8 @@ terraform {
       version = ">= 5.11, < 6"
     }
   }
+
+  provider_meta "google" {
+    module_name = "blueprints/terraform/kms-solutions:oss-nginx-ssl-offloading"
+  }
 }
diff --git a/oss-terraform-automation/3-cng-provider/versions.tf b/oss-terraform-automation/3-cng-provider/versions.tf
@@ -23,4 +23,8 @@ terraform {
       version = ">= 5.11, < 6"
     }
   }
+
+  provider_meta "google" {
+    module_name = "blueprints/terraform/kms-solutions:oss-cng-provider"
+  }
 }
diff --git a/oss-terraform-automation/common/modules/bootstrap-kms-hsm/cloudbuild.tf b/oss-terraform-automation/common/modules/bootstrap-kms-hsm/cloudbuild.tf
@@ -39,6 +39,7 @@ resource "null_resource" "pkcs11_docker_image_build_template" {
     google_project_iam_member.cb_service_agent,
     google_project_iam_member.sa_service_account_user,
     google_service_account_iam_member.cb_service_agent_impersonate,
-    google_service_account_iam_member.self_impersonation
+    google_service_account_iam_member.self_impersonation,
+    google_project_service.apis_to_enable
   ]
 }
diff --git a/oss-terraform-automation/common/modules/bootstrap-kms-hsm/main.tf b/oss-terraform-automation/common/modules/bootstrap-kms-hsm/main.tf
@@ -52,6 +52,8 @@ module "kms" {
   key_protection_level = "HSM"
   key_rotation_period  = ""
   prevent_destroy      = var.prevent_destroy
+
+  depends_on = [google_project_service.apis_to_enable]
 }
 
 resource "google_artifact_registry_repository" "pkcs11_hsm_examples" {
@@ -60,4 +62,6 @@ resource "google_artifact_registry_repository" "pkcs11_hsm_examples" {
   repository_id = "${var.artifact_repository}-${local.default_suffix}"
   description   = "This repo stores images of the PKCS #11 library usage examples using Cloud HSM."
   format        = "DOCKER"
+
+  depends_on = [google_project_service.apis_to_enable]
 }
diff --git a/oss-terraform-automation/common/modules/bootstrap-kms-hsm/network.tf b/oss-terraform-automation/common/modules/bootstrap-kms-hsm/network.tf
@@ -29,6 +29,8 @@ module "vpc" {
       subnet_private_access = "true"
     }
   ]
+
+  depends_on = [google_project_service.apis_to_enable]
 }
 
 resource "google_compute_firewall" "allow-ssh-iap" {

diff --git a/oss-terraform-automation/common/modules/bootstrap-kms-hsm/sa.tf b/oss-terraform-automation/common/modules/bootstrap-kms-hsm/sa.tf
@@ -72,6 +72,8 @@ resource "google_service_account_iam_member" "cb_service_agent_impersonate" {
   service_account_id = local.custom_sa_name
   role               = "roles/iam.serviceAccountTokenCreator"
   member             = "serviceAccount:service-${data.google_project.cloudbuild_project.number}@gcp-sa-cloudbuild.iam.gserviceaccount.com"
+
+  depends_on = [google_project_service.apis_to_enable]
 }
 
 resource "google_project_iam_member" "sa_service_account_user" {

diff --git a/share-encrypted-data-with-partners/consumer/0-bootstrap/versions.tf b/share-encrypted-data-with-partners/consumer/0-bootstrap/versions.tf
@@ -38,4 +38,8 @@ terraform {
       version = "0.11.1"
     }
   }
+
+  provider_meta "google" {
+    module_name = "blueprints/terraform/kms-solutions:share-encrypted-data-with-partners-consumer-bootstrap"
+  }
 }
diff --git a/share-encrypted-data-with-partners/consumer/1-key-import/versions.tf b/share-encrypted-data-with-partners/consumer/1-key-import/versions.tf
@@ -24,4 +24,8 @@ terraform {
     }
 
   }
+
+  provider_meta "google" {
+    module_name = "blueprints/terraform/kms-solutions:share-encrypted-data-with-partners-consumer-key-import"
+  }
 }
diff --git a/share-encrypted-data-with-partners/producer/versions.tf b/share-encrypted-data-with-partners/producer/versions.tf
@@ -24,4 +24,8 @@ terraform {
     }
 
   }
+
+  provider_meta "google" {
+    module_name = "blueprints/terraform/kms-solutions:share-encrypted-data-with-partners-producer"
+  }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,6 +29,8 @@ module "vpc" { @@
           subnet_private_access = "true"
         }
       ]
+      depends_on = [google_project_service.apis_to_enable]
     }
     resource "google_compute_firewall" "allow-ssh-iap" {
@@ Expand Down @@