From 3253e0b79e80a69476883f3292928e098e6c0338 Mon Sep 17 00:00:00 2001 From: Abhijeet Jha Date: Thu, 7 May 2026 07:01:51 +0000 Subject: [PATCH 1/4] Promoting beta to GA --- .../networkconnectivity/Transport.yaml | 5 ++--- ...twork_connectivity_transport_basic.tf.tmpl | 8 +------ ...etwork_connectivity_transport_test.go.tmpl | 21 +++---------------- 3 files changed, 6 insertions(+), 28 deletions(-) diff --git a/mmv1/products/networkconnectivity/Transport.yaml b/mmv1/products/networkconnectivity/Transport.yaml index 0696c9fc7a58..bb7f4a6b3e1a 100644 --- a/mmv1/products/networkconnectivity/Transport.yaml +++ b/mmv1/products/networkconnectivity/Transport.yaml @@ -17,8 +17,8 @@ description: | The Transport resource is a top-level resource used by customers to control Partner Cross-Cloud Interconnect (CCI) connections. references: guides: - 'Official Documentation': 'https://docs.cloud.google.com/sdk/gcloud/reference/beta/network-connectivity/transports' - api: 'https://cloud.google.com/network-connectivity/docs/reference/networkconnectivity/rest/v1beta/projects.locations.transport' + 'Official Documentation': 'https://docs.cloud.google.com/sdk/gcloud/reference/network-connectivity/transports' + api: 'https://docs.cloud.google.com/network-connectivity/docs/reference/networkconnectivity/rest/v1/projects.locations.transports' docs: base_url: 'projects/{{project}}/locations/{{region}}/transports' self_link: 'projects/{{project}}/locations/{{region}}/transports/{{name}}' @@ -36,7 +36,6 @@ async: result: resource_inside_response: false collection_url_key: 'items' -min_version: 'beta' examples: - name: 'network_connectivity_transport_basic' primary_resource_id: 'primary' diff --git a/mmv1/templates/terraform/examples/network_connectivity_transport_basic.tf.tmpl b/mmv1/templates/terraform/examples/network_connectivity_transport_basic.tf.tmpl index 4eea141960fd..5a6a2d4053cc 100644 --- a/mmv1/templates/terraform/examples/network_connectivity_transport_basic.tf.tmpl +++ b/mmv1/templates/terraform/examples/network_connectivity_transport_basic.tf.tmpl @@ -1,19 +1,13 @@ -data "google_project" "project" { - provider = google-beta -} - resource "google_compute_network" "primary-network" { - provider = google-beta name = "tf-test-my-vpc-network%{random_suffix}" auto_create_subnetworks = false } resource "google_network_connectivity_transport" "primary" { - provider = google-beta name = "tf-test-basic-transport%{random_suffix}" region = "us-east4" description = "A sample transport" - remote_profile = "https://networkconnectivity.googleapis.com/v1beta/${data.google_project.project.id}/locations/us-east4/remoteTransportProfiles/aws-us-east-1" + remote_profile = "https://networkconnectivity.googleapis.com/v1/${data.google_project.project.id}/locations/us-east4/remoteTransportProfiles/aws-us-east-1" network = google_compute_network.primary-network.name bandwidth = "BPS_1G" remote_account_id = "123" diff --git a/mmv1/third_party/terraform/services/networkconnectivity/resource_network_connectivity_transport_test.go.tmpl b/mmv1/third_party/terraform/services/networkconnectivity/resource_network_connectivity_transport_test.go.tmpl index 0b576064ce74..2f35db6d017d 100644 --- a/mmv1/third_party/terraform/services/networkconnectivity/resource_network_connectivity_transport_test.go.tmpl +++ b/mmv1/third_party/terraform/services/networkconnectivity/resource_network_connectivity_transport_test.go.tmpl @@ -3,8 +3,6 @@ package networkconnectivity_test -{{- if ne $.TargetVersionName "ga" }} - import ( "fmt" "log" @@ -47,7 +45,7 @@ func TestAccNetworkConnectivityTransport_networkConnectivityTransportBasicExampl acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), CheckDestroy: testAccCheckNetworkConnectivityTransportDestroyProducer(t), Steps: []resource.TestStep{ { @@ -74,22 +72,17 @@ func TestAccNetworkConnectivityTransport_networkConnectivityTransportBasicExampl func testAccNetworkConnectivityTransport_networkConnectivityTransportBasicExample_basic(context map[string]interface{}) string { return acctest.Nprintf(` -data "google_project" "project" { - provider = google-beta -} resource "google_compute_network" "primary-network" { - provider = google-beta name = "tf-test-my-vpc-network%{random_suffix}" auto_create_subnetworks = false } resource "google_network_connectivity_transport" "primary" { - provider = google-beta name = "tf-test-basic-transport%{random_suffix}" region = "us-east4" description = "A sample transport" - remote_profile = "https://networkconnectivity.googleapis.com/v1beta/${data.google_project.project.id}/locations/us-east4/remoteTransportProfiles/aws-us-east-1" + remote_profile = "https://networkconnectivity.googleapis.com/v1/${data.google_project.project.id}/locations/us-east4/remoteTransportProfiles/aws-us-east-1" network = google_compute_network.primary-network.name bandwidth = "BPS_1G" remote_account_id = "123" @@ -102,22 +95,16 @@ resource "google_network_connectivity_transport" "primary" { func testAccNetworkConnectivityTransport_networkConnectivityTransportBasicExample_update(context map[string]interface{}) string { return acctest.Nprintf(` -data "google_project" "project" { - provider = google-beta -} - resource "google_compute_network" "primary-network" { - provider = google-beta name = "tf-test-my-vpc-network%{random_suffix}" auto_create_subnetworks = false } resource "google_network_connectivity_transport" "primary" { - provider = google-beta name = "tf-test-basic-transport%{random_suffix}" region = "us-east4" description = "New description" - remote_profile = "https://networkconnectivity.googleapis.com/v1beta/${data.google_project.project.id}/locations/us-east4/remoteTransportProfiles/aws-us-east-1" + remote_profile = "https://networkconnectivity.googleapis.com/v1/${data.google_project.project.id}/locations/us-east4/remoteTransportProfiles/aws-us-east-1" network = google_compute_network.primary-network.name bandwidth = "BPS_1G" remote_account_id = "123" @@ -127,5 +114,3 @@ resource "google_network_connectivity_transport" "primary" { } `, context) } - -{{- end }} From d476c0b0b89205fe294fcf7de1d4d1829346b511 Mon Sep 17 00:00:00 2001 From: Abhijeet Jha Date: Thu, 7 May 2026 08:01:35 +0000 Subject: [PATCH 2/4] remove the templated .tmpl file. --- ...st.go.tmpl => resource_network_connectivity_transport_test.go} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename mmv1/third_party/terraform/services/networkconnectivity/{resource_network_connectivity_transport_test.go.tmpl => resource_network_connectivity_transport_test.go} (100%) diff --git a/mmv1/third_party/terraform/services/networkconnectivity/resource_network_connectivity_transport_test.go.tmpl b/mmv1/third_party/terraform/services/networkconnectivity/resource_network_connectivity_transport_test.go similarity index 100% rename from mmv1/third_party/terraform/services/networkconnectivity/resource_network_connectivity_transport_test.go.tmpl rename to mmv1/third_party/terraform/services/networkconnectivity/resource_network_connectivity_transport_test.go From 16d0bd2c5d47ff143608527ecb4fa0aefb70790e Mon Sep 17 00:00:00 2001 From: Abhijeet Jha Date: Thu, 7 May 2026 08:42:51 +0000 Subject: [PATCH 3/4] addressing tfs --- .../resource_network_connectivity_transport_test.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mmv1/third_party/terraform/services/networkconnectivity/resource_network_connectivity_transport_test.go b/mmv1/third_party/terraform/services/networkconnectivity/resource_network_connectivity_transport_test.go index 2f35db6d017d..a675fdc6d94a 100644 --- a/mmv1/third_party/terraform/services/networkconnectivity/resource_network_connectivity_transport_test.go +++ b/mmv1/third_party/terraform/services/networkconnectivity/resource_network_connectivity_transport_test.go @@ -72,6 +72,7 @@ func TestAccNetworkConnectivityTransport_networkConnectivityTransportBasicExampl func testAccNetworkConnectivityTransport_networkConnectivityTransportBasicExample_basic(context map[string]interface{}) string { return acctest.Nprintf(` +data "google_project" "project" {} resource "google_compute_network" "primary-network" { name = "tf-test-my-vpc-network%{random_suffix}" @@ -95,6 +96,8 @@ resource "google_network_connectivity_transport" "primary" { func testAccNetworkConnectivityTransport_networkConnectivityTransportBasicExample_update(context map[string]interface{}) string { return acctest.Nprintf(` +data "google_project" "project" {} + resource "google_compute_network" "primary-network" { name = "tf-test-my-vpc-network%{random_suffix}" auto_create_subnetworks = false From 77f4216d10a4f44ad9bb5e9d24ff690243c4a3ff Mon Sep 17 00:00:00 2001 From: Abhijeet Jha Date: Thu, 7 May 2026 09:07:37 +0000 Subject: [PATCH 4/4] tf fix --- .../examples/network_connectivity_transport_basic.tf.tmpl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mmv1/templates/terraform/examples/network_connectivity_transport_basic.tf.tmpl b/mmv1/templates/terraform/examples/network_connectivity_transport_basic.tf.tmpl index 5a6a2d4053cc..b162d90c3554 100644 --- a/mmv1/templates/terraform/examples/network_connectivity_transport_basic.tf.tmpl +++ b/mmv1/templates/terraform/examples/network_connectivity_transport_basic.tf.tmpl @@ -1,3 +1,5 @@ +data "google_project" "project" {} + resource "google_compute_network" "primary-network" { name = "tf-test-my-vpc-network%{random_suffix}" auto_create_subnetworks = false