Skip to content

Commit d042aae

Browse files
authored
feat: add TF 0.13 constraint and module attribution (#128)
BREAKING CHANGE: Minimum Terraform version increased to 0.13.
1 parent 6310016 commit d042aae

File tree

11 files changed

+59
-22
lines changed

11 files changed

+59
-22
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# Make will use bash instead of sh
1919
SHELL := /usr/bin/env bash
2020

21-
DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 0.12.2
21+
DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 0.13
2222
DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools
2323
REGISTRY_URL := gcr.io/cloud-foundation-cicd
2424

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ This is a collection of opinionated submodules that can be used as building bloc
88

99
## Compatibility
1010

11-
This module is meant for use with Terraform 0.12. If you haven't [upgraded](https://www.terraform.io/upgrade-guides/0-12.html)
12-
and need a Terraform 0.11.x-compatible version of this module, the last released version intended for
13-
Terraform 0.11.x is [0.2.0](https://registry.terraform.io/modules/terraform-google-modules/vm/google/0.2.0).
11+
This module is meant for use with Terraform 0.13. If you haven't [upgraded](https://www.terraform.io/upgrade-guides/0-13.html)
12+
and need a Terraform 0.12.x-compatible version of this module, the last released version intended for
13+
Terraform 0.12.x is [5.1.0](https://registry.terraform.io/modules/terraform-google-modules/vm/google/5.1.0).
1414

1515

1616
## Examples

autogen/versions.tf renamed to autogen/versions.tf.tmpl

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,15 @@
1515
*/
1616

1717
terraform {
18-
required_version = ">=0.12.6, <0.14"
18+
required_version = ">=0.13.0"
1919
required_providers {
20-
google = ">= 2.7, <4.0"
21-
google-beta = ">= 2.7, <4.0"
20+
google = ">= 3.43, <4.0"
21+
google-beta = ">= 3.43, <4.0"
22+
}
23+
provider_meta "google" {
24+
module_name = "blueprints/terraform/terraform-google-vm:{% if mig %}mig{% else %}mig_with_percent{% endif %}/v6.0.0"
25+
}
26+
provider_meta "google-beta" {
27+
module_name = "blueprints/terraform/terraform-google-vm:{% if mig %}mig{% else %}mig_with_percent{% endif %}/v6.0.0"
2228
}
2329
}

build/int.cloudbuild.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,4 +246,4 @@ tags:
246246
- 'integration'
247247
substitutions:
248248
_DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
249-
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.12.2'
249+
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.13'

build/lint.cloudbuild.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ tags:
2121
- 'lint'
2222
substitutions:
2323
_DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
24-
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.12.2'
24+
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.13'

modules/compute_instance/versions.tf

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,11 @@
1515
*/
1616

1717
terraform {
18-
required_version = ">=0.12.7, <0.14"
18+
required_version = ">=0.13.0"
1919
required_providers {
20-
google = ">= 2.7, <4.0"
20+
google = ">= 3.43, <4.0"
21+
}
22+
provider_meta "google" {
23+
module_name = "blueprints/terraform/terraform-google-vm:compute_instance/v6.0.0"
2124
}
2225
}

modules/instance_template/versions.tf

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,11 @@
1515
*/
1616

1717
terraform {
18-
required_version = ">=0.12.6, <0.14"
18+
required_version = ">=0.13.0"
1919
required_providers {
20-
google = ">= 2.7, <4.0"
20+
google = ">= 3.43, <4.0"
21+
}
22+
provider_meta "google" {
23+
module_name = "blueprints/terraform/terraform-google-vm:instance_template/v6.0.0"
2124
}
2225
}

modules/mig/versions.tf

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,15 @@
1515
*/
1616

1717
terraform {
18-
required_version = ">=0.12.6, <0.14"
18+
required_version = ">=0.13.0"
1919
required_providers {
20-
google = ">= 2.7, <4.0"
21-
google-beta = ">= 2.7, <4.0"
20+
google = ">= 3.43, <4.0"
21+
google-beta = ">= 3.43, <4.0"
22+
}
23+
provider_meta "google" {
24+
module_name = "blueprints/terraform/terraform-google-vm:mig/v6.0.0"
25+
}
26+
provider_meta "google-beta" {
27+
module_name = "blueprints/terraform/terraform-google-vm:mig/v6.0.0"
2228
}
2329
}

modules/mig_with_percent/versions.tf

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,15 @@
1515
*/
1616

1717
terraform {
18-
required_version = ">=0.12.6, <0.14"
18+
required_version = ">=0.13.0"
1919
required_providers {
20-
google = ">= 2.7, <4.0"
21-
google-beta = ">= 2.7, <4.0"
20+
google = ">= 3.43, <4.0"
21+
google-beta = ">= 3.43, <4.0"
22+
}
23+
provider_meta "google" {
24+
module_name = "blueprints/terraform/terraform-google-vm:mig_with_percent/v6.0.0"
25+
}
26+
provider_meta "google-beta" {
27+
module_name = "blueprints/terraform/terraform-google-vm:mig_with_percent/v6.0.0"
2228
}
2329
}

modules/preemptible_and_regular_instance_templates/versions.tf

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,15 @@
1515
*/
1616

1717
terraform {
18-
required_version = ">=0.12.6, <0.14"
18+
required_version = ">=0.13.0"
19+
required_providers {
20+
google = ">= 3.43, <4.0"
21+
google-beta = ">= 3.43, <4.0"
22+
}
23+
provider_meta "google" {
24+
module_name = "blueprints/terraform/terraform-google-vm:preemptible_and_regular_instance_templates/v6.0.0"
25+
}
26+
provider_meta "google-beta" {
27+
module_name = "blueprints/terraform/terraform-google-vm:preemptible_and_regular_instance_templates/v6.0.0"
28+
}
1929
}

0 commit comments

Comments
 (0)