Remove unnecessary boilerplate; fix network provider

Makefile

@@ -15,12 +15,14 @@
 # Please note that this file was generated from [terraform-google-module-template](https://github.com/terraform-google-modules/terraform-google-module-template).
 # Please make sure to contribute relevant changes upstream!
 
-SHELL := /usr/bin/env bash # Make will use bash instead of sh
+# Make will use bash instead of sh
+SHELL := /usr/bin/env bash
 
-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 0.0.1
+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 0.1.0
 DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools
 REGISTRY_URL := gcr.io/cloud-foundation-cicd
 
+# Enter docker container for local development
 .PHONY: docker_run
 docker_run:
 	docker run --rm -it \
@@ -41,7 +43,7 @@ docker_test_prepare:
 		$(REGISTRY_URL)/${DOCKER_IMAGE_DEVELOPER_TOOLS}:${DOCKER_TAG_VERSION_DEVELOPER_TOOLS} \
 		/usr/local/bin/execute_with_credentials.sh prepare_environment
 
-# Cleanup tests within the docker container
+# Clean up test environment within the docker container
 .PHONY: docker_test_cleanup
 docker_test_cleanup:
 	docker run --rm -it \
@@ -53,7 +55,7 @@ docker_test_cleanup:
 		$(REGISTRY_URL)/${DOCKER_IMAGE_DEVELOPER_TOOLS}:${DOCKER_TAG_VERSION_DEVELOPER_TOOLS} \
 		/usr/local/bin/execute_with_credentials.sh cleanup_environment
 
- # Execute integration tests within the docker container
+# Execute integration tests within the docker container
 .PHONY: docker_test_integration
 docker_test_integration:
 	docker run --rm -it \
@@ -62,7 +64,7 @@ docker_test_integration:
 		$(REGISTRY_URL)/${DOCKER_IMAGE_DEVELOPER_TOOLS}:${DOCKER_TAG_VERSION_DEVELOPER_TOOLS} \
 		/usr/local/bin/test_integration.sh
 
- # Execute lint tests within the docker container
+# Execute lint tests within the docker container
 .PHONY: docker_test_lint
 docker_test_lint:
 	docker run --rm -it \
@@ -78,5 +80,6 @@ docker_generate_docs:
 		$(REGISTRY_URL)/${DOCKER_IMAGE_DEVELOPER_TOOLS}:${DOCKER_TAG_VERSION_DEVELOPER_TOOLS} \
 		/bin/bash -c 'source /usr/local/bin/task_helper_functions.sh && generate_docs'
 
+# Alias for backwards compatibility
 .PHONY: generate_docs
-generate_docs: docker_generate_docs
+generate_docs: docker_generate_docs

examples/basic/main.tf

@@ -26,7 +26,7 @@ resource "google_service_account" "instance-group" {
 module "instance_template" {
   source               = "terraform-google-modules/vm/google//modules/instance_template"
   version              = "~> 1.0.0"
-  subnetwork           = google_compute_subnetwork.subnetwork.name
+  subnetwork           = google_compute_subnetwork.subnetwork.self_link
   source_image_family  = var.image_family
   source_image_project = var.image_project
   startup_script       = data.template_file.instance_startup_script.rendered

examples/basic/network.tf

@@ -19,12 +19,14 @@ resource "google_compute_network" "network" {
 
 resource "google_compute_subnetwork" "subnetwork" {
   name          = "load-balancer-module-subnetwork"
+  region  = var.region
   network       = google_compute_network.network.self_link
   ip_cidr_range = "10.0.0.0/16"
 }
 
 resource "google_compute_router" "router" {
   name    = "load-balancer-module-router"
+  region  = var.region
   network = google_compute_network.network.self_link
 }
 

examples/basic/provider.tf

@@ -15,11 +15,9 @@
 provider "google" {
   version = ">= 2.7.0"
   project = var.project_id
-  region  = var.region
 }
 
 provider "google-beta" {
   version = ">= 2.7.0"
   project = var.project_id
-  region  = var.region
 }

kitchen.yml

@@ -30,10 +30,9 @@ suites:
     driver:
       root_module_directory: test/fixtures/basic/
     verifier:
-      name: terraform
       color: false
       systems:
-      - name: system
+      - name: basic local
         backend: local
         controls:
           - gcloud

test/integration/basic/controls/gcloud.rb

@@ -12,21 +12,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-project_id = attribute('project_id')
-
 control "gcloud" do
-    title "gcloud"
-    describe command("gcloud compute forwarding-rules list --format json") do
-      its('exit_status') { should be 0 }
-      its('stderr') { should eq '' }
+  title "gcloud"
+  describe command("gcloud compute forwarding-rules list --project=#{attribute("project_id")} --format json") do
+    its('exit_status') { should be 0 }
+    its('stderr') { should eq '' }
 
-      let(:data) do
-        if subject.exit_status == 0
-          JSON.parse(subject.stdout, symbolize_names: true)
-        else
-          {}
-        end
+    let(:data) do
+      if subject.exit_status == 0
+        JSON.parse(subject.stdout, symbolize_names: true)
+      else
+        {}
       end
-      it { expect(data.first).to include(IPProtocol: 'TCP') }
     end
+    it { expect(data.first).to include(IPProtocol: 'TCP') }
   end
+end

test/integration/basic/inspec.yml

@@ -1,4 +1,8 @@
 name: basic
+depends:
+  - name: inspec-gcp
+    git: https://github.com/inspec/inspec-gcp.git
+    tag: v0.10.0
 attributes:
   - name: project_id
     required: true

test/setup/make_source.sh

@@ -17,7 +17,6 @@
 echo "#!/usr/bin/env bash" > ../source.sh
 
 project_id=$(terraform output project_id)
-echo "gcloud config set project $project_id" >> ../source.sh
 echo "export TF_VAR_project_id='$project_id'" >> ../source.sh
 
 sa_json=$(terraform output sa_key)