Promote google_gke_hub_membership to GA (GoogleCloudPlatform#4982)

* initial ga work * promote the right resource * remove description from ga * deprecate description Co-authored-by: upodroid <[email protected]>
khajduczenia · Oct 12, 2021 · 6042f10 · 6042f10
1 parent ed092d3
commit 6042f10
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 11 deletions.
diff --git a/mmv1/products/gkehub/api.yaml b/mmv1/products/gkehub/api.yaml
@@ -18,6 +18,9 @@ versions:
   - !ruby/object:Api::Product::Version
     name: beta
     base_url: https://gkehub.googleapis.com/v1beta1/
+  - !ruby/object:Api::Product::Version
+    name: ga
+    base_url: https://gkehub.googleapis.com/v1/
 scopes:
   - https://www.googleapis.com/auth/cloud-platform
 apis_required:
@@ -26,7 +29,6 @@ apis_required:
     url: https://console.cloud.google.com/apis/library/gkehub.googleapis.com
 objects:
   - !ruby/object:Api::Resource
-    min_version: beta
     name: 'Membership'
     base_url: "projects/{{project}}/locations/global/memberships"
     create_url: "projects/{{project}}/locations/global/memberships?membershipId={{membership_id}}"
@@ -40,7 +42,7 @@ objects:
       guides:
         'Registering a Cluster':
           'https://cloud.google.com/anthos/multicluster-management/connect/registering-a-cluster#register_cluster'
-      api: 'https://cloud.google.com/gkehub/docs/reference/rest/v1beta1/projects.locations.memberships'
+      api: 'https://cloud.google.com/anthos/multicluster-management/reference/rest/v1/projects.locations.memberships'
     async: !ruby/object:Api::OpAsync
       operation: !ruby/object:Api::OpAsync::Operation
         kind: 'gkehub#operation'
@@ -75,8 +77,10 @@ objects:
           The unique identifier of the membership.
       - !ruby/object:Api::Type::String
         name: 'description'
+        deprecation_message: This field is unavailable in the GA provider and will be removed from the beta provider in a future release.
+        min_version: beta
         description: |
-          The name of this entity type to be displayed on the console.
+          The name of this entity type to be displayed on the console. This field is unavailable in v1 of the API.
       - !ruby/object:Api::Type::KeyValuePairs
         name: 'labels'
         description: |

diff --git a/mmv1/products/gkehub/terraform.yaml b/mmv1/products/gkehub/terraform.yaml
@@ -17,14 +17,12 @@ overrides: !ruby/object:Overrides::ResourceOverrides
     autogen_async: true
     examples:
       - !ruby/object:Provider::Terraform::Examples
-        min_version: beta
         name: "gkehub_membership_basic"
         primary_resource_id: "basic_membership"
         vars:
           name: "basic"
           cluster_name: "basiccluster"
       - !ruby/object:Provider::Terraform::Examples
-        min_version: beta
         name: "gkehub_membership_issuer"
         primary_resource_id: "issuer_membership"
         vars:

diff --git a/mmv1/templates/terraform/examples/gkehub_membership_basic.tf.erb b/mmv1/templates/terraform/examples/gkehub_membership_basic.tf.erb
@@ -2,7 +2,6 @@ resource "google_container_cluster" "primary" {
   name               = "<%= ctx[:vars]['cluster_name'] %>"
   location           = "us-central1-a"
   initial_node_count = 1
-  provider = google-beta
 }
 
 resource "google_gke_hub_membership" "membership" {
@@ -12,6 +11,4 @@ resource "google_gke_hub_membership" "membership" {
       resource_link = "//container.googleapis.com/${google_container_cluster.primary.id}"
     }
   }
-  description = "test resource."
-  provider = google-beta
 }
diff --git a/mmv1/templates/terraform/examples/gkehub_membership_issuer.tf.erb b/mmv1/templates/terraform/examples/gkehub_membership_issuer.tf.erb
@@ -5,7 +5,6 @@ resource "google_container_cluster" "primary" {
   workload_identity_config {
     identity_namespace = "<%= ctx[:test_env_vars]['project'] %>.svc.id.goog"
   }
-  provider = google-beta
 }
 
 resource "google_gke_hub_membership" "membership" {
@@ -18,6 +17,4 @@ resource "google_gke_hub_membership" "membership" {
   authority {
     issuer = "https://container.googleapis.com/v1/${google_container_cluster.primary.id}"
   }
-  description = "test resource."
-  provider = google-beta
 }