Promote InstanceSettings compute resource to GA. (GoogleCloudPlatform…

…#10342)
hao-nan-li · Apr 5, 2024 · 475f70d · 475f70d
1 parent a391530
commit 475f70d
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 9 deletions.
diff --git a/mmv1/products/compute/InstanceSettings.yaml b/mmv1/products/compute/InstanceSettings.yaml
@@ -27,7 +27,6 @@ create_url: 'projects/{{project}}/zones/{{zone}}/instanceSettings?update_mask=*'
 update_verb: :PATCH
 update_url: 'projects/{{project}}/zones/{{zone}}/instanceSettings?update_mask=*'
 import_format: ['projects/{{project}}/zones/{{zone}}/instanceSettings']
-min_version: beta
 async: !ruby/object:Api::OpAsync
   operation: !ruby/object:Api::OpAsync::Operation
     kind: 'compute#operation'
@@ -48,7 +47,6 @@ async: !ruby/object:Api::OpAsync
     message: 'message'
 examples:
   - !ruby/object:Provider::Terraform::Examples
-    min_version: beta
     name: 'instance_settings_basic'
     primary_resource_id: 'gce_instance_settings'
 custom_code: !ruby/object:Provider::Terraform::CustomCode

diff --git a/mmv1/templates/terraform/examples/instance_settings_basic.tf.erb b/mmv1/templates/terraform/examples/instance_settings_basic.tf.erb
@@ -1,7 +1,6 @@
 # [START instance_settings_basic]
 
 resource "google_compute_instance_settings" "<%= ctx[:primary_resource_id] %>" {
-  provider = google-beta
   zone = "us-east7-b"
   metadata {
     items = {

diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_instance_settings_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_instance_settings_test.go.erb
@@ -1,7 +1,6 @@
 <% autogen_exception -%>
 package compute_test
 
-<% unless version == 'ga' -%>
 import (
 	"testing"
 
@@ -19,7 +18,7 @@ func TestAccComputeInstanceSettings_update(t *testing.T) {
 
 	acctest.VcrTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
-		ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
 		CheckDestroy:             testAccCheckComputeInstanceSettingsDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
@@ -57,7 +56,6 @@ func testAccComputeInstanceSettings_basic(context map[string]interface{}) string
 	return acctest.Nprintf(`
 
 resource "google_compute_instance_settings" "gce_instance_settings" {
-  provider = google-beta
   zone = "us-east7-b"
   metadata {
     items = {
@@ -73,7 +71,6 @@ func testAccComputeInstanceSettings_update(context map[string]interface{}) strin
 	return acctest.Nprintf(`
 
 resource "google_compute_instance_settings" "gce_instance_settings" {
-  provider = google-beta
   zone = "us-east7-b"
   metadata {
     items = {
@@ -90,7 +87,6 @@ func testAccComputeInstanceSettings_delete(context map[string]interface{}) strin
 	return acctest.Nprintf(`
 
 resource "google_compute_instance_settings" "gce_instance_settings" {
-  provider = google-beta
   zone = "us-east7-b"
   metadata {
     items = {
@@ -101,4 +97,3 @@ resource "google_compute_instance_settings" "gce_instance_settings" {
 
 `, context)
 }
-<% end -%>