diff --git a/.github/release-please.yml b/.github/release-please.yml index 568700f5..31fa0e6e 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -1,3 +1,17 @@ +# Copyright 2022 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + releaseType: terraform-module handleGHRelease: true primaryBranch: main diff --git a/Makefile b/Makefile index 36ccd9fa..a3bea6f4 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 := 0 +DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.3 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 4761162f..4d812c73 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: '0' + _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.3' diff --git a/build/lint.cloudbuild.yaml b/build/lint.cloudbuild.yaml index 0569972e..a2a80f3b 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: '0' + _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.3' diff --git a/examples/cloud_run_vpc_connector/network.tf b/examples/cloud_run_vpc_connector/network.tf index 6e292b09..adc4bb39 100644 --- a/examples/cloud_run_vpc_connector/network.tf +++ b/examples/cloud_run_vpc_connector/network.tf @@ -16,7 +16,7 @@ module "vpc" { source = "terraform-google-modules/network/google" - version = "~> 3.3.0" + version = "~> 4.0" project_id = var.project_id network_name = "cloud-run-vpc" @@ -36,7 +36,7 @@ module "vpc" { module "serverless_connector" { source = "terraform-google-modules/network/google//modules/vpc-serverless-connector-beta" - version = "~> 3.3.0" + version = "~> 4.0" project_id = var.project_id vpc_connectors = [{ diff --git a/examples/cloud_run_vpc_connector/versions.tf b/examples/cloud_run_vpc_connector/versions.tf index 116dcffb..f2bddf39 100644 --- a/examples/cloud_run_vpc_connector/versions.tf +++ b/examples/cloud_run_vpc_connector/versions.tf @@ -20,11 +20,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = "~> 3.53" + version = "~> 4.0" } google-beta = { source = "hashicorp/google-beta" - version = "~> 3.53" + version = "~> 4.0" } } } diff --git a/kitchen.yml b/kitchen.yml index 43b556a6..a6da53a6 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -15,6 +15,7 @@ --- driver: name: terraform + verify_version: false provisioner: name: terraform diff --git a/test/integration/simple_cloud_run/inspec.yml b/test/integration/simple_cloud_run/inspec.yml index 7ef3310e..05845b8a 100644 --- a/test/integration/simple_cloud_run/inspec.yml +++ b/test/integration/simple_cloud_run/inspec.yml @@ -1,3 +1,17 @@ +# Copyright 2022 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + name: simple_cloud_run attributes: - name: project_id diff --git a/versions.tf b/versions.tf index 622af4b2..2b117098 100644 --- a/versions.tf +++ b/versions.tf @@ -20,11 +20,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = "~> 3.53" + version = ">= 3.53, < 5.0" } google-beta = { source = "hashicorp/google-beta" - version = "~> 3.53" + version = ">= 3.53, < 5.0" } }