Skip to content

Commit 16eea11

Browse files
apeabodyapeabody
committed
fix!: TF >= 1.3 and metadata
1 parent 7610af2 commit 16eea11

File tree

23 files changed

+97
-106
lines changed

23 files changed

+97
-106
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# Make will use bash instead of sh
1919
SHELL := /usr/bin/env bash
2020

21-
DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.22
21+
DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.23
2222
DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools
2323
REGISTRY_URL := gcr.io/cloud-foundation-cicd
2424

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,9 +200,9 @@ determining that location is as follows:
200200

201201
- [gcloud sdk](https://cloud.google.com/sdk/install) >= 269.0.0
202202
- [jq](https://stedolan.github.io/jq/) >= 1.6
203-
- [Terraform](https://www.terraform.io/downloads.html) >= 0.13.0
204-
- [terraform-provider-google] plugin >= 5.33
205-
- [terraform-provider-google-beta] plugin >= 5.33
203+
- [Terraform](https://www.terraform.io/downloads.html) >= 1.3
204+
- [terraform-provider-google] plugin >= 5.41
205+
- [terraform-provider-google-beta] plugin >= 5.41
206206
- [terraform-provider-gsuite] plugin ~> 0.1.x if GSuite functionality is desired
207207

208208
### Permissions

‎metadata.yaml‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,10 @@ spec:
2323
title: Google Cloud Project Factory Terraform Module
2424
source:
2525
repo: https://github.com/terraform-google-modules/terraform-google-project-factory.git
26-
sourceType: git
2726
version: 17.1.0
2827
actuationTool:
2928
flavor: Terraform
30-
version: ">=0.13.0"
29+
version: ">= 1.3"
3130
description: {}
3231
content:
3332
subBlueprints:
@@ -356,13 +355,10 @@ spec:
356355
roles:
357356
- level: Project
358357
roles:
359-
- roles/owner
360-
- roles/compute.admin
361-
- roles/iam.serviceAccountAdmin
362-
- roles/resourcemanager.projectIamAdmin
363-
- roles/storage.admin
364-
- roles/iam.serviceAccountUser
365-
- roles/billing.projectManager
358+
- roles/accesscontextmanager.policyAdmin
359+
- roles/resourcemanager.organizationViewer
360+
- roles/resourcemanager.tagAdmin
361+
- roles/resourcemanager.tagUser
366362
- level: Project
367363
roles:
368364
- roles/owner
@@ -373,10 +369,13 @@ spec:
373369
- roles/compute.xpnAdmin
374370
- level: Project
375371
roles:
376-
- roles/accesscontextmanager.policyAdmin
377-
- roles/resourcemanager.organizationViewer
378-
- roles/resourcemanager.tagAdmin
379-
- roles/resourcemanager.tagUser
372+
- roles/owner
373+
- roles/compute.admin
374+
- roles/iam.serviceAccountAdmin
375+
- roles/resourcemanager.projectIamAdmin
376+
- roles/storage.admin
377+
- roles/iam.serviceAccountUser
378+
- roles/billing.projectManager
380379
services:
381380
- admin.googleapis.com
382381
- appengine.googleapis.com

‎modules/app_engine/versions.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
terraform {
18-
required_version = ">= 0.13"
18+
required_version = ">= 1.3"
1919

2020
required_providers {
2121
google = {

‎modules/budget/metadata.yaml‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,11 @@ spec:
2323
title: Budget configuration for a project
2424
source:
2525
repo: https://github.com/terraform-google-modules/terraform-google-project-factory.git
26-
sourceType: git
2726
dir: /modules/budget
2827
version: 17.1.0
2928
actuationTool:
3029
flavor: Terraform
31-
version: ">= 0.13"
30+
version: ">= 1.3"
3231
description: {}
3332
content:
3433
examples:
@@ -120,6 +119,12 @@ spec:
120119
description: Resource name of the budget. Values are of the form `billingAccounts/{billingAccountId}/budgets/{budgetId}.`
121120
requirements:
122121
roles:
122+
- level: Project
123+
roles:
124+
- roles/accesscontextmanager.policyAdmin
125+
- roles/resourcemanager.organizationViewer
126+
- roles/resourcemanager.tagAdmin
127+
- roles/resourcemanager.tagUser
123128
- level: Project
124129
roles:
125130
- roles/owner
@@ -128,12 +133,6 @@ spec:
128133
- roles/resourcemanager.folderIamAdmin
129134
- roles/billing.projectManager
130135
- roles/compute.xpnAdmin
131-
- level: Project
132-
roles:
133-
- roles/accesscontextmanager.policyAdmin
134-
- roles/resourcemanager.organizationViewer
135-
- roles/resourcemanager.tagAdmin
136-
- roles/resourcemanager.tagUser
137136
- level: Project
138137
roles:
139138
- roles/owner

‎modules/budget/versions.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
terraform {
18-
required_version = ">= 0.13"
18+
required_version = ">= 1.3"
1919

2020
required_providers {
2121
google = {

‎modules/core_project_factory/versions.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
terraform {
18-
required_version = ">= 0.13"
18+
required_version = ">= 1.3"
1919

2020
required_providers {
2121
google = {

‎modules/essential_contacts/metadata.yaml‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,11 @@ spec:
2323
title: Essential Contacts configuration
2424
source:
2525
repo: https://github.com/terraform-google-modules/terraform-google-project-factory.git
26-
sourceType: git
2726
dir: /modules/essential_contacts
2827
version: 17.1.0
2928
actuationTool:
3029
flavor: Terraform
31-
version: ">= 0.13"
30+
version: ">= 1.3"
3231
description: {}
3332
content:
3433
examples:
@@ -77,6 +76,12 @@ spec:
7776
description: The GCP project you want to enable APIs on
7877
requirements:
7978
roles:
79+
- level: Project
80+
roles:
81+
- roles/accesscontextmanager.policyAdmin
82+
- roles/resourcemanager.organizationViewer
83+
- roles/resourcemanager.tagAdmin
84+
- roles/resourcemanager.tagUser
8085
- level: Project
8186
roles:
8287
- roles/owner
@@ -85,12 +90,6 @@ spec:
8590
- roles/resourcemanager.folderIamAdmin
8691
- roles/billing.projectManager
8792
- roles/compute.xpnAdmin
88-
- level: Project
89-
roles:
90-
- roles/accesscontextmanager.policyAdmin
91-
- roles/resourcemanager.organizationViewer
92-
- roles/resourcemanager.tagAdmin
93-
- roles/resourcemanager.tagUser
9493
- level: Project
9594
roles:
9695
- roles/owner

‎modules/essential_contacts/versions.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
terraform {
18-
required_version = ">= 0.13"
18+
required_version = ">= 1.3"
1919
required_providers {
2020
google = {
2121
source = "hashicorp/google"

‎modules/fabric-project/metadata.yaml‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,11 @@ spec:
2323
title: Google Cloud Simple Project Creation
2424
source:
2525
repo: https://github.com/terraform-google-modules/terraform-google-project-factory.git
26-
sourceType: git
2726
dir: /modules/fabric-project
2827
version: 17.1.0
2928
actuationTool:
3029
flavor: Terraform
31-
version: ">= 0.13"
30+
version: ">= 1.3"
3231
description: {}
3332
content:
3433
examples:
@@ -157,6 +156,14 @@ spec:
157156
- roles/resourcemanager.organizationViewer
158157
- roles/resourcemanager.tagAdmin
159158
- roles/resourcemanager.tagUser
159+
- level: Project
160+
roles:
161+
- roles/owner
162+
- roles/resourcemanager.projectCreator
163+
- roles/resourcemanager.folderAdmin
164+
- roles/resourcemanager.folderIamAdmin
165+
- roles/billing.projectManager
166+
- roles/compute.xpnAdmin
160167
- level: Project
161168
roles:
162169
- roles/owner
@@ -166,14 +173,6 @@ spec:
166173
- roles/storage.admin
167174
- roles/iam.serviceAccountUser
168175
- roles/billing.projectManager
169-
- level: Project
170-
roles:
171-
- roles/owner
172-
- roles/resourcemanager.projectCreator
173-
- roles/resourcemanager.folderAdmin
174-
- roles/resourcemanager.folderIamAdmin
175-
- roles/billing.projectManager
176-
- roles/compute.xpnAdmin
177176
services:
178177
- admin.googleapis.com
179178
- appengine.googleapis.com

0 commit comments

Comments
 (0)