From fc357edc1a6b792b1e586bb593e81cbb4e4d0631 Mon Sep 17 00:00:00 2001 From: cloud-foundation-bot Date: Tue, 16 Nov 2021 19:19:41 -0600 Subject: [PATCH] feat: update TPG version constraints to allow 4.0 --- examples/automatic-labelling-folder/main.tf | 20 ---------- .../automatic-labelling-folder/versions.tf | 37 +++++++++++++++++++ .../main.tf | 20 ---------- .../versions.tf | 37 +++++++++++++++++++ .../main.tf | 20 ---------- .../versions.tf | 37 +++++++++++++++++++ examples/delete-vms-without-cmek/main.tf | 3 -- examples/delete-vms-without-cmek/versions.tf | 33 +++++++++++++++++ examples/dynamic-files/versions.tf | 16 +++++++- modules/event-folder-log-entry/versions.tf | 2 +- modules/event-project-log-entry/versions.tf | 2 +- modules/repository-function/versions.tf | 2 +- versions.tf | 2 +- 13 files changed, 163 insertions(+), 68 deletions(-) create mode 100644 examples/automatic-labelling-folder/versions.tf create mode 100644 examples/automatic-labelling-from-localhost/versions.tf create mode 100644 examples/automatic-labelling-from-repository/versions.tf create mode 100644 examples/delete-vms-without-cmek/versions.tf diff --git a/examples/automatic-labelling-folder/main.tf b/examples/automatic-labelling-folder/main.tf index 2cad993..660131a 100644 --- a/examples/automatic-labelling-folder/main.tf +++ b/examples/automatic-labelling-folder/main.tf @@ -14,26 +14,6 @@ * limitations under the License. */ -terraform { - required_version = ">= 0.12" -} - -provider "archive" { - version = "~> 1.0" -} - -provider "google" { - version = "~> 3.39" -} - -provider "random" { - version = "~> 2.0" -} - -provider "null" { - version = "~> 2.1" -} - resource "random_pet" "main" { length = 2 separator = "-" diff --git a/examples/automatic-labelling-folder/versions.tf b/examples/automatic-labelling-folder/versions.tf new file mode 100644 index 0000000..78eb579 --- /dev/null +++ b/examples/automatic-labelling-folder/versions.tf @@ -0,0 +1,37 @@ +/** + * Copyright 2021 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_providers { + archive = { + source = "hashicorp/archive" + version = "~> 1.0" + } + google = { + source = "hashicorp/google" + version = "~> 4.0" + } + null = { + source = "hashicorp/null" + version = "~> 2.1" + } + random = { + source = "hashicorp/random" + version = "~> 2.0" + } + } + required_version = ">= 0.13" +} diff --git a/examples/automatic-labelling-from-localhost/main.tf b/examples/automatic-labelling-from-localhost/main.tf index 8579468..589b139 100644 --- a/examples/automatic-labelling-from-localhost/main.tf +++ b/examples/automatic-labelling-from-localhost/main.tf @@ -14,26 +14,6 @@ * limitations under the License. */ -terraform { - required_version = ">= 0.12" -} - -provider "archive" { - version = "~> 1.0" -} - -provider "google" { - version = "~> 3.39" -} - -provider "random" { - version = "~> 2.0" -} - -provider "null" { - version = "~> 2.1" -} - resource "random_pet" "main" { separator = "-" } diff --git a/examples/automatic-labelling-from-localhost/versions.tf b/examples/automatic-labelling-from-localhost/versions.tf new file mode 100644 index 0000000..78eb579 --- /dev/null +++ b/examples/automatic-labelling-from-localhost/versions.tf @@ -0,0 +1,37 @@ +/** + * Copyright 2021 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_providers { + archive = { + source = "hashicorp/archive" + version = "~> 1.0" + } + google = { + source = "hashicorp/google" + version = "~> 4.0" + } + null = { + source = "hashicorp/null" + version = "~> 2.1" + } + random = { + source = "hashicorp/random" + version = "~> 2.0" + } + } + required_version = ">= 0.13" +} diff --git a/examples/automatic-labelling-from-repository/main.tf b/examples/automatic-labelling-from-repository/main.tf index b7e24ae..9f7b1a2 100644 --- a/examples/automatic-labelling-from-repository/main.tf +++ b/examples/automatic-labelling-from-repository/main.tf @@ -14,26 +14,6 @@ * limitations under the License. */ -terraform { - required_version = ">= 0.12" -} - -provider "archive" { - version = "~> 1.0" -} - -provider "google" { - version = "~> 3.39" -} - -provider "random" { - version = "~> 2.0" -} - -provider "null" { - version = "~> 2.1" -} - resource "random_pet" "main" { separator = "-" } diff --git a/examples/automatic-labelling-from-repository/versions.tf b/examples/automatic-labelling-from-repository/versions.tf new file mode 100644 index 0000000..78eb579 --- /dev/null +++ b/examples/automatic-labelling-from-repository/versions.tf @@ -0,0 +1,37 @@ +/** + * Copyright 2021 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_providers { + archive = { + source = "hashicorp/archive" + version = "~> 1.0" + } + google = { + source = "hashicorp/google" + version = "~> 4.0" + } + null = { + source = "hashicorp/null" + version = "~> 2.1" + } + random = { + source = "hashicorp/random" + version = "~> 2.0" + } + } + required_version = ">= 0.13" +} diff --git a/examples/delete-vms-without-cmek/main.tf b/examples/delete-vms-without-cmek/main.tf index 2cb8043..7f012ce 100644 --- a/examples/delete-vms-without-cmek/main.tf +++ b/examples/delete-vms-without-cmek/main.tf @@ -19,15 +19,12 @@ terraform { } provider "archive" { - version = "~> 1.0" } provider "google" { - version = "~> 3.39" } provider "random" { - version = "~> 2.0" } resource "random_pet" "main" { diff --git a/examples/delete-vms-without-cmek/versions.tf b/examples/delete-vms-without-cmek/versions.tf new file mode 100644 index 0000000..fb2bef7 --- /dev/null +++ b/examples/delete-vms-without-cmek/versions.tf @@ -0,0 +1,33 @@ +/** + * Copyright 2021 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_providers { + archive = { + source = "hashicorp/archive" + version = "~> 1.0" + } + google = { + source = "hashicorp/google" + version = "~> 4.0" + } + random = { + source = "hashicorp/random" + version = "~> 2.0" + } + } + required_version = ">= 0.13" +} diff --git a/examples/dynamic-files/versions.tf b/examples/dynamic-files/versions.tf index 2970427..dcae4c0 100644 --- a/examples/dynamic-files/versions.tf +++ b/examples/dynamic-files/versions.tf @@ -15,5 +15,19 @@ */ terraform { - required_version = ">= 0.12" + required_version = ">= 0.13" + required_providers { + google = { + source = "hashicorp/google" + } + local = { + source = "hashicorp/local" + } + null = { + source = "hashicorp/null" + } + random = { + source = "hashicorp/random" + } + } } diff --git a/modules/event-folder-log-entry/versions.tf b/modules/event-folder-log-entry/versions.tf index 69c0d87..5f68b1e 100644 --- a/modules/event-folder-log-entry/versions.tf +++ b/modules/event-folder-log-entry/versions.tf @@ -20,7 +20,7 @@ terraform { google = { source = "hashicorp/google" - version = "~> 3.53" + version = ">= 3.53, < 5.0" } } diff --git a/modules/event-project-log-entry/versions.tf b/modules/event-project-log-entry/versions.tf index 9ae6d25..0bda0eb 100644 --- a/modules/event-project-log-entry/versions.tf +++ b/modules/event-project-log-entry/versions.tf @@ -20,7 +20,7 @@ terraform { google = { source = "hashicorp/google" - version = "~> 3.53" + version = ">= 3.53, < 5.0" } } diff --git a/modules/repository-function/versions.tf b/modules/repository-function/versions.tf index f7ba6c3..3824116 100644 --- a/modules/repository-function/versions.tf +++ b/modules/repository-function/versions.tf @@ -20,7 +20,7 @@ terraform { google = { source = "hashicorp/google" - version = "~> 3.53" + version = ">= 3.53, < 5.0" } } diff --git a/versions.tf b/versions.tf index 3ca28af..361c656 100644 --- a/versions.tf +++ b/versions.tf @@ -20,7 +20,7 @@ terraform { google = { source = "hashicorp/google" - version = "~> 3.53" + version = ">= 3.53, < 5.0" } }