Promote new fields in google_iam_workload_identity_pool to GA (#16809)

Author: stevenyang72

mmv1/products/iambeta/WorkloadIdentityPool.yaml

@@ -52,7 +52,6 @@ iam_policy:
     - '{{workload_identity_pool_id}}'
   allowed_iam_role: 'roles/iam.workloadIdentityPoolViewer'
   iam_conditions_request_type: 'REQUEST_BODY'
-  min_version: beta
 custom_code:
   constants: 'templates/terraform/constants/iam_workload_identity_pool.go.tmpl'
   decoder: 'templates/terraform/decoders/treat_deleted_state_as_gone.go.tmpl'
@@ -66,17 +65,14 @@ examples:
     primary_resource_id: 'example'
     vars:
       workload_identity_pool_id: 'example-pool'
-    min_version: beta
   - name: 'iam_workload_identity_pool_full_trust_domain_mode'
     primary_resource_id: 'example'
     vars:
       workload_identity_pool_id: 'example-pool'
-    min_version: beta
   - name: 'iam_workload_identity_pool_full_trust_domain_mode_with_default_shared_ca'
     primary_resource_id: 'example'
     vars:
       workload_identity_pool_id: 'example-pool'
-    min_version: beta
 parameters:
 properties:
   - name: 'workloadIdentityPoolId'
@@ -154,7 +150,6 @@ properties:
 
           * `spiffe://<trust-domain>/ns/<kubernetes-namespace>/sa/<kubernetes-service-account>`
           * `spiffe://<trust-domain>/resources/<resource-scope>/<resource-name>`
-    min_version: beta
     enum_values:
       - 'FEDERATION_ONLY'
       - 'TRUST_DOMAIN'
@@ -165,7 +160,6 @@ properties:
       Represents configuration for generating mutual TLS (mTLS) certificates for the identities
       within this pool. Defines the Certificate Authority (CA) pool resources and configurations
       required for issuance and rotation of mTLS workload certificates.
-    min_version: beta
     properties:
       - name: 'caPools'
         type: KeyValuePairs
@@ -237,7 +231,6 @@ properties:
       domain will recognize and accept certificates issued by entities within the trusted domains.
       Note that a trust domain automatically trusts itself, eliminating the need for explicit
       configuration.
-    min_version: beta
     properties:
       - name: 'additionalTrustBundles'
         type: Map

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

@@ -1,6 +1,4 @@
 resource "google_iam_workload_identity_pool" "{{$.PrimaryResourceId}}" {
-  provider = google-beta
-
   workload_identity_pool_id = "{{index $.Vars "workload_identity_pool_id"}}"
   display_name              = "Name of the pool"
   description               = "Identity pool operates in FEDERATION_ONLY mode"

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

@@ -1,6 +1,4 @@
 resource "google_iam_workload_identity_pool" "{{$.PrimaryResourceId}}" {
-  provider = google-beta
-
   workload_identity_pool_id = "{{index $.Vars "workload_identity_pool_id"}}"
   display_name              = "Name of the pool"
   description               = "Identity pool operates in TRUST_DOMAIN mode"

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

@@ -1,6 +1,4 @@
 resource "google_iam_workload_identity_pool" "{{$.PrimaryResourceId}}" {
-  provider = google-beta
-
   workload_identity_pool_id = "{{index $.Vars "workload_identity_pool_id"}}"
   display_name              = "Name of the pool"
   description               = "Identity pool operates in TRUST_DOMAIN mode"

…_iam_workload_identity_pool_test.go.tmpl …ource_iam_workload_identity_pool_test.gommv1/third_party/terraform/services/iambeta/resource_iam_workload_identity_pool_test.go.tmpl renamed to mmv1/third_party/terraform/services/iambeta/resource_iam_workload_identity_pool_test.go mmv1/third_party/terraform/services/iambeta/resource_iam_workload_identity_pool_test.go.tmpl renamed to mmv1/third_party/terraform/services/iambeta/resource_iam_workload_identity_pool_test.go

@@ -2,11 +2,10 @@ package iambeta_test
 
 import (
 	"fmt"
-	{{if ne $.TargetVersionName "ga" -}}
+	"testing"
+
 	"github.com/hashicorp/terraform-plugin-testing/plancheck"
-	{{- end }}
 	"github.com/hashicorp/terraform-provider-google/google/acctest"
-	"testing"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 )
@@ -71,105 +70,70 @@ func TestAccIAMBetaWorkloadIdentityPool_minimal(t *testing.T) {
 	})
 }
 
-{{if ne $.TargetVersionName "ga" -}}
-func TestAccIAMBetaWorkloadIdentityPool_beta_update(t *testing.T) {
+func TestAccIAMBetaWorkloadIdentityPool_update(t *testing.T) {
 	t.Parallel()
 
 	randomSuffix := acctest.RandString(t, 10)
 
 	acctest.VcrTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
-		ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
 		CheckDestroy:             testAccCheckIAMBetaWorkloadIdentityPoolDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
-				Config: testAccIAMBetaWorkloadIdentityPool_beta_full(randomSuffix),
+				Config: testAccIAMBetaWorkloadIdentityPool_full(randomSuffix),
 			},
 			{
-				ResourceName:            "google_iam_workload_identity_pool.my_pool",
-				ImportState:             true,
-				ImportStateVerify:       true,
+				ResourceName:      "google_iam_workload_identity_pool.my_pool",
+				ImportState:       true,
+				ImportStateVerify: true,
 			},
 			{
-				Config: testAccIAMBetaWorkloadIdentityPool_beta_update(randomSuffix),
+				Config: testAccIAMBetaWorkloadIdentityPool_update(randomSuffix),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction("google_iam_workload_identity_pool.my_pool", plancheck.ResourceActionUpdate),
 					},
 				},
 			},
 			{
-				ResourceName:            "google_iam_workload_identity_pool.my_pool",
-				ImportState:             true,
-				ImportStateVerify:       true,
+				ResourceName:      "google_iam_workload_identity_pool.my_pool",
+				ImportState:       true,
+				ImportStateVerify: true,
 			},
 			{
-				Config: testAccIAMBetaWorkloadIdentityPool_beta_update_use_default_ca(randomSuffix),
+				Config: testAccIAMBetaWorkloadIdentityPool_update_use_default_ca(randomSuffix),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction("google_iam_workload_identity_pool.my_pool", plancheck.ResourceActionUpdate),
 					},
 				},
 			},
 			{
-				ResourceName:            "google_iam_workload_identity_pool.my_pool",
-				ImportState:             true,
-				ImportStateVerify:       true,
+				ResourceName:      "google_iam_workload_identity_pool.my_pool",
+				ImportState:       true,
+				ImportStateVerify: true,
 			},
 			{
-				Config: testAccIAMBetaWorkloadIdentityPool_beta_minimum(randomSuffix),
+				Config: testAccIAMBetaWorkloadIdentityPool_minimal(randomSuffix),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction("google_iam_workload_identity_pool.my_pool", plancheck.ResourceActionUpdate),
 					},
 				},
 			},
 			{
-				ResourceName:            "google_iam_workload_identity_pool.my_pool",
-				ImportState:             true,
-				ImportStateVerify:       true,
+				ResourceName:      "google_iam_workload_identity_pool.my_pool",
+				ImportState:       true,
+				ImportStateVerify: true,
 			},
 		},
 	})
 }
-{{- end }}
 
 func testAccIAMBetaWorkloadIdentityPool_full(suffix string) string {
 	return fmt.Sprintf(`
 resource "google_iam_workload_identity_pool" "my_pool" {
-  workload_identity_pool_id = "tf-test-my-pool-%s"
-  display_name              = "Name of pool"
-  description               = "Identity pool for automated test"
-  disabled                  = true
-}
-`, suffix)
-}
-
-func testAccIAMBetaWorkloadIdentityPool_minimal(suffix string) string {
-	return fmt.Sprintf(`
-resource "google_iam_workload_identity_pool" "my_pool" {
-  workload_identity_pool_id = "tf-test-my-pool-%s"
-}
-`, suffix)
-}
-
-func testAccIAMBetaWorkloadIdentityPool_update(suffix string) string {
-	return fmt.Sprintf(`
-resource "google_iam_workload_identity_pool" "my_pool" {
-  workload_identity_pool_id = "tf-test-my-pool-%s"
-  display_name              = "Updated name of pool"
-  description               = "Updated description"
-  disabled                  = false
-}
-`, suffix)
-}
-
-{{if ne $.TargetVersionName "ga" -}}
-func testAccIAMBetaWorkloadIdentityPool_beta_full(suffix string) string {
-	return fmt.Sprintf(`
-resource "google_iam_workload_identity_pool" "my_pool" {
-  provider = google-beta
-
   workload_identity_pool_id = "tf-test-my-pool-%s"
   display_name              = "Name of the pool"
   description               = "Identity pool operates in TRUST_DOMAIN mode"
@@ -208,11 +172,9 @@ resource "google_iam_workload_identity_pool" "my_pool" {
 `, suffix)
 }
 
-func testAccIAMBetaWorkloadIdentityPool_beta_update(suffix string) string {
+func testAccIAMBetaWorkloadIdentityPool_update(suffix string) string {
 	return fmt.Sprintf(`
 resource "google_iam_workload_identity_pool" "my_pool" {
-  provider = google-beta
-
   workload_identity_pool_id = "tf-test-my-pool-%s"
   display_name              = "Updated name of the pool"
   description               = "Updated identity pool operates in TRUST_DOMAIN mode"
@@ -239,11 +201,9 @@ resource "google_iam_workload_identity_pool" "my_pool" {
 `, suffix)
 }
 
-func testAccIAMBetaWorkloadIdentityPool_beta_update_use_default_ca(suffix string) string {
+func testAccIAMBetaWorkloadIdentityPool_update_use_default_ca(suffix string) string {
 	return fmt.Sprintf(`
 resource "google_iam_workload_identity_pool" "my_pool" {
-  provider = google-beta
-
   workload_identity_pool_id = "tf-test-my-pool-%s"
   display_name              = "Updated name of the pool"
   description               = "Updated identity pool operates in TRUST_DOMAIN mode"
@@ -267,15 +227,11 @@ resource "google_iam_workload_identity_pool" "my_pool" {
 `, suffix)
 }
 
-
-func testAccIAMBetaWorkloadIdentityPool_beta_minimum(suffix string) string {
+func testAccIAMBetaWorkloadIdentityPool_minimal(suffix string) string {
 	return fmt.Sprintf(`
 resource "google_iam_workload_identity_pool" "my_pool" {
-  provider = google-beta
-
   workload_identity_pool_id = "tf-test-my-pool-%s"
   mode                      = "TRUST_DOMAIN"
 }
 `, suffix)
 }
-{{- end }}