Promote health check resource field grpc_with_tls to GA (#15313)

Author: jkrish-c

mmv1/products/compute/HealthCheck.yaml

@@ -111,13 +111,11 @@ examples:
       health_check_name: 'grpc-health-check'
   - name: 'health_check_grpc_with_tls'
     primary_resource_id: 'grpc-with-tls-health-check'
-    min_version: 'beta'
     vars:
       health_check_name: 'grpc-with-tls-health-check'
     tgc_skip_test: 'grpcTlsHealthCheck is not in CAI asset, but is required in this test.'
   - name: 'health_check_grpc_with_tls_full'
     primary_resource_id: 'grpc-with-tls-health-check'
-    min_version: 'beta'
     vars:
       health_check_name: 'grpc-with-tls-health-check'
     tgc_skip_test: 'grpcTlsHealthCheck is not in CAI asset, but is required in this test.'
@@ -888,7 +886,6 @@ properties:
           - 'grpc_health_check.0.port_specification'
           - 'grpc_health_check.0.grpc_service_name'
   - name: 'grpcTlsHealthCheck'
-    min_version: beta
     type: NestedObject
     exactly_one_of:
       - 'http_health_check'

mmv1/products/compute/RegionHealthCheck.yaml

@@ -115,13 +115,11 @@ examples:
       health_check_name: 'grpc-region-health-check'
   - name: 'region_health_check_grpc_with_tls'
     primary_resource_id: 'grpc-with-tls-region-health-check'
-    min_version: 'beta'
     vars:
       health_check_name: 'grpc-with-tls-region-health-check'
     tgc_skip_test: 'grpcTlsHealthCheck is not in CAI asset, but is required in this test.'
   - name: 'region_health_check_grpc_with_tls_full'
     primary_resource_id: 'grpc-with-tls-region-health-check'
-    min_version: 'beta'
     vars:
       health_check_name: 'grpc-with-tls-region-health-check'
     tgc_skip_test: 'grpcTlsHealthCheck is not in CAI asset, but is required in this test.'
@@ -870,7 +868,6 @@ properties:
           - 'grpc_health_check.0.port_specification'
           - 'grpc_health_check.0.grpc_service_name'
   - name: 'grpcTlsHealthCheck'
-    min_version: 'beta'
     type: NestedObject
     exactly_one_of:
       - 'http_health_check'

mmv1/templates/terraform/encoders/health_check_type.tmpl

@@ -96,7 +96,6 @@ if _, ok := d.GetOk("grpc_health_check"); ok {
 	return obj, nil
 }
 
-{{ if ne $.TargetVersionName `ga` -}}
 if _, ok := d.GetOk("grpc_tls_health_check"); ok {
 	hc := d.Get("grpc_tls_health_check").([]interface{})[0]
 	ps := hc.(map[string]interface{})["port_specification"]
@@ -110,6 +109,5 @@ if _, ok := d.GetOk("grpc_tls_health_check"); ok {
 	obj["type"] = "GRPC_WITH_TLS"
 	return obj, nil
 }
-{{- end }}
 
 return nil, fmt.Errorf("error in HealthCheck %s: No health check block specified.", d.Get("name").(string))

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

@@ -1,6 +1,4 @@
 resource "google_compute_health_check" "grpc-with-tls-health-check" {
-  provider = google-beta
-
   name = "{{index $.Vars "health_check_name"}}"
 
   timeout_sec        = 1

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

@@ -1,6 +1,4 @@
 resource "google_compute_health_check" "grpc-with-tls-health-check" {
-  provider = google-beta
-
   name        = "{{index $.Vars "health_check_name"}}"
   description = "Health check via grpc with TLS"
 

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

@@ -1,6 +1,4 @@
 resource "google_compute_region_health_check" "grpc-with-tls-region-health-check" {
-  provider = google-beta
-  
   name = "{{index $.Vars "health_check_name"}}"
 
   timeout_sec        = 1

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

@@ -1,6 +1,4 @@
 resource "google_compute_region_health_check" "grpc-with-tls-region-health-check" {
-  provider = google-beta
-  
   name = "{{index $.Vars "health_check_name"}}"
   description = "regional health check via GRPC with TLS"
 

mmv1/third_party/terraform/services/compute/resource_compute_health_check_test.go.tmpl

@@ -39,15 +39,14 @@ func TestAccComputeHealthCheck_tcp_update(t *testing.T) {
 	})
 }
 
-{{ if ne $.TargetVersionName `ga` -}}
 func TestAccComputeHealthCheck_grpcWithTls_create(t *testing.T) {
 	t.Parallel()
 
 	hckName := fmt.Sprintf("tf-test-%s", acctest.RandString(t, 10))
 
 	acctest.VcrTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
-		ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
 		CheckDestroy:             testAccCheckComputeHealthCheckDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
@@ -61,17 +60,15 @@ func TestAccComputeHealthCheck_grpcWithTls_create(t *testing.T) {
 		},
 	})
 }
-{{- end }}
 
-{{ if ne $.TargetVersionName `ga` -}}
 func TestAccComputeHealthCheck_grpcWithTls_update(t *testing.T) {
 	t.Parallel()
 
 	hckName := fmt.Sprintf("tf-test-%s", acctest.RandString(t, 10))
 
 	acctest.VcrTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
-		ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
 		CheckDestroy:             testAccCheckComputeHealthCheckDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
@@ -93,7 +90,6 @@ func TestAccComputeHealthCheck_grpcWithTls_update(t *testing.T) {
 		},
 	})
 }
-{{- end }}
 
 func TestAccComputeHealthCheck_ssl_port_spec(t *testing.T) {
 	t.Parallel()
@@ -248,11 +244,9 @@ resource "google_compute_health_check" "foobar" {
 `, hckName)
 }
 
-{{ if ne $.TargetVersionName `ga` -}}
 func testAccComputeHealthCheck_grpcWithTls(hckName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_health_check" "foobar" {
-  provider            = "google-beta"
   check_interval_sec  = 3
   description         = "Resource created for Terraform acceptance testing"
   healthy_threshold   = 3
@@ -265,13 +259,10 @@ resource "google_compute_health_check" "foobar" {
 }
 `, hckName)
 }
-{{- end }}
 
-{{ if ne $.TargetVersionName `ga` -}}
 func testAccComputeHealthCheck_grpcWithTls_update(hckName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_health_check" "foobar" {
-  provider            = "google-beta"
   check_interval_sec  = 3
   healthy_threshold   = 10
   name                = "tf-test-health-test-%s"
@@ -283,7 +274,6 @@ resource "google_compute_health_check" "foobar" {
 }
 `, hckName)
 }
-{{- end }}
 
 func testAccComputeHealthCheck_ssl(hckName string) string {
 	return fmt.Sprintf(`

…compute_region_health_check_test.go.tmpl …urce_compute_region_health_check_test.gommv1/third_party/terraform/services/compute/resource_compute_region_health_check_test.go.tmpl renamed to mmv1/third_party/terraform/services/compute/resource_compute_region_health_check_test.go mmv1/third_party/terraform/services/compute/resource_compute_region_health_check_test.go.tmpl renamed to mmv1/third_party/terraform/services/compute/resource_compute_region_health_check_test.go

@@ -43,15 +43,14 @@ func TestAccComputeRegionHealthCheck_tcp_update(t *testing.T) {
 	})
 }
 
-{{ if ne $.TargetVersionName `ga` -}}
 func TestAccComputeRegionHealthCheck_grpcWithTls_create(t *testing.T) {
 	t.Parallel()
 
 	hckName := fmt.Sprintf("tf-test-%s", acctest.RandString(t, 10))
 
 	acctest.VcrTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
-		ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
 		CheckDestroy:             testAccCheckComputeRegionHealthCheckDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
@@ -69,17 +68,15 @@ func TestAccComputeRegionHealthCheck_grpcWithTls_create(t *testing.T) {
 		},
 	})
 }
-{{- end }}
 
-{{ if ne $.TargetVersionName `ga` -}}
 func TestAccComputeRegionHealthCheck_grpcWithTls_update(t *testing.T) {
 	t.Parallel()
 
 	hckName := fmt.Sprintf("tf-test-%s", acctest.RandString(t, 10))
 
 	acctest.VcrTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
-		ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
 		CheckDestroy:             testAccCheckComputeRegionHealthCheckDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
@@ -105,7 +102,6 @@ func TestAccComputeRegionHealthCheck_grpcWithTls_update(t *testing.T) {
 		},
 	})
 }
-{{- end }}
 
 func TestAccComputeRegionHealthCheck_ssl_port_spec(t *testing.T) {
 	t.Parallel()
@@ -281,11 +277,9 @@ resource "google_compute_region_health_check" "foobar" {
 `, hckName)
 }
 
-{{ if ne $.TargetVersionName `ga` -}}
 func testAccComputeRegionHealthCheck_grpcWithTls(hckName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_region_health_check" "foobar" {
-  provider            = "google-beta"
   check_interval_sec  = 3
   description         = "Resource created for Terraform acceptance testing"
   healthy_threshold   = 3
@@ -298,13 +292,10 @@ resource "google_compute_region_health_check" "foobar" {
 }
 `, hckName)
 }
-{{- end }}
 
-{{ if ne $.TargetVersionName `ga` -}}
 func testAccComputeRegionHealthCheck_grpcWithTls_update(hckName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_region_health_check" "foobar" {
-  provider            = "google-beta"
   check_interval_sec  = 3
   healthy_threshold   = 10
   name                = "tf-test-health-test-%s"
@@ -316,7 +307,6 @@ resource "google_compute_region_health_check" "foobar" {
 }
 `, hckName)
 }
-{{- end }}
 
 func testAccComputeRegionHealthCheck_ssl(hckName string) string {
 	return fmt.Sprintf(`