diff --git a/Makefile b/Makefile index 6d7c137c..afb67462 100644 --- 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 index 00be3ede..a2755bcb 100644 --- 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 index 3c17b523..debd5236 100644 --- 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 index 81c8a1d7..d89e26a7 100644 --- 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 index a6e2b3f8..c8769697 100644 --- 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 index 736b35bb..b40e408c 100644 --- 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 index cc3302aa..98827f92 100644 --- 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 index 1f4c2fdb..e67acd24 100644 --- 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 index 16a2787a..781a8dbe 100644 --- 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 index 654c6b2f..250d4e56 100644 --- 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 index 8bb7223b..f2515068 100644 --- 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 index 1e71e1b4..51af8907 100644 --- 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 index 2f16e631..bd0a4490 100644 --- 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 index c228f64f..e4114899 100644 --- 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 index 545edc91..20265c74 100644 --- 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 index 8b925f55..186cf7a8 100644 --- 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 index efb8071f..c1ca3b87 100644 --- 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"