Terraform: allow deletion of default route upon network creation (#1539)

Merged PR #1539.

Author: drebes

build/terraform

@@ -660,7 +660,15 @@ overrides: !ruby/object:Overrides::ResourceOverrides
         required: false
         default_from_api: true
     custom_code: !ruby/object:Provider::Terraform::CustomCode
+      extra_schema_entry: templates/terraform/extra_schema_entry/compute_network_delete_default_route.erb
+      post_create: templates/terraform/post_create/compute_network_delete_default_route.erb
+      post_import: templates/terraform/custom_import/compute_network_delete_default_route.erb
       encoder: templates/terraform/encoders/network.erb
+      decoder: templates/terraform/decoders/network.erb
+    docs: !ruby/object:Provider::Terraform::Docs
+      optional_properties: |
+        * `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`.
   Region: !ruby/object:Overrides::Terraform::ResourceOverride
     exclude: true
   RegionAutoscaler: !ruby/object:Overrides::Terraform::ResourceOverride

build/terraform-beta

@@ -0,0 +1,3 @@
+// 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)

products/compute/terraform.yaml

@@ -0,0 +1,19 @@
+<%# The license inside this block applies to this file.
+        # Copyright 2018 Google Inc.
+        # Licensed under the Apache License, Version 2.0 (the "License");
+        # you may not use this file except in compliance with the License.
+        # You may obtain a copy of the License at
+        #
+        #     http://www.apache.org/licenses/LICENSE-2.0
+        #
+        # Unless required by applicable law or agreed to in writing, software
+        # distributed under the License is distributed on an "AS IS" BASIS,
+        # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+        # See the License for the specific language governing permissions and
+        # limitations under the License.
+-%>
+        // 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

templates/terraform/custom_import/compute_network_delete_default_route.erb

@@ -0,0 +1,5 @@
+"delete_default_routes_on_create": {
+	Type:     schema.TypeBool,
+	Optional: true,
+	Default:  false,
+},

templates/terraform/decoders/network.erb

@@ -0,0 +1,28 @@
+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 != ""
+	}
+}

templates/terraform/extra_schema_entry/compute_network_delete_default_route.erb

@@ -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]
@@ -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))
+}