Promote google_gke_hub_membership to GA (#4982) (#3439)

* initial ga work * promote the right resource * remove description from ga * deprecate description Co-authored-by: upodroid <cy@borg.dev> Signed-off-by: Modular Magician <magic-modules@google.com> Co-authored-by: upodroid <cy@borg.dev>
hashicorp · Jul 22, 2021 · ee2ff83 · ee2ff83
1 parent e4291d1
commit ee2ff83
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 20 deletions.
diff --git a/.changelog/4982.txt b/.changelog/4982.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+gkehub: promoted `google_gke_hub_membership` to GA
+```
diff --git a/google-beta/resource_gke_hub_membership.go b/google-beta/resource_gke_hub_membership.go
@@ -69,7 +69,8 @@ with length <2000 characters. For example: 'https://container.googleapis.com/v1/
 			"description": {
 				Type:        schema.TypeString,
 				Optional:    true,
-				Description: `The name of this entity type to be displayed on the console.`,
+				Deprecated:  "This field is unavailable in the GA provider and will be removed from the beta provider in a future release.",
+				Description: `The name of this entity type to be displayed on the console. This field is unavailable in v1 of the API.`,
 			},
 			"endpoint": {
 				Type:        schema.TypeList,

diff --git a/google-beta/resource_gke_hub_membership_generated_test.go b/google-beta/resource_gke_hub_membership_generated_test.go
@@ -32,12 +32,18 @@ func TestAccGKEHubMembership_gkehubMembershipBasicExample(t *testing.T) {
 
 	vcrTest(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
-		Providers:    testAccProvidersOiCS,
+		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckGKEHubMembershipDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
 				Config: testAccGKEHubMembership_gkehubMembershipBasicExample(context),
 			},
+			{
+				ResourceName:            "google_gke_hub_membership.basic_membership",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"membership_id"},
+			},
 		},
 	})
 }
@@ -48,7 +54,6 @@ resource "google_container_cluster" "primary" {
   name               = "basiccluster%{random_suffix}"
   location           = "us-central1-a"
   initial_node_count = 1
-  provider = google-beta
 }
 
 resource "google_gke_hub_membership" "membership" {
@@ -58,8 +63,6 @@ resource "google_gke_hub_membership" "membership" {
       resource_link = "//container.googleapis.com/${google_container_cluster.primary.id}"
     }
   }
-  description = "test resource."
-  provider = google-beta
 }
 `, context)
 }
@@ -74,12 +77,18 @@ func TestAccGKEHubMembership_gkehubMembershipIssuerExample(t *testing.T) {
 
 	vcrTest(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
-		Providers:    testAccProvidersOiCS,
+		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckGKEHubMembershipDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
 				Config: testAccGKEHubMembership_gkehubMembershipIssuerExample(context),
 			},
+			{
+				ResourceName:            "google_gke_hub_membership.issuer_membership",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"membership_id"},
+			},
 		},
 	})
 }
@@ -93,7 +102,6 @@ resource "google_container_cluster" "primary" {
   workload_identity_config {
     identity_namespace = "%{project}.svc.id.goog"
   }
-  provider = google-beta
 }
 
 resource "google_gke_hub_membership" "membership" {
@@ -106,8 +114,6 @@ resource "google_gke_hub_membership" "membership" {
   authority {
     issuer = "https://container.googleapis.com/v1/${google_container_cluster.primary.id}"
   }
-  description = "test resource."
-  provider = google-beta
 }
 `, context)
 }

diff --git a/website/docs/r/gke_hub_membership.html.markdown b/website/docs/r/gke_hub_membership.html.markdown
@@ -24,12 +24,10 @@ description: |-
 
 Membership contains information about a member cluster.
 
-~> **Warning:** This resource is in beta, and should be used with the terraform-provider-google-beta provider.
-See [Provider Versions](https://terraform.io/docs/providers/google/guides/provider_versions.html) for more details on beta resources.
 
 To get more information about Membership, see:
 
-* [API documentation](https://cloud.google.com/gkehub/docs/reference/rest/v1beta1/projects.locations.memberships)
+* [API documentation](https://cloud.google.com/anthos/multicluster-management/reference/rest/v1/projects.locations.memberships)
 * How-to Guides
     * [Registering a Cluster](https://cloud.google.com/anthos/multicluster-management/connect/registering-a-cluster#register_cluster)
 
@@ -46,7 +44,6 @@ resource "google_container_cluster" "primary" {
   name               = "basiccluster"
   location           = "us-central1-a"
   initial_node_count = 1
-  provider = google-beta
 }
 
 resource "google_gke_hub_membership" "membership" {
@@ -56,8 +53,6 @@ resource "google_gke_hub_membership" "membership" {
       resource_link = "//container.googleapis.com/${google_container_cluster.primary.id}"
     }
   }
-  description = "test resource."
-  provider = google-beta
 }
 ```
 <div class = "oics-button" style="float: right; margin: 0 0 -15px">
@@ -76,7 +71,6 @@ resource "google_container_cluster" "primary" {
   workload_identity_config {
     identity_namespace = "my-project-name.svc.id.goog"
   }
-  provider = google-beta
 }
 
 resource "google_gke_hub_membership" "membership" {
@@ -89,8 +83,6 @@ resource "google_gke_hub_membership" "membership" {
   authority {
     issuer = "https://container.googleapis.com/v1/${google_container_cluster.primary.id}"
   }
-  description = "test resource."
-  provider = google-beta
 }
 ```
 
@@ -108,8 +100,8 @@ The following arguments are supported:
 
 
 * `description` -
-  (Optional)
-  The name of this entity type to be displayed on the console.
+  (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
+  The name of this entity type to be displayed on the console. This field is unavailable in v1 of the API.
 
 * `labels` -
   (Optional)