Remove hard-coded network from examples #33

averbuks · averbuks · commit 3dd4e974bbcc · 2019-10-17T14:49:00.000+02:00
diff --git a/examples/automatic-labelling-from-localhost/README.md b/examples/automatic-labelling-from-localhost/README.md
@@ -22,8 +22,10 @@ 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 |
 | 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,8 @@ resource "google_compute_instance" "main" {
   }
 
   network_interface {
-    network = "default"
+    network    = var.network
+    subnetwork = var.subnetwork
   }
 
   project = var.project_id
diff --git a/examples/automatic-labelling-from-localhost/variables.tf b/examples/automatic-labelling-from-localhost/variables.tf
@@ -28,3 +28,15 @@ variable "zone" {
   type        = string
   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     = ""
+}
diff --git a/examples/automatic-labelling-from-repository/README.md b/examples/automatic-labelling-from-repository/README.md
@@ -22,8 +22,10 @@ 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 |
 | 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,8 @@ resource "google_compute_instance" "main" {
   }
 
   network_interface {
-    network = "default"
+    network    = var.network
+    subnetwork = var.subnetwork
   }
 
   project = var.project_id
diff --git a/examples/automatic-labelling-from-repository/variables.tf b/examples/automatic-labelling-from-repository/variables.tf
@@ -28,3 +28,15 @@ variable "zone" {
   type        = string
   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     = ""
+}
diff --git a/test/fixtures/automatic-labelling-from-localhost/main.tf b/test/fixtures/automatic-labelling-from-localhost/main.tf
@@ -19,5 +19,6 @@ module "automatic_labelling_from_localhost" {
 
   project_id = var.project_id
   region     = var.region
+  subnetwork = var.subnetwork
   zone       = var.zone
 }
diff --git a/test/fixtures/automatic-labelling-from-localhost/variables.tf b/test/fixtures/automatic-labelling-from-localhost/variables.tf
@@ -28,3 +28,8 @@ variable "zone" {
   type        = string
   description = "The zone in which resources will be applied."
 }
+
+variable "subnetwork" {
+  type        = string
+  description = "The name or self_link of the subnetwork to create compute instance in."
+}
diff --git a/test/fixtures/automatic-labelling-from-repository/main.tf b/test/fixtures/automatic-labelling-from-repository/main.tf
@@ -19,5 +19,6 @@ module "automatic_labelling_from_repository" {
 
   project_id = var.project_id
   region     = var.region
+  subnetwork = var.subnetwork
   zone       = var.zone
 }
diff --git a/test/fixtures/automatic-labelling-from-repository/variables.tf b/test/fixtures/automatic-labelling-from-repository/variables.tf
@@ -28,3 +28,8 @@ variable "zone" {
   type        = string
   description = "The zone in which resources will be applied."
 }
+
+variable "subnetwork" {
+  type        = string
+  description = "The name or self_link of the subnetwork to create compute instance in."
+}
diff --git a/test/setup/main.tf b/test/setup/main.tf
@@ -32,12 +32,11 @@ module "project" {
   source  = "terraform-google-modules/project-factory/google"
   version = "~> 3.0"
 
-  name                = local.project_name
-  random_project_id   = true
-  auto_create_network = true
-  org_id              = var.org_id
-  folder_id           = var.folder_id
-  billing_account     = var.billing_account
+  name              = local.project_name
+  random_project_id = true
+  org_id            = var.org_id
+  folder_id         = var.folder_id
+  billing_account   = var.billing_account
 
   activate_apis = [
     "cloudresourcemanager.googleapis.com",
@@ -50,3 +49,16 @@ module "project" {
   ]
 }
 
+module "network" {
+  source  = "terraform-google-modules/network/google"
+  version = "~> 1.2"
+
+  project_id   = module.project.project_id
+  network_name = "test-network"
+
+  subnets = [{
+    subnet_name   = "test-subnet-01"
+    subnet_ip     = "10.10.10.0/24"
+    subnet_region = var.region
+  }]
+}
diff --git a/test/setup/make_source.sh b/test/setup/make_source.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# Copyright 2018 Google LLC
+# Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,17 +18,17 @@ project_id=$(terraform output project_id)
 region=$(terraform output region)
 zone=$(terraform output zone)
 sub_folder_id=$(terraform output sub_folder_id)
+subnetwork=$(terraform output subnetwork)
 
 {
   echo "#!/usr/bin/env bash"
   echo "export TF_VAR_project_id='$project_id'"
   echo "export TF_VAR_region='$region'"
   echo "export TF_VAR_zone='$zone'"
   echo "export TF_VAR_folder_id='$sub_folder_id'"
+  echo "export TF_VAR_subnetwork='$subnetwork'"
 } > ../source.sh
 
 sa_json=$(terraform output sa_key)
 # shellcheck disable=SC2086
 echo "export SERVICE_ACCOUNT_JSON='$(echo $sa_json | base64 --decode)'" >> ../source.sh
-
-
diff --git a/test/setup/outputs.tf b/test/setup/outputs.tf
@@ -35,3 +35,7 @@ output "zone" {
   value = var.zone
 }
 
+output "subnetwork" {
+  value = module.network.subnets_self_links[0]
+}
+

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,8 @@ resource "google_compute_instance" "main" {`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`network_interface {`
`93`		`- network = "default"`
	`93`	`+ network = var.network`
	`94`	`+ subnetwork = var.subnetwork`
`94`	`95`	`}`
`95`	`96`
`96`	`97`	`project = var.project_id`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,8 @@ resource "google_compute_instance" "main" {`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`network_interface {`
`122`		`- network = "default"`
	`122`	`+ network = var.network`
	`123`	`+ subnetwork = var.subnetwork`
`123`	`124`	`}`
`124`	`125`
`125`	`126`	`project = var.project_id`
Original file line number	Diff line number	Diff line change
`@@ -19,5 +19,6 @@ module "automatic_labelling_from_localhost" {`
`19`	`19`
`20`	`20`	`project_id = var.project_id`
`21`	`21`	`region = var.region`
	`22`	`+ subnetwork = var.subnetwork`
`22`	`23`	`zone = var.zone`
`23`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,3 +28,8 @@ variable "zone" {`
`28`	`28`	`type = string`
`29`	`29`	`description = "The zone in which resources will be applied."`
`30`	`30`	`}`
	`31`	`+`
	`32`	`+variable "subnetwork" {`
	`33`	`+ type = string`
	`34`	`+ description = "The name or self_link of the subnetwork to create compute instance in."`
	`35`	`+}`