diff --git a/examples/cloudbuild_enabled/versions.tf b/examples/cloudbuild_enabled/versions.tf deleted file mode 100644 index 317f4fd7..00000000 --- a/examples/cloudbuild_enabled/versions.tf +++ /dev/null @@ -1,37 +0,0 @@ -/** - * 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 { - google = { - source = "hashicorp/google" - version = "~> 4.0" - } - google-beta = { - source = "hashicorp/google-beta" - version = "~> 4.0" - } - null = { - source = "hashicorp/null" - version = "~> 3.0" - } - random = { - source = "hashicorp/random" - version = "~> 3.0" - } - } - required_version = ">= 0.13" -} diff --git a/examples/simple-folder/versions.tf b/examples/simple-folder/versions.tf deleted file mode 100644 index 6c3a22dc..00000000 --- a/examples/simple-folder/versions.tf +++ /dev/null @@ -1,33 +0,0 @@ -/** - * 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 { - google = { - source = "hashicorp/google" - version = "~> 4.0" - } - null = { - source = "hashicorp/null" - version = "~> 3.0" - } - random = { - source = "hashicorp/random" - version = "~> 3.0" - } - } - required_version = ">= 0.13" -} diff --git a/examples/simple/versions.tf b/examples/simple/versions.tf deleted file mode 100644 index 6c3a22dc..00000000 --- a/examples/simple/versions.tf +++ /dev/null @@ -1,33 +0,0 @@ -/** - * 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 { - google = { - source = "hashicorp/google" - version = "~> 4.0" - } - null = { - source = "hashicorp/null" - version = "~> 3.0" - } - random = { - source = "hashicorp/random" - version = "~> 3.0" - } - } - required_version = ">= 0.13" -} diff --git a/modules/cloudbuild/versions.tf b/modules/cloudbuild/versions.tf index f6edc55d..6af53675 100644 --- a/modules/cloudbuild/versions.tf +++ b/modules/cloudbuild/versions.tf @@ -21,12 +21,12 @@ terraform { google = { source = "hashicorp/google" # Exclude 4.31.0 for https://github.com/hashicorp/terraform-provider-google/issues/12226 - version = ">= 3.50, < 5.0, != 4.31.0" + version = ">= 3.50, != 4.31.0, <6" } google-beta = { source = "hashicorp/google-beta" # Exclude 4.31.0 for https://github.com/hashicorp/terraform-provider-google/issues/12226 - version = ">= 3.50, < 5.0, != 4.31.0" + version = ">= 3.50, != 4.31.0, <6" } random = { source = "hashicorp/random" diff --git a/modules/tf_cloudbuild_builder/versions.tf b/modules/tf_cloudbuild_builder/versions.tf index bda74825..f33696b0 100644 --- a/modules/tf_cloudbuild_builder/versions.tf +++ b/modules/tf_cloudbuild_builder/versions.tf @@ -21,12 +21,12 @@ terraform { google = { source = "hashicorp/google" # Exclude 4.31.0 for https://github.com/hashicorp/terraform-provider-google/issues/12226 - version = ">= 3.50, < 5.0, != 4.31.0" + version = ">= 3.50, != 4.31.0, < 6" } google-beta = { source = "hashicorp/google-beta" # Exclude 4.31.0 for https://github.com/hashicorp/terraform-provider-google/issues/12226 - version = ">= 3.50, < 5.0, != 4.31.0" + version = ">= 3.50, != 4.31.0, < 6" } } diff --git a/modules/tf_cloudbuild_source/versions.tf b/modules/tf_cloudbuild_source/versions.tf index ea052049..2c3bbb50 100644 --- a/modules/tf_cloudbuild_source/versions.tf +++ b/modules/tf_cloudbuild_source/versions.tf @@ -21,12 +21,12 @@ terraform { google = { source = "hashicorp/google" # Exclude 4.31.0 for https://github.com/hashicorp/terraform-provider-google/issues/12226 - version = ">= 3.50, < 5.0, != 4.31.0" + version = ">= 3.50, != 4.31.0, < 6" } google-beta = { source = "hashicorp/google-beta" # Exclude 4.31.0 for https://github.com/hashicorp/terraform-provider-google/issues/12226 - version = ">= 3.50, < 5.0, != 4.31.0" + version = ">= 3.50, != 4.31.0, < 6" } } diff --git a/modules/tf_cloudbuild_workspace/versions.tf b/modules/tf_cloudbuild_workspace/versions.tf index 4440af85..fed2522d 100644 --- a/modules/tf_cloudbuild_workspace/versions.tf +++ b/modules/tf_cloudbuild_workspace/versions.tf @@ -21,12 +21,12 @@ terraform { google = { source = "hashicorp/google" # Exclude 4.31.0 for https://github.com/hashicorp/terraform-provider-google/issues/12226 - version = ">= 4.17, < 5.0, != 4.31.0" + version = ">= 4.17, != 4.31.0, < 6" } google-beta = { source = "hashicorp/google-beta" # Exclude 4.31.0 for https://github.com/hashicorp/terraform-provider-google/issues/12226 - version = ">= 4.17, < 5.0, != 4.31.0" + version = ">= 4.17, != 4.31.0, < 6" } } diff --git a/test/setup/versions.tf b/test/setup/versions.tf index a48123aa..30651cd2 100644 --- a/test/setup/versions.tf +++ b/test/setup/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 3.50, < 5.0" + version = ">= 3.50, < 6" } google-beta = { source = "hashicorp/google-beta" - version = ">= 3.50, < 5.0" + version = ">= 3.50, < 6" } random = { source = "hashicorp/random" diff --git a/versions.tf b/versions.tf index 5699d468..bdf44421 100644 --- a/versions.tf +++ b/versions.tf @@ -20,7 +20,7 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 3.50, < 5.0" + version = ">= 3.50, < 6" } random = { source = "hashicorp/random"