feat: update TPG version constraints to allow 4.0 (#215)

* feat: update TPG version constraints to allow 4.0 * Loosens Google provider constraints * breaking changes in 4.0 are k8s-specific * Updates template * Replaces self_link with id * Corrects documentation Co-authored-by: cloud-foundation-bot <[email protected]>
terraform-google-modules · Nov 24, 2021 · af7347b · af7347b
1 parent 9e48c1f
commit af7347b
Show file tree

Hide file tree

Showing 50 changed files with 197 additions and 108 deletions.
diff --git a/autogen/versions.tf.tmpl b/autogen/versions.tf.tmpl
@@ -17,8 +17,8 @@
 terraform {
   required_version = ">=0.13.0"
   required_providers {
-    google      = ">= 3.43, <4.0"
-    google-beta = ">= 3.43, <4.0"
+    google      = ">= 3.43, < 5.0"
+    google-beta = ">= 3.43, < 5.0"
   }
   provider_meta "google" {
     module_name = "blueprints/terraform/terraform-google-vm:{% if mig %}mig{% else %}mig_with_percent{% endif %}/v7.2.0"

diff --git a/examples/compute_instance/disk_snapshot/main.tf b/examples/compute_instance/disk_snapshot/main.tf
@@ -14,10 +14,6 @@
  * limitations under the License.
  */
 
-provider "google" {
-  version = "~> 3.0"
-}
-
 # Building the list of disk names in the required format.
 # Usually you would build this list from the outputs of the compute_instance module
 locals {

diff --git a/examples/compute_instance/disk_snapshot/versions.tf b/examples/compute_instance/disk_snapshot/versions.tf
@@ -15,5 +15,11 @@
  */
 
 terraform {
-  required_version = ">=0.12.6"
+  required_version = ">= 0.13"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 4.0"
+    }
+  }
 }
diff --git a/examples/compute_instance/multiple_interfaces/main.tf b/examples/compute_instance/multiple_interfaces/main.tf
@@ -14,17 +14,6 @@
  * limitations under the License.
  */
 
-terraform {
-  required_providers {
-    google = {
-      version = ">= 3.45.0"
-    }
-    null = {
-      version = ">= 2.1.0"
-    }
-  }
-}
-
 # [START compute_vm_with_multiple_interface]
 resource "google_compute_instance" "default" {
   project      = var.project_id # Replace with your project ID in quotes

diff --git a/examples/compute_instance/multiple_interfaces/versions.tf b/examples/compute_instance/multiple_interfaces/versions.tf
@@ -15,5 +15,15 @@
  */
 
 terraform {
-  required_version = ">=0.12.6"
+  required_version = ">= 0.13"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 4.0"
+    }
+    null = {
+      source  = "hashicorp/null"
+      version = ">= 2.1.0"
+    }
+  }
 }
diff --git a/examples/compute_instance/next_hop/main.tf b/examples/compute_instance/next_hop/main.tf
@@ -14,11 +14,6 @@
  * limitations under the License.
  */
 
-provider "google" {
-
-  version = "~> 3.0"
-}
-
 # [START compute_vm_as_next_hop_create]
 resource "google_compute_instance" "default" {
   project      = var.project_id # Replace this with your project ID in quotes

diff --git a/examples/compute_instance/next_hop/versions.tf b/examples/compute_instance/next_hop/versions.tf
@@ -15,5 +15,11 @@
  */
 
 terraform {
-  required_version = ">=0.12.6"
+  required_version = ">= 0.13"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 4.0"
+    }
+  }
 }
diff --git a/examples/compute_instance/simple/main.tf b/examples/compute_instance/simple/main.tf
@@ -14,11 +14,6 @@
  * limitations under the License.
  */
 
-provider "google" {
-
-  version = "~> 3.0"
-}
-
 module "instance_template" {
   source          = "../../../modules/instance_template"
   region          = var.region

diff --git a/examples/compute_instance/simple/versions.tf b/examples/compute_instance/simple/versions.tf
@@ -15,5 +15,11 @@
  */
 
 terraform {
-  required_version = ">=0.12.6"
+  required_version = ">= 0.13"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 4.0"
+    }
+  }
 }
diff --git a/examples/compute_instance/tags/main.tf b/examples/compute_instance/tags/main.tf
@@ -14,11 +14,6 @@
  * limitations under the License.
  */
 
-provider "google" {
-
-  version = "~> 3.0"
-}
-
 # [START compute_vm_with_tags_create]
 resource "google_compute_instance" "default" {
   project      = var.project_id # Replace this with your project ID in quotes

diff --git a/examples/compute_instance/tags/versions.tf b/examples/compute_instance/tags/versions.tf
@@ -15,5 +15,11 @@
  */
 
 terraform {
-  required_version = ">=0.12.6"
+  required_version = ">= 0.13"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 4.0"
+    }
+  }
 }
diff --git a/examples/instance_template/additional_disks/main.tf b/examples/instance_template/additional_disks/main.tf
@@ -18,7 +18,6 @@ provider "google" {
 
   project = var.project_id
   region  = var.region
-  version = "~> 3.0"
 }
 
 module "instance_template" {

diff --git a/examples/instance_template/additional_disks/versions.tf b/examples/instance_template/additional_disks/versions.tf
@@ -15,5 +15,11 @@
  */
 
 terraform {
-  required_version = ">=0.12.6"
+  required_version = ">= 0.13"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 4.0"
+    }
+  }
 }
diff --git a/examples/instance_template/alias_ip_range/main.tf b/examples/instance_template/alias_ip_range/main.tf
@@ -18,7 +18,6 @@ provider "google" {
 
   project = var.project_id
   region  = var.region
-  version = "~> 3.0"
 }
 
 resource "google_compute_address" "ip_address" {

diff --git a/examples/instance_template/alias_ip_range/versions.tf b/examples/instance_template/alias_ip_range/versions.tf
@@ -15,5 +15,11 @@
  */
 
 terraform {
-  required_version = ">=0.12.6"
+  required_version = ">= 0.13"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 4.0"
+    }
+  }
 }
diff --git a/examples/instance_template/encrypted_disks/main.tf b/examples/instance_template/encrypted_disks/main.tf
@@ -18,7 +18,6 @@ provider "google" {
 
   project = var.project_id
   region  = var.region
-  version = "~> 3.0"
 }
 
 resource "google_kms_key_ring" "keyring" {
@@ -43,7 +42,7 @@ module "instance_template" {
   service_account = var.service_account
   name_prefix     = "additional-disks"
 
-  disk_encryption_key = google_kms_crypto_key.example-key.self_link
+  disk_encryption_key = google_kms_crypto_key.example-key.id
 
   additional_disks = [
     {

diff --git a/examples/instance_template/encrypted_disks/versions.tf b/examples/instance_template/encrypted_disks/versions.tf
@@ -15,5 +15,11 @@
  */
 
 terraform {
-  required_version = ">=0.12.6"
+  required_version = ">= 0.13"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 4.0"
+    }
+  }
 }
diff --git a/examples/instance_template/simple/main.tf b/examples/instance_template/simple/main.tf
@@ -18,7 +18,6 @@ provider "google" {
 
   project = var.project_id
   region  = var.region
-  version = "~> 3.0"
 }
 
 resource "google_compute_address" "ip_address" {

diff --git a/examples/instance_template/simple/versions.tf b/examples/instance_template/simple/versions.tf
@@ -15,5 +15,11 @@
  */
 
 terraform {
-  required_version = ">=0.12.6"
+  required_version = ">= 0.13"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 4.0"
+    }
+  }
 }
diff --git a/examples/mig/autoscaler/main.tf b/examples/mig/autoscaler/main.tf
@@ -18,14 +18,12 @@ provider "google" {
 
   project = var.project_id
   region  = var.region
-  version = "~>3.0"
 }
 
 provider "google-beta" {
 
   project = var.project_id
   region  = var.region
-  version = "~> 3.0"
 }
 
 module "instance_template" {

diff --git a/examples/mig/autoscaler/versions.tf b/examples/mig/autoscaler/versions.tf
@@ -15,5 +15,15 @@
  */
 
 terraform {
-  required_version = ">=0.12.6"
+  required_version = ">= 0.13"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 4.0"
+    }
+    google-beta = {
+      source  = "hashicorp/google-beta"
+      version = "~> 4.0"
+    }
+  }
 }
diff --git a/examples/mig/full/main.tf b/examples/mig/full/main.tf
@@ -18,14 +18,12 @@ provider "google" {
 
   project = var.project_id
   region  = var.region
-  version = "~>3.0"
 }
 
 provider "google-beta" {
 
   project = var.project_id
   region  = var.region
-  version = "~> 3.0"
 }
 
 module "instance_template" {

diff --git a/examples/mig/full/versions.tf b/examples/mig/full/versions.tf
@@ -15,5 +15,15 @@
  */
 
 terraform {
-  required_version = ">=0.12.6"
+  required_version = ">= 0.13"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 4.0"
+    }
+    google-beta = {
+      source  = "hashicorp/google-beta"
+      version = "~> 4.0"
+    }
+  }
 }
diff --git a/examples/mig/healthcheck/main.tf b/examples/mig/healthcheck/main.tf
@@ -19,19 +19,11 @@
 provider "google" {
   project = var.project_id
   region  = var.region
-  version = "~>3.0"
 }
 
 provider "google-beta" {
   project = var.project_id
   region  = var.region
-  version = "~> 3.0"
-}
-
-/** Random String (optional) **/
-
-provider "random" {
-  version = "~> 2.2"
 }
 
 resource "random_string" "suffix" {

diff --git a/examples/mig/healthcheck/versions.tf b/examples/mig/healthcheck/versions.tf
@@ -15,5 +15,19 @@
  */
 
 terraform {
-  required_version = ">=0.12.6"
+  required_version = ">= 0.13"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 4.0"
+    }
+    google-beta = {
+      source  = "hashicorp/google-beta"
+      version = "~> 4.0"
+    }
+    random = {
+      source  = "hashicorp/random"
+      version = "~> 2.2"
+    }
+  }
 }
diff --git a/examples/mig/simple/main.tf b/examples/mig/simple/main.tf
@@ -16,14 +16,12 @@
 
 provider "google" {
 
-  region  = var.region
-  version = "~> 3.0"
+  region = var.region
 }
 
 provider "google-beta" {
 
-  region  = var.region
-  version = "~> 3.0"
+  region = var.region
 }
 
 module "instance_template" {

diff --git a/examples/mig/simple/versions.tf b/examples/mig/simple/versions.tf
@@ -15,5 +15,15 @@
  */
 
 terraform {
-  required_version = ">=0.12.6"
+  required_version = ">= 0.13"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 4.0"
+    }
+    google-beta = {
+      source  = "hashicorp/google-beta"
+      version = "~> 4.0"
+    }
+  }
 }
diff --git a/examples/mig_with_percent/simple/main.tf b/examples/mig_with_percent/simple/main.tf
@@ -18,14 +18,12 @@ provider "google" {
 
   project = var.project_id
   region  = var.region
-  version = "~> 3.0"
 }
 
 provider "google-beta" {
 
   project = var.project_id
   region  = var.region
-  version = "~> 3.0"
 }
 
 module "preemptible_and_regular_instance_templates" {