chore: update examples to use registry (#212)

terraform-google-modules · Dec 19, 2023 · 964ce8e · 964ce8e
1 parent 750404e
commit 964ce8e
Show file tree

Hide file tree

Showing 22 changed files with 61 additions and 21 deletions.
diff --git 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_dataset/main.tf b/examples/bigquery_dataset/main.tf
@@ -18,7 +18,9 @@
   Module bigquery_dataset_iam_binding calling
  *********************************************/
 module "bigquery_dataset_iam_binding" {
-  source  = "../../modules/bigquery_datasets_iam/"
+  source  = "terraform-google-modules/iam/google//modules/bigquery_datasets_iam"
+  version = "~> 7.0"
+
   project = var.project_id
   bigquery_datasets = [
     google_bigquery_dataset.bigquery_dataset_one.dataset_id,

diff --git a/examples/billing_account/main.tf b/examples/billing_account/main.tf
@@ -34,7 +34,8 @@ locals {
   Module billing_account_iam_binding calling
  *****************************************/
 module "billing-account-iam" {
-  source = "../../modules/billing_accounts_iam/"
+  source  = "terraform-google-modules/iam/google//modules/billing_accounts_iam"
+  version = "~> 7.0"
 
   billing_account_ids = [var.billing_account_id]
 

diff --git a/examples/cloud_run_service/main.tf b/examples/cloud_run_service/main.tf
@@ -19,7 +19,9 @@
  *****************************************/
 
 module "cloud_run_service_iam_binding" {
-  source             = "../../modules/cloud_run_services_iam/"
+  source  = "terraform-google-modules/iam/google//modules/cloud_run_services_iam"
+  version = "~> 7.0"
+
   project            = var.cloud_run_service_project
   location           = var.cloud_run_service_location
   cloud_run_services = [var.cloud_run_service_one, var.cloud_run_service_two]

diff --git a/examples/custom_role_org/main.tf b/examples/custom_role_org/main.tf
@@ -22,7 +22,8 @@ resource "random_id" "rand_custom_id" {
   Module custom_role call
  *****************************************/
 module "custom-roles-org" {
-  source = "../../modules/custom_role_iam/"
+  source  = "terraform-google-modules/iam/google//modules/custom_role_iam"
+  version = "~> 7.0"
 
   target_level         = "org"
   target_id            = var.org_id

diff --git a/examples/custom_role_project/main.tf b/examples/custom_role_project/main.tf
@@ -18,7 +18,8 @@
   Module custom_role call
  *****************************************/
 module "custom-role-project" {
-  source = "../../modules/custom_role_iam/"
+  source  = "terraform-google-modules/iam/google//modules/custom_role_iam"
+  version = "~> 7.0"
 
   target_level         = "project"
   target_id            = var.project_id

diff --git a/examples/dns_zone/main.tf b/examples/dns_zone/main.tf
@@ -18,7 +18,9 @@
   Module dns_zone_iam_binding calling
  *********************************************/
 module "dns_zones_iam_binding" {
-  source  = "../../modules/dns_zones_iam/"
+  source  = "terraform-google-modules/iam/google//modules/dns_zones_iam"
+  version = "~> 7.0"
+
   project = var.project_id
   managed_zones = [
     google_dns_managed_zone.dns_zone_one.name,

diff --git a/examples/folder/main.tf b/examples/folder/main.tf
@@ -18,7 +18,9 @@
   Module folder_iam_binding calling
  *****************************************/
 module "folder-iam" {
-  source  = "../../modules/folders_iam/"
+  source  = "terraform-google-modules/iam/google//modules/folders_iam"
+  version = "~> 7.0"
+
   folders = [var.folder_one, var.folder_two]
 
   mode = "additive"

diff --git a/examples/kms_crypto_key/main.tf b/examples/kms_crypto_key/main.tf
@@ -18,7 +18,9 @@
   Module kms_crypto_key_iam_binding calling
  *****************************************/
 module "kms_crypto_key_iam_binding" {
-  source          = "../../modules/kms_crypto_keys_iam/"
+  source  = "terraform-google-modules/iam/google//modules/kms_crypto_keys_iam"
+  version = "~> 7.0"
+
   kms_crypto_keys = [var.kms_crypto_key_one, var.kms_crypto_key_two]
 
   mode = "authoritative"

diff --git a/examples/kms_key_ring/main.tf b/examples/kms_key_ring/main.tf
@@ -18,7 +18,9 @@
   Module kms_key_ring_iam_binding calling
  *****************************************/
 module "kms_key_ring_iam_binding" {
-  source        = "../../modules/kms_key_rings_iam/"
+  source  = "terraform-google-modules/iam/google//modules/kms_key_rings_iam"
+  version = "~> 7.0"
+
   kms_key_rings = [var.kms_key_ring_one, var.kms_key_ring_two]
   mode          = "additive"
 

diff --git a/examples/member_iam/main.tf b/examples/member_iam/main.tf
@@ -21,7 +21,9 @@ resource "google_service_account" "member_iam_test" {
 }
 
 module "member_roles" {
-  source                  = "../../modules/member_iam"
+  source  = "terraform-google-modules/iam/google//modules/member_iam"
+  version = "~> 7.0"
+
   service_account_address = google_service_account.member_iam_test.email
   project_id              = var.project_id
   project_roles           = ["roles/compute.networkAdmin", "roles/appengine.appAdmin"]

diff --git a/examples/organization/main.tf b/examples/organization/main.tf
@@ -18,7 +18,9 @@
   Module organization_iam_binding calling
  *****************************************/
 module "organization_iam_binding" {
-  source        = "../../modules/organizations_iam/"
+  source  = "terraform-google-modules/iam/google//modules/organizations_iam"
+  version = "~> 7.0"
+
   organizations = [var.organization_one, var.organization_two]
   mode          = "authoritative"
 

diff --git a/examples/project/main.tf b/examples/project/main.tf
@@ -18,7 +18,9 @@
   Module project_iam_binding calling
  *****************************************/
 module "project_iam_binding" {
-  source   = "../../modules/projects_iam/"
+  source  = "terraform-google-modules/iam/google//modules/projects_iam"
+  version = "~> 7.0"
+
   projects = [var.project_one, var.project_two]
   mode     = "additive"
 

diff --git a/examples/project_conditions/main.tf b/examples/project_conditions/main.tf
@@ -18,7 +18,9 @@
   Module project_iam_binding calling
  *****************************************/
 module "project_iam_binding" {
-  source   = "../../modules/projects_iam/"
+  source  = "terraform-google-modules/iam/google//modules/projects_iam"
+  version = "~> 7.0"
+
   projects = [var.project_one, var.project_two]
   mode     = "additive"
 

diff --git a/examples/pubsub_subscription/main.tf b/examples/pubsub_subscription/main.tf
@@ -18,7 +18,9 @@
   Module pubsub_subscription_iam_binding calling
  *****************************************/
 module "pubsub_subscription_iam_binding" {
-  source               = "../../modules/pubsub_subscriptions_iam/"
+  source  = "terraform-google-modules/iam/google//modules/pubsub_subscriptions_iam"
+  version = "~> 7.0"
+
   project              = var.pubsub_subscription_project
   pubsub_subscriptions = [var.pubsub_subscription_one, var.pubsub_subscription_two]
   mode                 = "additive"

diff --git a/examples/pubsub_topic/main.tf b/examples/pubsub_topic/main.tf
@@ -18,7 +18,9 @@
   Module pubsub_topic_iam_binding calling
  *****************************************/
 module "pubsub_topic_iam_binding" {
-  source        = "../../modules/pubsub_topics_iam/"
+  source  = "terraform-google-modules/iam/google//modules/pubsub_topics_iam"
+  version = "~> 7.0"
+
   project       = var.pubsub_topic_project
   pubsub_topics = [var.pubsub_topic_one, var.pubsub_topic_two]
   mode          = "authoritative"

diff --git a/examples/secret_manager/main.tf b/examples/secret_manager/main.tf
@@ -18,7 +18,9 @@
   Module secret_iam_binding calling
  *****************************************/
 module "folder-iam" {
-  source  = "../../modules/secret_manager_iam"
+  source  = "terraform-google-modules/iam/google//modules/secret_manager_iam"
+  version = "~> 7.0"
+
   project = var.project_id
   secrets = [var.secret_one, var.secret_two]
 

diff --git a/examples/service_account/main.tf b/examples/service_account/main.tf
@@ -18,7 +18,8 @@
   Module service_account_iam_binding calling
  *****************************************/
 module "service_account_iam_binding" {
-  source = "../../modules/service_accounts_iam/"
+  source  = "terraform-google-modules/iam/google//modules/service_accounts_iam"
+  version = "~> 7.0"
 
   service_accounts = [var.service_account_one, var.service_account_two]
   project          = var.service_account_project

diff --git a/examples/storage_bucket/main.tf b/examples/storage_bucket/main.tf
@@ -18,7 +18,9 @@
   Module pubsub_subscription_iam_binding calling
  *****************************************/
 module "storage_buckets_iam_binding" {
-  source          = "../../modules/storage_buckets_iam/"
+  source  = "terraform-google-modules/iam/google//modules/storage_buckets_iam"
+  version = "~> 7.0"
+
   storage_buckets = [var.storage_bucket_one, var.storage_bucket_two]
   mode            = "additive"
 

diff --git a/examples/subnet/main.tf b/examples/subnet/main.tf
@@ -33,7 +33,8 @@ locals {
   Module pubsub_subscription_iam_binding calling
  *****************************************/
 module "subnet_iam_binding" {
-  source = "../../modules/subnets_iam"
+  source  = "terraform-google-modules/iam/google//modules/subnets_iam"
+  version = "~> 7.0"
 
   subnets        = [local.subnet_one_full, local.subnet_two_full]
   subnets_region = var.region

diff --git a/examples/tag_keys/main.tf b/examples/tag_keys/main.tf
@@ -18,7 +18,9 @@
   Module tag_keys_iam_binding calling
  *********************************************/
 module "tag_keys_iam_binding" {
-  source = "../../modules/tag_keys_iam/"
+  source  = "terraform-google-modules/iam/google//modules/tag_keys_iam"
+  version = "~> 7.0"
+
   tag_keys = [
     google_tags_tag_key.tag_key.name,
   ]

diff --git a/examples/tag_values/main.tf b/examples/tag_values/main.tf
@@ -18,7 +18,9 @@
   Module tag_values_iam_binding calling
  *********************************************/
 module "tag_values_iam_binding" {
-  source = "../../modules/tag_values_iam/"
+  source  = "terraform-google-modules/iam/google//modules/tag_values_iam"
+  version = "~> 7.0"
+
   tag_values = [
     google_tags_tag_value.tag_value.name,
   ]