From 45f441fdb4c0ec05d2ac70d76d07dd7c83930b98 Mon Sep 17 00:00:00 2001 From: Christoph Blecker Date: Tue, 1 Nov 2016 06:45:36 -0700 Subject: [PATCH] Add support for default-internet-gateway alias for google_compute_route (#9676) --- .../google/resource_compute_route.go | 6 +++- .../google/resource_compute_route_test.go | 33 +++++++++++++++++++ .../google/r/compute_route.html.markdown | 5 +-- 3 files changed, 41 insertions(+), 3 deletions(-) diff --git a/builtin/providers/google/resource_compute_route.go b/builtin/providers/google/resource_compute_route.go index 6e39a4136..ac5760f96 100644 --- a/builtin/providers/google/resource_compute_route.go +++ b/builtin/providers/google/resource_compute_route.go @@ -118,7 +118,11 @@ func resourceComputeRouteCreate(d *schema.ResourceData, meta interface{}) error nextHopIp = v.(string) } if v, ok := d.GetOk("next_hop_gateway"); ok { - nextHopGateway = v.(string) + if v == "default-internet-gateway" { + nextHopGateway = fmt.Sprintf("projects/%s/global/gateways/default-internet-gateway", project) + } else { + nextHopGateway = v.(string) + } } if v, ok := d.GetOk("next_hop_vpn_tunnel"); ok { nextHopVpnTunnel = v.(string) diff --git a/builtin/providers/google/resource_compute_route_test.go b/builtin/providers/google/resource_compute_route_test.go index dff2ed003..24ef0cf21 100644 --- a/builtin/providers/google/resource_compute_route_test.go +++ b/builtin/providers/google/resource_compute_route_test.go @@ -29,6 +29,25 @@ func TestAccComputeRoute_basic(t *testing.T) { }) } +func TestAccComputeRoute_defaultInternetGateway(t *testing.T) { + var route compute.Route + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckComputeRouteDestroy, + Steps: []resource.TestStep{ + resource.TestStep{ + Config: testAccComputeRoute_defaultInternetGateway, + Check: resource.ComposeTestCheckFunc( + testAccCheckComputeRouteExists( + "google_compute_route.foobar", &route), + ), + }, + }, + }) +} + func testAccCheckComputeRouteDestroy(s *terraform.State) error { config := testAccProvider.Meta().(*Config) @@ -89,3 +108,17 @@ resource "google_compute_route" "foobar" { next_hop_ip = "10.0.1.5" priority = 100 }`, acctest.RandString(10), acctest.RandString(10)) + +var testAccComputeRoute_defaultInternetGateway = fmt.Sprintf(` +resource "google_compute_network" "foobar" { + name = "route-test-%s" + ipv4_range = "10.0.0.0/16" +} + +resource "google_compute_route" "foobar" { + name = "route-test-%s" + dest_range = "0.0.0.0/0" + network = "${google_compute_network.foobar.name}" + next_hop_gateway = "default-internet-gateway" + priority = 100 +}`, acctest.RandString(10), acctest.RandString(10)) diff --git a/website/source/docs/providers/google/r/compute_route.html.markdown b/website/source/docs/providers/google/r/compute_route.html.markdown index 484fd7db4..d7d9fbe71 100644 --- a/website/source/docs/providers/google/r/compute_route.html.markdown +++ b/website/source/docs/providers/google/r/compute_route.html.markdown @@ -43,8 +43,9 @@ The following arguments are supported: - - - -* `next_hop_gateway` - (Optional) The name of the internet gateway to route - to if this route is matched. +* `next_hop_gateway` - (Optional) The URL of the internet gateway to route + to if this route is matched. The alias "default-internet-gateway" can also + be used. * `next_hop_instance` - (Optional) The name of the VM instance to route to if this route is matched.