Bump Cloud Armor Hierchical Policies - Security Policy Associations to GA (#15468)

Author: maxi-cit

mmv1/products/compute/OrganizationSecurityPolicyAssociation.yaml

@@ -17,11 +17,10 @@ api_resource_type_kind: SecurityPolicy
 api_resource_field: 'associations'
 description: |
   An association for the OrganizationSecurityPolicy.
-min_version: 'beta'
 references:
   guides:
     'Associating a policy with the organization or folder': 'https://cloud.google.com/vpc/docs/using-firewall-policies#associate'
-  api: 'https://cloud.google.com/compute/docs/reference/rest/beta/organizationSecurityPolicies/addAssociation'
+  api: 'https://cloud.google.com/compute/docs/reference/rest/v1/organizationSecurityPolicies/addAssociation'
 docs:
 id_format: '{{policy_id}}/association/{{name}}'
 base_url: '{{policy_id}}'
@@ -45,7 +44,8 @@ read_error_transform: 'transformSecurityPolicyAssociationReadError'
 examples:
   - name: 'organization_security_policy_association_basic'
     primary_resource_id: 'policy'
-    min_version: 'beta'
+    vars:
+      short_name: "my-short-name"
     test_env_vars:
       org_id: 'ORG_ID'
 parameters:
@@ -54,25 +54,21 @@ parameters:
     description: |
       The security policy ID of the association.
     api_name: securityPolicyId
-    min_version: 'beta'
     url_param_only: true
     required: true
 properties:
   - name: 'name'
     type: String
     description: |
       The name for an association.
-    min_version: 'beta'
     required: true
   - name: 'attachmentId'
     type: String
     description: |
       The resource that the security policy is attached to.
-    min_version: 'beta'
     required: true
   - name: 'displayName'
     type: String
     description: |
       The display name of the security policy of the association.
-    min_version: 'beta'
     output: true

mmv1/templates/terraform/examples/organization_security_policy_association_basic.tf.tmpl

@@ -1,19 +1,16 @@
 resource "google_folder" "security_policy_target" {
-  provider     = google-beta
   display_name = "tf-test-secpol-%{random_suffix}"
   parent       = "organizations/{{index $.TestEnvVars "org_id"}}"
   deletion_protection = false
 }
 
 resource "google_compute_organization_security_policy" "policy" {
-  provider     = google-beta
-  display_name = "tf-test%{random_suffix}"
+  short_name   = "tf-test%{random_suffix}"
   parent       = google_folder.security_policy_target.name
-  type         = "FIREWALL"
+  type         = "CLOUD_ARMOR"
 }
 
 resource "google_compute_organization_security_policy_association" "{{$.PrimaryResourceId}}" {
-  provider = google-beta
   name          = "tf-test%{random_suffix}"
   attachment_id = google_compute_organization_security_policy.{{$.PrimaryResourceId}}.parent
   policy_id     = google_compute_organization_security_policy.{{$.PrimaryResourceId}}.id

…ecurity_policy_association_utils.go.tmpl …ute/security_policy_association_utils.gommv1/third_party/terraform/services/compute/security_policy_association_utils.go.tmpl renamed to mmv1/third_party/terraform/services/compute/security_policy_association_utils.go mmv1/third_party/terraform/services/compute/security_policy_association_utils.go.tmpl renamed to mmv1/third_party/terraform/services/compute/security_policy_association_utils.go

@@ -1,5 +1,4 @@
 package compute
-{{- if ne $.TargetVersionName "ga" }}
 
 import (
 	"log"
@@ -25,4 +24,3 @@ func transformSecurityPolicyAssociationReadError(err error) error {
 
 	return err
 }
-{{- end }}