Skip to content

Commit 6c835be

Browse files
authored
chore: add Terraform 0.13 constraint and module attribution (#224)
BREAKING CHANGE: Minimum Terraform version increased to 0.13.
1 parent bb31529 commit 6c835be

File tree

12 files changed

+84
-21
lines changed

12 files changed

+84
-21
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# Make will use bash instead of sh
1616
SHELL := /usr/bin/env bash
1717

18-
DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 0.12.2
18+
DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 0.13
1919
DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools
2020
REGISTRY_URL := gcr.io/cloud-foundation-cicd
2121

build/int.cloudbuild.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,4 +166,4 @@ tags:
166166
- 'integration'
167167
substitutions:
168168
_DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
169-
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.12.2'
169+
_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/fabric-net-firewall/versions.tf

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

1717
terraform {
18-
required_version = ">=0.12.6"
18+
required_version = ">= 0.13.0"
1919
required_providers {
20-
google = "<4.0,>= 2.12"
20+
google = {
21+
source = "hashicorp/google"
22+
version = "<4.0,>= 2.12"
23+
}
24+
}
25+
26+
provider_meta "google" {
27+
module_name = "blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.0.0"
2128
}
2229
}

modules/fabric-net-svpc-access/versions.tf

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

1717
terraform {
18-
required_version = ">=0.12.6"
18+
required_version = ">= 0.13.0"
1919
required_providers {
20-
google = "<4.0,>= 2.12"
20+
google = {
21+
source = "hashicorp/google"
22+
version = "<4.0,>= 2.12"
23+
}
24+
}
25+
26+
provider_meta "google" {
27+
module_name = "blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.0.0"
2128
}
2229
}

modules/network-peering/versions.tf

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

1717
terraform {
18-
required_version = ">=0.12.6"
18+
required_version = ">= 0.13.0"
1919
required_providers {
20-
google = "<4.0,>= 2.12"
20+
google = {
21+
source = "hashicorp/google"
22+
version = "<4.0,>= 2.12"
23+
}
24+
}
25+
26+
provider_meta "google" {
27+
module_name = "blueprints/terraform/terraform-google-network:network-peering/v3.0.0"
2128
}
2229
}

modules/routes-beta/versions.tf

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

1717
terraform {
18-
required_version = ">=0.12.6"
18+
required_version = ">= 0.13.0"
1919
required_providers {
20-
google-beta = "~> 2.19.0"
20+
google-beta = {
21+
source = "hashicorp/google-beta"
22+
version = "~> 3.0"
23+
}
24+
}
25+
26+
provider_meta "google-beta" {
27+
module_name = "blueprints/terraform/terraform-google-network:routes-beta/v3.0.0"
2128
}
2229
}

modules/routes/versions.tf

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

1717
terraform {
18-
required_version = ">=0.12.6"
18+
required_version = ">= 0.13.0"
1919
required_providers {
20-
google = "<4.0,>= 2.12"
20+
google = {
21+
source = "hashicorp/google"
22+
version = "<4.0,>= 2.12"
23+
}
24+
}
25+
26+
provider_meta "google" {
27+
module_name = "blueprints/terraform/terraform-google-network:routes/v3.0.0"
2128
}
2229
}

modules/subnets-beta/versions.tf

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

1717
terraform {
18-
required_version = ">=0.12.6"
18+
required_version = ">= 0.13.0"
1919
required_providers {
20-
google-beta = ">= 2.19.0, <4.0.0"
20+
google-beta = {
21+
source = "hashicorp/google-beta"
22+
version = "<4.0,>= 2.19"
23+
}
24+
}
25+
26+
provider_meta "google-beta" {
27+
module_name = "blueprints/terraform/terraform-google-network:subnets-beta/v3.0.0"
2128
}
2229
}

modules/subnets/versions.tf

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

1717
terraform {
18-
required_version = ">=0.12.6"
18+
required_version = ">= 0.13.0"
1919
required_providers {
20-
google = "<4.0,>= 2.12"
20+
google = {
21+
source = "hashicorp/google"
22+
version = "<4.0,>= 2.12"
23+
}
24+
}
25+
26+
provider_meta "google" {
27+
module_name = "blueprints/terraform/terraform-google-network:subnets/v3.0.0"
2128
}
2229
}

0 commit comments

Comments
 (0)