Promote regional target TCP proxy to GA. (GoogleCloudPlatform#6804)

kubalaguna · Feb 27, 2023 · 81b618a · 81b618a
1 parent 73b9c3e
commit 81b618a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 16 deletions.
diff --git a/mmv1/products/compute/api.yaml b/mmv1/products/compute/api.yaml
@@ -16397,8 +16397,7 @@ objects:
       guides:
         'Official Documentation':
           'https://cloud.google.com/load-balancing/docs/tcp/internal-proxy'
-      api: 'https://cloud.google.com/compute/docs/reference/rest/beta/targetTcpProxies'
-    min_version: beta
+      api: 'https://cloud.google.com/compute/docs/reference/rest/v1/regionTargetTcpProxies'
     async: !ruby/object:Api::OpAsync
       operation: !ruby/object:Api::OpAsync::Operation
         kind: 'compute#operation'

diff --git a/mmv1/templates/terraform/examples/region_target_tcp_proxy_basic.tf.erb b/mmv1/templates/terraform/examples/region_target_tcp_proxy_basic.tf.erb
@@ -1,13 +1,11 @@
 # [START cloudloadbalancing_region_target_tcp_proxy_basic]
 resource "google_compute_region_target_tcp_proxy" "default" {
-  provider        = google-beta
   name            = "<%= ctx[:vars]['region_target_tcp_proxy_name'] %>"
   region          = "europe-west4"
   backend_service = google_compute_region_backend_service.default.id
 }
 
 resource "google_compute_region_backend_service" "default" {
-  provider    = google-beta
   name        = "<%= ctx[:vars]['region_backend_service_name'] %>"
   protocol    = "TCP"
   timeout_sec = 10
@@ -18,7 +16,6 @@ resource "google_compute_region_backend_service" "default" {
 }
 
 resource "google_compute_region_health_check" "default" {
-  provider           = google-beta
   name               = "<%= ctx[:vars]['health_check_name'] %>"
   region             = "europe-west4"
   timeout_sec        = 1

diff --git a/mmv1/third_party/terraform/tests/resource_compute_region_target_tcp_proxy_test.go.erb b/mmv1/third_party/terraform/tests/resource_compute_region_target_tcp_proxy_test.go.erb
@@ -1,6 +1,5 @@
 <% autogen_exception -%>
 package google
-<% unless version == 'ga' -%>
 
 import (
 	"fmt"
@@ -19,7 +18,7 @@ func TestAccComputeRegionTargetTcpProxy_update(t *testing.T) {
 
 	vcrTest(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
-		Providers:    testAccProvidersOiCS,
+		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckComputeRegionTargetTcpProxyDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
@@ -87,7 +86,6 @@ func testAccCheckComputeRegionTargetTcpProxyExists(t *testing.T, n string) resou
 func testAccComputeRegionTargetTcpProxy_basic1(target, backend, hc string) string {
 	return fmt.Sprintf(`
 resource "google_compute_region_target_tcp_proxy" "foobar" {
-  provider        = google-beta
   description     = "Resource created for Terraform acceptance testing"
   name            = "%s"
   backend_service = google_compute_region_backend_service.foobar.self_link
@@ -96,7 +94,6 @@ resource "google_compute_region_target_tcp_proxy" "foobar" {
 }
 
 resource "google_compute_region_backend_service" "foobar" {
-  provider      = google-beta
   name          = "%s"
   protocol      = "TCP"
   health_checks = [google_compute_region_health_check.zero.self_link]
@@ -106,7 +103,6 @@ resource "google_compute_region_backend_service" "foobar" {
 }
 
 resource "google_compute_region_health_check" "zero" {
-  provider           = google-beta
   name               = "%s"
   check_interval_sec = 1
   timeout_sec        = 1
@@ -121,7 +117,6 @@ resource "google_compute_region_health_check" "zero" {
 func testAccComputeRegionTargetTcpProxy_update2(target, backend, hc string) string {
 	return fmt.Sprintf(`
 resource "google_compute_region_target_tcp_proxy" "foobar" {
-  provider        = google-beta
   description     = "Resource created for Terraform acceptance testing"
   name            = "%s"
   backend_service = google_compute_region_backend_service.foobar2.self_link
@@ -130,7 +125,6 @@ resource "google_compute_region_target_tcp_proxy" "foobar" {
 }
 
 resource "google_compute_region_backend_service" "foobar" { 
-  provider      = google-beta
   name          = "%s"
   protocol      = "TCP"
   health_checks = [google_compute_region_health_check.zero.self_link]
@@ -140,7 +134,6 @@ resource "google_compute_region_backend_service" "foobar" {
 }
 
 resource "google_compute_region_backend_service" "foobar2" { 
-  provider      = google-beta
   name          = "%s-2"
   protocol      = "TCP"
   health_checks = [google_compute_region_health_check.zero.self_link]
@@ -150,7 +143,6 @@ resource "google_compute_region_backend_service" "foobar2" {
 }
 
 resource "google_compute_region_health_check" "zero" {
-  provider           = google-beta
   name               = "%s"
   check_interval_sec = 1
   timeout_sec        = 1
@@ -160,5 +152,4 @@ resource "google_compute_region_health_check" "zero" {
   region = "us-central1"
 }
 `, target, backend, backend, hc)
-}
-<% end -%>
+}