Skip to content

Commit 7b52003

Browse files
author
moondial
committed
Updated cloud armor tier description to include Enterprise Annual tier.
1 parent fdc4307 commit 7b52003

File tree

11 files changed

+30
-30
lines changed

11 files changed

+30
-30
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ determining that location is as follows:
132132
| budget\_display\_name | The display name of the budget. If not set defaults to `Budget For <projects[0]|All Projects>` | `string` | `null` | no |
133133
| budget\_labels | A single label and value pair specifying that usage from only this set of labeled resources should be included in the budget. | `map(string)` | `{}` | no |
134134
| budget\_monitoring\_notification\_channels | A list of monitoring notification channels in the form `[projects/{project_id}/notificationChannels/{channel_id}]`. A maximum of 5 channels are allowed. | `list(string)` | `[]` | no |
135-
| cloud\_armor\_tier | Managed protection tier to be set. Possible values are: CA\_STANDARD, CA\_ENTERPRISE\_PAYGO | `string` | `null` | no |
135+
| cloud\_armor\_tier | Managed protection tier to be set. Possible values are: CA\_STANDARD, CA\_ENTERPRISE\_PAYGO, CA\_ENTERPRISE\_ANNUAL | `string` | `null` | no |
136136
| consumer\_quotas | The quotas configuration you want to override for the project. | <pre>list(object({<br> service = string,<br> metric = string,<br> dimensions = map(string),<br> limit = string,<br> value = string,<br> }))</pre> | `[]` | no |
137137
| create\_project\_sa | Whether the default service account for the project shall be created | `bool` | `true` | no |
138138
| default\_network\_tier | Default Network Service Tier for resources created in this project. If unset, the value will not be modified. See https://cloud.google.com/network-tiers/docs/using-network-service-tiers and https://cloud.google.com/network-tiers. | `string` | `""` | no |

metadata.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ spec:
310310
varType: list(string)
311311
defaultValue: []
312312
- name: cloud_armor_tier
313-
description: "Managed protection tier to be set. Possible values are: CA_STANDARD, CA_ENTERPRISE_PAYGO"
313+
description: "Managed protection tier to be set. Possible values are: CA_STANDARD, CA_ENTERPRISE_PAYGO, CA_ENTERPRISE_ANNUAL"
314314
varType: string
315315
- name: deletion_policy
316316
description: "The deletion policy for the project. Possible values are: DELETE, PREVENT"
@@ -359,12 +359,12 @@ spec:
359359
roles:
360360
- level: Project
361361
roles:
362-
- roles/compute.admin
363362
- roles/iam.serviceAccountAdmin
364363
- roles/resourcemanager.projectIamAdmin
365364
- roles/storage.admin
366365
- roles/iam.serviceAccountUser
367366
- roles/billing.projectManager
367+
- roles/compute.admin
368368
services:
369369
- accesscontextmanager.googleapis.com
370370
- admin.googleapis.com
@@ -382,6 +382,6 @@ spec:
382382
- serviceusage.googleapis.com
383383
providerVersions:
384384
- source: hashicorp/google
385-
version: ">= 5.41, < 7"
385+
version: ">= 5.41, < 8"
386386
- source: hashicorp/google-beta
387-
version: ">= 5.41, < 7"
387+
version: ">= 5.41, < 8"

modules/budget/metadata.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,12 +122,12 @@ spec:
122122
roles:
123123
- level: Project
124124
roles:
125-
- roles/billing.projectManager
126-
- roles/compute.admin
127-
- roles/iam.serviceAccountAdmin
128125
- roles/resourcemanager.projectIamAdmin
129126
- roles/storage.admin
130127
- roles/iam.serviceAccountUser
128+
- roles/billing.projectManager
129+
- roles/compute.admin
130+
- roles/iam.serviceAccountAdmin
131131
services:
132132
- accesscontextmanager.googleapis.com
133133
- admin.googleapis.com
@@ -145,4 +145,4 @@ spec:
145145
- serviceusage.googleapis.com
146146
providerVersions:
147147
- source: hashicorp/google
148-
version: ">= 4.28, < 7"
148+
version: ">= 4.28, < 8"

modules/essential_contacts/metadata.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,12 @@ spec:
7979
roles:
8080
- level: Project
8181
roles:
82-
- roles/compute.admin
83-
- roles/iam.serviceAccountAdmin
84-
- roles/resourcemanager.projectIamAdmin
8582
- roles/storage.admin
8683
- roles/iam.serviceAccountUser
8784
- roles/billing.projectManager
85+
- roles/compute.admin
86+
- roles/iam.serviceAccountAdmin
87+
- roles/resourcemanager.projectIamAdmin
8888
services:
8989
- accesscontextmanager.googleapis.com
9090
- admin.googleapis.com
@@ -102,6 +102,6 @@ spec:
102102
- serviceusage.googleapis.com
103103
providerVersions:
104104
- source: hashicorp/google
105-
version: ">= 3.43, < 7"
105+
version: ">= 3.43, < 8"
106106
- source: hashicorp/google-beta
107-
version: ">= 3.43, < 7"
107+
version: ">= 3.43, < 8"

modules/fabric-project/metadata.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,12 +153,12 @@ spec:
153153
roles:
154154
- level: Project
155155
roles:
156+
- roles/iam.serviceAccountAdmin
156157
- roles/resourcemanager.projectIamAdmin
157158
- roles/storage.admin
158159
- roles/iam.serviceAccountUser
159160
- roles/billing.projectManager
160161
- roles/compute.admin
161-
- roles/iam.serviceAccountAdmin
162162
services:
163163
- accesscontextmanager.googleapis.com
164164
- admin.googleapis.com
@@ -176,4 +176,4 @@ spec:
176176
- serviceusage.googleapis.com
177177
providerVersions:
178178
- source: hashicorp/google
179-
version: ">= 5.41, < 7"
179+
version: ">= 5.41, < 8"

modules/gsuite_enabled/metadata.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,6 @@ spec:
275275
- source: DeviaVir/gsuite
276276
version: ~> 0.1
277277
- source: hashicorp/google
278-
version: ">= 4.11, < 7"
278+
version: ">= 4.11, < 8"
279279
- source: hashicorp/google-beta
280-
version: ">= 4.11, < 7"
280+
version: ">= 4.11, < 8"

modules/project_services/metadata.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,12 +104,12 @@ spec:
104104
roles:
105105
- level: Project
106106
roles:
107+
- roles/compute.admin
107108
- roles/iam.serviceAccountAdmin
108109
- roles/resourcemanager.projectIamAdmin
109110
- roles/storage.admin
110111
- roles/iam.serviceAccountUser
111112
- roles/billing.projectManager
112-
- roles/compute.admin
113113
services:
114114
- accesscontextmanager.googleapis.com
115115
- admin.googleapis.com
@@ -127,6 +127,6 @@ spec:
127127
- serviceusage.googleapis.com
128128
providerVersions:
129129
- source: hashicorp/google
130-
version: ">= 3.43, < 7"
130+
version: ">= 3.43, < 8"
131131
- source: hashicorp/google-beta
132-
version: ">= 3.43, < 7"
132+
version: ">= 3.43, < 8"

modules/quota_manager/metadata.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,4 +102,4 @@ spec:
102102
- serviceusage.googleapis.com
103103
providerVersions:
104104
- source: hashicorp/google-beta
105-
version: ">= 4.11, < 7"
105+
version: ">= 4.11, < 8"

modules/shared_vpc_access/metadata.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,12 @@ spec:
106106
roles:
107107
- level: Project
108108
roles:
109+
- roles/billing.projectManager
109110
- roles/compute.admin
110111
- roles/iam.serviceAccountAdmin
111112
- roles/resourcemanager.projectIamAdmin
112113
- roles/storage.admin
113114
- roles/iam.serviceAccountUser
114-
- roles/billing.projectManager
115115
services:
116116
- accesscontextmanager.googleapis.com
117117
- admin.googleapis.com
@@ -129,6 +129,6 @@ spec:
129129
- serviceusage.googleapis.com
130130
providerVersions:
131131
- source: hashicorp/google
132-
version: ">= 3.43, < 7"
132+
version: ">= 3.43, < 8"
133133
- source: hashicorp/google-beta
134-
version: ">= 3.43, < 7"
134+
version: ">= 3.43, < 8"

modules/svpc_service_project/metadata.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -237,12 +237,12 @@ spec:
237237
roles:
238238
- level: Project
239239
roles:
240+
- roles/iam.serviceAccountUser
241+
- roles/billing.projectManager
240242
- roles/compute.admin
241243
- roles/iam.serviceAccountAdmin
242244
- roles/resourcemanager.projectIamAdmin
243245
- roles/storage.admin
244-
- roles/iam.serviceAccountUser
245-
- roles/billing.projectManager
246246
services:
247247
- accesscontextmanager.googleapis.com
248248
- admin.googleapis.com
@@ -260,6 +260,6 @@ spec:
260260
- serviceusage.googleapis.com
261261
providerVersions:
262262
- source: hashicorp/google
263-
version: ">= 4.5, < 7"
263+
version: ">= 4.5, < 8"
264264
- source: hashicorp/google-beta
265-
version: ">= 4.5, < 7"
265+
version: ">= 4.5, < 8"

0 commit comments

Comments
 (0)