Merge branch 'master' into aaron-lane-project-id

Author: aaron-lane

CHANGELOG.md

@@ -6,6 +6,17 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this
 project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
+
+## [1.4.0] - 2020-01-08
+
+### Added
+
+- `access_config` variable on the `umig` submodule. [#57]
+
+### Changed
+
+- The required Terraform provider versions are enforced. [#52]
+
 ## [1.3.0] - 2019-12-09
 
 ### Added
@@ -16,7 +27,7 @@ project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Added
 
-- Support for public IPs. Added `access_config` variable. [#43]
+- `access_config` variable on the `instance_template` and `preemptible_and_regular_instance_templates` submodules. [#43]
 
 ### Fixed
 
@@ -58,7 +69,8 @@ project adheres to [Semantic Versioning](http://semver.org/).
 - `instance_template`, `mig`, and `umig` modules
 - examples, basic tests and fixtures for all modules
 
-[Unreleased]: https://github.com/terraform-google-modules/terraform-google-vm/compare/v1.3.0...HEAD
+[Unreleased]: https://github.com/terraform-google-modules/terraform-google-vm/compare/v1.4.0...HEAD
+[1.4.0]: https://github.com/terraform-google-modules/terraform-google-vm/compare/v1.3.0...v1.4.0
 [1.3.0]: https://github.com/terraform-google-modules/terraform-google-vm/compare/v1.2.0...v1.3.0
 [1.2.0]: https://github.com/terraform-google-modules/terraform-google-vm/compare/v1.1.1...v1.2.0
 [1.1.1]: https://github.com/terraform-google-modules/terraform-google-vm/compare/v1.1.0...v1.1.1
@@ -77,3 +89,5 @@ project adheres to [Semantic Versioning](http://semver.org/).
 [#42]: https://github.com/terraform-google-modules/terraform-google-vm/pull/42
 [#43]: https://github.com/terraform-google-modules/terraform-google-vm/pull/43
 [#44]: https://github.com/terraform-google-modules/terraform-google-vm/pull/44
+[#52]: https://github.com/terraform-google-modules/terraform-google-vm/pull/52
+[#57]: https://github.com/terraform-google-modules/terraform-google-vm/pull/57

examples/compute_instance/simple/README.md

@@ -7,10 +7,9 @@ This is a simple, minimal example of how to use the compute_instance module
 
 | Name | Description | Type | Default | Required |
 |------|-------------|:----:|:-----:|:-----:|
-| credentials\_path | The path to the GCP credentials JSON file | string | n/a | yes |
 | num\_instances | Number of instances to create | 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 |
+| region | The GCP region to create and test resources in | string | `"us-central1"` | no |
 | 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 |
 

examples/compute_instance/simple/main.tf

@@ -15,10 +15,10 @@
  */
 
 provider "google" {
-  credentials = file(var.credentials_path)
-  project     = var.project_id
-  region      = var.region
-  version     = "~> 2.7.0"
+
+  project = var.project_id
+  region  = var.region
+  version = "~> 2.7.0"
 }
 
 module "instance_template" {

examples/compute_instance/simple/variables.tf

@@ -1,5 +1,5 @@
 /**
- * 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.
@@ -14,16 +14,17 @@
  * limitations under the License.
  */
 
-variable "credentials_path" {
-  description = "The path to the GCP credentials JSON file"
-}
+
 
 variable "project_id" {
   description = "The GCP project to use for integration tests"
+  type        = string
 }
 
 variable "region" {
   description = "The GCP region to create and test resources in"
+  type        = string
+  default     = "us-central1"
 }
 
 variable "subnetwork" {
@@ -34,6 +35,8 @@ variable "num_instances" {
   description = "Number of instances to create"
 }
 
+
+
 variable "service_account" {
   default = null
   type = object({

examples/instance_template/additional_disks/README.md

@@ -8,9 +8,8 @@ instance templates with additional persistent disks.
 
 | 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 |
+| region | The GCP region to create and test resources in | string | `"us-central1"` | no |
 | 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 |
 

examples/instance_template/additional_disks/main.tf

@@ -15,10 +15,10 @@
  */
 
 provider "google" {
-  credentials = file(var.credentials_path)
-  project     = var.project_id
-  region      = var.region
-  version     = "~> 2.7.0"
+
+  project = var.project_id
+  region  = var.region
+  version = "~> 2.7.0"
 }
 
 module "instance_template" {

examples/instance_template/additional_disks/variables.tf

@@ -1,5 +1,5 @@
 /**
- * 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.
@@ -14,16 +14,17 @@
  * limitations under the License.
  */
 
-variable "credentials_path" {
-  description = "The path to the GCP credentials JSON file"
-}
+
 
 variable "project_id" {
   description = "The GCP project to use for integration tests"
+  type        = string
 }
 
 variable "region" {
   description = "The GCP region to create and test resources in"
+  type        = string
+  default     = "us-central1"
 }
 
 variable "subnetwork" {

examples/instance_template/simple/README.md

@@ -7,10 +7,9 @@ This is a simple, minimal example of how to use the instance_template module.
 
 | 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(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 |
+| region | The GCP region to create and test resources in | string | `"us-central1"` | no |
 | 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(string) | n/a | yes |

examples/instance_template/simple/main.tf

@@ -15,10 +15,10 @@
  */
 
 provider "google" {
-  credentials = file(var.credentials_path)
-  project     = var.project_id
-  region      = var.region
-  version     = "~> 2.7.0"
+
+  project = var.project_id
+  region  = var.region
+  version = "~> 2.7.0"
 }
 
 resource "google_compute_address" "ip_address" {

examples/instance_template/simple/variables.tf

@@ -1,5 +1,5 @@
 /**
- * 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.
@@ -14,16 +14,17 @@
  * limitations under the License.
  */
 
-variable "credentials_path" {
-  description = "The path to the GCP credentials JSON file"
-}
+
 
 variable "project_id" {
   description = "The GCP project to use for integration tests"
+  type        = string
 }
 
 variable "region" {
   description = "The GCP region to create and test resources in"
+  type        = string
+  default     = "us-central1"
 }
 
 variable "subnetwork" {