Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Terraform: allow deletion of default route upon network creation #3391

Merged
merged 1 commit into from
Apr 5, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 50 additions & 0 deletions google/resource_compute_network.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,11 @@ func resourceComputeNetwork() *schema.Resource {
Type: schema.TypeString,
Computed: true,
},
"delete_default_routes_on_create": {
Type: schema.TypeBool,
Optional: true,
Default: false,
},
"project": {
Type: schema.TypeString,
Optional: true,
Expand Down Expand Up @@ -170,6 +175,35 @@ func resourceComputeNetworkCreate(d *schema.ResourceData, meta interface{}) erro

log.Printf("[DEBUG] Finished creating Network %q: %#v", d.Id(), res)

if d.Get("delete_default_routes_on_create").(bool) {
token := ""
for paginate := true; paginate; {
networkLink := fmt.Sprintf("%s/%s", url, d.Get("name").(string))
filter := fmt.Sprintf("(network=\"%s\") AND (destRange=\"0.0.0.0/0\")", networkLink)
log.Printf("[DEBUG] Getting routes for network %q with filter '%q'", d.Get("name").(string), filter)
resp, err := config.clientCompute.Routes.List(project).Filter(filter).Do()
if err != nil {
return fmt.Errorf("Error listing routes in proj: %s", err)
}

log.Printf("[DEBUG] Found %d routes rules in %q network", len(resp.Items), d.Get("name").(string))

for _, route := range resp.Items {
op, err := config.clientCompute.Routes.Delete(project, route.Name).Do()
if err != nil {
return fmt.Errorf("Error deleting route: %s", err)
}
err = computeSharedOperationWait(config.clientCompute, op, project, "Deleting Route")
if err != nil {
return err
}
}

token = resp.NextPageToken
paginate = token != ""
}
}

return resourceComputeNetworkRead(d, meta)
}

Expand All @@ -186,6 +220,11 @@ func resourceComputeNetworkRead(d *schema.ResourceData, meta interface{}) error
return handleNotFoundError(err, d, fmt.Sprintf("ComputeNetwork %q", d.Id()))
}

res, err = resourceComputeNetworkDecoder(d, meta, res)
if err != nil {
return err
}

project, err := getProject(d, config)
if err != nil {
return err
Expand Down Expand Up @@ -321,6 +360,9 @@ func resourceComputeNetworkImport(d *schema.ResourceData, meta interface{}) ([]*
return nil, fmt.Errorf("Error constructing id: %s", err)
}
d.SetId(id)
// Explicitly set to default as a workaround for `ImportStateVerify` tests, and so that users
// don't see a diff immediately after import.
d.Set("delete_default_routes_on_create", false)

return []*schema.ResourceData{d}, nil
}
Expand Down Expand Up @@ -389,3 +431,11 @@ func resourceComputeNetworkEncoder(d *schema.ResourceData, meta interface{}, obj

return obj, nil
}

func resourceComputeNetworkDecoder(d *schema.ResourceData, meta interface{}, res map[string]interface{}) (map[string]interface{}, error) {
// Explicitly set to default if not set
if _, ok := d.GetOk("delete_default_routes_on_create"); !ok {
d.Set("delete_default_routes_on_create", false)
}
return res, nil
}
24 changes: 24 additions & 0 deletions google/resource_compute_network_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,21 @@ func TestAccComputeNetwork_default_routing_mode(t *testing.T) {
})
}

func TestAccComputeNetwork_networkDeleteDefaultRoute(t *testing.T) {
t.Parallel()

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckComputeNetworkDestroy,
Steps: []resource.TestStep{
{
Config: testAccComputeNetwork_deleteDefaultRoute(),
},
},
})
}

func testAccCheckComputeNetworkExists(n string, network *compute.Network) resource.TestCheckFunc {
return func(s *terraform.State) error {
rs, ok := s.RootModule().Resources[n]
Expand Down Expand Up @@ -284,3 +299,12 @@ resource "google_compute_network" "acc_network_routing_mode" {
routing_mode = "%s"
}`, network, routingMode)
}

func testAccComputeNetwork_deleteDefaultRoute() string {
return fmt.Sprintf(`
resource "google_compute_network" "bar" {
name = "network-test-%s"
delete_default_routes_on_create = true
auto_create_subnetworks = false
}`, acctest.RandString(10))
}
3 changes: 3 additions & 0 deletions website/docs/r/compute_network.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,9 @@ The following arguments are supported:
If it is not provided, the provider project is used.


* `delete_default_routes_on_create`: If set to `true`, default routes (`0.0.0.0/0`) will be deleted
immediately after network creation. Defaults to `false`.

## Attributes Reference

In addition to the arguments listed above, the following computed attributes are exported:
Expand Down