Update tests and project_services submodule

Simon So · Simon So · commit ebbb80b71d2c · 2019-01-23T14:18:44.000-08:00
diff --git a/examples/instance_template/simple/main.tf b/examples/instance_template/simple/main.tf
@@ -26,4 +26,6 @@ module "instance_template" {
   subnetwork      = "${var.subnetwork}"
   service_account = "${var.service_account}"
   name_prefix     = "simple"
+  tags            = "${var.tags}"
+  labels          = "${var.labels}"
 }
diff --git a/examples/instance_template/simple/variables.tf b/examples/instance_template/simple/variables.tf
@@ -35,3 +35,13 @@ variable "service_account" {
   type        = "map"
   description = "Service account email address and scopes"
 }
+
+variable "tags" {
+  type        = "list"
+  description = "Network tags, provided as a list"
+}
+
+variable "labels" {
+  type        = "map"
+  description = "Labels, provided as a map"
+}
diff --git a/examples/mig/autoscaler/main.tf b/examples/mig/autoscaler/main.tf
@@ -32,8 +32,6 @@ module "instance_template" {
   source          = "../../../modules/instance_template"
   subnetwork      = "${var.subnetwork}"
   service_account = "${var.service_account}"
-  tags            = "${var.tags}"
-  labels          = "${var.labels}"
 }
 
 module "mig" {
diff --git a/examples/mig/autoscaler/variables.tf b/examples/mig/autoscaler/variables.tf
@@ -35,16 +35,6 @@ variable "service_account" {
   description = "Service account email address and scopes"
 }
 
-variable "tags" {
-  type        = "list"
-  description = "Network tags, provided as a list"
-}
-
-variable "labels" {
-  type        = "map"
-  description = "Labels, provided as a map"
-}
-
 variable "autoscaling_enabled" {
   description = "Creates an autoscaler for the managed instance group"
 }
diff --git a/examples/mig/simple/main.tf b/examples/mig/simple/main.tf
@@ -32,8 +32,6 @@ module "instance_template" {
   source          = "../../../modules/instance_template"
   subnetwork      = "${var.subnetwork}"
   service_account = "${var.service_account}"
-  tags            = "${var.tags}"
-  labels          = "${var.labels}"
 }
 
 module "mig" {
diff --git a/examples/mig/simple/variables.tf b/examples/mig/simple/variables.tf
@@ -30,16 +30,6 @@ variable "subnetwork" {
   description = "The subnetwork to host the compute instances in"
 }
 
-variable "tags" {
-  type        = "list"
-  description = "Network tags, provided as a list"
-}
-
-variable "labels" {
-  type        = "map"
-  description = "Labels, provided as a map"
-}
-
 variable "target_size" {
   description = "The target number of running instances for this managed instance group. This value should always be explicitly set unless this resource is attached to an autoscaler, in which case it should never be set."
 }
diff --git a/modules/mig/outputs.tf b/modules/mig/outputs.tf
@@ -16,5 +16,5 @@
 
 output "self_link" {
   description = "Self-link of managed instance group"
-  value       = "${element(coalescelist(google_compute_region_instance_group_manager.mig.*.self_link, list("")),0)}"
+  value       = "${google_compute_region_instance_group_manager.mig.self_link}"
 }
diff --git a/modules/project_services/main.tf b/modules/project_services/main.tf
@@ -18,7 +18,8 @@
   APIs configuration
  *****************************************/
 resource "google_project_service" "project_services" {
-  count   = "${length(var.activate_apis)}"
-  project = "${var.project_id}"
-  service = "${element(var.activate_apis, count.index)}"
+  count              = "${var.enable_apis ? length(var.activate_apis) : 0}"
+  project            = "${var.project_id}"
+  service            = "${element(var.activate_apis, count.index)}"
+  disable_on_destroy = "${var.disable_services_on_destroy}"
 }
diff --git a/modules/project_services/outputs.tf b/modules/project_services/outputs.tf
@@ -0,0 +1,20 @@
+/**
+ * Copyright 2018 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+output "project_id" {
+  description = "The GCP project you want to enable APIs on"
+  value       = "${var.project_id}"
+}
diff --git a/modules/project_services/variables.tf b/modules/project_services/variables.tf
@@ -18,6 +18,11 @@ variable "project_id" {
   description = "The GCP project you want to enable APIs on"
 }
 
+variable "enable_apis" {
+  description = "Whether to actually enable the APIs. If false, this module is a no-op."
+  default     = "true"
+}
+
 variable "activate_apis" {
   description = "The list of apis to activate within the project"
   type        = "list"
@@ -27,3 +32,9 @@ variable "activate_apis" {
     "iam.googleapis.com",
   ]
 }
+
+variable "disable_services_on_destroy" {
+  description = "Whether project services will be disabled when the resources are destroyed. https://www.terraform.io/docs/providers/google/r/google_project_service.html#disable_on_destroy"
+  default     = "true"
+  type        = "string"
+}
diff --git a/test/fixtures/instance_template/simple/main.tf b/test/fixtures/instance_template/simple/main.tf
@@ -25,4 +25,9 @@ module "instance_template_simple" {
   region           = "${var.region}"
   subnetwork       = "${google_compute_subnetwork.main.name}"
   service_account  = "${var.service_account}"
+  tags             = ["foo", "bar"]
+
+  labels = {
+    environment = "dev"
+  }
 }
diff --git a/test/fixtures/mig/autoscaler/main.tf b/test/fixtures/mig/autoscaler/main.tf
@@ -19,18 +19,12 @@ locals {
 }
 
 module "mig_autoscaler" {
-  source           = "../../../../examples/mig/autoscaler"
-  credentials_path = "${local.credentials_path}"
-  project_id       = "${var.project_id}"
-  region           = "${var.region}"
-  subnetwork       = "${google_compute_subnetwork.main.name}"
-  service_account  = "${var.service_account}"
-  tags             = ["foo", "bar"]
-
-  labels = {
-    environment = "dev"
-  }
-
+  source              = "../../../../examples/mig/autoscaler"
+  credentials_path    = "${local.credentials_path}"
+  project_id          = "${var.project_id}"
+  region              = "${var.region}"
+  subnetwork          = "${google_compute_subnetwork.main.name}"
+  service_account     = "${var.service_account}"
   autoscaling_enabled = "true"
   min_replicas        = 4
 
diff --git a/test/fixtures/mig/simple/main.tf b/test/fixtures/mig/simple/main.tf
@@ -26,9 +26,4 @@ module "mig_simple" {
   subnetwork       = "${google_compute_subnetwork.main.name}"
   target_size      = 4
   service_account  = "${var.service_account}"
-  tags             = ["foo", "bar"]
-
-  labels = {
-    environment = "dev"
-  }
 }
diff --git a/test/integration/it_simple/controls/it_simple.rb b/test/integration/it_simple/controls/it_simple.rb
@@ -48,5 +48,29 @@
         expect(data[0]['properties']['disks'].length).to eq(expected_disks)
       end
     end
+
+    describe "network tags" do
+      it "should include 'foo'" do
+        expect(data[0]['properties']['tags']['items']).to include("foo")
+      end
+    end
+
+    describe "network tags" do
+      it "should include 'bar'" do
+        expect(data[0]['properties']['tags']['items']).to include("bar")
+      end
+    end
+
+    describe "labels" do
+      it "should include 'environment' key" do
+        expect(data[0]['properties']['labels']).to include("environment")
+      end
+    end
+
+    describe "label" do
+      it "'environment' should have value 'dev'" do
+        expect(data[0]['properties']['labels']['environment']).to eq("dev")
+      end
+    end
   end
 end
diff --git a/test/integration/mig_autoscaler/controls/mig_autoscaler.rb b/test/integration/mig_autoscaler/controls/mig_autoscaler.rb
@@ -43,79 +43,6 @@
         expect(data.length).to eq(expected_instances)
       end
     end
-
-    describe "network tags for instance 1" do
-      it "should include 'foo'" do
-        expect(data[0]['tags']['items']).to include("foo")
-      end
-    end
-
-    describe "network tags for instance 2" do
-      it "should include 'foo'" do
-        expect(data[1]['tags']['items']).to include("foo")
-      end
-    end
-
-    describe "network tags for instance 3" do
-      it "should include 'foo'" do
-        expect(data[2]['tags']['items']).to include("foo")
-      end
-    end
-
-    describe "network tags for instance 4" do
-      it "should include 'foo'" do
-        expect(data[3]['tags']['items']).to include("foo")
-      end
-    end
-
-    describe "labels for instance 1" do
-      it "should include 'environment' key" do
-        expect(data[0]['labels']).to include("environment")
-      end
-    end
-
-    describe "labels for instance 2" do
-      it "should include 'environment' key" do
-        expect(data[1]['labels']).to include("environment")
-      end
-    end
-
-    describe "labels for instance 3" do
-      it "should include 'environment' key" do
-        expect(data[2]['labels']).to include("environment")
-      end
-    end
-
-    describe "labels for instance 4" do
-      it "should include 'environment' key" do
-        expect(data[3]['labels']).to include("environment")
-      end
-    end
-
-    describe "labels for instance 1" do
-      it "'environment' should have value 'dev'" do
-        expect(data[0]['labels']['environment']).to eq("dev")
-      end
-    end
-
-    describe "labels for instance 2" do
-      it "'environment' should have value 'dev'" do
-        expect(data[1]['labels']['environment']).to eq("dev")
-      end
-    end
-
-    describe "labels for instance 3" do
-      it "'environment' should have value 'dev'" do
-        expect(data[2]['labels']['environment']).to eq("dev")
-      end
-    end
-
-    describe "labels for instance 4" do
-      it "'environment' should have value 'dev'" do
-        expect(data[3]['labels']['environment']).to eq("dev")
-      end
-    end
-
   end
 
   describe command("gcloud --project=#{project_id} compute instance-groups list --format=json --filter='name~^mig-autoscaler*'") do
diff --git a/test/integration/mig_simple/controls/mig_simple.rb b/test/integration/mig_simple/controls/mig_simple.rb
@@ -43,79 +43,6 @@
         expect(data.length).to eq(expected_instances)
       end
     end
-
-    describe "network tags for instance 1" do
-      it "should include 'foo'" do
-        expect(data[0]['tags']['items']).to include("foo")
-      end
-    end
-
-    describe "network tags for instance 2" do
-      it "should include 'foo'" do
-        expect(data[1]['tags']['items']).to include("foo")
-      end
-    end
-
-    describe "network tags for instance 3" do
-      it "should include 'foo'" do
-        expect(data[2]['tags']['items']).to include("foo")
-      end
-    end
-
-    describe "network tags for instance 4" do
-      it "should include 'foo'" do
-        expect(data[3]['tags']['items']).to include("foo")
-      end
-    end
-
-    describe "labels for instance 1" do
-      it "should include 'environment' key" do
-        expect(data[0]['labels']).to include("environment")
-      end
-    end
-
-    describe "labels for instance 2" do
-      it "should include 'environment' key" do
-        expect(data[1]['labels']).to include("environment")
-      end
-    end
-
-    describe "labels for instance 3" do
-      it "should include 'environment' key" do
-        expect(data[2]['labels']).to include("environment")
-      end
-    end
-
-    describe "labels for instance 4" do
-      it "should include 'environment' key" do
-        expect(data[3]['labels']).to include("environment")
-      end
-    end
-
-    describe "labels for instance 1" do
-      it "'environment' should have value 'dev'" do
-        expect(data[0]['labels']['environment']).to eq("dev")
-      end
-    end
-
-    describe "labels for instance 2" do
-      it "'environment' should have value 'dev'" do
-        expect(data[1]['labels']['environment']).to eq("dev")
-      end
-    end
-
-    describe "labels for instance 3" do
-      it "'environment' should have value 'dev'" do
-        expect(data[2]['labels']['environment']).to eq("dev")
-      end
-    end
-
-    describe "labels for instance 4" do
-      it "'environment' should have value 'dev'" do
-        expect(data[3]['labels']['environment']).to eq("dev")
-      end
-    end
-
   end
 
   describe command("gcloud --project=#{project_id} compute instance-groups list --format=json --filter='name~^mig-simple*'") do
@@ -154,7 +81,6 @@
         expect(data.length).to eq(expected_instance_groups)
       end
     end
-
   end
 
 end
diff --git a/test/integration/umig_static_ips/controls/umig_static_ips.rb b/test/integration/umig_static_ips/controls/umig_static_ips.rb

Original file line number	Diff line number	Diff line change
`@@ -26,4 +26,6 @@ module "instance_template" {`
`26`	`26`	`subnetwork = "${var.subnetwork}"`
`27`	`27`	`service_account = "${var.service_account}"`
`28`	`28`	`name_prefix = "simple"`
	`29`	`+ tags = "${var.tags}"`
	`30`	`+ labels = "${var.labels}"`
`29`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,6 @@ module "instance_template" {`
`32`	`32`	`source = "../../../modules/instance_template"`
`33`	`33`	`subnetwork = "${var.subnetwork}"`
`34`	`34`	`service_account = "${var.service_account}"`
`35`		`- tags = "${var.tags}"`
`36`		`- labels = "${var.labels}"`
`37`	`35`	`}`
`38`	`36`
`39`	`37`	`module "mig" {`
Original file line number	Diff line number	Diff line change
`@@ -16,5 +16,5 @@`
`16`	`16`
`17`	`17`	`output "self_link" {`
`18`	`18`	`description = "Self-link of managed instance group"`
`19`		`- value = "${element(coalescelist(google_compute_region_instance_group_manager.mig.*.self_link, list("")),0)}"`
	`19`	`+ value = "${google_compute_region_instance_group_manager.mig.self_link}"`
`20`	`20`	`}`