From 1910fe188d13c1da73e697bb73afca3479778e0d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 3 Nov 2023 17:06:17 +0000 Subject: [PATCH 1/3] chore(deps): update cft/developer-tools docker tag to v1.17 --- Makefile | 2 +- build/int.cloudbuild.yaml | 2 +- build/lint.cloudbuild.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 4ee4fee3..d7abd842 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ # Make will use bash instead of sh SHELL := /usr/bin/env bash -DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.14 +DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.17 DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools REGISTRY_URL := gcr.io/cloud-foundation-cicd diff --git a/build/int.cloudbuild.yaml b/build/int.cloudbuild.yaml index 3f0413d6..0027ac08 100644 --- a/build/int.cloudbuild.yaml +++ b/build/int.cloudbuild.yaml @@ -216,4 +216,4 @@ tags: - 'integration' substitutions: _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools' - _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.14' + _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.17' diff --git a/build/lint.cloudbuild.yaml b/build/lint.cloudbuild.yaml index 808622b1..1debe2f9 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.14' + _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.17' From e27ea1b3ae8930e3eaeaaeb9c7f9bbeb204a6d89 Mon Sep 17 00:00:00 2001 From: Awais Malik Date: Fri, 3 Nov 2023 12:37:44 -0700 Subject: [PATCH 2/3] lint fix --- modules/vpc/outputs.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/vpc/outputs.tf b/modules/vpc/outputs.tf index 87db4a22..125bc03f 100644 --- a/modules/vpc/outputs.tf +++ b/modules/vpc/outputs.tf @@ -35,6 +35,6 @@ output "network_self_link" { } output "project_id" { - value = var.shared_vpc_host && length(google_compute_shared_vpc_host_project.shared_vpc_host) > 0 ? google_compute_shared_vpc_host_project.shared_vpc_host.*.project[0] : google_compute_network.network.project + value = var.shared_vpc_host && length(google_compute_shared_vpc_host_project.shared_vpc_host) > 0 ? google_compute_shared_vpc_host_project.shared_vpc_host[*].project[0] : google_compute_network.network.project description = "VPC project id" } From 81ca8ca5887971b073f2a6deac4f963cc0b99b70 Mon Sep 17 00:00:00 2001 From: Awais Malik Date: Fri, 3 Nov 2023 16:04:28 -0700 Subject: [PATCH 3/3] lint fix v2 --- modules/vpc/outputs.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/vpc/outputs.tf b/modules/vpc/outputs.tf index 125bc03f..7ba11cba 100644 --- a/modules/vpc/outputs.tf +++ b/modules/vpc/outputs.tf @@ -35,6 +35,6 @@ output "network_self_link" { } output "project_id" { - value = var.shared_vpc_host && length(google_compute_shared_vpc_host_project.shared_vpc_host) > 0 ? google_compute_shared_vpc_host_project.shared_vpc_host[*].project[0] : google_compute_network.network.project + value = var.shared_vpc_host && length(google_compute_shared_vpc_host_project.shared_vpc_host) > 0 ? google_compute_shared_vpc_host_project.shared_vpc_host[0].project : google_compute_network.network.project description = "VPC project id" }