Skip to content

Commit

Permalink
Mark network peering routes fields GA (#1650)
Browse files Browse the repository at this point in the history 
Signed-off-by: Modular Magician <magic-modules@google.com>

Co-authored-by: Riley Karson <rileykarson@google.com>
  • Loading branch information
@modular-magician @rileykarson
modular-magician and rileykarson committed Jan 16, 2020
1 parent 41aec82 commit e1b0359
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 17 deletions.
13 changes: 6 additions & 7 deletions google-beta/resource_compute_network_peering.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down Expand Up @@ -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.
Expand All @@ -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)
}
Expand All @@ -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))
}
Expand Down Expand Up @@ -192,16 +191,16 @@ 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
}
}
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),
Expand Down
19 changes: 11 additions & 8 deletions google-beta/resource_compute_network_peering_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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),
Expand All @@ -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")
Expand All @@ -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 {
Expand All @@ -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
}
Expand All @@ -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 {
Expand All @@ -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)
Expand All @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions website/docs/r/compute_network_peering.html.markdown
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit e1b0359

Please sign in to comment.