Commit 16eea11 1 parent 7610af2 commit 16eea11 Copy full SHA for 16eea11
File tree 23 files changed +97
-106
lines changed
23 files changed +97
-106
lines changed Original file line number Diff line number Diff line change 18
18
# Make will use bash instead of sh
19
19
SHELL := /usr/bin/env bash
20
20
21
- DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.22
21
+ DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.23
22
22
DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools
23
23
REGISTRY_URL := gcr.io/cloud-foundation-cicd
24
24
Original file line number Diff line number Diff line change @@ -200,9 +200,9 @@ determining that location is as follows:
200
200
201
201
- [ gcloud sdk] ( https://cloud.google.com/sdk/install ) >= 269.0.0
202
202
- [ 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
206
206
- [ terraform-provider-gsuite] plugin ~ > 0.1.x if GSuite functionality is desired
207
207
208
208
### Permissions
Original file line number Diff line number Diff line change @@ -23,11 +23,10 @@ spec:
23
23
title : Google Cloud Project Factory Terraform Module
24
24
source :
25
25
repo : https://github.com/terraform-google-modules/terraform-google-project-factory.git
26
- sourceType : git
27
26
version : 17.1.0
28
27
actuationTool :
29
28
flavor : Terraform
30
- version : " >=0.13.0 "
29
+ version : " >= 1.3 "
31
30
description : {}
32
31
content :
33
32
subBlueprints :
@@ -356,13 +355,10 @@ spec:
356
355
roles :
357
356
- level : Project
358
357
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
366
362
- level : Project
367
363
roles :
368
364
- roles/owner
@@ -373,10 +369,13 @@ spec:
373
369
- roles/compute.xpnAdmin
374
370
- level : Project
375
371
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
380
379
services :
381
380
- admin.googleapis.com
382
381
- appengine.googleapis.com
Original file line number Diff line number Diff line change 15
15
*/
16
16
17
17
terraform {
18
- required_version = " >= 0.13 "
18
+ required_version = " >= 1.3 "
19
19
20
20
required_providers {
21
21
google = {
Original file line number Diff line number Diff line change @@ -23,12 +23,11 @@ spec:
23
23
title : Budget configuration for a project
24
24
source :
25
25
repo : https://github.com/terraform-google-modules/terraform-google-project-factory.git
26
- sourceType : git
27
26
dir : /modules/budget
28
27
version : 17.1.0
29
28
actuationTool :
30
29
flavor : Terraform
31
- version : " >= 0.13 "
30
+ version : " >= 1.3 "
32
31
description : {}
33
32
content :
34
33
examples :
@@ -120,6 +119,12 @@ spec:
120
119
description : Resource name of the budget. Values are of the form `billingAccounts/{billingAccountId}/budgets/{budgetId}.`
121
120
requirements :
122
121
roles :
122
+ - level : Project
123
+ roles :
124
+ - roles/accesscontextmanager.policyAdmin
125
+ - roles/resourcemanager.organizationViewer
126
+ - roles/resourcemanager.tagAdmin
127
+ - roles/resourcemanager.tagUser
123
128
- level : Project
124
129
roles :
125
130
- roles/owner
@@ -128,12 +133,6 @@ spec:
128
133
- roles/resourcemanager.folderIamAdmin
129
134
- roles/billing.projectManager
130
135
- roles/compute.xpnAdmin
131
- - level : Project
132
- roles :
133
- - roles/accesscontextmanager.policyAdmin
134
- - roles/resourcemanager.organizationViewer
135
- - roles/resourcemanager.tagAdmin
136
- - roles/resourcemanager.tagUser
137
136
- level : Project
138
137
roles :
139
138
- roles/owner
Original file line number Diff line number Diff line change 15
15
*/
16
16
17
17
terraform {
18
- required_version = " >= 0.13 "
18
+ required_version = " >= 1.3 "
19
19
20
20
required_providers {
21
21
google = {
Original file line number Diff line number Diff line change 15
15
*/
16
16
17
17
terraform {
18
- required_version = " >= 0.13 "
18
+ required_version = " >= 1.3 "
19
19
20
20
required_providers {
21
21
google = {
Original file line number Diff line number Diff line change @@ -23,12 +23,11 @@ spec:
23
23
title : Essential Contacts configuration
24
24
source :
25
25
repo : https://github.com/terraform-google-modules/terraform-google-project-factory.git
26
- sourceType : git
27
26
dir : /modules/essential_contacts
28
27
version : 17.1.0
29
28
actuationTool :
30
29
flavor : Terraform
31
- version : " >= 0.13 "
30
+ version : " >= 1.3 "
32
31
description : {}
33
32
content :
34
33
examples :
77
76
description : The GCP project you want to enable APIs on
78
77
requirements :
79
78
roles :
79
+ - level : Project
80
+ roles :
81
+ - roles/accesscontextmanager.policyAdmin
82
+ - roles/resourcemanager.organizationViewer
83
+ - roles/resourcemanager.tagAdmin
84
+ - roles/resourcemanager.tagUser
80
85
- level : Project
81
86
roles :
82
87
- roles/owner
85
90
- roles/resourcemanager.folderIamAdmin
86
91
- roles/billing.projectManager
87
92
- roles/compute.xpnAdmin
88
- - level : Project
89
- roles :
90
- - roles/accesscontextmanager.policyAdmin
91
- - roles/resourcemanager.organizationViewer
92
- - roles/resourcemanager.tagAdmin
93
- - roles/resourcemanager.tagUser
94
93
- level : Project
95
94
roles :
96
95
- roles/owner
Original file line number Diff line number Diff line change 15
15
*/
16
16
17
17
terraform {
18
- required_version = " >= 0.13 "
18
+ required_version = " >= 1.3 "
19
19
required_providers {
20
20
google = {
21
21
source = " hashicorp/google"
Original file line number Diff line number Diff line change @@ -23,12 +23,11 @@ spec:
23
23
title : Google Cloud Simple Project Creation
24
24
source :
25
25
repo : https://github.com/terraform-google-modules/terraform-google-project-factory.git
26
- sourceType : git
27
26
dir : /modules/fabric-project
28
27
version : 17.1.0
29
28
actuationTool :
30
29
flavor : Terraform
31
- version : " >= 0.13 "
30
+ version : " >= 1.3 "
32
31
description : {}
33
32
content :
34
33
examples :
@@ -157,6 +156,14 @@ spec:
157
156
- roles/resourcemanager.organizationViewer
158
157
- roles/resourcemanager.tagAdmin
159
158
- 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
160
167
- level : Project
161
168
roles :
162
169
- roles/owner
@@ -166,14 +173,6 @@ spec:
166
173
- roles/storage.admin
167
174
- roles/iam.serviceAccountUser
168
175
- 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
177
176
services :
178
177
- admin.googleapis.com
179
178
- appengine.googleapis.com
Original file line number Diff line number Diff line change 15
15
*/
16
16
17
17
terraform {
18
- required_version = " >= 0.13 "
18
+ required_version = " >= 1.3 "
19
19
20
20
required_providers {
21
21
google = {
Original file line number Diff line number Diff line change @@ -23,12 +23,11 @@ spec:
23
23
title : Google Cloud Project Factory with G Suite Terraform Module
24
24
source :
25
25
repo : https://github.com/terraform-google-modules/terraform-google-project-factory.git
26
- sourceType : git
27
26
dir : /modules/gsuite_enabled
28
27
version : 17.1.0
29
28
actuationTool :
30
29
flavor : Terraform
31
- version : " >= 0.13 "
30
+ version : " >= 1.3 "
32
31
description : {}
33
32
content :
34
33
examples :
@@ -250,13 +249,10 @@ spec:
250
249
roles :
251
250
- level : Project
252
251
roles :
253
- - roles/owner
254
- - roles/compute.admin
255
- - roles/iam.serviceAccountAdmin
256
- - roles/resourcemanager.projectIamAdmin
257
- - roles/storage.admin
258
- - roles/iam.serviceAccountUser
259
- - roles/billing.projectManager
252
+ - roles/accesscontextmanager.policyAdmin
253
+ - roles/resourcemanager.organizationViewer
254
+ - roles/resourcemanager.tagAdmin
255
+ - roles/resourcemanager.tagUser
260
256
- level : Project
261
257
roles :
262
258
- roles/owner
@@ -267,10 +263,13 @@ spec:
267
263
- roles/compute.xpnAdmin
268
264
- level : Project
269
265
roles :
270
- - roles/accesscontextmanager.policyAdmin
271
- - roles/resourcemanager.organizationViewer
272
- - roles/resourcemanager.tagAdmin
273
- - roles/resourcemanager.tagUser
266
+ - roles/owner
267
+ - roles/compute.admin
268
+ - roles/iam.serviceAccountAdmin
269
+ - roles/resourcemanager.projectIamAdmin
270
+ - roles/storage.admin
271
+ - roles/iam.serviceAccountUser
272
+ - roles/billing.projectManager
274
273
services :
275
274
- admin.googleapis.com
276
275
- appengine.googleapis.com
Original file line number Diff line number Diff line change 15
15
*/
16
16
17
17
terraform {
18
- required_version = " >= 0.13 "
18
+ required_version = " >= 1.3 "
19
19
required_providers {
20
20
google = {
21
21
source = " hashicorp/google"
Original file line number Diff line number Diff line change 15
15
*/
16
16
17
17
terraform {
18
- required_version = " >= 0.13 "
18
+ required_version = " >= 1.3 "
19
19
required_providers {
20
20
google = {
21
21
source = " hashicorp/google"
Original file line number Diff line number Diff line change 1
- # Copyright 2022 Google LLC
1
+ # Copyright 2024 Google LLC
2
2
#
3
3
# Licensed under the Apache License, Version 2.0 (the "License");
4
4
# you may not use this file except in compliance with the License.
@@ -23,12 +23,11 @@ spec:
23
23
title : Project API Activation
24
24
source :
25
25
repo : https://github.com/terraform-google-modules/terraform-google-project-factory.git
26
- sourceType : git
27
26
dir : /modules/project_services
28
27
version : 17.1.0
29
28
actuationTool :
30
29
flavor : Terraform
31
- version : " >= 0.13 "
30
+ version : " >= 1.3 "
32
31
description : {}
33
32
content :
34
33
examples :
@@ -102,6 +101,12 @@ spec:
102
101
type : string
103
102
requirements :
104
103
roles :
104
+ - level : Project
105
+ roles :
106
+ - roles/accesscontextmanager.policyAdmin
107
+ - roles/resourcemanager.organizationViewer
108
+ - roles/resourcemanager.tagAdmin
109
+ - roles/resourcemanager.tagUser
105
110
- level : Project
106
111
roles :
107
112
- roles/owner
@@ -110,12 +115,6 @@ spec:
110
115
- roles/resourcemanager.folderIamAdmin
111
116
- roles/billing.projectManager
112
117
- roles/compute.xpnAdmin
113
- - level : Project
114
- roles :
115
- - roles/accesscontextmanager.policyAdmin
116
- - roles/resourcemanager.organizationViewer
117
- - roles/resourcemanager.tagAdmin
118
- - roles/resourcemanager.tagUser
119
118
- level : Project
120
119
roles :
121
120
- roles/owner
Original file line number Diff line number Diff line change 15
15
*/
16
16
17
17
terraform {
18
- required_version = " >= 0.13 "
18
+ required_version = " >= 1.3 "
19
19
required_providers {
20
20
google = {
21
21
source = " hashicorp/google"
You can’t perform that action at this time.
0 commit comments