diff --git a/build/int.cloudbuild.yaml b/build/int.cloudbuild.yaml index b8b1dc5e..bf479820 100644 --- a/build/int.cloudbuild.yaml +++ b/build/int.cloudbuild.yaml @@ -14,7 +14,9 @@ timeout: 10800s steps: - +- id: swap-module-refs + name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS' + args: ['module-swapper'] - id: 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 && prepare_environment'] diff --git a/examples/de-identification-template/main.tf b/examples/de-identification-template/main.tf index f48f9fdd..7548745d 100644 --- a/examples/de-identification-template/main.tf +++ b/examples/de-identification-template/main.tf @@ -15,7 +15,8 @@ */ module "de_identification_template_example" { - source = "../..//modules/de-identification-template" + source = "GoogleCloudPlatform/secured-data-warehouse/google//modules/de-identification-template" + version = "~> 0.2" project_id = var.project_id terraform_service_account = var.terraform_service_account diff --git a/examples/regional-dlp/main.tf b/examples/regional-dlp/main.tf index 78ad7f38..8ece33d9 100644 --- a/examples/regional-dlp/main.tf +++ b/examples/regional-dlp/main.tf @@ -20,7 +20,9 @@ locals { } module "data_ingestion" { - source = "../.." + source = "GoogleCloudPlatform/secured-data-warehouse/google" + version = "~> 0.2" + org_id = var.org_id labels = { environment = "dev" } data_governance_project_id = var.data_governance_project_id @@ -45,7 +47,8 @@ module "data_ingestion" { } module "de_identification_template_example" { - source = "../..//modules/de-identification-template" + source = "GoogleCloudPlatform/secured-data-warehouse/google//modules/de-identification-template" + version = "~> 0.2" project_id = var.data_governance_project_id terraform_service_account = var.terraform_service_account @@ -89,7 +92,8 @@ resource "google_artifact_registry_repository_iam_member" "python_reader" { } module "regional_dlp" { - source = "../../modules/dataflow-flex-job" + source = "GoogleCloudPlatform/secured-data-warehouse/google//modules/dataflow-flex-job" + version = "~> 0.2" project_id = var.data_ingestion_project_id name = "regional-flex-python-pubsub-dlp-bq" diff --git a/examples/simple-example/main.tf b/examples/simple-example/main.tf index 5da8561c..a4c2349f 100644 --- a/examples/simple-example/main.tf +++ b/examples/simple-example/main.tf @@ -15,7 +15,9 @@ */ module "secured_data_warehouse" { - source = "../.." + source = "GoogleCloudPlatform/secured-data-warehouse/google" + version = "~> 0.2" + org_id = var.org_id labels = { environment = "dev" } data_governance_project_id = var.data_governance_project_id diff --git a/examples/standalone-enhanced-org-policy/harness.tf b/examples/standalone-enhanced-org-policy/harness.tf index a378de56..e0aaa503 100644 --- a/examples/standalone-enhanced-org-policy/harness.tf +++ b/examples/standalone-enhanced-org-policy/harness.tf @@ -155,7 +155,8 @@ module "non_confidential_data_project_id" { } module "centralized_logging" { - source = "../../modules/centralized-logging" + source = "GoogleCloudPlatform/secured-data-warehouse/google//modules/centralized-logging" + version = "~> 0.2" projects_ids = local.projects_ids logging_project_id = var.data_governance_project_id kms_project_id = var.data_governance_project_id diff --git a/examples/standalone-enhanced-org-policy/main.tf b/examples/standalone-enhanced-org-policy/main.tf index 4fc98829..3405473a 100644 --- a/examples/standalone-enhanced-org-policy/main.tf +++ b/examples/standalone-enhanced-org-policy/main.tf @@ -20,7 +20,9 @@ locals { } module "secured_data_warehouse" { - source = "../.." + source = "GoogleCloudPlatform/secured-data-warehouse/google" + version = "~> 0.2" + org_id = var.org_id data_governance_project_id = var.data_governance_project_id confidential_data_project_id = var.confidential_data_project_id diff --git a/examples/standalone/harness.tf b/examples/standalone/harness.tf index 898db1a4..68c79ddb 100755 --- a/examples/standalone/harness.tf +++ b/examples/standalone/harness.tf @@ -147,7 +147,8 @@ data "google_secret_manager_secret_version" "wrapped_key" { } module "centralized_logging" { - source = "../../modules/centralized-logging" + source = "GoogleCloudPlatform/secured-data-warehouse/google//modules/centralized-logging" + version = "~> 0.2" projects_ids = local.projects_ids labels = { environment = "dev" } logging_project_id = module.base_projects.data_governance_project_id diff --git a/examples/standalone/main.tf b/examples/standalone/main.tf index d91a5949..26b10b3f 100644 --- a/examples/standalone/main.tf +++ b/examples/standalone/main.tf @@ -33,7 +33,8 @@ resource "random_id" "suffix" { } module "secured_data_warehouse" { - source = "../.." + source = "GoogleCloudPlatform/secured-data-warehouse/google" + version = "~> 0.2" org_id = var.org_id labels = { environment = "dev" } @@ -97,7 +98,8 @@ module "secured_data_warehouse" { } module "de_identification_template" { - source = "../..//modules/de-identification-template" + source = "GoogleCloudPlatform/secured-data-warehouse/google//modules/de-identification-template" + version = "~> 0.2" project_id = module.base_projects.data_governance_project_id terraform_service_account = var.terraform_service_account @@ -154,7 +156,8 @@ resource "google_artifact_registry_repository_iam_member" "confidential_python_r // that provides the public with financial information about a nonprofit organization // (https://console.cloud.google.com/marketplace/product/internal-revenue-service/irs-990?project=bigquery-public-data) module "regional_deid_pipeline" { - source = "../../modules/dataflow-flex-job" + source = "GoogleCloudPlatform/secured-data-warehouse/google//modules/dataflow-flex-job" + version = "~> 0.2" project_id = module.base_projects.data_ingestion_project_id name = "dataflow-flex-regional-dlp-deid-job-python-query" @@ -189,7 +192,8 @@ resource "time_sleep" "wait_de_identify_job_execution" { } module "regional_reid_pipeline" { - source = "../../modules/dataflow-flex-job" + source = "GoogleCloudPlatform/secured-data-warehouse/google//modules/dataflow-flex-job" + version = "~> 0.2" project_id = module.base_projects.confidential_data_project_id name = "dataflow-flex-regional-dlp-reid-job-python-query"