From 99ca56323eab77915f8b2b385c6b2ed850eed6ac Mon Sep 17 00:00:00 2001 From: Awais Malik Date: Wed, 1 Nov 2023 09:52:53 -0700 Subject: [PATCH] chore: upgraded versions.tf to include minor bumps from tpg v5 (#148) --- Makefile | 2 +- README.md | 2 +- build/int.cloudbuild.yaml | 2 +- build/lint.cloudbuild.yaml | 2 +- examples/logs-slack-alerts/README.md | 2 +- examples/logs-slack-alerts/versions.tf | 6 ++---- examples/pubsub_scheduled/versions.tf | 6 ++---- examples/pubsub_scheduled_multiple/versions.tf | 6 ++---- modules/project_cleanup/versions.tf | 2 +- test/setup/versions.tf | 4 ++-- versions.tf | 2 +- 11 files changed, 15 insertions(+), 21 deletions(-) diff --git a/Makefile b/Makefile index a41e193..cac9cf8 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.13 +DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.17 DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools REGISTRY_URL := gcr.io/cloud-foundation-cicd diff --git a/README.md b/README.md index 6b7372a..663d3c2 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ Then perform the following commands on the root folder: | time\_zone | The timezone to use in scheduler | `string` | `"Etc/UTC"` | no | | topic\_labels | A set of key/value label pairs to assign to the pubsub topic. | `map(string)` | `{}` | no | | topic\_name | Name of pubsub topic connecting the scheduled job and the function | `string` | `"test-topic"` | no | -| vpc\_connector | The VPC Network Connector that this cloud function can connect to. It should be set up as fully-qualified URI. The format of this field is projects//locations//connectors/\*. | `string` | `null` | no | +| vpc\_connector | The VPC Network Connector that this cloud function can connect to. It should be set up as fully-qualified URI. The format of this field is projects//locations//connectors/*. | `string` | `null` | no | | vpc\_connector\_egress\_settings | The egress settings for the connector, controlling what traffic is diverted through it. Allowed values are ALL\_TRAFFIC and PRIVATE\_RANGES\_ONLY. If unset, this field preserves the previously set value. | `string` | `null` | no | ## Outputs diff --git a/build/int.cloudbuild.yaml b/build/int.cloudbuild.yaml index 6eecf01..697abf2 100644 --- a/build/int.cloudbuild.yaml +++ b/build/int.cloudbuild.yaml @@ -38,4 +38,4 @@ tags: - 'integration' substitutions: _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools' - _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.13' + _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.17' diff --git a/build/lint.cloudbuild.yaml b/build/lint.cloudbuild.yaml index 9eba0ab..61c0911 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.13' + _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.17' diff --git a/examples/logs-slack-alerts/README.md b/examples/logs-slack-alerts/README.md index 6827608..0161724 100644 --- a/examples/logs-slack-alerts/README.md +++ b/examples/logs-slack-alerts/README.md @@ -27,6 +27,6 @@ If not using the default App Engine default service account (PROJECT_ID@appspot. ## Outputs -No output. +No outputs. diff --git a/examples/logs-slack-alerts/versions.tf b/examples/logs-slack-alerts/versions.tf index c7fc4a6..e05f909 100644 --- a/examples/logs-slack-alerts/versions.tf +++ b/examples/logs-slack-alerts/versions.tf @@ -17,12 +17,10 @@ terraform { required_providers { google = { - source = "hashicorp/google" - version = "~> 4.0" + source = "hashicorp/google" } google-beta = { - source = "hashicorp/google-beta" - version = "~> 4.0" + source = "hashicorp/google-beta" } } required_version = ">= 0.13" diff --git a/examples/pubsub_scheduled/versions.tf b/examples/pubsub_scheduled/versions.tf index c7fc4a6..e05f909 100644 --- a/examples/pubsub_scheduled/versions.tf +++ b/examples/pubsub_scheduled/versions.tf @@ -17,12 +17,10 @@ terraform { required_providers { google = { - source = "hashicorp/google" - version = "~> 4.0" + source = "hashicorp/google" } google-beta = { - source = "hashicorp/google-beta" - version = "~> 4.0" + source = "hashicorp/google-beta" } } required_version = ">= 0.13" diff --git a/examples/pubsub_scheduled_multiple/versions.tf b/examples/pubsub_scheduled_multiple/versions.tf index c7fc4a6..e05f909 100644 --- a/examples/pubsub_scheduled_multiple/versions.tf +++ b/examples/pubsub_scheduled_multiple/versions.tf @@ -17,12 +17,10 @@ terraform { required_providers { google = { - source = "hashicorp/google" - version = "~> 4.0" + source = "hashicorp/google" } google-beta = { - source = "hashicorp/google-beta" - version = "~> 4.0" + source = "hashicorp/google-beta" } } required_version = ">= 0.13" diff --git a/modules/project_cleanup/versions.tf b/modules/project_cleanup/versions.tf index 27d00d3..2f1121c 100644 --- a/modules/project_cleanup/versions.tf +++ b/modules/project_cleanup/versions.tf @@ -20,7 +20,7 @@ terraform { google = { source = "hashicorp/google" - version = ">= 3.53, < 5.0" + version = ">= 3.53, < 6" } } diff --git a/test/setup/versions.tf b/test/setup/versions.tf index f1968ee..4616f75 100644 --- a/test/setup/versions.tf +++ b/test/setup/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 3.53, < 5.0" + version = ">= 3.53, < 6" } google-beta = { source = "hashicorp/google-beta" - version = ">= 3.35, < 5.0" + version = ">= 3.35, < 6" } } } diff --git a/versions.tf b/versions.tf index a5bacc0..66f5c1d 100644 --- a/versions.tf +++ b/versions.tf @@ -19,7 +19,7 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 3.53, < 5.0" + version = ">= 3.53, < 6" } random = { source = "hashicorp/random"