Principal Access Boundary - Promote Beta to GA (#12354)

Co-authored-by: Priyanka Deo <priyankadeo-g>
GoogleCloudPlatform · Nov 25, 2024 · 23775a8 · 23775a8
1 parent 04174a8
commit 23775a8
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 55 deletions.
diff --git a/mmv1/products/iam3/FoldersPolicyBinding.yaml b/mmv1/products/iam3/FoldersPolicyBinding.yaml
@@ -17,8 +17,7 @@ description: A policy binding to a folder
 references:
   guides:
     'Apply a policy binding': 'https://cloud.google.com/iam/docs/principal-access-boundary-policies-create#create_binding'
-  api: 'https://cloud.google.com/iam/docs/reference/rest/v3beta/folders.locations.policyBindings'
-min_version: 'beta'
+  api: 'https://cloud.google.com/iam/docs/reference/rest/v3/folders.locations.policyBindings'
 id_format: 'folders/{{folder}}/locations/{{location}}/policyBindings/{{policy_binding_id}}'
 base_url: 'folders/{{folder}}/locations/{{location}}/policyBindings'
 self_link: 'folders/{{folder}}/locations/{{location}}/policyBindings/{{policy_binding_id}}'
@@ -50,7 +49,6 @@ async:
   include_project: true
 examples:
   - name: 'iam_folders_policy_binding'
-    min_version: 'beta'
     primary_resource_id: 'my-folder-binding'
     test_env_vars:
       org_id: 'ORG_ID'

diff --git a/mmv1/products/iam3/OrganizationsPolicyBinding.yaml b/mmv1/products/iam3/OrganizationsPolicyBinding.yaml
@@ -17,8 +17,7 @@ description: A policy binding to an organizations
 references:
   guides:
     'Apply a policy binding': 'https://cloud.google.com/iam/docs/principal-access-boundary-policies-create#create_binding'
-  api: 'https://cloud.google.com/iam/docs/reference/rest/v3beta/organizations.locations.policyBindings'
-min_version: 'beta'
+  api: 'https://cloud.google.com/iam/docs/reference/rest/v3/organizations.locations.policyBindings'
 id_format: 'organizations/{{organization}}/locations/{{location}}/policyBindings/{{policy_binding_id}}'
 base_url: 'organizations/{{organization}}/locations/{{location}}/policyBindings'
 self_link: 'organizations/{{organization}}/locations/{{location}}/policyBindings/{{policy_binding_id}}'
@@ -50,7 +49,6 @@ async:
   include_project: true
 examples:
   - name: 'iam_organizations_policy_binding'
-    min_version: 'beta'
     primary_resource_id: 'my-org-binding'
     test_env_vars:
       org_id: 'ORG_ID'

diff --git a/mmv1/products/iam3/PrincipalAccessBoundaryPolicy.yaml b/mmv1/products/iam3/PrincipalAccessBoundaryPolicy.yaml
@@ -17,8 +17,7 @@ description: An IAM Principal Access Boundary Policy resource
 references:
   guides:
     'Create and apply Principal Access Boundaries': 'https://cloud.google.com/iam/docs/principal-access-boundary-policies-create'
-  api: 'https://cloud.google.com/iam/docs/reference/rest/v3beta/organizations.locations.principalAccessBoundaryPolicies'
-min_version: 'beta'
+  api: 'https://cloud.google.com/iam/docs/reference/rest/v3/organizations.locations.principalAccessBoundaryPolicies'
 id_format: 'organizations/{{organization}}/locations/{{location}}/principalAccessBoundaryPolicies/{{principal_access_boundary_policy_id}}'
 base_url: 'organizations/{{organization}}/locations/{{location}}/principalAccessBoundaryPolicies'
 self_link: 'organizations/{{organization}}/locations/{{location}}/principalAccessBoundaryPolicies/{{principal_access_boundary_policy_id}}'
@@ -48,7 +47,6 @@ async:
   include_project: true
 examples:
   - name: 'iam_principal_access_boundary_policy'
-    min_version: 'beta'
     primary_resource_id: 'my-pab-policy'
     test_env_vars:
       org_id: 'ORG_ID'

diff --git a/mmv1/products/iam3/ProjectsPolicyBinding.yaml b/mmv1/products/iam3/ProjectsPolicyBinding.yaml
@@ -17,8 +17,7 @@ description: A policy binding to a Project
 references:
   guides:
     'Apply a policy binding': 'https://cloud.google.com/iam/docs/principal-access-boundary-policies-create#create_binding'
-  api: 'https://cloud.google.com/iam/docs/reference/rest/v3beta/projects.locations.policyBindings'
-min_version: 'beta'
+  api: 'https://cloud.google.com/iam/docs/reference/rest/v3/projects.locations.policyBindings'
 id_format: 'projects/{{project}}/locations/{{location}}/policyBindings/{{policy_binding_id}}'
 base_url: 'projects/{{project}}/locations/{{location}}/policyBindings'
 self_link: 'projects/{{project}}/locations/{{location}}/policyBindings/{{policy_binding_id}}'
@@ -49,7 +48,6 @@ async:
     message: 'message'
 examples:
   - name: 'iam_projects_policy_binding'
-    min_version: 'beta'
     primary_resource_id: 'my-project-binding'
     test_env_vars:
       org_id: 'ORG_ID'

diff --git a/mmv1/products/iam3/product.yaml b/mmv1/products/iam3/product.yaml
@@ -17,5 +17,7 @@ display_name: 'Cloud IAM'
 versions:
   - name: 'beta'
     base_url: 'https://iam.googleapis.com/v3beta/'
+  - name: 'ga'
+    base_url: 'https://iam.googleapis.com/v3/'
 scopes:
   - 'https://www.googleapis.com/auth/iam'
diff --git a/mmv1/templates/terraform/examples/iam_folders_policy_binding.tf.tmpl b/mmv1/templates/terraform/examples/iam_folders_policy_binding.tf.tmpl
@@ -1,13 +1,11 @@
 resource "google_iam_principal_access_boundary_policy" "pab_policy" {
-  provider = google-beta
   organization   = "{{index $.TestEnvVars "org_id"}}"
   location       = "global"
   display_name   = "{{index $.Vars "display_name"}}"
   principal_access_boundary_policy_id = "{{index $.Vars "pab_policy_id"}}"
 }
 
 resource "google_folder" "folder" {
-  provider = google-beta
   display_name        = "{{index $.Vars "folder_name"}}"
   parent              = "organizations/{{index $.TestEnvVars "org_id"}}"
   deletion_protection = false
@@ -19,7 +17,6 @@ resource "time_sleep" "wait_120s" {
 }
 
 resource "google_iam_folders_policy_binding" "{{$.PrimaryResourceId}}" {
-  provider = google-beta
   folder         = google_folder.folder.folder_id
   location       = "global"
   display_name   = "{{index $.Vars "display_name"}}"

diff --git a/mmv1/templates/terraform/examples/iam_organizations_policy_binding.tf.tmpl b/mmv1/templates/terraform/examples/iam_organizations_policy_binding.tf.tmpl
@@ -1,13 +1,11 @@
 resource "google_iam_principal_access_boundary_policy" "pab_policy" {
-  provider = google-beta
   organization   = "{{index $.TestEnvVars "org_id"}}"
   location       = "global"
   display_name   = "{{index $.Vars "display_name"}}"
   principal_access_boundary_policy_id = "{{index $.Vars "pab_policy_id"}}"
 }
 
 resource "google_iam_organizations_policy_binding" "{{$.PrimaryResourceId}}" {
-  provider = google-beta
   organization   = "{{index $.TestEnvVars "org_id"}}"
   location       = "global"
   display_name   = "{{index $.Vars "display_name"}}"

diff --git a/mmv1/templates/terraform/examples/iam_principal_access_boundary_policy.tf.tmpl b/mmv1/templates/terraform/examples/iam_principal_access_boundary_policy.tf.tmpl
@@ -1,5 +1,4 @@
 resource "google_iam_principal_access_boundary_policy" "{{$.PrimaryResourceId}}" {
-  provider = google-beta
   organization   = "{{index $.TestEnvVars "org_id"}}"
   location       = "global"
   display_name   = "{{index $.Vars "display_name"}}"

diff --git a/mmv1/templates/terraform/examples/iam_projects_policy_binding.tf.tmpl b/mmv1/templates/terraform/examples/iam_projects_policy_binding.tf.tmpl
@@ -1,17 +1,15 @@
 data "google_project" "project" {
-  provider = google-beta
+  provider = google
 }
 
 resource "google_iam_principal_access_boundary_policy" "pab_policy" {
-  provider = google-beta
   organization   = "{{index $.TestEnvVars "org_id"}}"
   location       = "global"
   display_name   = "{{index $.Vars "display_name"}}"
   principal_access_boundary_policy_id = "{{index $.Vars "pab_policy_id"}}"
 }
 
 resource "google_iam_projects_policy_binding" "{{$.PrimaryResourceId}}" {
-  provider = google-beta
   project        = data.google_project.project.project_id
   location       = "global"
   display_name   = "{{index $.Vars "display_name"}}"

diff --git a/mmv1/third_party/terraform/services/iam3/resource_iam_folders_policy_binding_test.go.tmpl b/mmv1/third_party/terraform/services/iam3/resource_iam_folders_policy_binding_test.go.tmpl
@@ -1,5 +1,4 @@
 package iam3_test
-{{- if ne $.TargetVersionName "ga" }}
 
 import (
 	"testing"
@@ -20,7 +19,7 @@ func TestAccIAM3FoldersPolicyBinding_iamFoldersPolicyBindingExample_update(t *te
 
 	acctest.VcrTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
-		ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
 		ExternalProviders: map[string]resource.ExternalProvider{
 				   "time": {},
 		},
@@ -51,15 +50,13 @@ func TestAccIAM3FoldersPolicyBinding_iamFoldersPolicyBindingExample_update(t *te
 func testAccIAM3FoldersPolicyBinding_iamFoldersPolicyBindingExample_full(context map[string]interface{}) string {
 	return acctest.Nprintf(`
 resource "google_iam_principal_access_boundary_policy" "pab_policy" {
-  provider = google-beta
   organization   = "%{org_id}"
   location       = "global"
   display_name   = "test folder binding%{random_suffix}"
   principal_access_boundary_policy_id = "tf-test-my-pab-policy%{random_suffix}"
 }
 
 resource "google_folder" "folder" {
-  provider = google-beta
   display_name        = "test folder%{random_suffix}"
   parent              = "organizations/%{org_id}"
   deletion_protection = false
@@ -71,7 +68,6 @@ resource "time_sleep" "wait_120s" {
 }
 
 resource "google_iam_folders_policy_binding" "my-folder-binding" {
-  provider = google-beta
   folder         = google_folder.folder.folder_id
   location       = "global"
   display_name   = "test folder binding%{random_suffix}"
@@ -89,15 +85,13 @@ resource "google_iam_folders_policy_binding" "my-folder-binding" {
 func testAccIAM3FoldersPolicyBinding_iamFoldersPolicyBindingExample_update(context map[string]interface{}) string {
 	return acctest.Nprintf(`
 resource "google_iam_principal_access_boundary_policy" "pab_policy" {
-  provider = google-beta
   organization   = "%{org_id}"
   location       = "global"
   display_name   = "test folder binding%{random_suffix}"
   principal_access_boundary_policy_id = "tf-test-my-pab-policy%{random_suffix}"
 }
 
 resource "google_folder" "folder" {
-  provider = google-beta
   display_name        = "test folder%{random_suffix}"
   parent              = "organizations/%{org_id}"
   deletion_protection = false
@@ -109,7 +103,6 @@ resource "time_sleep" "wait_120s" {
 }
 
 resource "google_iam_folders_policy_binding" "my-folder-binding" {
-  provider = google-beta
   folder         = google_folder.folder.folder_id
   location       = "global"
   display_name   = "test folder binding%{random_suffix}"
@@ -130,5 +123,3 @@ resource "google_iam_folders_policy_binding" "my-folder-binding" {
 }
 `, context)
 }
-
-{{- end }}
diff --git a/...hird_party/terraform/services/iam3/resource_iam_organizations_policy_binding_test.go.tmpl b/...hird_party/terraform/services/iam3/resource_iam_organizations_policy_binding_test.go.tmpl
@@ -1,5 +1,4 @@
 package iam3_test
-{{- if ne $.TargetVersionName "ga" }}
 
 import (
 	"testing"
@@ -20,7 +19,7 @@ func TestAccIAM3OrganizationsPolicyBinding_iam3OrganizationsPolicyBindingExample
 
 	acctest.VcrTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
-		ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
 		CheckDestroy:             testAccCheckIAM3OrganizationsPolicyBindingDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
@@ -49,15 +48,13 @@ func TestAccIAM3OrganizationsPolicyBinding_iam3OrganizationsPolicyBindingExample
 func testAccIAM3OrganizationsPolicyBinding_iam3OrganizationsPolicyBindingExample_full(context map[string]interface{}) string {
 	return acctest.Nprintf(`
 resource "google_iam_principal_access_boundary_policy" "pab_policy" {
-  provider = google-beta
   organization   = "%{org_id}"
   location       = "global"
   display_name   = "test org binding%{random_suffix}"
   principal_access_boundary_policy_id = "tf-test-my-pab-policy%{random_suffix}"
 }
 
 resource "google_iam_organizations_policy_binding" "my_org_binding" {
-  provider = google-beta
   organization   = "%{org_id}"
   location       = "global"
   display_name   = "test org binding%{random_suffix}"
@@ -74,15 +71,13 @@ resource "google_iam_organizations_policy_binding" "my_org_binding" {
 func testAccIAM3OrganizationsPolicyBinding_iam3OrganizationsPolicyBindingExample_update(context map[string]interface{}) string {
 	return acctest.Nprintf(`
 resource "google_iam_principal_access_boundary_policy" "pab_policy" {
-  provider = google-beta
   organization   = "%{org_id}"
   location       = "global"
   display_name   = "test org binding%{random_suffix}"
   principal_access_boundary_policy_id = "tf-test-my-pab-policy%{random_suffix}"
 }
 
 resource "google_iam_organizations_policy_binding" "my_org_binding" {
-  provider = google-beta
   organization   = "%{org_id}"
   location       = "global"
   display_name   = "test org binding%{random_suffix}"
@@ -102,4 +97,3 @@ resource "google_iam_organizations_policy_binding" "my_org_binding" {
 }
 `, context)
 }
-{{- end }}
diff --git a/..._party/terraform/services/iam3/resource_iam_principal_access_boundary_policy_test.go.tmpl b/..._party/terraform/services/iam3/resource_iam_principal_access_boundary_policy_test.go.tmpl
@@ -1,6 +1,4 @@
 package iam3_test
-{{- if ne $.TargetVersionName "ga" }}
-
 import (
 	"testing"
 
@@ -19,7 +17,7 @@ func TestAccIAM3PrincipalAccessBoundaryPolicy_iam3PrincipalAccessBoundaryPolicyE
 
 	acctest.VcrTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
-		ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
 		CheckDestroy:             testAccCheckIAM3PrincipalAccessBoundaryPolicyDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
@@ -47,7 +45,6 @@ func TestAccIAM3PrincipalAccessBoundaryPolicy_iam3PrincipalAccessBoundaryPolicyE
 func testAccIAM3PrincipalAccessBoundaryPolicy_iam3PrincipalAccessBoundaryPolicyExample_full(context map[string]interface{}) string {
 	return acctest.Nprintf(`
 resource "google_iam_principal_access_boundary_policy" "my-pab-policy" {
-  provider       = google-beta
   organization   = "%{org_id}"
   location       = "global"
   display_name   = "test pab policy%{random_suffix}"
@@ -60,15 +57,13 @@ func testAccIAM3PrincipalAccessBoundaryPolicy_iam3PrincipalAccessBoundaryPolicyE
 	return acctest.Nprintf(`
 
 resource "google_project" "project" {
-  provider       = google-beta
   project_id     = "tf-test%{random_suffix}"
   name           = "tf-test%{random_suffix}"
   org_id         = "%{org_id}"
   deletion_policy = "DELETE"
 }
 
 resource "google_iam_principal_access_boundary_policy" "my-pab-policy" {
-  provider       = google-beta
   organization   = "%{org_id}"
   location       = "global"
   display_name   = "test pab policy%{random_suffix}"
@@ -85,4 +80,3 @@ resource "google_iam_principal_access_boundary_policy" "my-pab-policy" {
 }
 `, context)
 }
-{{- end }}
diff --git a/mmv1/third_party/terraform/services/iam3/resource_iam_projects_policy_binding_test.go.tmpl b/mmv1/third_party/terraform/services/iam3/resource_iam_projects_policy_binding_test.go.tmpl
@@ -1,5 +1,4 @@
 package iam3_test
-{{- if ne $.TargetVersionName "ga" }}
 
 import (
 	"testing"
@@ -20,7 +19,7 @@ func TestAccIAM3ProjectsPolicyBinding_iamProjectsPolicyBindingExample_update(t *
 
 	acctest.VcrTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
-		ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
 		CheckDestroy: testAccCheckIAM3ProjectsPolicyBindingDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
@@ -58,19 +57,17 @@ func TestAccIAM3ProjectsPolicyBinding_iamProjectsPolicyBindingExample_update(t *
 func testAccIAM3ProjectsPolicyBinding_iamProjectsPolicyBindingExample_full(context map[string]interface{}) string {
 	return acctest.Nprintf(`
 resource "google_iam_principal_access_boundary_policy" "pab_policy" {
-  provider = google-beta
   organization   = "%{org_id}"
   location       = "global"
   display_name   = "test project binding%{random_suffix}"
   principal_access_boundary_policy_id = "tf-test-my-pab-policy%{random_suffix}"
 }
 
 data "google_project" "project" {
-  provider = google-beta
+  provider = google
 }
 
 resource "google_iam_projects_policy_binding" "my-project-binding" {
-  provider = google-beta
   project        = data.google_project.project.project_id
   location       = "global"
   display_name   = "test project binding%{random_suffix}"
@@ -87,19 +84,17 @@ resource "google_iam_projects_policy_binding" "my-project-binding" {
 func testAccIAM3ProjectsPolicyBinding_iamProjectsPolicyBindingExample_update(context map[string]interface{}) string {
 	return acctest.Nprintf(`
 resource "google_iam_principal_access_boundary_policy" "pab_policy" {
-  provider = google-beta
   organization   = "%{org_id}"
   location       = "global"
   display_name   = "test project binding%{random_suffix}"
   principal_access_boundary_policy_id = "tf-test-my-pab-policy%{random_suffix}"
 }
 
 data "google_project" "project" {
-  provider = google-beta
+  provider = google
 }
 
 resource "google_iam_projects_policy_binding" "my-project-binding" {
-  provider = google-beta
   project        = data.google_project.project.project_id
   location       = "global"
   display_name   = "test project binding%{random_suffix}"
@@ -119,5 +114,3 @@ resource "google_iam_projects_policy_binding" "my-project-binding" {
 }
 `, context)
 }
-
-{{- end }}