From 9ebabcb36a267642ff046bc410fa28da5acd1ec2 Mon Sep 17 00:00:00 2001 From: bharathkkb Date: Mon, 18 Dec 2023 20:19:13 +0000 Subject: [PATCH] chore: update examples to use registry --- build/int.cloudbuild.yaml | 3 +++ examples/bigquery/main.tf | 4 +++- examples/cloud_storage/main.tf | 4 +++- examples/kms/main.tf | 4 +++- examples/simple/main.tf | 4 +++- examples/subscriptions_only/main.tf | 4 +++- 6 files changed, 18 insertions(+), 5 deletions(-) diff --git a/build/int.cloudbuild.yaml b/build/int.cloudbuild.yaml index 5baac1c..8ab26d6 100644 --- a/build/int.cloudbuild.yaml +++ b/build/int.cloudbuild.yaml @@ -14,6 +14,9 @@ timeout: 3600s 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/bigquery/main.tf b/examples/bigquery/main.tf index 2076e3a..0bcf1cb 100644 --- a/examples/bigquery/main.tf +++ b/examples/bigquery/main.tf @@ -19,7 +19,9 @@ provider "google" { } module "pubsub" { - source = "../../" + source = "terraform-google-modules/pubsub/google" + version = "~> 6.0" + project_id = var.project_id topic = "cft-tf-pubsub-topic-bigquery" topic_labels = { diff --git a/examples/cloud_storage/main.tf b/examples/cloud_storage/main.tf index 4fec517..b2ab735 100644 --- a/examples/cloud_storage/main.tf +++ b/examples/cloud_storage/main.tf @@ -23,7 +23,9 @@ provider "google" { } module "pubsub" { - source = "../../" + source = "terraform-google-modules/pubsub/google" + version = "~> 6.0" + project_id = var.project_id topic = "cft-tf-pubsub-topic-cloud-storage" diff --git a/examples/kms/main.tf b/examples/kms/main.tf index f375e86..2a04b31 100644 --- a/examples/kms/main.tf +++ b/examples/kms/main.tf @@ -48,7 +48,9 @@ resource "google_project_iam_member" "project" { } module "pubsub" { - source = "../../" + source = "terraform-google-modules/pubsub/google" + version = "~> 6.0" + project_id = var.project_id topic = var.topic_name topic_labels = var.topic_labels diff --git a/examples/simple/main.tf b/examples/simple/main.tf index 0aae1a9..b7d0dca 100644 --- a/examples/simple/main.tf +++ b/examples/simple/main.tf @@ -19,7 +19,9 @@ provider "google" { } module "pubsub" { - source = "../../" + source = "terraform-google-modules/pubsub/google" + version = "~> 6.0" + project_id = var.project_id topic = "cft-tf-pubsub-topic" topic_labels = { diff --git a/examples/subscriptions_only/main.tf b/examples/subscriptions_only/main.tf index 7457234..8fd85b1 100644 --- a/examples/subscriptions_only/main.tf +++ b/examples/subscriptions_only/main.tf @@ -24,7 +24,9 @@ resource "google_pubsub_topic" "example" { } module "pubsub" { - source = "../../" + source = "terraform-google-modules/pubsub/google" + version = "~> 6.0" + project_id = var.project_id create_topic = false create_subscriptions = true