Get rid of null defaults for examples

averbuks · averbuks · commit 57365a85f5cb · 2019-10-17T17:38:20.000+02:00
diff --git a/examples/automatic-labelling-from-localhost/README.md b/examples/automatic-labelling-from-localhost/README.md
@@ -22,10 +22,9 @@ this directory:
 
 | Name | Description | Type | Default | Required |
 |------|-------------|:----:|:-----:|:-----:|
-| network | The name or self_link of the network to create compute instance in. Only one of network or subnetwork should be specified. | string | `""` | no |
 | project\_id | The ID of the project to which resources will be applied. | string | n/a | yes |
 | region | The region in which resources will be applied. | string | n/a | yes |
-| subnetwork | The name or self_link of the subnetwork to create compute instance in. Only one of network or subnetwork should be specified. | string | `""` | no |
+| subnetwork | The name or self_link of the subnetwork to create compute instance in. | string | `"default"` | no |
 | zone | The zone in which resources will be applied. | string | n/a | yes |
 
 ## Outputs
diff --git a/examples/automatic-labelling-from-localhost/main.tf b/examples/automatic-labelling-from-localhost/main.tf
@@ -90,7 +90,6 @@ resource "google_compute_instance" "main" {
   }
 
   network_interface {
-    network    = var.network
     subnetwork = var.subnetwork
   }
 
diff --git a/examples/automatic-labelling-from-localhost/variables.tf b/examples/automatic-labelling-from-localhost/variables.tf
@@ -29,14 +29,8 @@ variable "zone" {
   description = "The zone in which resources will be applied."
 }
 
-variable "network" {
-  type        = string
-  description = "The name or self_link of the network to create compute instance in. Only one of network or subnetwork should be specified."
-  default     = ""
-}
-
 variable "subnetwork" {
   type        = string
-  description = "The name or self_link of the subnetwork to create compute instance in. Only one of network or subnetwork should be specified."
-  default     = ""
+  description = "The name or self_link of the subnetwork to create compute instance in."
+  default     = "default"
 }
diff --git a/examples/automatic-labelling-from-repository/README.md b/examples/automatic-labelling-from-repository/README.md
@@ -22,10 +22,9 @@ this directory:
 
 | Name | Description | Type | Default | Required |
 |------|-------------|:----:|:-----:|:-----:|
-| network | The name or self_link of the network to create compute instance in. Only one of network or subnetwork should be specified. | string | `""` | no |
 | project\_id | The ID of the project to which resources will be applied. | string | n/a | yes |
 | region | The region in which resources will be applied. | string | n/a | yes |
-| subnetwork | The name or self_link of the subnetwork to create compute instance in. Only one of network or subnetwork should be specified. | string | `""` | no |
+| subnetwork | The name or self_link of the subnetwork to create compute instance in. | string | `""` | no |
 | zone | The zone in which resources will be applied. | string | n/a | yes |
 
 ## Outputs
diff --git a/examples/automatic-labelling-from-repository/main.tf b/examples/automatic-labelling-from-repository/main.tf
@@ -119,7 +119,6 @@ resource "google_compute_instance" "main" {
   }
 
   network_interface {
-    network    = var.network
     subnetwork = var.subnetwork
   }
 
diff --git a/examples/automatic-labelling-from-repository/variables.tf b/examples/automatic-labelling-from-repository/variables.tf
@@ -29,14 +29,8 @@ variable "zone" {
   description = "The zone in which resources will be applied."
 }
 
-variable "network" {
-  type        = string
-  description = "The name or self_link of the network to create compute instance in. Only one of network or subnetwork should be specified."
-  default     = ""
-}
-
 variable "subnetwork" {
   type        = string
-  description = "The name or self_link of the subnetwork to create compute instance in. Only one of network or subnetwork should be specified."
+  description = "The name or self_link of the subnetwork to create compute instance in."
   default     = ""
 }
diff --git a/modules/event-folder-log-entry/README.md b/modules/event-folder-log-entry/README.md
@@ -46,7 +46,7 @@ The following software dependencies must be installed on the system
 from which this module will be invoked:
 
 - [Terraform][terraform-site] v0.12
-- [Terraform Provider for Google Cloud Platform][terraformm-provider-gcp-site] v2.5
+- [Terraform Provider for Google Cloud Platform][terraform-provider-gcp-site] v2.5
 
 ### IAM Roles
 
@@ -69,4 +69,4 @@ following APIs enabled:
 [repository-function]: ../repository-function
 [root-module]: ../..
 [terraform-site]: https://www.terraform.io/
-[terraformm-provider-gcp-site]: https://github.com/terraform-providers/terraform-provider-google
+[terraform-provider-gcp-site]: https://github.com/terraform-providers/terraform-provider-google
diff --git a/modules/event-project-log-entry/README.md b/modules/event-project-log-entry/README.md
@@ -46,7 +46,7 @@ The following software dependencies must be installed on the system
 from which this module will be invoked:
 
 - [Terraform][terraform-site] v0.12
-- [Terraform Provider for Google Cloud Platform][terraformm-provider-gcp-site] v2.5
+- [Terraform Provider for Google Cloud Platform][terraform-provider-gcp-site] v2.5
 
 ### IAM Roles
 
@@ -69,5 +69,4 @@ following APIs enabled:
 [repository-function]: ../repository-function
 [root-module]: ../..
 [terraform-site]: https://www.terraform.io/
-[terraformm-provider-gcp-site]: https://github.com/terraform-providers/terraform-provider-google
-
+[terraform-provider-gcp-site]: https://github.com/terraform-providers/terraform-provider-google
diff --git a/modules/repository-function/README.md b/modules/repository-function/README.md
@@ -50,7 +50,7 @@ The following software dependencies must be installed on the system
 from which this module will be invoked:
 
 - [Terraform][terraform-site] v0.12
-- [Terraform Provider for Google Cloud Platform][terraformm-provider-gcp-site] v2.5
+- [Terraform Provider for Google Cloud Platform][terraform-provider-gcp-site] v2.5
 
 ### IAM Roles
 
@@ -70,4 +70,4 @@ following APIs enabled:
 [automatic-labelling-from-repository-example]: ../../examples/automatic-labelling-from-repository
 [event-project-log-entry-submodule]: ../event-project-log-entry
 [terraform-site]: https://www.terraform.io/
-[terraformm-provider-gcp-site]: https://github.com/terraform-providers/terraform-provider-google
+[terraform-provider-gcp-site]: https://github.com/terraform-providers/terraform-provider-google

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,6 @@ resource "google_compute_instance" "main" {`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`network_interface {`
`93`		`- network = var.network`
`94`	`93`	`subnetwork = var.subnetwork`
`95`	`94`	`}`
`96`	`95`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,6 @@ resource "google_compute_instance" "main" {`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`network_interface {`
`122`		`- network = var.network`
`123`	`122`	`subnetwork = var.subnetwork`
`124`	`123`	`}`
`125`	`124`