Merge pull request #26 from paulpalamarchuk/add_project_id_variable

Added variable "project_id", to replace implicit dependency on provider's project ID

Author: morgante

CHANGELOG.md

@@ -9,6 +9,8 @@ project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Added
 
+- Added variable `project_id`. [#26]
+
 - `preemptible_and_regular_instance_templates` submodule. [#18]
 - `mig_with_percent` submodule. [#18]
 
@@ -42,3 +44,4 @@ project adheres to [Semantic Versioning](http://semver.org/).
 [#14]: https://github.com/terraform-google-modules/terraform-google-vm/pull/14
 [#16]: https://github.com/terraform-google-modules/terraform-google-vm/pull/16
 [#18]: https://github.com/terraform-google-modules/terraform-google-vm/pull/18
+[#26]: https://github.com/terraform-google-modules/terraform-google-vm/pull/26

Makefile

@@ -52,10 +52,6 @@ check_golang:
 check_terraform:
 	@source test/make.sh && check_terraform
 
-.PHONY: check_docker
-check_docker:
-	@source test/make.sh && docker
-
 .PHONY: check_base_files
 check_base_files:
 	@source test/make.sh && basefiles

examples/instance_template/additional_disks/README.md

@@ -3,16 +3,15 @@
 This example demonstrates how to use the instance_template module to create
 instance templates with additional persistent disks.
 
-[^]: (autogen_docs_start)
-
+<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
 ## Inputs
 
 | Name | Description | Type | Default | Required |
 |------|-------------|:----:|:-----:|:-----:|
 | credentials\_path | The path to the GCP credentials JSON file | string | n/a | yes |
 | project\_id | The GCP project to use for integration tests | string | n/a | yes |
 | region | The GCP region to create and test resources in | string | n/a | yes |
-| service\_account | Service account email address and scopes | map | n/a | yes |
+| service\_account | Service account to attach to the instance. See https://www.terraform.io/docs/providers/google/r/compute_instance_template.html#service_account. | object | `"null"` | no |
 | subnetwork | The name of the subnetwork create this instance in. | string | `""` | no |
 
 ## Outputs
@@ -22,4 +21,4 @@ instance templates with additional persistent disks.
 | name | Name of the instance templates |
 | self\_link | Self-link to the instance template |
 
-[^]: (autogen_docs_end)
+<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->

examples/instance_template/additional_disks/main.tf

@@ -23,6 +23,7 @@ provider "google" {
 
 module "instance_template" {
   source          = "../../../modules/instance_template"
+  project_id      = var.project_id
   subnetwork      = var.subnetwork
   service_account = var.service_account
   name_prefix     = "additional-disks"

examples/instance_template/simple/README.md

@@ -2,19 +2,18 @@
 
 This is a simple, minimal example of how to use the instance_template module.
 
-[^]: (autogen_docs_start)
-
+<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
 ## Inputs
 
 | Name | Description | Type | Default | Required |
 |------|-------------|:----:|:-----:|:-----:|
 | credentials\_path | The path to the GCP credentials JSON file | string | n/a | yes |
-| labels | Labels, provided as a map | map | n/a | yes |
+| labels | Labels, provided as a map | map(string) | n/a | yes |
 | project\_id | The GCP project to use for integration tests | string | n/a | yes |
 | region | The GCP region to create and test resources in | string | n/a | yes |
-| service\_account | Service account email address and scopes | map | n/a | yes |
+| service\_account | Service account to attach to the instance. See https://www.terraform.io/docs/providers/google/r/compute_instance_template.html#service_account. | object | `"null"` | no |
 | subnetwork | The name of the subnetwork create this instance in. | string | `""` | no |
-| tags | Network tags, provided as a list | list | n/a | yes |
+| tags | Network tags, provided as a list | list(string) | n/a | yes |
 
 ## Outputs
 
@@ -23,4 +22,4 @@ This is a simple, minimal example of how to use the instance_template module.
 | name | Name of the instance templates |
 | self\_link | Self-link to the instance template |
 
-[^]: (autogen_docs_end)
+<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->

examples/instance_template/simple/main.tf

@@ -23,6 +23,7 @@ provider "google" {
 
 module "instance_template" {
   source          = "../../../modules/instance_template"
+  project_id      = var.project_id
   subnetwork      = var.subnetwork
   service_account = var.service_account
   name_prefix     = "simple"

examples/mig/autoscaler/README.md

@@ -3,19 +3,18 @@
 This is an example of how to use the MIG module to create a managed instance
 group with an autoscaler.
 
-[^]: (autogen_docs_start)
-
+<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
 ## Inputs
 
 | Name | Description | Type | Default | Required |
 |------|-------------|:----:|:-----:|:-----:|
-| autoscaling\_cpu | Autoscaling, cpu utilization policy block as single element array. https://www.terraform.io/docs/providers/google/r/compute\_autoscaler.html#cpu\_utilization | list | n/a | yes |
+| autoscaling\_cpu | Autoscaling, cpu utilization policy block as single element array. https://www.terraform.io/docs/providers/google/r/compute_autoscaler.html#cpu_utilization | list(map(number)) | n/a | yes |
 | autoscaling\_enabled | Creates an autoscaler for the managed instance group | string | n/a | yes |
 | credentials\_path | The path to the GCP credentials JSON file | string | n/a | yes |
 | min\_replicas | The minimum number of replicas that the autoscaler can scale down to. This cannot be less than 0. | string | n/a | yes |
 | project\_id | The GCP project to use for integration tests | string | n/a | yes |
 | region | The GCP region to create and test resources in | string | n/a | yes |
-| service\_account | Service account email address and scopes | map | n/a | yes |
+| service\_account | Service account to attach to the instance. See https://www.terraform.io/docs/providers/google/r/compute_instance_template.html#service_account. | object | `"null"` | no |
 | subnetwork | The subnetwork to host the compute instances in | string | n/a | yes |
 
 ## Outputs
@@ -25,4 +24,4 @@ group with an autoscaler.
 | instance\_template\_self\_link | Self-link of instance template |
 | mig\_self\_link | Self-link for managed instance group |
 
-[^]: (autogen_docs_end)
+<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->

examples/mig/autoscaler/main.tf

@@ -30,12 +30,14 @@ provider "google-beta" {
 
 module "instance_template" {
   source          = "../../../modules/instance_template"
+  project_id      = var.project_id
   subnetwork      = var.subnetwork
   service_account = var.service_account
 }
 
 module "mig" {
   source              = "../../../modules/mig"
+  project_id          = var.project_id
   region              = var.region
   hostname            = "mig-autoscaler"
   subnetwork          = var.subnetwork

examples/mig/full/main.tf

@@ -31,6 +31,7 @@ provider "google-beta" {
 module "instance_template" {
   source          = "../../../modules/instance_template"
   name_prefix     = "${var.hostname}-instance-template"
+  project_id      = var.project_id
   machine_type    = var.machine_type
   tags            = var.tags
   labels          = var.labels
@@ -58,6 +59,7 @@ module "instance_template" {
 
 module "mig" {
   source                    = "../../../modules/mig"
+  project_id                = var.project_id
   network                   = var.network
   subnetwork                = var.subnetwork
   subnetwork_project        = var.subnetwork_project

examples/mig/full/variables.tf

@@ -39,7 +39,6 @@ variable "subnetwork" {
 
 variable "project_id" {
   description = "The GCP project to use for integration tests"
-  default     = ""
 }
 
 variable "credentials_path" {