diff --git a/mmv1/products/compute/TargetTcpProxy.yaml b/mmv1/products/compute/TargetTcpProxy.yaml index 0105842a72ad..ea23a1f0f25a 100644 --- a/mmv1/products/compute/TargetTcpProxy.yaml +++ b/mmv1/products/compute/TargetTcpProxy.yaml @@ -41,30 +41,16 @@ samples: backend_service_name: backend-service health_check_name: health-check target_tcp_proxy_name: test-proxy - - name: target_tcp_proxy_basic_beta - primary_resource_id: default - min_version: beta - steps: - - name: target_tcp_proxy_basic_beta - min_version: beta - resource_id_vars: - backend_service_name: backend-service - health_check_name: health-check - target_tcp_proxy_name: test-proxy - name: target_tcp_proxy_backendless - min_version: beta primary_resource_id: default steps: - name: target_tcp_proxy_backendless - min_version: beta resource_id_vars: target_tcp_proxy_name: test-proxy - name: target_tcp_proxy_tls_route - min_version: beta primary_resource_id: default steps: - name: target_tcp_proxy_tls_route - min_version: beta resource_id_vars: backend_service_name: backend-service health_check_name: health-check @@ -112,7 +98,7 @@ properties: type: ResourceRef description: | A reference to the BackendService resource. This field is optional when - the loadBalancingScheme (available in beta) is set to INTERNAL_MANAGED. + the loadBalancingScheme is set to INTERNAL_MANAGED. update_verb: POST update_url: projects/{{project}}/global/targetTcpProxies/{{name}}/setBackendService at_least_one_of: @@ -133,7 +119,6 @@ properties: Specifies the load balancer type. A target TCP proxy created for one type of load balancer cannot be used with another. For more information, refer to [Summary of types of Google Cloud load balancers](https://docs.cloud.google.com/load-balancing/docs/load-balancing-overview#summary-gclb). - min_version: beta at_least_one_of: - backend_service - load_balancing_scheme diff --git a/mmv1/products/networkservices/TlsRoute.yaml b/mmv1/products/networkservices/TlsRoute.yaml index 12f22053a411..0221ccc33b01 100644 --- a/mmv1/products/networkservices/TlsRoute.yaml +++ b/mmv1/products/networkservices/TlsRoute.yaml @@ -80,11 +80,9 @@ samples: backend_service_name: my-backend-service health_check_name: backend-service-health-check - name: network_services_tls_route_target_tcp_proxy_basic - min_version: beta primary_resource_id: default steps: - name: network_services_tls_route_target_tcp_proxy_basic - min_version: beta resource_id_vars: resource_name: my-tls-route target_tcp_proxy_name: my-target-tcp-proxy diff --git a/mmv1/templates/terraform/samples/services/compute/target_tcp_proxy_backendless.tf.tmpl b/mmv1/templates/terraform/samples/services/compute/target_tcp_proxy_backendless.tf.tmpl index 9151f39ffd3d..55d83f7305fa 100644 --- a/mmv1/templates/terraform/samples/services/compute/target_tcp_proxy_backendless.tf.tmpl +++ b/mmv1/templates/terraform/samples/services/compute/target_tcp_proxy_backendless.tf.tmpl @@ -1,5 +1,4 @@ resource "google_compute_target_tcp_proxy" "{{$.PrimaryResourceId}}" { - provider = google-beta name = "{{index $.ResourceIdVars "target_tcp_proxy_name"}}" load_balancing_scheme = "INTERNAL_MANAGED" } diff --git a/mmv1/templates/terraform/samples/services/compute/target_tcp_proxy_basic.tf.tmpl b/mmv1/templates/terraform/samples/services/compute/target_tcp_proxy_basic.tf.tmpl index 452274a68880..a25ca90c34f6 100644 --- a/mmv1/templates/terraform/samples/services/compute/target_tcp_proxy_basic.tf.tmpl +++ b/mmv1/templates/terraform/samples/services/compute/target_tcp_proxy_basic.tf.tmpl @@ -1,12 +1,14 @@ resource "google_compute_target_tcp_proxy" "{{$.PrimaryResourceId}}" { - name = "{{index $.ResourceIdVars "target_tcp_proxy_name"}}" - backend_service = google_compute_backend_service.default.id + name = "{{index $.ResourceIdVars "target_tcp_proxy_name"}}" + load_balancing_scheme = "EXTERNAL_MANAGED" + backend_service = google_compute_backend_service.default.id } resource "google_compute_backend_service" "default" { - name = "{{index $.ResourceIdVars "backend_service_name"}}" - protocol = "TCP" - timeout_sec = 10 + name = "{{index $.ResourceIdVars "backend_service_name"}}" + load_balancing_scheme = "EXTERNAL_MANAGED" + protocol = "TCP" + timeout_sec = 10 health_checks = [google_compute_health_check.default.id] } diff --git a/mmv1/templates/terraform/samples/services/compute/target_tcp_proxy_basic_beta.tf.tmpl b/mmv1/templates/terraform/samples/services/compute/target_tcp_proxy_basic_beta.tf.tmpl deleted file mode 100644 index c933c2f98845..000000000000 --- a/mmv1/templates/terraform/samples/services/compute/target_tcp_proxy_basic_beta.tf.tmpl +++ /dev/null @@ -1,27 +0,0 @@ -resource "google_compute_target_tcp_proxy" "{{$.PrimaryResourceId}}" { - provider = google-beta - name = "{{index $.ResourceIdVars "target_tcp_proxy_name"}}" - load_balancing_scheme = "EXTERNAL_MANAGED" - backend_service = google_compute_backend_service.default.id -} - -resource "google_compute_backend_service" "default" { - provider = google-beta - name = "{{index $.ResourceIdVars "backend_service_name"}}" - load_balancing_scheme = "EXTERNAL_MANAGED" - protocol = "TCP" - timeout_sec = 10 - - health_checks = [google_compute_health_check.default.id] -} - -resource "google_compute_health_check" "default" { - provider = google-beta - name = "{{index $.ResourceIdVars "health_check_name"}}" - timeout_sec = 1 - check_interval_sec = 1 - - tcp_health_check { - port = "443" - } -} diff --git a/mmv1/templates/terraform/samples/services/compute/target_tcp_proxy_tls_route.tf.tmpl b/mmv1/templates/terraform/samples/services/compute/target_tcp_proxy_tls_route.tf.tmpl index 40680735166a..98913368abc5 100644 --- a/mmv1/templates/terraform/samples/services/compute/target_tcp_proxy_tls_route.tf.tmpl +++ b/mmv1/templates/terraform/samples/services/compute/target_tcp_proxy_tls_route.tf.tmpl @@ -1,11 +1,9 @@ resource "google_compute_target_tcp_proxy" "{{$.PrimaryResourceId}}" { - provider = google-beta name = "{{index $.ResourceIdVars "target_tcp_proxy_name"}}" load_balancing_scheme = "INTERNAL_MANAGED" } resource "google_compute_backend_service" "{{$.PrimaryResourceId}}" { - provider = google-beta name = "{{index $.ResourceIdVars "backend_service_name"}}" load_balancing_scheme = "INTERNAL_MANAGED" protocol = "TCP" @@ -13,7 +11,6 @@ resource "google_compute_backend_service" "{{$.PrimaryResourceId}}" { } resource "google_compute_health_check" "{{$.PrimaryResourceId}}" { - provider = google-beta name = "{{index $.ResourceIdVars "health_check_name"}}" https_health_check { @@ -22,7 +19,6 @@ resource "google_compute_health_check" "{{$.PrimaryResourceId}}" { } resource "google_network_services_tls_route" "{{$.PrimaryResourceId}}" { - provider = google-beta name = "{{index $.ResourceIdVars "tls_route_name"}}" target_proxies = [ diff --git a/mmv1/templates/terraform/samples/services/networkservices/network_services_tls_route_target_tcp_proxy_basic.tf.tmpl b/mmv1/templates/terraform/samples/services/networkservices/network_services_tls_route_target_tcp_proxy_basic.tf.tmpl index 1e73622c61df..e322703060bf 100644 --- a/mmv1/templates/terraform/samples/services/networkservices/network_services_tls_route_target_tcp_proxy_basic.tf.tmpl +++ b/mmv1/templates/terraform/samples/services/networkservices/network_services_tls_route_target_tcp_proxy_basic.tf.tmpl @@ -1,5 +1,4 @@ resource "google_compute_backend_service" "{{$.PrimaryResourceId}}" { - provider = google-beta name = "{{index $.ResourceIdVars "backend_service_name"}}" load_balancing_scheme = "INTERNAL_MANAGED" protocol = "TCP" @@ -7,7 +6,6 @@ resource "google_compute_backend_service" "{{$.PrimaryResourceId}}" { } resource "google_compute_health_check" "{{$.PrimaryResourceId}}" { - provider = google-beta name = "{{index $.ResourceIdVars "health_check_name"}}" https_health_check { @@ -16,13 +14,11 @@ resource "google_compute_health_check" "{{$.PrimaryResourceId}}" { } resource "google_compute_target_tcp_proxy" "{{$.PrimaryResourceId}}" { - provider = google-beta name = "{{index $.ResourceIdVars "target_tcp_proxy_name"}}" load_balancing_scheme = "INTERNAL_MANAGED" } resource "google_network_services_tls_route" "{{$.PrimaryResourceId}}" { - provider = google-beta name = "{{index $.ResourceIdVars "resource_name"}}" target_proxies = [