Merge branch 'master' into fix/enable-meta

terraform-google-modules · Sep 20, 2023 · e65ad8d · e65ad8d
2 parents 06e10e2 + c37fe26
commit e65ad8d
Show file tree

Hide file tree

Showing 17 changed files with 65 additions and 34 deletions.
diff --git a/Makefile b/Makefile
@@ -18,7 +18,7 @@
 # Make will use bash instead of sh
 SHELL := /usr/bin/env bash
 
-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.15
+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.16
 DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools
 REGISTRY_URL := gcr.io/cloud-foundation-cicd
 ENABLE_BPMETADATA := 1

diff --git a/autogen/main.tf.tmpl b/autogen/main.tf.tmpl
@@ -18,9 +18,9 @@
 
 locals {
   healthchecks = concat(
-    google_compute_health_check.https.*.self_link,
-    google_compute_health_check.http.*.self_link,
-    google_compute_health_check.tcp.*.self_link,
+    google_compute_health_check.https[*].self_link,
+    google_compute_health_check.http[*].self_link,
+    google_compute_health_check.tcp[*].self_link,
   )
   distribution_policy_zones    = coalescelist(var.distribution_policy_zones, data.google_compute_zones.available.names)
   autoscaling_scale_in_enabled = var.autoscaling_scale_in_control.fixed_replicas != null || var.autoscaling_scale_in_control.percent_replicas != null

diff --git a/autogen/versions.tf.tmpl b/autogen/versions.tf.tmpl
@@ -17,8 +17,14 @@
 terraform {
   required_version = ">=0.13.0"
   required_providers {
-    google      = ">= 4.48, < 5.0"
-    google-beta = ">= 4.48, < 5.0"
+    google = {
+      source  = "hashicorp/google"
+      version = ">= 4.48, < 5.0"
+    }
+    google-beta = {
+      source  = "hashicorp/google-beta"
+      version = ">= 4.48, < 5.0"
+    }
   }
   provider_meta "google" {
     module_name = "blueprints/terraform/terraform-google-vm:{% if mig %}mig{% else %}mig_with_percent{% endif %}/v9.0.0"

diff --git a/build/int.cloudbuild.yaml b/build/int.cloudbuild.yaml
@@ -260,4 +260,4 @@ tags:
 - 'integration'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.15'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.16'
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: '1.15'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.16'
diff --git a/modules/compute_disk_snapshot/outputs.tf b/modules/compute_disk_snapshot/outputs.tf
@@ -21,5 +21,5 @@ output "policy" {
 
 output "attachments" {
   description = "Disk attachments to the resource policy"
-  value       = google_compute_disk_resource_policy_attachment.attachment.*
+  value       = google_compute_disk_resource_policy_attachment.attachment[*]
 }
diff --git a/modules/compute_disk_snapshot/versions.tf b/modules/compute_disk_snapshot/versions.tf
@@ -17,8 +17,14 @@
 terraform {
   required_version = ">=0.13.0"
   required_providers {
-    google = ">= 3.71, < 5.0"
-    null   = ">= 2.1"
+    google = {
+      source  = "hashicorp/google"
+      version = ">= 3.71, < 5.0"
+    }
+    null = {
+      source  = "hashicorp/null"
+      version = ">= 2.1"
+    }
   }
   provider_meta "google" {
     module_name = "blueprints/terraform/terraform-google-vm:compute_instance/v9.0.0"

diff --git a/modules/compute_instance/outputs.tf b/modules/compute_instance/outputs.tf
@@ -16,17 +16,16 @@
 
 output "instances_self_links" {
   description = "List of self-links for compute instances"
-  value       = google_compute_instance_from_template.compute_instance.*.self_link
+  value       = google_compute_instance_from_template.compute_instance[*].self_link
 }
 
 output "instances_details" {
   description = "List of all details for compute instances"
   sensitive   = true
-  value       = google_compute_instance_from_template.compute_instance.*
+  value       = google_compute_instance_from_template.compute_instance[*]
 }
 
 output "available_zones" {
   description = "List of available zones in region"
   value       = data.google_compute_zones.available.names
 }
-
diff --git a/modules/compute_instance/versions.tf b/modules/compute_instance/versions.tf
@@ -17,7 +17,10 @@
 terraform {
   required_version = ">=0.13.0"
   required_providers {
-    google = ">= 3.88, < 5.0"
+    google = {
+      source  = "hashicorp/google"
+      version = ">= 3.88, < 5.0"
+    }
   }
   provider_meta "google" {
     module_name = "blueprints/terraform/terraform-google-vm:compute_instance/v9.0.0"

diff --git a/modules/instance_template/versions.tf b/modules/instance_template/versions.tf
@@ -17,7 +17,10 @@
 terraform {
   required_version = ">=0.13.0"
   required_providers {
-    google = ">= 4.67, < 5.0"
+    google = {
+      source  = "hashicorp/google"
+      version = ">= 4.67, < 5.0"
+    }
   }
   provider_meta "google" {
     module_name = "blueprints/terraform/terraform-google-vm:instance_template/v9.0.0"

diff --git a/modules/mig/main.tf b/modules/mig/main.tf
@@ -18,9 +18,9 @@
 
 locals {
   healthchecks = concat(
-    google_compute_health_check.https.*.self_link,
-    google_compute_health_check.http.*.self_link,
-    google_compute_health_check.tcp.*.self_link,
+    google_compute_health_check.https[*].self_link,
+    google_compute_health_check.http[*].self_link,
+    google_compute_health_check.tcp[*].self_link,
   )
   distribution_policy_zones    = coalescelist(var.distribution_policy_zones, data.google_compute_zones.available.names)
   autoscaling_scale_in_enabled = var.autoscaling_scale_in_control.fixed_replicas != null || var.autoscaling_scale_in_control.percent_replicas != null

diff --git a/modules/mig/versions.tf b/modules/mig/versions.tf
@@ -17,8 +17,14 @@
 terraform {
   required_version = ">=0.13.0"
   required_providers {
-    google      = ">= 4.48, < 5.0"
-    google-beta = ">= 4.48, < 5.0"
+    google = {
+      source  = "hashicorp/google"
+      version = ">= 4.48, < 5.0"
+    }
+    google-beta = {
+      source  = "hashicorp/google-beta"
+      version = ">= 4.48, < 5.0"
+    }
   }
   provider_meta "google" {
     module_name = "blueprints/terraform/terraform-google-vm:mig/v9.0.0"

diff --git a/modules/mig_with_percent/main.tf b/modules/mig_with_percent/main.tf
@@ -18,9 +18,9 @@
 
 locals {
   healthchecks = concat(
-    google_compute_health_check.https.*.self_link,
-    google_compute_health_check.http.*.self_link,
-    google_compute_health_check.tcp.*.self_link,
+    google_compute_health_check.https[*].self_link,
+    google_compute_health_check.http[*].self_link,
+    google_compute_health_check.tcp[*].self_link,
   )
   distribution_policy_zones    = coalescelist(var.distribution_policy_zones, data.google_compute_zones.available.names)
   autoscaling_scale_in_enabled = var.autoscaling_scale_in_control.fixed_replicas != null || var.autoscaling_scale_in_control.percent_replicas != null

diff --git a/modules/mig_with_percent/versions.tf b/modules/mig_with_percent/versions.tf
@@ -17,8 +17,14 @@
 terraform {
   required_version = ">=0.13.0"
   required_providers {
-    google      = ">= 4.48, < 5.0"
-    google-beta = ">= 4.48, < 5.0"
+    google = {
+      source  = "hashicorp/google"
+      version = ">= 4.48, < 5.0"
+    }
+    google-beta = {
+      source  = "hashicorp/google-beta"
+      version = ">= 4.48, < 5.0"
+    }
   }
   provider_meta "google" {
     module_name = "blueprints/terraform/terraform-google-vm:mig_with_percent/v9.0.0"

diff --git a/modules/umig/main.tf b/modules/umig/main.tf
@@ -109,8 +109,8 @@ resource "google_compute_instance_group" "instance_group" {
   project  = var.project_id
   zone     = element(local.zones, count.index)
   instances = matchkeys(
-    google_compute_instance_from_template.compute_instance.*.self_link,
-    google_compute_instance_from_template.compute_instance.*.zone,
+    google_compute_instance_from_template.compute_instance[*].self_link,
+    google_compute_instance_from_template.compute_instance[*].zone,
     [local.zones[count.index]],
   )
 

diff --git a/modules/umig/outputs.tf b/modules/umig/outputs.tf
@@ -16,26 +16,25 @@
 
 output "self_links" {
   description = "List of self-links for unmanaged instance groups"
-  value       = google_compute_instance_group.instance_group.*.self_link
+  value       = google_compute_instance_group.instance_group[*].self_link
 }
 
 output "umig_details" {
   description = "List of all details for unmanaged instance groups"
-  value       = google_compute_instance_group.instance_group.*
+  value       = google_compute_instance_group.instance_group[*]
 }
 
 output "instances_self_links" {
   description = "List of self-links for compute instances"
-  value       = google_compute_instance_from_template.compute_instance.*.self_link
+  value       = google_compute_instance_from_template.compute_instance[*].self_link
 }
 
 output "instances_details" {
   description = "List of all details for compute instances"
-  value       = google_compute_instance_from_template.compute_instance.*
+  value       = google_compute_instance_from_template.compute_instance[*]
 }
 
 output "available_zones" {
   description = "List of available zones in region"
   value       = data.google_compute_zones.available.names
 }
-
diff --git a/modules/umig/versions.tf b/modules/umig/versions.tf
@@ -17,7 +17,10 @@
 terraform {
   required_version = ">=0.13.0"
   required_providers {
-    google = ">= 3.88, < 5.0"
+    google = {
+      source  = "hashicorp/google"
+      version = ">= 3.88, < 5.0"
+    }
   }
   provider_meta "google" {
     module_name = "blueprints/terraform/terraform-google-vm:umig/v9.0.0"