Add the Resourcemanager Capability Service to the google provider. (#15148)

Author: blacken57

mmv1/products/resourcemanager3/Capability.yaml

@@ -21,7 +21,6 @@ references:
   guides:
     'Official Documentation': 'https://cloud.google.com/resource-manager/docs/manage-applications'
   api: 'https://cloud.google.com/resource-manager/reference/rest'
-min_version: beta
 
 import_format:
   - '{{parent}}/capabilities/{{capability_name}}'
@@ -54,7 +53,6 @@ examples:
       display_name: 'my-folder'
     test_env_vars:
       org_id: "ORG_ID"
-    min_version: beta
     external_providers: ["time"]
 
 parameters:

mmv1/products/resourcemanager3/product.yaml

@@ -16,7 +16,7 @@ name: 'ResourceManager3'
 legacy_name: 'resource_manager'
 display_name: 'Resource Manager'
 versions:
-  - name: 'beta'
+  - name: 'ga'
     base_url: 'https://cloudresourcemanager.googleapis.com/v3/'
 scopes:
   - 'https://www.googleapis.com/auth/cloud-platform'

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

@@ -1,5 +1,4 @@
 resource "google_folder" "folder" {
-  provider         = google-beta
   display_name     = "{{index $.Vars "display_name"}}"
   parent           = "organizations/{{index $.TestEnvVars "org_id"}}"
   deletion_protection = false
@@ -9,7 +8,6 @@ resource "time_sleep" "wait_60s" {
   create_duration = "60s"
 }
 resource "google_resource_manager_capability" "{{$.PrimaryResourceId}}" {
-  provider         = google-beta
   value            = true
   parent           = "${google_folder.folder.name}"
   capability_name  = "app-management"

…resource_manager_capability_test.go.tmpl …urce_resource_manager_capability_test.gommv1/third_party/terraform/services/resourcemanager3/resource_resource_manager_capability_test.go.tmpl renamed to mmv1/third_party/terraform/services/resourcemanager3/resource_resource_manager_capability_test.go mmv1/third_party/terraform/services/resourcemanager3/resource_resource_manager_capability_test.go.tmpl renamed to mmv1/third_party/terraform/services/resourcemanager3/resource_resource_manager_capability_test.go

@@ -1,9 +1,8 @@
 package resourcemanager3_test
-{{- if ne $.TargetVersionName "ga" }}
 
 import (
-	"testing"
 	"regexp"
+	"testing"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 
@@ -15,14 +14,14 @@ func TestAccResourceManagerCapability_resourceManagerCapabilityExample_basic(t *
 	t.Parallel()
 
 	context := map[string]interface{}{
-		"org_id":          envvar.GetTestOrgFromEnv(t),
+		"org_id":        envvar.GetTestOrgFromEnv(t),
 		"random_suffix": acctest.RandString(t, 10),
 	}
 	folderTFResourceName := "google_folder.folder"
 
 	acctest.VcrTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
-		ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
 		ExternalProviders: map[string]resource.ExternalProvider{
 			"time": {},
 		},
@@ -41,9 +40,9 @@ func TestAccResourceManagerCapability_resourceManagerCapabilityExample_basic(t *
 				),
 			},
 			{
-				ResourceName:      "google_resource_manager_capability.capability",
-				ImportState:       true,
-				ImportStateVerify: true,
+				ResourceName:            "google_resource_manager_capability.capability",
+				ImportState:             true,
+				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{"capability_name", "parent"},
 			},
 		},
@@ -53,7 +52,6 @@ func TestAccResourceManagerCapability_resourceManagerCapabilityExample_basic(t *
 func testAccResourceManagerCapability_resourceManagerCapabilityExample_basic(context map[string]interface{}) string {
 	return acctest.Nprintf(`
 resource "google_folder" "folder" {
-  provider         = google-beta
   display_name     = "my-folder%{random_suffix}"
   parent           = "organizations/%{org_id}"
   deletion_protection = false
@@ -63,14 +61,10 @@ resource "time_sleep" "wait_60s" {
   create_duration = "60s"
 }
 resource "google_resource_manager_capability" "capability" {
-  provider         = google-beta
   value            = true
   parent           = "${google_folder.folder.name}"
   capability_name  = "app-management"
-  depends_on = [time_sleep.wait_60s]
+  depends_on = [time_sleep.wait_60s, google_folder.folder]
 }
 `, context)
 }
-{{- else }}
-// Capability is only in beta version.
-{{- end }}