Skip to content

Commit

Permalink
chore: update examples to use registry (#254)
Browse files Browse the repository at this point in the history
  • Loading branch information
bharathkkb authored Dec 20, 2023
1 parent 380d48f commit b0126c6
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 7 deletions.
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
8 changes: 6 additions & 2 deletions examples/cloudbuild_enabled/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@
*************************************************/

module "seed_bootstrap" {
source = "../.."
source = "terraform-google-modules/bootstrap/google"
version = "~> 6.0"

org_id = var.org_id
billing_account = var.billing_account
group_org_admins = var.group_org_admins
Expand All @@ -31,7 +33,9 @@ module "seed_bootstrap" {
}

module "cloudbuild_bootstrap" {
source = "../../modules/cloudbuild"
source = "terraform-google-modules/bootstrap/google//modules/cloudbuild"
version = "~> 6.0"

org_id = var.org_id
billing_account = var.billing_account
group_org_admins = var.group_org_admins
Expand Down
4 changes: 3 additions & 1 deletion examples/simple-folder/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@
*************************************************/

module "seed_bootstrap" {
source = "../.."
source = "terraform-google-modules/bootstrap/google"
version = "~> 6.0"

org_id = var.org_id
parent_folder = var.parent
billing_account = var.billing_account
Expand Down
4 changes: 3 additions & 1 deletion examples/simple/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@
*************************************************/

module "seed_bootstrap" {
source = "../.."
source = "terraform-google-modules/bootstrap/google"
version = "~> 6.0"

org_id = var.org_id
billing_account = var.billing_account
group_org_admins = var.group_org_admins
Expand Down
3 changes: 2 additions & 1 deletion examples/tf_cloudbuild_builder_simple/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
*/

module "cloudbuilder" {
source = "../../modules/tf_cloudbuild_builder"
source = "terraform-google-modules/bootstrap/google//modules/tf_cloudbuild_builder"
version = "~> 6.0"

project_id = module.enabled_google_apis.project_id
dockerfile_repo_uri = google_sourcerepo_repository.builder_dockerfile_repo.url
Expand Down
3 changes: 2 additions & 1 deletion examples/tf_cloudbuild_source_simple/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
*/

module "tf_source" {
source = "../../modules/tf_cloudbuild_source"
source = "terraform-google-modules/bootstrap/google//modules/tf_cloudbuild_source"
version = "~> 6.0"

org_id = var.org_id
folder_id = var.parent_folder
Expand Down
3 changes: 2 additions & 1 deletion examples/tf_cloudbuild_workspace_simple/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
*/

module "tf_workspace" {
source = "../../modules/tf_cloudbuild_workspace"
source = "terraform-google-modules/bootstrap/google//modules/tf_cloudbuild_workspace"
version = "~> 6.0"

project_id = module.enabled_google_apis.project_id
tf_repo_uri = google_sourcerepo_repository.tf_config_repo.url
Expand Down

0 comments on commit b0126c6

Please sign in to comment.