Merge pull request #21 from terraform-google-modules/morgante/simplify-secondary-example

Remove secondary networks from simple example

Author: morgante

CHANGELOG.md

@@ -1,20 +1,26 @@
-## 0.4.0
+## [Unreleased]
+### Fixed
+- Resolved issue with networks that have no secondary networks (#19)
 
+## 0.4.0
+### Changed
 - Make `subnet_private_access` and `subnet_flow_logs` into strings to be consistent with `shared_vpc` flag (#13)
 
 ## 0.3.0
-
+### Added
 - Add support for controlling subnet flow logs (#6)
+
+### Changed
 - Make `subnet_private_access` default to false (#6)
 
 ## 0.2.0
-
+### Added
 - Add support for Shared VPC hosting
 
 ## 0.1.0
 
-This is the initial release of the module, with basic support for creating:
-
+### Added
+- Initial release
 - A Google Virtual Private Network (VPC)
 - Subnets within the VPC
 - Secondary ranges for the subnets (if applicable)

examples/simple_project/README.md

@@ -2,29 +2,28 @@
 
 This example configures a single simple VPC inside of a project.
 
-This VPC has two subnets, with the first subnet being given a single secondary range.
+This VPC has two subnets, with no secondary ranges.
 
 [^]: (autogen_docs_start)
 
-
 ## Inputs
 
 | Name | Description | Type | Default | Required |
 |------|-------------|:----:|:-----:|:-----:|
-| project_id | The project ID to host the network in | string | - | yes |
+| project\_id | The project ID to host the network in | string | - | yes |
 
 ## Outputs
 
 | Name | Description |
 |------|-------------|
-| network_name | The name of the VPC being created |
-| network_self_link | The URI of the VPC being created |
-| subnets_flow_logs | Whether the subnets will have VPC flow logs enabled |
-| subnets_ips | The IP and cidrs of the subnets being created |
-| subnets_names | The names of the subnets being created |
-| subnets_private_access | Whether the subnets will have access to Google API's without a public IP |
-| subnets_regions | The region where subnets will be created |
-| subnets_secondary_ranges | The secondary ranges associated with these subnets |
+| network\_name | The name of the VPC being created |
+| network\_self\_link | The URI of the VPC being created |
 | routes | The routes associated with this VPC |
+| subnets\_flow\_logs | Whether the subnets will have VPC flow logs enabled |
+| subnets\_ips | The IP and cidrs of the subnets being created |
+| subnets\_names | The names of the subnets being created |
+| subnets\_private\_access | Whether the subnets will have access to Google API's without a public IP |
+| subnets\_regions | The region where subnets will be created |
+| subnets\_secondary\_ranges | The secondary ranges associated with these subnets |
 
 [^]: (autogen_docs_end)

examples/simple_project/main.tf

@@ -35,13 +35,7 @@ module "test-vpc-module" {
   ]
 
   secondary_ranges = {
-    subnet-01 = [
-      {
-        range_name    = "subnet-01-secondary-01"
-        ip_cidr_range = "192.168.64.0/24"
-      },
-    ]
-
+    subnet-01 = []
     subnet-02 = []
   }
 }

main.tf

@@ -52,8 +52,8 @@ resource "google_compute_subnetwork" "subnetwork" {
 data "google_compute_subnetwork" "created_subnets" {
   count = "${length(var.subnets)}"
 
-  name    = "${lookup(var.subnets[count.index], "subnet_name")}"
-  region  = "${lookup(var.subnets[count.index], "subnet_region")}"
+  name    = "${element(google_compute_subnetwork.subnetwork.*.name, count.index)}"
+  region  = "${element(google_compute_subnetwork.subnetwork.*.region, count.index)}"
   project = "${var.project_id}"
 }