diff --git a/examples/minimal/versions.tf b/examples/minimal/versions.tf index e96b88c..daf5cb0 100644 --- a/examples/minimal/versions.tf +++ b/examples/minimal/versions.tf @@ -18,7 +18,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = "~> 3.62.0" + version = "~> 4.26.0" + } + google-beta = { + source = "hashicorp/google-beta" + version = "~> 4.26.0" } random = { source = "hashicorp/random" 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 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 931688a..8a77a19 100644 --- a/examples/simple/versions.tf +++ b/examples/simple/versions.tf @@ -18,7 +18,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = "~> 3.62.0" + version = "~> 4.26.0" + } + google-beta = { + source = "hashicorp/google-beta" + version = "~> 4.26.0" } random = { source = "hashicorp/random" diff --git a/main.tf b/main.tf index aa5e345..9c3a6e9 100644 --- a/main.tf +++ b/main.tf @@ -41,6 +41,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/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 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" } 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 f93011e..cecde2c 100644 --- a/versions.tf +++ b/versions.tf @@ -17,10 +17,14 @@ terraform { required_version = ">= 0.13" required_providers { - google = { source = "hashicorp/google" - version = ">= 3.53, < 5.0" + version = ">= 4.26, < 5.0" + } + + google-beta = { + source = "hashicorp/google-beta" + version = ">= 4.26, < 5.0" } } @@ -28,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" + } }