chore: Per-module isolation for integration tests

Makefile

@@ -91,6 +91,7 @@ docker_test_integration:
 	docker run --rm -it \
 		-e SERVICE_ACCOUNT_JSON \
 		-e TF_VAR_project_id \
+		-v /usr/local/google/home/martijnvs/cft-forks/cloud-foundation-toolkit:/localgithub/mycft \
 		-v "$(CURDIR)":/workspace \
 		$(REGISTRY_URL)/${DOCKER_IMAGE_DEVELOPER_TOOLS}:${DOCKER_TAG_VERSION_DEVELOPER_TOOLS} \
-		/usr/local/bin/test_integration.sh
+		cft test run all

build/int.cloudbuild.yaml

@@ -49,34 +49,19 @@ steps:
 #   - 'TF_VAR_create_access_context_manager_access_policy=false'
 #   waitFor:
 #   - prepare
-- id: create
-  name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
-  args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do create']
-  waitFor:
-  - prepare
-- id: converge
-  name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
-  args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do converge']
+- id: simple-cloud-run
   waitFor:
-  - create
-- id: verify
+    - prepare
   name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
-  args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do verify']
-  waitFor:
-  - converge
-- id: destroy
-  name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
-  args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do destroy']
-  waitFor:
-  - verify
-- id: create all
+  args: ['/bin/bash', '-c', 'cft test run TestSimpleCloudRun --verbose']
+- id: create cloud-run-with-cmek
   waitFor:
-    - destroy
+    - simple-cloud-run
   name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
   args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && source_test_env && init_credentials && cft test run TestCloudRunWithCMEK --test-dir test/integration --stage init --verbose']
 - id: converge cloud-run-with-cmek
   waitFor:
-    - create all
+    - create cloud-run-with-cmek
   name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
   args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && source_test_env && init_credentials && cft test run TestCloudRunWithCMEK --test-dir test/integration --stage apply --verbose']
 - id: verify cloud-run-with-cmek

examples/cloud_run_vpc_connector/main.tf

@@ -23,8 +23,8 @@ module "service_account" {
 }
 
 module "cloud_run" {
-  source  = "GoogleCloudPlatform/cloud-run/google"
-  version = "~> 0.16"
+  source = "../.."
+  # [restore-marker]   version = "~> 0.16"
 
   service_name          = "ci-cloud-run-sc"
   project_id            = var.project_id

examples/job_service_account_creation/main.tf

@@ -15,8 +15,8 @@
  */
 
 module "job" {
-  source  = "GoogleCloudPlatform/cloud-run/google//modules/job-exec"
-  version = "~> 0.16"
+  source = "../../modules/job-exec"
+  # [restore-marker]   version = "~> 0.16"
 
   project_id                    = var.project_id
   name                          = "job-sa-creation"

examples/secure_cloud_run/main.tf

@@ -21,8 +21,8 @@ locals {
 }
 
 module "secure_cloud_run" {
-  source  = "GoogleCloudPlatform/cloud-run/google//modules/secure-cloud-run"
-  version = "~> 0.16"
+  source = "../../modules/secure-cloud-run"
+  # [restore-marker]   version = "~> 0.16"
 
   connector_name              = "con-run"
   subnet_name                 = "vpc-subnet"

examples/secure_cloud_run_standalone/main.tf

@@ -27,8 +27,8 @@ resource "random_id" "random_folder_suffix" {
 }
 
 module "secure_harness" {
-  source  = "GoogleCloudPlatform/cloud-run/google//modules/secure-serverless-harness"
-  version = "~> 0.16"
+  source = "../../modules/secure-serverless-harness"
+  # [restore-marker]   version = "~> 0.16"
 
   billing_account                             = var.billing_account
   security_project_name                       = "prj-kms-secure-cloud-run"
@@ -66,8 +66,8 @@ resource "null_resource" "copy_image" {
 }
 
 module "secure_cloud_run" {
-  source  = "GoogleCloudPlatform/cloud-run/google//modules/secure-cloud-run"
-  version = "~> 0.16"
+  source = "../../modules/secure-cloud-run"
+  # [restore-marker]   version = "~> 0.16"
 
   location                                = local.location
   region                                  = local.region

examples/simple_cloud_run/main.tf

@@ -23,8 +23,8 @@ module "service_account" {
 }
 
 module "cloud_run" {
-  source  = "GoogleCloudPlatform/cloud-run/google"
-  version = "~> 0.16"
+  source = "../.."
+  # [restore-marker]   version = "~> 0.16"
 
   service_name          = "ci-cloud-run"
   project_id            = var.project_id

examples/simple_cloud_run_with_cmek/main.tf

@@ -52,8 +52,8 @@ resource "google_project_service_identity" "serverless_sa" {
 }
 
 module "cloud_run" {
-  source  = "GoogleCloudPlatform/cloud-run/google"
-  version = "~> 0.16"
+  source = "../.."
+  # [restore-marker]   version = "~> 0.16"
 
   service_name          = "ci-cloud-run"
   project_id            = var.project_id

examples/simple_job_exec/main.tf

@@ -15,8 +15,8 @@
  */
 
 module "job" {
-  source  = "GoogleCloudPlatform/cloud-run/google//modules/job-exec"
-  version = "~> 0.16"
+  source = "../../modules/job-exec"
+  # [restore-marker]   version = "~> 0.16"
 
   project_id = var.project_id
   name       = "simple-job"

examples/v2/main.tf

@@ -21,8 +21,8 @@ resource "google_service_account" "sa" {
 }
 
 module "cloud_run_v2" {
-  source  = "GoogleCloudPlatform/cloud-run/google//modules/v2"
-  version = "~> 0.16"
+  source = "../../modules/v2"
+  # [restore-marker]   version = "~> 0.16"
 
   service_name           = "ci-cloud-run-v2"
   project_id             = var.project_id

examples/v2_with_gmp/main.tf

@@ -15,8 +15,8 @@
  */
 
 module "cloud_run_v2" {
-  source  = "GoogleCloudPlatform/cloud-run/google//modules/v2"
-  version = "~> 0.16"
+  source = "../../modules/v2"
+  # [restore-marker]   version = "~> 0.16"
 
   service_name = "ci-cloud-run-v2-gmp"
   project_id   = var.project_id

examples/v2_with_gpu/main.tf

@@ -21,7 +21,7 @@ resource "google_service_account" "sa" {
 }
 
 module "cloud_run_v2_gpu" {
-  source = "GoogleCloudPlatform/cloud-run/google//modules/v2"
+  source = "../../modules/v2"
 
   service_name           = "ci-cloud-run-v2-gpu"
   project_id             = var.project_id

examples/v2_with_iap/main.tf

@@ -15,8 +15,8 @@
  */
 
 module "cloud_run_v2" {
-  source  = "GoogleCloudPlatform/cloud-run/google//modules/v2"
-  version = "~> 0.16"
+  source = "../../modules/v2"
+  # [restore-marker]   version = "~> 0.16"
 
   service_name = "ci-cloud-run-v2-iap"
   project_id   = var.project_id

test/integration/go.mod

@@ -5,49 +5,35 @@ go 1.23.0
 toolchain go1.24.4
 
 require (
-	github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.7
-	github.com/stretchr/testify v1.10.0
+	github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.8
+	github.com/stretchr/testify v1.11.1
 	github.com/tidwall/gjson v1.18.0
 )
 
 require (
-	cloud.google.com/go v0.116.0 // indirect
-	cloud.google.com/go/compute v1.28.3 // indirect
-	cloud.google.com/go/compute/metadata v0.5.2 // indirect
-	cloud.google.com/go/iam v1.2.2 // indirect
-	cloud.google.com/go/storage v1.47.0 // indirect
 	github.com/agext/levenshtein v1.2.3 // indirect
 	github.com/alexflint/go-filemutex v1.3.0 // indirect
 	github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
-	github.com/aws/aws-sdk-go v1.45.5 // indirect
 	github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/go-errors/errors v1.5.0 // indirect
 	github.com/go-openapi/jsonpointer v0.21.0 // indirect
 	github.com/go-openapi/jsonreference v0.20.2 // indirect
 	github.com/go-openapi/swag v0.23.0 // indirect
-	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/gnostic-models v0.6.9 // indirect
 	github.com/google/go-cmp v0.7.0 // indirect
-	github.com/google/s2a-go v0.1.8 // indirect
-	github.com/google/uuid v1.6.0 // indirect
-	github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
-	github.com/googleapis/gax-go/v2 v2.14.0 // indirect
-	github.com/gruntwork-io/terratest v0.49.0 // indirect
+	github.com/gruntwork-io/terratest v0.50.0 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
-	github.com/hashicorp/go-getter v1.7.6 // indirect
 	github.com/hashicorp/go-getter/v2 v2.2.3 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/hashicorp/go-safetemp v1.0.0 // indirect
 	github.com/hashicorp/go-version v1.7.0 // indirect
 	github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f // indirect
 	github.com/hashicorp/hcl/v2 v2.22.0 // indirect
-	github.com/hashicorp/terraform-config-inspect v0.0.0-20250515145901-f4c50e64fd6d // indirect
-	github.com/hashicorp/terraform-json v0.25.0 // indirect
+	github.com/hashicorp/terraform-config-inspect v0.0.0-20250731202709-e8a84eebd3e7 // indirect
+	github.com/hashicorp/terraform-json v0.26.0 // indirect
 	github.com/jinzhu/copier v0.4.0 // indirect
-	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/klauspost/compress v1.16.7 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
@@ -61,27 +47,22 @@ require (
 	github.com/tidwall/pretty v1.2.1 // indirect
 	github.com/tidwall/sjson v1.2.5 // indirect
 	github.com/tmccombs/hcl2json v0.6.4 // indirect
-	github.com/ulikunitz/xz v0.5.11 // indirect
-	github.com/zclconf/go-cty v1.16.2 // indirect
-	go.opencensus.io v0.24.0 // indirect
-	golang.org/x/crypto v0.36.0 // indirect
-	golang.org/x/mod v0.24.0 // indirect
-	golang.org/x/net v0.38.0 // indirect
-	golang.org/x/oauth2 v0.24.0 // indirect
-	golang.org/x/sync v0.12.0 // indirect
-	golang.org/x/sys v0.31.0 // indirect
-	golang.org/x/text v0.23.0 // indirect
-	golang.org/x/tools v0.26.0 // indirect
-	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
-	google.golang.org/api v0.206.0 // indirect
-	google.golang.org/appengine v1.6.8 // indirect
-	google.golang.org/genproto v0.0.0-20241113202542-65e8d215514f // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
-	google.golang.org/grpc v1.67.1 // indirect
-	google.golang.org/protobuf v1.35.1 // indirect
+	github.com/ulikunitz/xz v0.5.14 // indirect
+	github.com/zclconf/go-cty v1.16.3 // indirect
+	go.yaml.in/yaml/v2 v2.4.2 // indirect
+	go.yaml.in/yaml/v3 v3.0.3 // indirect
+	golang.org/x/crypto v0.40.0 // indirect
+	golang.org/x/mod v0.27.0 // indirect
+	golang.org/x/net v0.42.0 // indirect
+	golang.org/x/sync v0.16.0 // indirect
+	golang.org/x/sys v0.34.0 // indirect
+	golang.org/x/text v0.27.0 // indirect
+	golang.org/x/tools v0.35.0 // indirect
+	google.golang.org/protobuf v1.36.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
-	sigs.k8s.io/kustomize/kyaml v0.19.0 // indirect
-	sigs.k8s.io/yaml v1.4.0 // indirect
+	sigs.k8s.io/kustomize/kyaml v0.20.1 // indirect
 )
+
+replace github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.8 => /localgithub/mycft/infra/blueprint-test
+//replace github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.8 => /usr/local/google/home/martijnvs/cft-forks/cloud-foundation-toolkit/infra/blueprint-test