From bdf4dbffeb79029cd348bf913194a7e9252714ad Mon Sep 17 00:00:00 2001 From: Will Roberts Date: Fri, 20 May 2022 21:26:52 +0000 Subject: [PATCH 1/9] Adds support for labels --- main.tf | 2 ++ variables.tf | 6 ++++++ versions.tf | 5 +++++ 3 files changed, 13 insertions(+) diff --git a/main.tf b/main.tf index aa5e345..2acc81f 100644 --- a/main.tf +++ b/main.tf @@ -28,6 +28,7 @@ data "google_compute_subnetwork" "network" { } resource "google_compute_forwarding_rule" "default" { + provider = google-beta project = var.project name = var.name region = var.region @@ -41,6 +42,7 @@ resource "google_compute_forwarding_rule" "default" { ports = var.ports all_ports = var.all_ports service_label = var.service_label + labels = var.labels } resource "google_compute_region_backend_service" "default" { diff --git a/variables.tf b/variables.tf index 270125b..d397780 100644 --- a/variables.tf +++ b/variables.tf @@ -156,3 +156,9 @@ variable "firewall_enable_logging" { default = false type = bool } + +variable "labels" { + description = "The labels to attach to resources created by this module." + default = {} + type = map(string) +} diff --git a/versions.tf b/versions.tf index d125c9a..dc4d180 100644 --- a/versions.tf +++ b/versions.tf @@ -22,6 +22,11 @@ terraform { source = "hashicorp/google" version = ">= 3.53, < 5.0" } + + google-beta = { + source = "hashicorp/google-beta" + version = ">= 3.53, < 5.0" + } } provider_meta "google" { From 5505339288f573e116c659df7ef32b884076aa63 Mon Sep 17 00:00:00 2001 From: Will Roberts Date: Tue, 21 Jun 2022 10:49:21 -0400 Subject: [PATCH 2/9] Add provider_meta --- versions.tf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/versions.tf b/versions.tf index 378e1b2..2d143e6 100644 --- a/versions.tf +++ b/versions.tf @@ -17,7 +17,6 @@ terraform { required_version = ">= 0.13" required_providers { - google = { source = "hashicorp/google" version = ">= 3.53, < 5.0" @@ -33,4 +32,7 @@ terraform { module_name = "blueprints/terraform/terraform-google-lb-internal/v4.6.0" } + provider_meta "google-beta" { + module_name = "blueprints/terraform/terraform-google-lb-internal/v4.6.0" + } } From a18c53c2921a00125addbd0a2e0a06ea2f14b95b Mon Sep 17 00:00:00 2001 From: Will Roberts Date: Wed, 22 Jun 2022 10:19:57 -0400 Subject: [PATCH 3/9] forwarding rule does not need beta provider --- main.tf | 1 - 1 file changed, 1 deletion(-) diff --git a/main.tf b/main.tf index 2acc81f..9c3a6e9 100644 --- a/main.tf +++ b/main.tf @@ -28,7 +28,6 @@ data "google_compute_subnetwork" "network" { } resource "google_compute_forwarding_rule" "default" { - provider = google-beta project = var.project name = var.name region = var.region From 3a7961086c8dde2a429e831209e653f67dce8f10 Mon Sep 17 00:00:00 2001 From: Will Roberts Date: Wed, 22 Jun 2022 17:38:21 +0000 Subject: [PATCH 4/9] Use provider version 4.26 --- versions.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/versions.tf b/versions.tf index 2d143e6..cecde2c 100644 --- a/versions.tf +++ b/versions.tf @@ -19,12 +19,12 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 3.53, < 5.0" + version = ">= 4.26, < 5.0" } google-beta = { source = "hashicorp/google-beta" - version = ">= 3.53, < 5.0" + version = ">= 4.26, < 5.0" } } From 2a6050364ee6b4b5da9fefedf5dc058f287c58f6 Mon Sep 17 00:00:00 2001 From: Will Roberts Date: Wed, 22 Jun 2022 17:59:53 +0000 Subject: [PATCH 5/9] Upgrade GCP/lb/google to 3.1 --- examples/simple/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/simple/main.tf b/examples/simple/main.tf index 2f5fbb8..69a45a9 100644 --- a/examples/simple/main.tf +++ b/examples/simple/main.tf @@ -16,7 +16,7 @@ module "gce-lb-fr" { source = "GoogleCloudPlatform/lb/google" - version = "~> 2.3" + version = "~> 3.1" region = var.region network = var.network project = var.project From 2e239a3ab10157c63c46c741eb89d45346b897cc Mon Sep 17 00:00:00 2001 From: Will Roberts Date: Wed, 22 Jun 2022 18:42:58 +0000 Subject: [PATCH 6/9] bump provider versions --- examples/minimal/versions.tf | 2 +- examples/simple/versions.tf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/minimal/versions.tf b/examples/minimal/versions.tf index e96b88c..56c7461 100644 --- a/examples/minimal/versions.tf +++ b/examples/minimal/versions.tf @@ -18,7 +18,7 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = "~> 3.62.0" + version = "~> 4.26.0" } random = { source = "hashicorp/random" diff --git a/examples/simple/versions.tf b/examples/simple/versions.tf index 931688a..426a866 100644 --- a/examples/simple/versions.tf +++ b/examples/simple/versions.tf @@ -18,7 +18,7 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = "~> 3.62.0" + version = "~> 4.26.0" } random = { source = "hashicorp/random" From f66baf4e6beed1e1e32f32b7d76ccb346e231344 Mon Sep 17 00:00:00 2001 From: Will Roberts Date: Wed, 22 Jun 2022 18:45:12 +0000 Subject: [PATCH 7/9] bump test setup providers --- test/setup/versions.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/setup/versions.tf b/test/setup/versions.tf index 0468e88..b05c43e 100644 --- a/test/setup/versions.tf +++ b/test/setup/versions.tf @@ -19,9 +19,9 @@ terraform { } provider "google" { - version = "~> 3.62" + version = "~> 4.26" } provider "google-beta" { - version = "~> 3.62" + version = "~> 4.26" } From 387ea26cbc9560f1bb69a75b645fd6c146d04cc4 Mon Sep 17 00:00:00 2001 From: Will Roberts Date: Thu, 23 Jun 2022 15:45:37 +0000 Subject: [PATCH 8/9] Update instance_template module to allow provider v4 --- examples/minimal/versions.tf | 4 ++++ examples/simple/mig.tf | 12 ++++++------ examples/simple/versions.tf | 4 ++++ 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/examples/minimal/versions.tf b/examples/minimal/versions.tf index 56c7461..daf5cb0 100644 --- a/examples/minimal/versions.tf +++ b/examples/minimal/versions.tf @@ -20,6 +20,10 @@ terraform { source = "hashicorp/google" version = "~> 4.26.0" } + google-beta = { + source = "hashicorp/google-beta" + version = "~> 4.26.0" + } random = { source = "hashicorp/random" version = "~> 2.0" diff --git a/examples/simple/mig.tf b/examples/simple/mig.tf index f5bf3d4..ae7f73a 100644 --- a/examples/simple/mig.tf +++ b/examples/simple/mig.tf @@ -16,7 +16,7 @@ module "instance_template1" { source = "terraform-google-modules/vm/google//modules/instance_template" - version = "~> 6.2.0" + version = "~> 7.8.0" project_id = var.project subnetwork = var.subnetwork subnetwork_project = var.subnetwork_project @@ -27,7 +27,7 @@ module "instance_template1" { module "instance_template2" { source = "terraform-google-modules/vm/google//modules/instance_template" - version = "~> 6.2.0" + version = "~> 7.8.0" project_id = var.project subnetwork = var.subnetwork subnetwork_project = var.subnetwork_project @@ -38,7 +38,7 @@ module "instance_template2" { module "instance_template3" { source = "terraform-google-modules/vm/google//modules/instance_template" - version = "~> 6.2.0" + version = "~> 7.8.0" project_id = var.project subnetwork = var.subnetwork subnetwork_project = var.subnetwork_project @@ -49,7 +49,7 @@ module "instance_template3" { module "mig1" { source = "terraform-google-modules/vm/google//modules/mig" - version = "~> 6.2.0" + version = "~> 7.8.0" project_id = var.project subnetwork_project = var.subnetwork_project region = var.region @@ -61,7 +61,7 @@ module "mig1" { module "mig2" { source = "terraform-google-modules/vm/google//modules/mig" - version = "~> 6.2.0" + version = "~> 7.8.0" project_id = var.project subnetwork_project = var.subnetwork_project region = var.region @@ -72,7 +72,7 @@ module "mig2" { module "mig3" { source = "terraform-google-modules/vm/google//modules/mig" - version = "~> 6.2.0" + version = "~> 7.8.0" project_id = var.project subnetwork_project = var.subnetwork_project region = var.region diff --git a/examples/simple/versions.tf b/examples/simple/versions.tf index 426a866..8a77a19 100644 --- a/examples/simple/versions.tf +++ b/examples/simple/versions.tf @@ -20,6 +20,10 @@ terraform { source = "hashicorp/google" version = "~> 4.26.0" } + google-beta = { + source = "hashicorp/google-beta" + version = "~> 4.26.0" + } random = { source = "hashicorp/random" version = "~> 2.0" From af5db6e88c8f548958eb541eab86ee235a9027e8 Mon Sep 17 00:00:00 2001 From: Will Roberts Date: Thu, 23 Jun 2022 15:52:58 +0000 Subject: [PATCH 9/9] Update project factory module to allow provider v4 --- test/setup/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/setup/main.tf b/test/setup/main.tf index 4c6b032..f628827 100644 --- a/test/setup/main.tf +++ b/test/setup/main.tf @@ -16,7 +16,7 @@ module "project-ci-lb-internal" { source = "terraform-google-modules/project-factory/google" - version = "~> 10.2" + version = "~> 13.0" name = "ci-int-lb-internal" random_project_id = true