Promote CSM network services resources to GA (#13206) (#930)

modular-magician · web-flow · commit aa6f6324af30 · 2025-03-03T13:14:21.000-08:00
[upstream:7a4f00d3c05e938e5a9e290ac6cb71f2f442dd04]

Signed-off-by: Modular Magician &lt;magic-modules@google.com&gt;
diff --git a/network_services_endpoint_policy_basic/main.tf b/network_services_endpoint_policy_basic/main.tf
@@ -1,5 +1,4 @@
 resource "google_network_services_endpoint_policy" "default" {
-  provider               = google-beta
   name                   = "my-endpoint-policy-${local.name_suffix}"
   labels                 = {
     foo = "bar"
diff --git a/network_services_endpoint_policy_empty_match/main.tf b/network_services_endpoint_policy_empty_match/main.tf
@@ -1,5 +1,4 @@
 resource "google_network_services_endpoint_policy" "default" {
-  provider               = google-beta
   name                   = "my-endpoint-policy-${local.name_suffix}"
   labels                 = {
     foo = "bar"
diff --git a/network_services_grpc_route_actions/main.tf b/network_services_grpc_route_actions/main.tf
@@ -1,5 +1,4 @@
 resource "google_network_services_grpc_route" "default" {
-  provider               = google-beta
   name                   = "my-grpc-route-${local.name_suffix}"
   labels                 = {
     foo = "bar"
diff --git a/network_services_grpc_route_basic/main.tf b/network_services_grpc_route_basic/main.tf
@@ -1,5 +1,4 @@
 resource "google_network_services_grpc_route" "default" {
-  provider               = google-beta
   name                   = "my-grpc-route-${local.name_suffix}"
   labels                 = {
     foo = "bar"
diff --git a/network_services_grpc_route_matches_and_actions/main.tf b/network_services_grpc_route_matches_and_actions/main.tf
@@ -1,5 +1,4 @@
 resource "google_network_services_grpc_route" "default" {
-  provider               = google-beta
   name                   = "my-grpc-route-${local.name_suffix}"
   labels                 = {
     foo = "bar"
diff --git a/network_services_http_route_actions/main.tf b/network_services_http_route_actions/main.tf
@@ -1,5 +1,4 @@
 resource "google_network_services_http_route" "default" {
-  provider               = google-beta
   name                   = "my-http-route-${local.name_suffix}"
   labels                 = {
     foo = "bar"
diff --git a/network_services_http_route_basic/main.tf b/network_services_http_route_basic/main.tf
@@ -1,5 +1,4 @@
 resource "google_network_services_http_route" "default" {
-  provider               = google-beta
   name                   = "my-http-route-${local.name_suffix}"
   labels                 = {
     foo = "bar"
diff --git a/network_services_http_route_matches_and_actions/main.tf b/network_services_http_route_matches_and_actions/main.tf
@@ -1,5 +1,4 @@
 resource "google_network_services_http_route" "default" {
-  provider               = google-beta
   name                   = "my-http-route-${local.name_suffix}"
   labels                 = {
     foo = "bar"
diff --git a/network_services_http_route_mesh_basic/main.tf b/network_services_http_route_mesh_basic/main.tf
@@ -1,5 +1,4 @@
 resource "google_network_services_mesh" "default" {
-  provider    = google-beta
   name        = "my-http-route-${local.name_suffix}"
   labels      = {
     foo = "bar"
@@ -8,7 +7,6 @@ resource "google_network_services_mesh" "default" {
 }
 
 resource "google_network_services_http_route" "default" {
-  provider               = google-beta
   name                   = "my-http-route-${local.name_suffix}"
   labels                 = {
     foo = "bar"
diff --git a/network_services_mesh_basic/main.tf b/network_services_mesh_basic/main.tf
@@ -1,5 +1,4 @@
 resource "google_network_services_mesh" "default" {
-  provider    = google-beta
   name        = "my-mesh-${local.name_suffix}"
   labels      = {
     foo = "bar"
diff --git a/network_services_mesh_location/backing_file.tf b/network_services_mesh_location/backing_file.tf
@@ -0,0 +1,15 @@
+# This file has some scaffolding to make sure that names are unique and that
+# a region and zone are selected when you try to create your Terraform resources.
+
+locals {
+  name_suffix = "${random_pet.suffix.id}"
+}
+
+resource "random_pet" "suffix" {
+  length = 2
+}
+
+provider "google" {
+  region = "us-central1"
+  zone   = "us-central1-c"
+}
diff --git a/network_services_mesh_location/main.tf b/network_services_mesh_location/main.tf
@@ -0,0 +1,4 @@
+resource "google_network_services_mesh" "default" {
+  name        = "my-mesh-${local.name_suffix}"
+  location    = "global"
+}
diff --git a/network_services_mesh_location/motd b/network_services_mesh_location/motd
@@ -0,0 +1,7 @@
+===
+
+These examples use real resources that will be billed to the
+Google Cloud Platform project you use - so make sure that you
+run "terraform destroy" before quitting!
+
+===
diff --git a/network_services_mesh_location/tutorial.md b/network_services_mesh_location/tutorial.md
@@ -0,0 +1,79 @@
+# Network Services Mesh Location - Terraform
+
+## Setup
+
+<walkthrough-author name="rileykarson@google.com" analyticsId="UA-125550242-1" tutorialName="network_services_mesh_location" repositoryUrl="https://github.com/terraform-google-modules/docs-examples"></walkthrough-author>
+
+Welcome to Terraform in Google Cloud Shell! We need you to let us know what project you'd like to use with Terraform.
+
+<walkthrough-project-billing-setup></walkthrough-project-billing-setup>
+
+Terraform provisions real GCP resources, so anything you create in this session will be billed against this project.
+
+## Terraforming!
+
+Let's use {{project-id}} with Terraform! Click the Cloud Shell icon below to copy the command
+to your shell, and then run it from the shell by pressing Enter/Return. Terraform will pick up
+the project name from the environment variable.
+
+```bash
+export GOOGLE_CLOUD_PROJECT={{project-id}}
+```
+
+After that, let's get Terraform started. Run the following to pull in the providers.
+
+```bash
+terraform init
+```
+
+With the providers downloaded and a project set, you're ready to use Terraform. Go ahead!
+
+```bash
+terraform apply
+```
+
+Terraform will show you what it plans to do, and prompt you to accept. Type "yes" to accept the plan.
+
+```bash
+yes
+```
+
+
+## Post-Apply
+
+### Editing your config
+
+Now you've provisioned your resources in GCP! If you run a "plan", you should see no changes needed.
+
+```bash
+terraform plan
+```
+
+So let's make a change! Try editing a number, or appending a value to the name in the editor. Then,
+run a 'plan' again.
+
+```bash
+terraform plan
+```
+
+Afterwards you can run an apply, which implicitly does a plan and shows you the intended changes
+at the 'yes' prompt.
+
+```bash
+terraform apply
+```
+
+```bash
+yes
+```
+
+## Cleanup
+
+Run the following to remove the resources Terraform provisioned:
+
+```bash
+terraform destroy
+```
+```bash
+yes
+```
diff --git a/network_services_mesh_no_port/main.tf b/network_services_mesh_no_port/main.tf
@@ -1,5 +1,4 @@
 resource "google_network_services_mesh" "default" {
-  provider    = google-beta
   name        = "my-mesh-noport-${local.name_suffix}"
   labels      = {
     foo = "bar"
diff --git a/network_services_service_binding_basic/main.tf b/network_services_service_binding_basic/main.tf
@@ -1,11 +1,9 @@
 resource "google_service_directory_namespace" "default" {
-  provider     = google-beta
   namespace_id = "my-namespace-${local.name_suffix}"
   location     = "us-central1"
 }
 
 resource "google_service_directory_service" "default" {
-  provider   = google-beta
   service_id = "my-service-${local.name_suffix}"
   namespace  = google_service_directory_namespace.default.id
 
@@ -16,7 +14,6 @@ resource "google_service_directory_service" "default" {
 }
 
 resource "google_network_services_service_binding" "default" {
-  provider    = google-beta
   name        = "my-service-binding-${local.name_suffix}"
   labels      = {
     foo = "bar"
diff --git a/network_services_tcp_route_actions/main.tf b/network_services_tcp_route_actions/main.tf
@@ -1,19 +1,16 @@
 resource "google_compute_backend_service" "default" {
-  provider               = google-beta
   name          = "my-backend-service-${local.name_suffix}"
   health_checks = [google_compute_http_health_check.default.id]
 }
 
 resource "google_compute_http_health_check" "default" {
-  provider               = google-beta
   name               = "backend-service-health-check-${local.name_suffix}"
   request_path       = "/"
   check_interval_sec = 1
   timeout_sec        = 1
 }
 
 resource "google_network_services_tcp_route" "default" {
-  provider               = google-beta
   name                   = "my-tcp-route-${local.name_suffix}"
   labels                 = {
     foo = "bar"
@@ -26,6 +23,7 @@ resource "google_network_services_tcp_route" "default" {
         weight = 1
       }
       original_destination = false
+      idle_timeout = "60s"
     }
   }
 }
diff --git a/network_services_tcp_route_basic/main.tf b/network_services_tcp_route_basic/main.tf
@@ -1,19 +1,16 @@
 resource "google_compute_backend_service" "default" {
-  provider               = google-beta
   name          = "my-backend-service-${local.name_suffix}"
   health_checks = [google_compute_http_health_check.default.id]
 }
 
 resource "google_compute_http_health_check" "default" {
-  provider               = google-beta
   name               = "backend-service-health-check-${local.name_suffix}"
   request_path       = "/"
   check_interval_sec = 1
   timeout_sec        = 1
 }
 
 resource "google_network_services_tcp_route" "default" {
-  provider               = google-beta
   name                   = "my-tcp-route-${local.name_suffix}"
   labels                 = {
     foo = "bar"
diff --git a/network_services_tcp_route_gateway_basic/main.tf b/network_services_tcp_route_gateway_basic/main.tf
@@ -1,19 +1,16 @@
 resource "google_compute_backend_service" "default" {
-  provider               = google-beta
   name          = "my-backend-service-${local.name_suffix}"
   health_checks = [google_compute_http_health_check.default.id]
 }
 
 resource "google_compute_http_health_check" "default" {
-  provider               = google-beta
   name               = "backend-service-health-check-${local.name_suffix}"
   request_path       = "/"
   check_interval_sec = 1
   timeout_sec        = 1
 }
 
 resource "google_network_services_gateway" "default" {
-  provider    = google-beta
   name        = "my-tcp-route-${local.name_suffix}"
   labels      = {
     foo = "bar"
@@ -26,7 +23,6 @@ resource "google_network_services_gateway" "default" {
 
 
 resource "google_network_services_tcp_route" "default" {
-  provider               = google-beta
   name                   = "my-tcp-route-${local.name_suffix}"
   labels                 = {
     foo = "bar"
diff --git a/network_services_tcp_route_mesh_basic/main.tf b/network_services_tcp_route_mesh_basic/main.tf
@@ -1,19 +1,16 @@
 resource "google_compute_backend_service" "default" {
-  provider               = google-beta
   name          = "my-backend-service-${local.name_suffix}"
   health_checks = [google_compute_http_health_check.default.id]
 }
 
 resource "google_compute_http_health_check" "default" {
-  provider               = google-beta
   name               = "backend-service-health-check-${local.name_suffix}"
   request_path       = "/"
   check_interval_sec = 1
   timeout_sec        = 1
 }
 
 resource "google_network_services_mesh" "default" {
-  provider    = google-beta
   name        = "my-tcp-route-${local.name_suffix}"
   labels      = {
     foo = "bar"
@@ -23,7 +20,6 @@ resource "google_network_services_mesh" "default" {
 
 
 resource "google_network_services_tcp_route" "default" {
-  provider               = google-beta
   name                   = "my-tcp-route-${local.name_suffix}"
   labels                 = {
     foo = "bar"
diff --git a/network_services_tls_route_basic/main.tf b/network_services_tls_route_basic/main.tf
@@ -1,19 +1,16 @@
 resource "google_compute_backend_service" "default" {
-  provider               = google-beta
   name          = "my-backend-service-${local.name_suffix}"
   health_checks = [google_compute_http_health_check.default.id]
 }
 
 resource "google_compute_http_health_check" "default" {
-  provider               = google-beta
   name               = "backend-service-health-check-${local.name_suffix}"
   request_path       = "/"
   check_interval_sec = 1
   timeout_sec        = 1
 }
 
 resource "google_network_services_tls_route" "default" {
-  provider               = google-beta
   name                   = "my-tls-route-${local.name_suffix}"
   description             = "my description"
   rules                   {
diff --git a/network_services_tls_route_gateway_basic/main.tf b/network_services_tls_route_gateway_basic/main.tf
@@ -1,19 +1,16 @@
 resource "google_compute_backend_service" "default" {
-  provider               = google-beta
   name          = "my-backend-service-${local.name_suffix}"
   health_checks = [google_compute_http_health_check.default.id]
 }
 
 resource "google_compute_http_health_check" "default" {
-  provider               = google-beta
   name               = "backend-service-health-check-${local.name_suffix}"
   request_path       = "/"
   check_interval_sec = 1
   timeout_sec        = 1
 }
 
 resource "google_network_services_gateway" "default" {
-  provider    = google-beta
   name        = "my-tls-route-${local.name_suffix}"
   labels      = {
     foo = "bar"
@@ -25,7 +22,6 @@ resource "google_network_services_gateway" "default" {
 }
 
 resource "google_network_services_tls_route" "default" {
-  provider               = google-beta
   name                   = "my-tls-route-${local.name_suffix}"
   description             = "my description"
   gateways = [
diff --git a/network_services_tls_route_mesh_basic/main.tf b/network_services_tls_route_mesh_basic/main.tf
@@ -1,19 +1,16 @@
 resource "google_compute_backend_service" "default" {
-  provider               = google-beta
   name          = "my-backend-service-${local.name_suffix}"
   health_checks = [google_compute_http_health_check.default.id]
 }
 
 resource "google_compute_http_health_check" "default" {
-  provider               = google-beta
   name               = "backend-service-health-check-${local.name_suffix}"
   request_path       = "/"
   check_interval_sec = 1
   timeout_sec        = 1
 }
 
 resource "google_network_services_mesh" "default" {
-  provider    = google-beta
   name        = "my-tls-route-${local.name_suffix}"
   labels      = {
     foo = "bar"
@@ -23,7 +20,6 @@ resource "google_network_services_mesh" "default" {
 
 
 resource "google_network_services_tls_route" "default" {
-  provider               = google-beta
   name                   = "my-tls-route-${local.name_suffix}"
   description             = "my description"
   meshes = [

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`resource "google_network_services_endpoint_policy" "default" {`
`2`		`- provider = google-beta`
`3`	`2`	`name = "my-endpoint-policy-${local.name_suffix}"`
`4`	`3`	`labels = {`
`5`	`4`	`foo = "bar"`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`resource "google_network_services_grpc_route" "default" {`
`2`		`- provider = google-beta`
`3`	`2`	`name = "my-grpc-route-${local.name_suffix}"`
`4`	`3`	`labels = {`
`5`	`4`	`foo = "bar"`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`resource "google_network_services_http_route" "default" {`
`2`		`- provider = google-beta`
`3`	`2`	`name = "my-http-route-${local.name_suffix}"`
`4`	`3`	`labels = {`
`5`	`4`	`foo = "bar"`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`resource "google_network_services_mesh" "default" {`
`2`		`- provider = google-beta`
`3`	`2`	`name = "my-mesh-${local.name_suffix}"`
`4`	`3`	`labels = {`
`5`	`4`	`foo = "bar"`