Skip to content

Commit 72da4d9

Browse files
authored
chore: update examples to use registry (#870)
1 parent ab155cf commit 72da4d9

File tree

12 files changed

+49
-17
lines changed

12 files changed

+49
-17
lines changed

build/int.cloudbuild.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
# limitations under the License.
1414
timeout: 3600s
1515
steps:
16+
- id: swap-module-refs
17+
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
18+
args: ['module-swapper']
1619
- id: prepare
1720
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
1821
args: ['/bin/bash', '-c', 'mkdir -p ~/.terraform.d && ln -s /root/.terraform.d/plugins ~/.terraform.d/plugins && source /usr/local/bin/task_helper_functions.sh && prepare_environment']

examples/app_engine/main.tf

+6-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ resource "random_string" "suffix" {
2121
}
2222

2323
module "app-engine-project" {
24-
source = "../../"
24+
source = "terraform-google-modules/project-factory/google"
25+
version = "~> 14.0"
26+
2527
name = "appeng-${random_string.suffix.result}"
2628
random_project_id = true
2729
org_id = var.org_id
@@ -33,7 +35,9 @@ module "app-engine-project" {
3335
}
3436

3537
module "app-engine" {
36-
source = "../../modules/app_engine"
38+
source = "terraform-google-modules/project-factory/google//modules/app_engine"
39+
version = "~> 14.0"
40+
3741
project_id = module.app-engine-project.project_id
3842
location_id = "us-east4"
3943
}

examples/budget_project/main.tf

+5-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ resource "random_string" "suffix" {
2121
}
2222

2323
module "budget_project" {
24-
source = "../../"
24+
source = "terraform-google-modules/project-factory/google"
25+
version = "~> 14.0"
26+
2527
name = "budget-project-${random_string.suffix.result}"
2628
random_project_id = true
2729
random_project_id_length = 6
@@ -46,7 +48,8 @@ resource "google_pubsub_topic" "budget" {
4648
}
4749

4850
module "additional_budget" {
49-
source = "../../modules/budget"
51+
source = "terraform-google-modules/project-factory/google//modules/budget"
52+
version = "~> 14.0"
5053

5154
billing_account = var.billing_account
5255
projects = [var.parent_project_id, module.budget_project.project_id]

examples/essential_contacts/main.tf

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
*/
1616

1717
module "project-factory" {
18-
source = "../../"
18+
source = "terraform-google-modules/project-factory/google"
19+
version = "~> 14.0"
1920

2021
name = "pf-ci-test-ec-${var.random_string_for_testing}"
2122
random_project_id = true

examples/fabric_project/main.tf

+3-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ resource "random_string" "prefix" {
2626
}
2727

2828
module "fabric-project" {
29-
source = "../../modules/fabric-project"
29+
source = "terraform-google-modules/project-factory/google//modules/fabric-project"
30+
version = "~> 14.0"
31+
3032
activate_apis = var.activate_apis
3133
billing_account = var.billing_account
3234
name = var.name

examples/gke_shared_vpc/main.tf

+3-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
*/
1616

1717
module "project-factory" {
18-
source = "../../"
18+
source = "terraform-google-modules/project-factory/google"
19+
version = "~> 14.0"
20+
1921
random_project_id = true
2022
name = "sample-gke-shared-project"
2123
org_id = var.org_id

examples/group_project/main.tf

+3-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ provider "gsuite" {
2828
}
2929

3030
module "project-factory" {
31-
source = "../../modules/gsuite_enabled"
31+
source = "terraform-google-modules/project-factory/google//modules/gsuite_enabled"
32+
version = "~> 14.0"
33+
3234
random_project_id = true
3335
name = "group-sample-project"
3436
org_id = var.organization_id

examples/project-hierarchy/main.tf

+6-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ resource "google_folder" "prod" {
3232
}
3333

3434
module "project-prod-gke" {
35-
source = "../../modules/gsuite_enabled"
35+
source = "terraform-google-modules/project-factory/google//modules/gsuite_enabled"
36+
version = "~> 14.0"
37+
3638
random_project_id = true
3739
name = "hierarchy-sample-prod-gke"
3840
org_id = var.organization_id
@@ -41,7 +43,9 @@ module "project-prod-gke" {
4143
}
4244

4345
module "project-factory" {
44-
source = "../../modules/gsuite_enabled"
46+
source = "terraform-google-modules/project-factory/google//modules/gsuite_enabled"
47+
version = "~> 14.0"
48+
4549
random_project_id = true
4650
name = "hierarchy-sample-factory"
4751
org_id = var.organization_id

examples/project_services/main.tf

+3-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
Provider configuration
1919
*****************************************/
2020
module "project-services" {
21-
source = "../../modules/project_services"
21+
source = "terraform-google-modules/project-factory/google//modules/project_services"
22+
version = "~> 14.0"
23+
2224
project_id = var.project_id
2325
enable_apis = var.enable
2426
disable_services_on_destroy = true

examples/quota_project/main.tf

+3-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ resource "random_string" "suffix" {
2525
}
2626

2727
module "quota-project" {
28-
source = "../../"
28+
source = "terraform-google-modules/project-factory/google"
29+
version = "~> 14.0"
30+
2931
name = "pf-ci-test-quota-${random_string.suffix.result}"
3032
random_project_id = true
3133
org_id = var.org_id

examples/shared_vpc/main.tf

+9-4
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ locals {
2323
Host Project Creation
2424
*****************************************/
2525
module "host-project" {
26-
source = "../../"
26+
source = "terraform-google-modules/project-factory/google"
27+
version = "~> 14.0"
28+
2729
random_project_id = true
2830
name = var.host_project_name
2931
org_id = var.organization_id
@@ -90,7 +92,8 @@ module "vpc" {
9092
Service Project Creation
9193
*****************************************/
9294
module "service-project" {
93-
source = "../../modules/svpc_service_project"
95+
source = "terraform-google-modules/project-factory/google//modules/svpc_service_project"
96+
version = "~> 14.0"
9497

9598
name = var.service_project_name
9699
random_project_id = false
@@ -116,7 +119,8 @@ module "service-project" {
116119
Second Service Project Creation
117120
*****************************************/
118121
module "service-project-b" {
119-
source = "../../modules/svpc_service_project"
122+
source = "terraform-google-modules/project-factory/google//modules/svpc_service_project"
123+
version = "~> 14.0"
120124

121125
name = "b-${var.service_project_name}"
122126
random_project_id = false
@@ -149,7 +153,8 @@ module "service-project-b" {
149153
To test the grant_network_role
150154
*****************************************/
151155
module "service-project-c" {
152-
source = "../../modules/svpc_service_project"
156+
source = "terraform-google-modules/project-factory/google//modules/svpc_service_project"
157+
version = "~> 14.0"
153158

154159
name = "c-${var.service_project_name}"
155160
random_project_id = false

examples/simple_project/main.tf

+3-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
*/
1616

1717
module "project-factory" {
18-
source = "../../"
18+
source = "terraform-google-modules/project-factory/google"
19+
version = "~> 14.0"
20+
1921
random_project_id = true
2022
name = "simple-sample-project"
2123
org_id = var.organization_id

0 commit comments

Comments
 (0)