diff --git a/mmv1/products/networkconnectivity/Transport.yaml b/mmv1/products/networkconnectivity/Transport.yaml index 0696c9fc7a58..7cd297a5b198 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' @@ -112,6 +111,7 @@ properties: [Output only] The maximum transmission unit (MTU) of a packet that can be sent over this transport. - name: 'adminEnabled' type: Boolean + min_version: 'beta' description: | Administrative state of the underlying connectivity. If set to true (default), connectivity should be available between your environments. If set to false, the connectivity over these links is disabled. Disabling your Transport does not affect billing, and retains the underlying network bandwidth associated with the connectivity. send_empty_value: true @@ -148,6 +148,7 @@ properties: immutable: true - name: 'pscRoutingEnabled' type: Boolean + min_version: 'beta' description: | Controls whether a Routing VPC Spoke should be created and attached to the NCC Hub. send_empty_value: true @@ -155,6 +156,7 @@ properties: immutable: true - name: 'autoAccept' type: Boolean + min_version: 'beta' description: | Controls whether resources proposed by the Transport are automatically accepted on behalf of the user. send_empty_value: true 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..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,19 +1,15 @@ -data "google_project" "project" { - provider = google-beta -} +data "google_project" "project" {} 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 similarity index 85% 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 index 0b576064ce74..a675fdc6d94a 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 @@ -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,18 @@ func TestAccNetworkConnectivityTransport_networkConnectivityTransportBasicExampl func testAccNetworkConnectivityTransport_networkConnectivityTransportBasicExample_basic(context map[string]interface{}) string { return acctest.Nprintf(` -data "google_project" "project" { - provider = google-beta -} +data "google_project" "project" {} 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 +96,18 @@ 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 -} +data "google_project" "project" {} 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 +117,3 @@ resource "google_network_connectivity_transport" "primary" { } `, context) } - -{{- end }}