Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): update cft/developer-tools docker tag to v1.16 #340

Merged
merged 2 commits into from
Sep 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions autogen/main.tf.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 8 additions & 2 deletions autogen/versions.tf.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion build/int.cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
2 changes: 1 addition & 1 deletion build/lint.cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
2 changes: 1 addition & 1 deletion modules/compute_disk_snapshot/outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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[*]
}
10 changes: 8 additions & 2 deletions modules/compute_disk_snapshot/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 2 additions & 3 deletions modules/compute_instance/outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

5 changes: 4 additions & 1 deletion modules/compute_instance/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 4 additions & 1 deletion modules/instance_template/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions modules/mig/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 8 additions & 2 deletions modules/mig/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions modules/mig_with_percent/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 8 additions & 2 deletions modules/mig_with_percent/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions modules/umig/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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]],
)

Expand Down
9 changes: 4 additions & 5 deletions modules/umig/outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

5 changes: 4 additions & 1 deletion modules/umig/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down