Docs: Updated cloud armor tier description to include Enterprise Annual tier.

README.md

@@ -132,7 +132,7 @@ determining that location is as follows:
 | budget\_display\_name | The display name of the budget. If not set defaults to `Budget For <projects[0]|All Projects>` | `string` | `null` | no |
 | 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 |
 | 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 |
-| cloud\_armor\_tier | Managed protection tier to be set. Possible values are: CA\_STANDARD, CA\_ENTERPRISE\_PAYGO | `string` | `null` | no |
+| cloud\_armor\_tier | Managed protection tier to be set. Possible values are: CA\_STANDARD, CA\_ENTERPRISE\_PAYGO, CA\_ENTERPRISE\_ANNUAL | `string` | `null` | no |
 | 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 |
 | create\_project\_sa | Whether the default service account for the project shall be created | `bool` | `true` | no |
 | 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

@@ -310,7 +310,7 @@ spec:
         varType: list(string)
         defaultValue: []
       - name: cloud_armor_tier
-        description: "Managed protection tier to be set. Possible values are: CA_STANDARD, CA_ENTERPRISE_PAYGO"
+        description: "Managed protection tier to be set. Possible values are: CA_STANDARD, CA_ENTERPRISE_PAYGO, CA_ENTERPRISE_ANNUAL"
         varType: string
       - name: deletion_policy
         description: "The deletion policy for the project. Possible values are: DELETE, PREVENT"
@@ -359,12 +359,12 @@ spec:
     roles:
       - level: Project
         roles:
-          - roles/compute.admin
           - roles/iam.serviceAccountAdmin
           - roles/resourcemanager.projectIamAdmin
           - roles/storage.admin
           - roles/iam.serviceAccountUser
           - roles/billing.projectManager
+          - roles/compute.admin
     services:
       - accesscontextmanager.googleapis.com
       - admin.googleapis.com
@@ -382,6 +382,6 @@ spec:
       - serviceusage.googleapis.com
     providerVersions:
       - source: hashicorp/google
-        version: ">= 5.41, < 7"
+        version: ">= 5.41, < 8"
       - source: hashicorp/google-beta
-        version: ">= 5.41, < 7"
+        version: ">= 5.41, < 8"

modules/budget/metadata.yaml

@@ -122,12 +122,12 @@ spec:
     roles:
       - level: Project
         roles:
-          - roles/billing.projectManager
-          - roles/compute.admin
-          - roles/iam.serviceAccountAdmin
           - roles/resourcemanager.projectIamAdmin
           - roles/storage.admin
           - roles/iam.serviceAccountUser
+          - roles/billing.projectManager
+          - roles/compute.admin
+          - roles/iam.serviceAccountAdmin
     services:
       - accesscontextmanager.googleapis.com
       - admin.googleapis.com
@@ -145,4 +145,4 @@ spec:
       - serviceusage.googleapis.com
     providerVersions:
       - source: hashicorp/google
-        version: ">= 4.28, < 7"
+        version: ">= 4.28, < 8"

modules/essential_contacts/metadata.yaml

@@ -79,12 +79,12 @@ spec:
     roles:
       - level: Project
         roles:
-          - roles/compute.admin
-          - roles/iam.serviceAccountAdmin
-          - roles/resourcemanager.projectIamAdmin
           - roles/storage.admin
           - roles/iam.serviceAccountUser
           - roles/billing.projectManager
+          - roles/compute.admin
+          - roles/iam.serviceAccountAdmin
+          - roles/resourcemanager.projectIamAdmin
     services:
       - accesscontextmanager.googleapis.com
       - admin.googleapis.com
@@ -102,6 +102,6 @@ spec:
       - serviceusage.googleapis.com
     providerVersions:
       - source: hashicorp/google
-        version: ">= 3.43, < 7"
+        version: ">= 3.43, < 8"
       - source: hashicorp/google-beta
-        version: ">= 3.43, < 7"
+        version: ">= 3.43, < 8"

modules/fabric-project/metadata.yaml

@@ -153,12 +153,12 @@ spec:
     roles:
       - level: Project
         roles:
+          - roles/iam.serviceAccountAdmin
           - roles/resourcemanager.projectIamAdmin
           - roles/storage.admin
           - roles/iam.serviceAccountUser
           - roles/billing.projectManager
           - roles/compute.admin
-          - roles/iam.serviceAccountAdmin
     services:
       - accesscontextmanager.googleapis.com
       - admin.googleapis.com
@@ -176,4 +176,4 @@ spec:
       - serviceusage.googleapis.com
     providerVersions:
       - source: hashicorp/google
-        version: ">= 5.41, < 7"
+        version: ">= 5.41, < 8"

modules/gsuite_enabled/metadata.yaml

@@ -275,6 +275,6 @@ spec:
       - source: DeviaVir/gsuite
         version: ~> 0.1
       - source: hashicorp/google
-        version: ">= 4.11, < 7"
+        version: ">= 4.11, < 8"
       - source: hashicorp/google-beta
-        version: ">= 4.11, < 7"
+        version: ">= 4.11, < 8"

modules/project_services/metadata.yaml

@@ -104,12 +104,12 @@ spec:
     roles:
       - level: Project
         roles:
+          - roles/compute.admin
           - roles/iam.serviceAccountAdmin
           - roles/resourcemanager.projectIamAdmin
           - roles/storage.admin
           - roles/iam.serviceAccountUser
           - roles/billing.projectManager
-          - roles/compute.admin
     services:
       - accesscontextmanager.googleapis.com
       - admin.googleapis.com
@@ -127,6 +127,6 @@ spec:
       - serviceusage.googleapis.com
     providerVersions:
       - source: hashicorp/google
-        version: ">= 3.43, < 7"
+        version: ">= 3.43, < 8"
       - source: hashicorp/google-beta
-        version: ">= 3.43, < 7"
+        version: ">= 3.43, < 8"

modules/quota_manager/metadata.yaml

@@ -102,4 +102,4 @@ spec:
       - serviceusage.googleapis.com
     providerVersions:
       - source: hashicorp/google-beta
-        version: ">= 4.11, < 7"
+        version: ">= 4.11, < 8"

modules/shared_vpc_access/metadata.yaml

@@ -106,12 +106,12 @@ spec:
     roles:
       - level: Project
         roles:
+          - roles/billing.projectManager
           - roles/compute.admin
           - roles/iam.serviceAccountAdmin
           - roles/resourcemanager.projectIamAdmin
           - roles/storage.admin
           - roles/iam.serviceAccountUser
-          - roles/billing.projectManager
     services:
       - accesscontextmanager.googleapis.com
       - admin.googleapis.com
@@ -129,6 +129,6 @@ spec:
       - serviceusage.googleapis.com
     providerVersions:
       - source: hashicorp/google
-        version: ">= 3.43, < 7"
+        version: ">= 3.43, < 8"
       - source: hashicorp/google-beta
-        version: ">= 3.43, < 7"
+        version: ">= 3.43, < 8"

modules/svpc_service_project/metadata.yaml

@@ -237,12 +237,12 @@ spec:
     roles:
       - level: Project
         roles:
+          - roles/iam.serviceAccountUser
+          - roles/billing.projectManager
           - roles/compute.admin
           - roles/iam.serviceAccountAdmin
           - roles/resourcemanager.projectIamAdmin
           - roles/storage.admin
-          - roles/iam.serviceAccountUser
-          - roles/billing.projectManager
     services:
       - accesscontextmanager.googleapis.com
       - admin.googleapis.com
@@ -260,6 +260,6 @@ spec:
       - serviceusage.googleapis.com
     providerVersions:
       - source: hashicorp/google
-        version: ">= 4.5, < 7"
+        version: ">= 4.5, < 8"
       - source: hashicorp/google-beta
-        version: ">= 4.5, < 7"
+        version: ">= 4.5, < 8"

variables.tf

@@ -367,7 +367,7 @@ variable "tag_binding_values" {
 }
 
 variable "cloud_armor_tier" {
-  description = "Managed protection tier to be set. Possible values are: CA_STANDARD, CA_ENTERPRISE_PAYGO"
+  description = "Managed protection tier to be set. Possible values are: CA_STANDARD, CA_ENTERPRISE_PAYGO, CA_ENTERPRISE_ANNUAL"
   type        = string
   default     = null
 }