From 43fc0c72a2df0b95ee593c3002945824125b4f9d Mon Sep 17 00:00:00 2001 From: Riley Karson Date: Wed, 15 Jan 2020 23:13:11 +0000 Subject: [PATCH] Mark network peering routes fields GA Signed-off-by: Modular Magician --- .../resource_compute_network_peering.go | 13 ++++++------- .../resource_compute_network_peering_test.go | 19 +++++++++++-------- .../r/compute_network_peering.html.markdown | 4 ++-- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/google-beta/resource_compute_network_peering.go b/google-beta/resource_compute_network_peering.go index bcf2272afb..5944f33d7b 100644 --- a/google-beta/resource_compute_network_peering.go +++ b/google-beta/resource_compute_network_peering.go @@ -7,7 +7,6 @@ import ( "strings" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - computeBeta "google.golang.org/api/compute/v0.beta" "google.golang.org/api/compute/v1" "google.golang.org/api/googleapi" ) @@ -92,7 +91,7 @@ func resourceComputeNetworkPeeringCreate(d *schema.ResourceData, meta interface{ return err } - request := &computeBeta.NetworksAddPeeringRequest{} + request := &compute.NetworksAddPeeringRequest{} request.NetworkPeering = expandNetworkPeering(d) // Only one peering operation at a time can be performed for a given network. @@ -103,7 +102,7 @@ func resourceComputeNetworkPeeringCreate(d *schema.ResourceData, meta interface{ defer mutexKV.Unlock(kn) } - addOp, err := config.clientComputeBeta.Networks.AddPeering(networkFieldValue.Project, networkFieldValue.Name, request).Do() + addOp, err := config.clientCompute.Networks.AddPeering(networkFieldValue.Project, networkFieldValue.Name, request).Do() if err != nil { return fmt.Errorf("Error adding network peering: %s", err) } @@ -127,7 +126,7 @@ func resourceComputeNetworkPeeringRead(d *schema.ResourceData, meta interface{}) return err } - network, err := config.clientComputeBeta.Networks.Get(networkFieldValue.Project, networkFieldValue.Name).Do() + network, err := config.clientCompute.Networks.Get(networkFieldValue.Project, networkFieldValue.Name).Do() if err != nil { return handleNotFoundError(err, d, fmt.Sprintf("Network %q", networkFieldValue.Name)) } @@ -192,7 +191,7 @@ func resourceComputeNetworkPeeringDelete(d *schema.ResourceData, meta interface{ return nil } -func findPeeringFromNetwork(network *computeBeta.Network, peeringName string) *computeBeta.NetworkPeering { +func findPeeringFromNetwork(network *compute.Network, peeringName string) *compute.NetworkPeering { for _, p := range network.Peerings { if p.Name == peeringName { return p @@ -200,8 +199,8 @@ func findPeeringFromNetwork(network *computeBeta.Network, peeringName string) *c } return nil } -func expandNetworkPeering(d *schema.ResourceData) *computeBeta.NetworkPeering { - return &computeBeta.NetworkPeering{ +func expandNetworkPeering(d *schema.ResourceData) *compute.NetworkPeering { + return &compute.NetworkPeering{ ExchangeSubnetRoutes: true, Name: d.Get("name").(string), Network: d.Get("peer_network").(string), diff --git a/google-beta/resource_compute_network_peering_test.go b/google-beta/resource_compute_network_peering_test.go index 8f832cebab..766e7b37eb 100644 --- a/google-beta/resource_compute_network_peering_test.go +++ b/google-beta/resource_compute_network_peering_test.go @@ -8,12 +8,12 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/terraform" - computeBeta "google.golang.org/api/compute/v0.beta" + "google.golang.org/api/compute/v1" ) func TestAccComputeNetworkPeering_basic(t *testing.T) { t.Parallel() - var peering_beta computeBeta.NetworkPeering + var peering_beta compute.NetworkPeering primaryNetworkName := acctest.RandomWithPrefix("network-test-1") peeringName := acctest.RandomWithPrefix("peering-test-1") @@ -27,10 +27,13 @@ func TestAccComputeNetworkPeering_basic(t *testing.T) { { Config: testAccComputeNetworkPeering_basic(primaryNetworkName, peeringName), Check: resource.ComposeTestCheckFunc( + // network foo testAccCheckComputeNetworkPeeringExist("google_compute_network_peering.foo", &peering_beta), testAccCheckComputeNetworkPeeringAutoCreateRoutes(true, &peering_beta), testAccCheckComputeNetworkPeeringImportCustomRoutes(false, &peering_beta), testAccCheckComputeNetworkPeeringExportCustomRoutes(false, &peering_beta), + + // network bar testAccCheckComputeNetworkPeeringExist("google_compute_network_peering.bar", &peering_beta), testAccCheckComputeNetworkPeeringAutoCreateRoutes(true, &peering_beta), testAccCheckComputeNetworkPeeringImportCustomRoutes(true, &peering_beta), @@ -56,7 +59,7 @@ func testAccComputeNetworkPeeringDestroy(s *terraform.State) error { continue } - _, err := config.clientComputeBeta.Networks.Get( + _, err := config.clientCompute.Networks.Get( config.Project, rs.Primary.ID).Do() if err == nil { return fmt.Errorf("Network peering still exists") @@ -66,7 +69,7 @@ func testAccComputeNetworkPeeringDestroy(s *terraform.State) error { return nil } -func testAccCheckComputeNetworkPeeringExist(n string, peering *computeBeta.NetworkPeering) resource.TestCheckFunc { +func testAccCheckComputeNetworkPeeringExist(n string, peering *compute.NetworkPeering) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[n] if !ok { @@ -86,7 +89,7 @@ func testAccCheckComputeNetworkPeeringExist(n string, peering *computeBeta.Netwo networkName, peeringName := parts[0], parts[1] - network, err := config.clientComputeBeta.Networks.Get(config.Project, networkName).Do() + network, err := config.clientCompute.Networks.Get(config.Project, networkName).Do() if err != nil { return err } @@ -101,7 +104,7 @@ func testAccCheckComputeNetworkPeeringExist(n string, peering *computeBeta.Netwo } } -func testAccCheckComputeNetworkPeeringAutoCreateRoutes(v bool, peering *computeBeta.NetworkPeering) resource.TestCheckFunc { +func testAccCheckComputeNetworkPeeringAutoCreateRoutes(v bool, peering *compute.NetworkPeering) resource.TestCheckFunc { return func(s *terraform.State) error { if peering.ExchangeSubnetRoutes != v { @@ -111,7 +114,7 @@ func testAccCheckComputeNetworkPeeringAutoCreateRoutes(v bool, peering *computeB } } -func testAccCheckComputeNetworkPeeringImportCustomRoutes(v bool, peering *computeBeta.NetworkPeering) resource.TestCheckFunc { +func testAccCheckComputeNetworkPeeringImportCustomRoutes(v bool, peering *compute.NetworkPeering) resource.TestCheckFunc { return func(s *terraform.State) error { if peering.ImportCustomRoutes != v { return fmt.Errorf("should ImportCustomRoutes set to %t", v) @@ -121,7 +124,7 @@ func testAccCheckComputeNetworkPeeringImportCustomRoutes(v bool, peering *comput } } -func testAccCheckComputeNetworkPeeringExportCustomRoutes(v bool, peering *computeBeta.NetworkPeering) resource.TestCheckFunc { +func testAccCheckComputeNetworkPeeringExportCustomRoutes(v bool, peering *compute.NetworkPeering) resource.TestCheckFunc { return func(s *terraform.State) error { if peering.ExportCustomRoutes != v { return fmt.Errorf("should ExportCustomRoutes set to %t", v) diff --git a/website/docs/r/compute_network_peering.html.markdown b/website/docs/r/compute_network_peering.html.markdown index 15f09ccf0e..36395fb3c0 100644 --- a/website/docs/r/compute_network_peering.html.markdown +++ b/website/docs/r/compute_network_peering.html.markdown @@ -56,10 +56,10 @@ The following arguments are supported: * `peer_network` - (Required) The peer network in the peering. The peer network may belong to a different project. -* `export_custom_routes` - (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html)) +* `export_custom_routes` - (Optional) Whether to export the custom routes to the peer network. Defaults to `false`. -* `import_custom_routes` - (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html)) +* `import_custom_routes` - (Optional) Whether to export the custom routes from the peer network. Defaults to `false`. ## Attributes Reference