Merge pull request #16 from terraform-google-modules/no_secondary_ranges

Support no secondary ranges to be defined

Author: morgante

README.md

@@ -89,7 +89,7 @@ Then perform the following commands on the root folder:
 | project\_id | The ID of the project where this VPC will be created | string | n/a | yes |
 | routes | List of routes being created in this VPC | list(map(string)) | `<list>` | no |
 | routing\_mode | The network routing mode (default 'GLOBAL') | string | `"GLOBAL"` | no |
-| secondary\_ranges | Secondary ranges that will be used in some of the subnets | object | n/a | yes |
+| secondary\_ranges | Secondary ranges that will be used in some of the subnets | object | `<map>` | no |
 | shared\_vpc\_host | Makes this project a Shared VPC host if 'true' (default 'false') | string | `"false"` | no |
 | subnets | The list of subnets being created | list(map(string)) | n/a | yes |
 

examples/delete_default_gateway_routes/main.tf

@@ -39,8 +39,4 @@ module "test-vpc-module" {
       subnet_region = "us-west1"
     },
   ]
-
-  secondary_ranges = {
-    "${local.subnet_01}" = []
-  }
 }

examples/multi_vpc/main.tf

@@ -104,8 +104,6 @@ module "test-vpc-module-01" {
         ip_cidr_range = "192.168.74.0/24"
       },
     ]
-
-    "${local.network_01_subnet_03}" = []
   }
 
   routes = "${local.network_01_routes}"
@@ -140,8 +138,6 @@ module "test-vpc-module-02" {
         ip_cidr_range = "192.168.75.0/24"
       },
     ]
-
-    "${local.network_02_subnet_02}" = []
   }
 
   routes = local.network_02_routes

examples/secondary_ranges/main.tf

@@ -26,6 +26,7 @@ locals {
   subnet_01 = "${var.network_name}-subnet-01"
   subnet_02 = "${var.network_name}-subnet-02"
   subnet_03 = "${var.network_name}-subnet-03"
+  subnet_04 = "${var.network_name}-subnet-04"
 }
 
 module "vpc-secondary-ranges" {
@@ -51,6 +52,11 @@ module "vpc-secondary-ranges" {
       subnet_ip     = "10.10.30.0/24"
       subnet_region = "us-west1"
     },
+    {
+      subnet_name   = "${local.subnet_04}"
+      subnet_ip     = "10.10.40.0/24"
+      subnet_region = "us-west1"
+    },
   ]
 
   secondary_ranges = {

examples/simple_project/main.tf

@@ -46,9 +46,4 @@ module "test-vpc-module" {
       subnet_flow_logs      = "true"
     },
   ]
-
-  secondary_ranges = {
-    "${local.subnet_01}" = []
-    "${local.subnet_02}" = []
-  }
 }

examples/simple_project_with_regional_network/main.tf

@@ -47,9 +47,4 @@ module "test-vpc-module" {
       subnet_flow_logs      = "true"
     },
   ]
-
-  secondary_ranges = {
-    "${local.subnet_01}" = []
-    "${local.subnet_02}" = []
-  }
 }

examples/submodule_firewall/main.tf

@@ -46,11 +46,6 @@ module "test-vpc-module" {
       subnet_flow_logs      = "true"
     },
   ]
-
-  secondary_ranges = {
-    "${local.subnet_01}" = []
-    "${local.subnet_02}" = []
-  }
 }
 
 module "test-firewall-submodule" {

examples/submodule_svpc_access/main.tf

@@ -37,11 +37,6 @@ module "net-vpc-shared" {
       subnet_region = "europe-west1"
     },
   ]
-
-  secondary_ranges = {
-    first  = []
-    second = []
-  }
 }
 
 module "net-svpc-access" {

main.tf

@@ -47,7 +47,7 @@ resource "google_compute_subnetwork" "subnetwork" {
   enable_flow_logs         = lookup(var.subnets[count.index], "subnet_flow_logs", "false")
   network                  = google_compute_network.network.name
   project                  = var.project_id
-  secondary_ip_range       = var.secondary_ranges[lookup(var.subnets[count.index], "subnet_name", null)]
+  secondary_ip_range       = [for i in range(length(contains(keys(var.secondary_ranges), var.subnets[count.index]["subnet_name"]) == true ? var.secondary_ranges[var.subnets[count.index]["subnet_name"]] : [])) : var.secondary_ranges[var.subnets[count.index]["subnet_name"]][i]]
 }
 
 data "google_compute_subnetwork" "created_subnets" {

test/integration/secondary_ranges/controls/gcloud.rb

@@ -45,6 +45,23 @@
     end
   end
 
+  describe command("gcloud compute networks subnets describe #{network_name}-subnet-02 --project=#{project_id} --region=us-west1 --format=json") do
+    its(:exit_status) { should eq 0 }
+    its(:stderr) { should eq '' }
+
+    let(:data) do
+      if subject.exit_status == 0
+        JSON.parse(subject.stdout)
+      else
+        {}
+      end
+    end
+
+    it "should have the correct secondaryIpRanges configuration for #{network_name}-subnet-02" do
+      expect(data).not_to include("secondaryIpRanges")
+    end
+  end
+
   describe command("gcloud compute networks subnets describe #{network_name}-subnet-03 --project=#{project_id} --region=us-west1 --format=json") do
     its(:exit_status) { should eq 0 }
     its(:stderr) { should eq '' }
@@ -64,4 +81,21 @@
       )
     end
   end
+
+  describe command("gcloud compute networks subnets describe #{network_name}-subnet-04 --project=#{project_id} --region=us-west1 --format=json") do
+    its(:exit_status) { should eq 0 }
+    its(:stderr) { should eq '' }
+
+    let(:data) do
+      if subject.exit_status == 0
+        JSON.parse(subject.stdout)
+      else
+        {}
+      end
+    end
+
+    it "should have the correct secondaryIpRanges configuration for #{network_name}-subnet-04" do
+      expect(data).not_to include("secondaryIpRanges")
+    end
+  end
 end