Merge branch 'morgante/simplify-secondary-example' into adrienthebo/add-secondary-ranges-example

Author: morgante

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)

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}"
 }