chore: add Terraform 0.13 constraint and module attribution (#224)

BREAKING CHANGE: Minimum Terraform version increased to 0.13.
terraform-google-modules · Dec 29, 2020 · 6c835be · 6c835be
1 parent bb31529
commit 6c835be
Show file tree

Hide file tree

Showing 12 changed files with 84 additions and 21 deletions.
diff --git a/Makefile b/Makefile
@@ -15,7 +15,7 @@
 # Make will use bash instead of sh
 SHELL := /usr/bin/env bash
 
-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 0.12.2
+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 0.13
 DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools
 REGISTRY_URL := gcr.io/cloud-foundation-cicd
 

diff --git a/build/int.cloudbuild.yaml b/build/int.cloudbuild.yaml
@@ -166,4 +166,4 @@ tags:
 - 'integration'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.12.2'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.13'
diff --git a/build/lint.cloudbuild.yaml b/build/lint.cloudbuild.yaml
@@ -21,4 +21,4 @@ tags:
 - 'lint'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.12.2'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.13'
diff --git a/modules/fabric-net-firewall/versions.tf b/modules/fabric-net-firewall/versions.tf
@@ -15,8 +15,15 @@
  */
 
 terraform {
-  required_version = ">=0.12.6"
+  required_version = ">= 0.13.0"
   required_providers {
-    google = "<4.0,>= 2.12"
+    google = {
+      source  = "hashicorp/google"
+      version = "<4.0,>= 2.12"
+    }
+  }
+
+  provider_meta "google" {
+    module_name = "blueprints/terraform/terraform-google-network:fabric-net-firewall/v3.0.0"
   }
 }
diff --git a/modules/fabric-net-svpc-access/versions.tf b/modules/fabric-net-svpc-access/versions.tf
@@ -15,8 +15,15 @@
  */
 
 terraform {
-  required_version = ">=0.12.6"
+  required_version = ">= 0.13.0"
   required_providers {
-    google = "<4.0,>= 2.12"
+    google = {
+      source  = "hashicorp/google"
+      version = "<4.0,>= 2.12"
+    }
+  }
+
+  provider_meta "google" {
+    module_name = "blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v3.0.0"
   }
 }
diff --git a/modules/network-peering/versions.tf b/modules/network-peering/versions.tf
@@ -15,8 +15,15 @@
  */
 
 terraform {
-  required_version = ">=0.12.6"
+  required_version = ">= 0.13.0"
   required_providers {
-    google = "<4.0,>= 2.12"
+    google = {
+      source  = "hashicorp/google"
+      version = "<4.0,>= 2.12"
+    }
+  }
+
+  provider_meta "google" {
+    module_name = "blueprints/terraform/terraform-google-network:network-peering/v3.0.0"
   }
 }
diff --git a/modules/routes-beta/versions.tf b/modules/routes-beta/versions.tf
@@ -15,8 +15,15 @@
  */
 
 terraform {
-  required_version = ">=0.12.6"
+  required_version = ">= 0.13.0"
   required_providers {
-    google-beta = "~> 2.19.0"
+    google-beta = {
+      source  = "hashicorp/google-beta"
+      version = "~> 3.0"
+    }
+  }
+
+  provider_meta "google-beta" {
+    module_name = "blueprints/terraform/terraform-google-network:routes-beta/v3.0.0"
   }
 }
diff --git a/modules/routes/versions.tf b/modules/routes/versions.tf
@@ -15,8 +15,15 @@
  */
 
 terraform {
-  required_version = ">=0.12.6"
+  required_version = ">= 0.13.0"
   required_providers {
-    google = "<4.0,>= 2.12"
+    google = {
+      source  = "hashicorp/google"
+      version = "<4.0,>= 2.12"
+    }
+  }
+
+  provider_meta "google" {
+    module_name = "blueprints/terraform/terraform-google-network:routes/v3.0.0"
   }
 }
diff --git a/modules/subnets-beta/versions.tf b/modules/subnets-beta/versions.tf
@@ -15,8 +15,15 @@
  */
 
 terraform {
-  required_version = ">=0.12.6"
+  required_version = ">= 0.13.0"
   required_providers {
-    google-beta = ">= 2.19.0, <4.0.0"
+    google-beta = {
+      source  = "hashicorp/google-beta"
+      version = "<4.0,>= 2.19"
+    }
+  }
+
+  provider_meta "google-beta" {
+    module_name = "blueprints/terraform/terraform-google-network:subnets-beta/v3.0.0"
   }
 }
diff --git a/modules/subnets/versions.tf b/modules/subnets/versions.tf
@@ -15,8 +15,15 @@
  */
 
 terraform {
-  required_version = ">=0.12.6"
+  required_version = ">= 0.13.0"
   required_providers {
-    google = "<4.0,>= 2.12"
+    google = {
+      source  = "hashicorp/google"
+      version = "<4.0,>= 2.12"
+    }
+  }
+
+  provider_meta "google" {
+    module_name = "blueprints/terraform/terraform-google-network:subnets/v3.0.0"
   }
 }
diff --git a/modules/vpc/versions.tf b/modules/vpc/versions.tf
@@ -15,8 +15,15 @@
  */
 
 terraform {
-  required_version = ">=0.12.6"
+  required_version = ">= 0.13.0"
   required_providers {
-    google = "<4.0,>= 3.45"
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 3.45"
+    }
+  }
+
+  provider_meta "google" {
+    module_name = "blueprints/terraform/terraform-google-network:vpc/v3.0.0"
   }
 }
diff --git a/versions.tf b/versions.tf
@@ -15,8 +15,15 @@
  */
 
 terraform {
-  required_version = ">=0.12.6"
+  required_version = ">= 0.13.0"
   required_providers {
-    google = "<4.0,>= 2.12"
+    google = {
+      source  = "hashicorp/google"
+      version = "<4.0,>= 2.12"
+    }
+  }
+
+  provider_meta "google" {
+    module_name = "blueprints/terraform/terraform-google-network/v3.0.0"
   }
 }