Merge branch 'master' into tfhartmann-adding-description

tfhartmann · tfhartmann · commit 011e27352549 · 2019-09-06T10:15:41.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning][semver-site].
 
 ## [Unreleased]
 
+### Fixed
+
+- Made setting `secondary_ranges` optional. [#16] 
+
 ## [1.1.0] - 2019-07-24
 
 ### Added
@@ -103,6 +107,8 @@ and this project adheres to [Semantic Versioning][semver-site].
 [0.3.0]: https://github.com/terraform-google-modules/terraform-google-network/compare/v0.2.0...v0.3.0
 [0.2.0]: https://github.com/terraform-google-modules/terraform-google-network/compare/v0.1.0...v0.2.0
 [0.1.0]: https://github.com/terraform-google-modules/terraform-google-network/releases/tag/v0.1.0
+
+[#16]: https://github.com/terraform-google-modules/terraform-google-network/pull/16
 [#57]: https://github.com/terraform-google-modules/terraform-google-network/pull/57
 [#47]: https://github.com/terraform-google-modules/terraform-google-network/pull/47
 [#45]: https://github.com/terraform-google-modules/terraform-google-network/pull/45
diff --git a/README.md b/README.md
@@ -90,7 +90,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 |
 
diff --git a/examples/delete_default_gateway_routes/main.tf b/examples/delete_default_gateway_routes/main.tf
@@ -39,8 +39,4 @@ module "test-vpc-module" {
       subnet_region = "us-west1"
     },
   ]
-
-  secondary_ranges = {
-    "${local.subnet_01}" = []
-  }
 }
diff --git a/examples/multi_vpc/main.tf b/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
diff --git a/examples/secondary_ranges/main.tf b/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 = {
diff --git a/examples/simple_project/main.tf b/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}" = []
-  }
 }
diff --git a/examples/simple_project_with_regional_network/main.tf b/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}" = []
-  }
 }
diff --git a/examples/submodule_firewall/main.tf b/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" {
diff --git a/examples/submodule_svpc_access/main.tf b/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" {
diff --git a/main.tf b/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]]
   description              = lookup(var.subnets[count.index], "description", null)
 }
 
diff --git a/test/integration/secondary_ranges/controls/gcloud.rb b/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
diff --git a/variables.tf b/variables.tf
@@ -42,6 +42,7 @@ variable "subnets" {
 variable "secondary_ranges" {
   type        = map(list(object({ range_name = string, ip_cidr_range = string })))
   description = "Secondary ranges that will be used in some of the subnets"
+  default     = {}
 }
 
 variable "routes" {

Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,4 @@ module "test-vpc-module" {`
`39`	`39`	`subnet_region = "us-west1"`
`40`	`40`	`},`
`41`	`41`	`]`
`42`		`-`
`43`		`- secondary_ranges = {`
`44`		`- "${local.subnet_01}" = []`
`45`		`- }`
`46`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -104,8 +104,6 @@ module "test-vpc-module-01" {`
`104`	`104`	`ip_cidr_range = "192.168.74.0/24"`
`105`	`105`	`},`
`106`	`106`	`]`
`107`		`-`
`108`		`- "${local.network_01_subnet_03}" = []`
`109`	`107`	`}`
`110`	`108`
`111`	`109`	`routes = "${local.network_01_routes}"`
`@@ -140,8 +138,6 @@ module "test-vpc-module-02" {`
`140`	`138`	`ip_cidr_range = "192.168.75.0/24"`
`141`	`139`	`},`
`142`	`140`	`]`
`143`		`-`
`144`		`- "${local.network_02_subnet_02}" = []`
`145`	`141`	`}`
`146`	`142`
`147`	`143`	`routes = local.network_02_routes`
Original file line number	Diff line number	Diff line change
`@@ -46,9 +46,4 @@ module "test-vpc-module" {`
`46`	`46`	`subnet_flow_logs = "true"`
`47`	`47`	`},`
`48`	`48`	`]`
`49`		`-`
`50`		`- secondary_ranges = {`
`51`		`- "${local.subnet_01}" = []`
`52`		`- "${local.subnet_02}" = []`
`53`		`- }`
`54`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,9 +47,4 @@ module "test-vpc-module" {`
`47`	`47`	`subnet_flow_logs = "true"`
`48`	`48`	`},`
`49`	`49`	`]`
`50`		`-`
`51`		`- secondary_ranges = {`
`52`		`- "${local.subnet_01}" = []`
`53`		`- "${local.subnet_02}" = []`
`54`		`- }`
`55`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,11 +46,6 @@ module "test-vpc-module" {`
`46`	`46`	`subnet_flow_logs = "true"`
`47`	`47`	`},`
`48`	`48`	`]`
`49`		`-`
`50`		`- secondary_ranges = {`
`51`		`- "${local.subnet_01}" = []`
`52`		`- "${local.subnet_02}" = []`
`53`		`- }`
`54`	`49`	`}`
`55`	`50`
`56`	`51`	`module "test-firewall-submodule" {`
Original file line number	Diff line number	Diff line change
`@@ -37,11 +37,6 @@ module "net-vpc-shared" {`
`37`	`37`	`subnet_region = "europe-west1"`
`38`	`38`	`},`
`39`	`39`	`]`
`40`		`-`
`41`		`- secondary_ranges = {`
`42`		`- first = []`
`43`		`- second = []`
`44`		`- }`
`45`	`40`	`}`
`46`	`41`
`47`	`42`	`module "net-svpc-access" {`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ resource "google_compute_subnetwork" "subnetwork" {`
`47`	`47`	`enable_flow_logs = lookup(var.subnets[count.index], "subnet_flow_logs", "false")`
`48`	`48`	`network = google_compute_network.network.name`
`49`	`49`	`project = var.project_id`
`50`		`- secondary_ip_range = var.secondary_ranges[lookup(var.subnets[count.index], "subnet_name", null)]`
	`50`	`+ 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]]`
`51`	`51`	`description = lookup(var.subnets[count.index], "description", null)`
`52`	`52`	`}`
`53`	`53`