diff --git a/mmv1/products/compute/Router.yaml b/mmv1/products/compute/Router.yaml index 1c034d3be5f6..8cdc3739a21e 100644 --- a/mmv1/products/compute/Router.yaml +++ b/mmv1/products/compute/Router.yaml @@ -82,11 +82,9 @@ samples: ignore_read_extra: - 'advertisedIpRanges' - name: 'router_ncc_gw' - min_version: beta primary_resource_id: 'foobar' steps: - name: 'router_ncc_gw' - min_version: beta resource_id_vars: router_name: 'my-router' network_name: 'net-spoke' @@ -259,7 +257,6 @@ properties: type: ResourceRef description: | A URI of an NCC Gateway spoke - min_version: 'beta' immutable: true resource: 'Spoke' custom_expand: 'templates/terraform/custom_expand/self_link_from_name_network_connectivity.tmpl' diff --git a/mmv1/products/networkconnectivity/GatewayAdvertisedRoute.yaml b/mmv1/products/networkconnectivity/GatewayAdvertisedRoute.yaml index f571b78b4b7d..7a6b2da25442 100644 --- a/mmv1/products/networkconnectivity/GatewayAdvertisedRoute.yaml +++ b/mmv1/products/networkconnectivity/GatewayAdvertisedRoute.yaml @@ -20,9 +20,8 @@ description: | references: guides: QUICKSTART_TITLE: https://docs.cloud.google.com/network-connectivity/docs/network-connectivity-center/concepts/ncc-gateway-overview - api: https://docs.cloud.google.com/network-connectivity/docs/reference/networkconnectivity/rest/v1beta/projects.locations.spokes.gatewayAdvertisedRoutes + api: https://docs.cloud.google.com/network-connectivity/docs/reference/networkconnectivity/rest/v1/projects.locations.spokes.gatewayAdvertisedRoutes base_url: projects/{{project}}/locations/{{location}}/spokes/{{spoke}}/gatewayAdvertisedRoutes -min_version: beta self_link: projects/{{project}}/locations/{{location}}/spokes/{{spoke}}/gatewayAdvertisedRoutes/{{name}} create_url: projects/{{project}}/locations/{{location}}/spokes/{{spoke}}/gatewayAdvertisedRoutes?gatewayAdvertisedRouteId={{name}} update_mask: true @@ -37,11 +36,9 @@ async: autogen_async: true samples: - name: network_connectivity_gateway_advertised_route_basic - min_version: beta primary_resource_id: default steps: - name: network_connectivity_gateway_advertised_route_basic - min_version: beta resource_id_vars: resource_name: gateway-advertised-route-name spoke_name: spoke-name diff --git a/mmv1/products/networkconnectivity/Spoke.yaml b/mmv1/products/networkconnectivity/Spoke.yaml index 83f0dce7cee7..cfb1f8b67946 100644 --- a/mmv1/products/networkconnectivity/Spoke.yaml +++ b/mmv1/products/networkconnectivity/Spoke.yaml @@ -150,10 +150,8 @@ samples: hub_name: '"hub1" + randomSuffix' - name: network_connectivity_spoke_gateway primary_resource_id: primary - min_version: beta steps: - name: network_connectivity_spoke_gateway - min_version: beta resource_id_vars: network_name: net-spoke hub_name: hub @@ -433,7 +431,6 @@ properties: type: NestedObject description: This is a gateway that can apply specialized processing to traffic going through it. immutable: true - min_version: beta conflicts: - linked_interconnect_attachments - linked_router_appliance_instances @@ -465,7 +462,6 @@ properties: - name: routers type: Array description: Set of Cloud Routers that are attached to this NCC-GW - min_version: beta item_type: type: String description: Cloud Router that is attached to the NCC-GW diff --git a/mmv1/templates/terraform/samples/services/compute/router_ncc_gw.tf.tmpl b/mmv1/templates/terraform/samples/services/compute/router_ncc_gw.tf.tmpl index 05f5efe68048..0fb5bde3241a 100644 --- a/mmv1/templates/terraform/samples/services/compute/router_ncc_gw.tf.tmpl +++ b/mmv1/templates/terraform/samples/services/compute/router_ncc_gw.tf.tmpl @@ -1,11 +1,9 @@ resource "google_compute_network" "network" { - provider = google-beta name = "{{index $.ResourceIdVars "network_name"}}" auto_create_subnetworks = false } resource "google_compute_subnetwork" "subnetwork" { - provider = google-beta name = "tf-test-subnet%{random_suffix}" ip_cidr_range = "10.0.0.0/28" region = "us-central1" @@ -13,7 +11,6 @@ resource "google_compute_subnetwork" "subnetwork" { } resource "google_network_connectivity_hub" "basic_hub" { - provider = google-beta name = "{{index $.ResourceIdVars "hub_name"}}" description = "A sample hub" labels = { @@ -23,7 +20,6 @@ resource "google_network_connectivity_hub" "basic_hub" { } resource "google_network_connectivity_spoke" "primary" { - provider = google-beta name = "{{index $.ResourceIdVars "ncc_gw_name"}}" location = "us-central1" description = "A sample spoke of type Gateway" @@ -42,7 +38,6 @@ resource "google_network_connectivity_spoke" "primary" { resource "google_compute_router" "foobar" { - provider = google-beta name = "{{index $.ResourceIdVars "router_name"}}" bgp { asn = 64514 diff --git a/mmv1/templates/terraform/samples/services/networkconnectivity/network_connectivity_gateway_advertised_route_basic.tf.tmpl b/mmv1/templates/terraform/samples/services/networkconnectivity/network_connectivity_gateway_advertised_route_basic.tf.tmpl index 83a57265301b..47b72e7f1833 100644 --- a/mmv1/templates/terraform/samples/services/networkconnectivity/network_connectivity_gateway_advertised_route_basic.tf.tmpl +++ b/mmv1/templates/terraform/samples/services/networkconnectivity/network_connectivity_gateway_advertised_route_basic.tf.tmpl @@ -1,11 +1,9 @@ resource "google_compute_network" "network" { - provider = google-beta name = "{{index $.ResourceIdVars "network_name"}}" auto_create_subnetworks = false } resource "google_compute_subnetwork" "subnetwork" { - provider = google-beta name = "tf-test-subnet%{random_suffix}" ip_cidr_range = "10.0.0.0/28" region = "us-central1" @@ -13,7 +11,6 @@ resource "google_compute_subnetwork" "subnetwork" { } resource "google_network_connectivity_hub" "basic_hub" { - provider = google-beta name = "{{index $.ResourceIdVars "hub_name"}}" description = "A sample hub" labels = { @@ -23,7 +20,6 @@ resource "google_network_connectivity_hub" "basic_hub" { } resource "google_network_connectivity_spoke" "primary" { - provider = google-beta name = "{{index $.ResourceIdVars "spoke_name"}}" location = "us-central1" description = "A sample spoke of type Gateway" @@ -41,7 +37,6 @@ resource "google_network_connectivity_spoke" "primary" { } resource "google_network_connectivity_gateway_advertised_route" "{{$.PrimaryResourceId}}" { - provider = google-beta spoke = google_network_connectivity_spoke.primary.name location = "us-central1" name = "{{index $.ResourceIdVars "resource_name"}}" diff --git a/mmv1/templates/terraform/samples/services/networkconnectivity/network_connectivity_spoke_gateway.tf.tmpl b/mmv1/templates/terraform/samples/services/networkconnectivity/network_connectivity_spoke_gateway.tf.tmpl index cbe4ec7c3cc9..d233956ce49a 100644 --- a/mmv1/templates/terraform/samples/services/networkconnectivity/network_connectivity_spoke_gateway.tf.tmpl +++ b/mmv1/templates/terraform/samples/services/networkconnectivity/network_connectivity_spoke_gateway.tf.tmpl @@ -1,11 +1,9 @@ resource "google_compute_network" "network" { - provider = google-beta name = "{{index $.ResourceIdVars "network_name"}}" auto_create_subnetworks = false } resource "google_compute_subnetwork" "subnetwork" { - provider = google-beta name = "tf-test-subnet%{random_suffix}" ip_cidr_range = "10.0.0.0/28" region = "us-central1" @@ -13,7 +11,6 @@ resource "google_compute_subnetwork" "subnetwork" { } resource "google_network_connectivity_hub" "basic_hub" { - provider = google-beta name = "{{index $.ResourceIdVars "hub_name"}}" description = "A sample hub" labels = { @@ -23,7 +20,6 @@ resource "google_network_connectivity_hub" "basic_hub" { } resource "google_network_connectivity_spoke" "primary" { - provider = google-beta name = "{{index $.ResourceIdVars "spoke_name"}}" location = "us-central1" description = "A sample spoke of type Gateway" diff --git a/mmv1/third_party/terraform/services/networkconnectivity/resource_network_connectivity_gateway_advertised_route_test.go.tmpl b/mmv1/third_party/terraform/services/networkconnectivity/resource_network_connectivity_gateway_advertised_route_test.go similarity index 91% rename from mmv1/third_party/terraform/services/networkconnectivity/resource_network_connectivity_gateway_advertised_route_test.go.tmpl rename to mmv1/third_party/terraform/services/networkconnectivity/resource_network_connectivity_gateway_advertised_route_test.go index 9cf415e8fad7..ac66fd95ab8e 100644 --- a/mmv1/third_party/terraform/services/networkconnectivity/resource_network_connectivity_gateway_advertised_route_test.go.tmpl +++ b/mmv1/third_party/terraform/services/networkconnectivity/resource_network_connectivity_gateway_advertised_route_test.go @@ -1,15 +1,14 @@ -{{ if ne $.TargetVersionName `ga` -}} package networkconnectivity_test import ( "testing" "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/plancheck" "github.com/hashicorp/terraform-provider-google/google/acctest" + "github.com/hashicorp/terraform-provider-google/google/envvar" _ "github.com/hashicorp/terraform-provider-google/google/services/compute" _ "github.com/hashicorp/terraform-provider-google/google/services/networkconnectivity" - "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-testing/plancheck" ) func TestAccNetworkConnectivityGatewayAdvertisedRouter_test_basic(t *testing.T) { @@ -36,12 +35,12 @@ func TestAccNetworkConnectivityGatewayAdvertisedRouter_test_basic(t *testing.T) ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, { - Config: testAccNetworkConnectivitySpoke_test_update(context), - ConfigPlanChecks: resource.ConfigPlanChecks{ - PreApply: []plancheck.PlanCheck{ - plancheck.ExpectResourceAction("google_network_connectivity_gateway_advertised_route.gateway-advertised-route", plancheck.ResourceActionUpdate), - }, - }, + Config: testAccNetworkConnectivitySpoke_test_update(context), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction("google_network_connectivity_gateway_advertised_route.gateway-advertised-route", plancheck.ResourceActionUpdate), + }, + }, }, { ResourceName: "google_network_connectivity_gateway_advertised_route.gateway-advertised-route", @@ -164,6 +163,3 @@ resource "google_network_connectivity_gateway_advertised_route" "gateway-adverti } `, context) } - - -{{- end }} \ No newline at end of file