From 21616a76d596d3d2a6112bb1b28b522419081458 Mon Sep 17 00:00:00 2001 From: Andrew Peabody Date: Fri, 15 Jul 2022 15:13:30 -0700 Subject: [PATCH] chore: update tests to CFT 1.5 and project-factory ~> 13.0 (#168) --- Makefile | 2 +- build/int.cloudbuild.yaml | 2 +- build/lint.cloudbuild.yaml | 2 +- test/fixtures/cloudbuild_enabled/versions.tf | 19 ------------------- test/fixtures/simple-folder/versions.tf | 19 ------------------- test/fixtures/simple/versions.tf | 19 ------------------- test/setup/main.tf | 2 +- test/setup/versions.tf | 2 +- 8 files changed, 5 insertions(+), 62 deletions(-) delete mode 100644 test/fixtures/cloudbuild_enabled/versions.tf delete mode 100644 test/fixtures/simple-folder/versions.tf delete mode 100644 test/fixtures/simple/versions.tf diff --git a/Makefile b/Makefile index 79b309f7..7931c947 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.4 +DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.5 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 3ebbb24a..a6f1b57d 100644 --- a/build/int.cloudbuild.yaml +++ b/build/int.cloudbuild.yaml @@ -142,4 +142,4 @@ tags: - 'integration' substitutions: _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools' - _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.4' + _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.5' diff --git a/build/lint.cloudbuild.yaml b/build/lint.cloudbuild.yaml index 7437fd5a..6d944b30 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.4' + _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.5' diff --git a/test/fixtures/cloudbuild_enabled/versions.tf b/test/fixtures/cloudbuild_enabled/versions.tf deleted file mode 100644 index 89c29bd2..00000000 --- a/test/fixtures/cloudbuild_enabled/versions.tf +++ /dev/null @@ -1,19 +0,0 @@ -/** - * Copyright 2018 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. - */ - -terraform { - required_version = ">=0.12.20" -} diff --git a/test/fixtures/simple-folder/versions.tf b/test/fixtures/simple-folder/versions.tf deleted file mode 100644 index 832ec1df..00000000 --- a/test/fixtures/simple-folder/versions.tf +++ /dev/null @@ -1,19 +0,0 @@ -/** - * Copyright 2018 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. - */ - -terraform { - required_version = ">= 0.12" -} diff --git a/test/fixtures/simple/versions.tf b/test/fixtures/simple/versions.tf deleted file mode 100644 index 832ec1df..00000000 --- a/test/fixtures/simple/versions.tf +++ /dev/null @@ -1,19 +0,0 @@ -/** - * Copyright 2018 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. - */ - -terraform { - required_version = ">= 0.12" -} diff --git a/test/setup/main.tf b/test/setup/main.tf index 4269695b..78e76f34 100644 --- a/test/setup/main.tf +++ b/test/setup/main.tf @@ -16,7 +16,7 @@ module "project" { source = "terraform-google-modules/project-factory/google" - version = "~> 11.3.1" + version = "~> 13.0" name = "ci-bootstrap" random_project_id = true diff --git a/test/setup/versions.tf b/test/setup/versions.tf index 38bbe914..a48123aa 100644 --- a/test/setup/versions.tf +++ b/test/setup/versions.tf @@ -15,7 +15,7 @@ */ terraform { - required_version = ">= 0.13" + required_version = ">= 0.13.0" required_providers { google = { source = "hashicorp/google"