From eaf2dda504e512b5dd11d0a10717e1f99d9d217a Mon Sep 17 00:00:00 2001 From: Awais Malik Date: Fri, 6 Oct 2023 16:29:43 -0700 Subject: [PATCH 1/5] chore: upgraded versions.tf to include minor bumps from tpg v5 --- modules/key-distributor/versions.tf | 2 +- versions.tf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/key-distributor/versions.tf b/modules/key-distributor/versions.tf index 01e24c7..bcf147b 100644 --- a/modules/key-distributor/versions.tf +++ b/modules/key-distributor/versions.tf @@ -20,7 +20,7 @@ terraform { google = { source = "hashicorp/google" - version = ">= 3.53, < 5.0" + version = ">= 3.53, < 6" } archive = { source = "hashicorp/archive" diff --git a/versions.tf b/versions.tf index fa07d00..a133626 100644 --- a/versions.tf +++ b/versions.tf @@ -20,7 +20,7 @@ terraform { google = { source = "hashicorp/google" - version = ">= 3.53, < 5.0" + version = ">= 3.53, < 6" } } From d7767c863c44b7ed57f045712c3f805f8ecb0573 Mon Sep 17 00:00:00 2001 From: Andrew Peabody Date: Fri, 20 Oct 2023 10:01:21 -0700 Subject: [PATCH 2/5] Delete examples/key_distributor/versions.tf --- examples/key_distributor/versions.tf | 25 ------------------------- 1 file changed, 25 deletions(-) delete mode 100644 examples/key_distributor/versions.tf diff --git a/examples/key_distributor/versions.tf b/examples/key_distributor/versions.tf deleted file mode 100644 index 4389ca9..0000000 --- a/examples/key_distributor/versions.tf +++ /dev/null @@ -1,25 +0,0 @@ -/** - * Copyright 2019 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.13" - required_providers { - google = { - source = "hashicorp/google" - version = "~> 4.0" - } - } -} From dd81e1faba1c49b0f3ad61e6afaf1f6ce42aa676 Mon Sep 17 00:00:00 2001 From: Andrew Peabody Date: Fri, 20 Oct 2023 10:01:28 -0700 Subject: [PATCH 3/5] Delete examples/multiple_service_accounts/versions.tf --- .../multiple_service_accounts/versions.tf | 25 ------------------- 1 file changed, 25 deletions(-) delete mode 100644 examples/multiple_service_accounts/versions.tf diff --git a/examples/multiple_service_accounts/versions.tf b/examples/multiple_service_accounts/versions.tf deleted file mode 100644 index 4389ca9..0000000 --- a/examples/multiple_service_accounts/versions.tf +++ /dev/null @@ -1,25 +0,0 @@ -/** - * Copyright 2019 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.13" - required_providers { - google = { - source = "hashicorp/google" - version = "~> 4.0" - } - } -} From 3725f3bc475b80b3360a23abd61eac135caa757e Mon Sep 17 00:00:00 2001 From: Andrew Peabody Date: Fri, 20 Oct 2023 10:01:36 -0700 Subject: [PATCH 4/5] Delete examples/single_service_account/versions.tf --- examples/single_service_account/versions.tf | 25 --------------------- 1 file changed, 25 deletions(-) delete mode 100644 examples/single_service_account/versions.tf diff --git a/examples/single_service_account/versions.tf b/examples/single_service_account/versions.tf deleted file mode 100644 index 4389ca9..0000000 --- a/examples/single_service_account/versions.tf +++ /dev/null @@ -1,25 +0,0 @@ -/** - * Copyright 2019 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.13" - required_providers { - google = { - source = "hashicorp/google" - version = "~> 4.0" - } - } -} From 2a40d86c846cbead9970a26ad8bfd05c81ad6f63 Mon Sep 17 00:00:00 2001 From: Andrew Peabody Date: Fri, 20 Oct 2023 10:01:59 -0700 Subject: [PATCH 5/5] Update versions.tf --- modules/key-distributor/versions.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/key-distributor/versions.tf b/modules/key-distributor/versions.tf index bcf147b..d8ed258 100644 --- a/modules/key-distributor/versions.tf +++ b/modules/key-distributor/versions.tf @@ -24,11 +24,11 @@ terraform { } archive = { source = "hashicorp/archive" - version = "~> 2.2" + version = ">= 2.2" } local = { source = "hashicorp/local" - version = "~> 2.2" + version = ">= 2.2" } }