Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update examples to use registry #212

Merged
merged 1 commit into from
Dec 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions build/int.cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand Down
4 changes: 3 additions & 1 deletion examples/bigquery_dataset/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 2 additions & 1 deletion examples/billing_account/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down
4 changes: 3 additions & 1 deletion examples/cloud_run_service/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
3 changes: 2 additions & 1 deletion examples/custom_role_org/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion examples/custom_role_project/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion examples/dns_zone/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 3 additions & 1 deletion examples/folder/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 3 additions & 1 deletion examples/kms_crypto_key/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 3 additions & 1 deletion examples/kms_key_ring/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 3 additions & 1 deletion examples/member_iam/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
4 changes: 3 additions & 1 deletion examples/organization/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 3 additions & 1 deletion examples/project/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 3 additions & 1 deletion examples/project_conditions/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 3 additions & 1 deletion examples/pubsub_subscription/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 3 additions & 1 deletion examples/pubsub_topic/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 3 additions & 1 deletion examples/secret_manager/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down
3 changes: 2 additions & 1 deletion examples/service_account/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion examples/storage_bucket/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
3 changes: 2 additions & 1 deletion examples/subnet/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion examples/tag_keys/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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,
]
Expand Down
4 changes: 3 additions & 1 deletion examples/tag_values/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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,
]
Expand Down