diff --git a/.gitignore b/.gitignore index cdc5bb8..902b3b0 100644 --- a/.gitignore +++ b/.gitignore @@ -24,6 +24,9 @@ Session.vim # Local .terraform directories **/.terraform/* +# tf lock file +.terraform.lock.hcl + # .tfstate files *.tfstate *.tfstate.* diff --git a/examples/advance/.terraform.lock.hcl b/examples/advance/.terraform.lock.hcl deleted file mode 100644 index 99c6392..0000000 --- a/examples/advance/.terraform.lock.hcl +++ /dev/null @@ -1,84 +0,0 @@ -# This file is maintained automatically by "terraform init". -# Manual edits may be lost in future updates. - -provider "registry.terraform.io/hashicorp/google" { - version = "3.90.1" - constraints = ">= 2.12.0, ~> 3.45, ~> 3.53, < 4.0.0" - hashes = [ - "h1:91QFfSGwMX4wKH5u+/FEMf2W3mToJxHtw/Ty0nvrDEU=", - "zh:07aabc8e46a5a2b29932e10677b23d4ce9d9a25f22ab61d3307a6b0e7998c84e", - "zh:0b63cd9534a98ed0fee794da495833046ad5319bd2da3102e21a941b7e2b857e", - "zh:17f815d57e1426edf8818323ab8e1022c8ec60dce0ced89a3b8e5dde5a95b3cc", - "zh:37855eae3542f2ebc6416984b124533d00299e0e01dcd7d2bc2205469cb9eceb", - "zh:579aa32a8e3fa317ddbd28c99a6449ae8864a5b7d10247bca6496f399cb36701", - "zh:703f71e0231cfe7a025c61db361d928189adba1d4fad2fe77f783dc73c8afe30", - "zh:afcd80c31cb1ed75ce6813269618e01ab29af68dae7aae1c51521c13acdaa678", - "zh:b21302f65a0d37045216912695d1ef718a1fe1732c30dc5654891fe2519b8e4e", - "zh:b69d0c8a74c2cd6233681db37e01aaaf1a6fb6bb24c83f7715bd2b456083e29d", - "zh:d4fb305816b143cb26c1827c79e56651347fd41809a57184e4807fb3f804f510", - "zh:fa24173ef9524bdfa1c5cada5188489554b08374f9519fe545f3fc1d3a9d9d4f", - ] -} - -provider "registry.terraform.io/hashicorp/google-beta" { - version = "3.90.1" - constraints = "~> 3.45" - hashes = [ - "h1:1nsVeFXCTeXKo0CDQ/M7z5TnUYI0Uo13smNII4jrjgo=", - "zh:2d647e42313f4e3f36480d2508a5056373099843a16558c21d5c798899a1e2d7", - "zh:51a637b35d8c923cb02eb9a13c72526a72364f0a99100470cb253c5116446475", - "zh:52940431348d23998fdd9216b7fa666e3bcfd6c3ad9751f8f076fbd5529006de", - "zh:53d36e0ada5a5b95d0b66a8cdfa65adf25d5a49a826f7f4a6f891955c0d19600", - "zh:6564b0c6692c8ef571254e3279b5803893b50825abb4e4b175b8eff19af4e447", - "zh:747757f0582561e18d930295ea14dfde4ca485be87b2bb7097e410f40076707b", - "zh:a828fb94d2a2d99c435215a780ce1fcd2cbf8bd2dfce86d9989a9a978c100eec", - "zh:b81949694ec1bf59cd0a838149b33792e3ceed35b18333dbfbcd28052bc94f23", - "zh:db255de73e0c5c030c6d54fc9217b20169e2c19fd7dde8e0415c495dd48907f0", - "zh:e5966c5ac5887b02cef0b3aa703c986d5a74e95279be4ec1db93843e9c92e64a", - "zh:eb172abc91f80b9f13c942cf6b1081095b6d9796f024a301f218eaf7f5241121", - ] -} - -provider "registry.terraform.io/hashicorp/local" { - version = "2.2.3" - hashes = [ - "h1:aWp5iSUxBGgPv1UnV5yag9Pb0N+U1I0sZb38AXBFO8A=", - "zh:04f0978bb3e052707b8e82e46780c371ac1c66b689b4a23bbc2f58865ab7d5c0", - "zh:6484f1b3e9e3771eb7cc8e8bab8b35f939a55d550b3f4fb2ab141a24269ee6aa", - "zh:78a56d59a013cb0f7eb1c92815d6eb5cf07f8b5f0ae20b96d049e73db915b238", - "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:8aa9950f4c4db37239bcb62e19910c49e47043f6c8587e5b0396619923657797", - "zh:996beea85f9084a725ff0e6473a4594deb5266727c5f56e9c1c7c62ded6addbb", - "zh:9a7ef7a21f48fabfd145b2e2a4240ca57517ad155017e86a30860d7c0c109de3", - "zh:a63e70ac052aa25120113bcddd50c1f3cfe61f681a93a50cea5595a4b2cc3e1c", - "zh:a6e8d46f94108e049ad85dbed60354236dc0b9b5ec8eabe01c4580280a43d3b8", - "zh:bb112ce7efbfcfa0e65ed97fa245ef348e0fd5bfa5a7e4ab2091a9bd469f0a9e", - "zh:d7bec0da5c094c6955efed100f3fe22fca8866859f87c025be1760feb174d6d9", - "zh:fb9f271b72094d07cef8154cd3d50e9aa818a0ea39130bc193132ad7b23076fd", - ] -} - -provider "registry.terraform.io/hashicorp/null" { - version = "3.2.1" - constraints = ">= 2.0.0" - hashes = [ - "h1:FbGfc+muBsC17Ohy5g806iuI1hQc4SIexpYCrQHQd8w=", - ] -} - -provider "registry.terraform.io/hashicorp/template" { - version = "2.2.0" - hashes = [ - "h1:94qn780bi1qjrbC3uQtjJh3Wkfwd5+tTtJHOb7KTg9w=", - "zh:01702196f0a0492ec07917db7aaa595843d8f171dc195f4c988d2ffca2a06386", - "zh:09aae3da826ba3d7df69efeb25d146a1de0d03e951d35019a0f80e4f58c89b53", - "zh:09ba83c0625b6fe0a954da6fbd0c355ac0b7f07f86c91a2a97849140fea49603", - "zh:0e3a6c8e16f17f19010accd0844187d524580d9fdb0731f675ffcf4afba03d16", - "zh:45f2c594b6f2f34ea663704cc72048b212fe7d16fb4cfd959365fa997228a776", - "zh:77ea3e5a0446784d77114b5e851c970a3dde1e08fa6de38210b8385d7605d451", - "zh:8a154388f3708e3df5a69122a23bdfaf760a523788a5081976b3d5616f7d30ae", - "zh:992843002f2db5a11e626b3fc23dc0c87ad3729b3b3cff08e32ffb3df97edbde", - "zh:ad906f4cebd3ec5e43d5cd6dc8f4c5c9cc3b33d2243c89c5fc18f97f7277b51d", - "zh:c979425ddb256511137ecd093e23283234da0154b7fa8b21c2687182d9aea8b2", - ] -} diff --git a/examples/advance/main.tf b/examples/advance/main.tf index 0afcc09..d2d34be 100644 --- a/examples/advance/main.tf +++ b/examples/advance/main.tf @@ -25,7 +25,7 @@ locals { *****************************************/ module "vpc" { source = "terraform-google-modules/network/google" - version = "~> 6.0" + version = "~> 7.5" project_id = var.project_id network_name = local.network_name diff --git a/examples/advance/versions.tf b/examples/advance/versions.tf deleted file mode 100644 index 069a51e..0000000 --- a/examples/advance/versions.tf +++ /dev/null @@ -1,26 +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 = ">= 3.53, < 5.0" - } - } -} diff --git a/examples/basic/.terraform.lock.hcl b/examples/basic/.terraform.lock.hcl deleted file mode 100644 index e8d06a6..0000000 --- a/examples/basic/.terraform.lock.hcl +++ /dev/null @@ -1,40 +0,0 @@ -# This file is maintained automatically by "terraform init". -# Manual edits may be lost in future updates. - -provider "registry.terraform.io/hashicorp/google" { - version = "3.90.1" - constraints = ">= 2.12.0, ~> 3.45, ~> 3.53, < 4.0.0" - hashes = [ - "h1:91QFfSGwMX4wKH5u+/FEMf2W3mToJxHtw/Ty0nvrDEU=", - ] -} - -provider "registry.terraform.io/hashicorp/google-beta" { - version = "3.90.1" - constraints = "~> 3.45" - hashes = [ - "h1:1nsVeFXCTeXKo0CDQ/M7z5TnUYI0Uo13smNII4jrjgo=", - ] -} - -provider "registry.terraform.io/hashicorp/local" { - version = "2.2.3" - hashes = [ - "h1:aWp5iSUxBGgPv1UnV5yag9Pb0N+U1I0sZb38AXBFO8A=", - ] -} - -provider "registry.terraform.io/hashicorp/null" { - version = "3.2.1" - constraints = ">= 2.0.0" - hashes = [ - "h1:FbGfc+muBsC17Ohy5g806iuI1hQc4SIexpYCrQHQd8w=", - ] -} - -provider "registry.terraform.io/hashicorp/template" { - version = "2.2.0" - hashes = [ - "h1:94qn780bi1qjrbC3uQtjJh3Wkfwd5+tTtJHOb7KTg9w=", - ] -} diff --git a/examples/basic/versions.tf b/examples/basic/versions.tf deleted file mode 100644 index 069a51e..0000000 --- a/examples/basic/versions.tf +++ /dev/null @@ -1,26 +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 = ">= 3.53, < 5.0" - } - } -} diff --git a/modules/iap_firewall/.terraform.lock.hcl b/modules/iap_firewall/.terraform.lock.hcl deleted file mode 100644 index d85aea0..0000000 --- a/modules/iap_firewall/.terraform.lock.hcl +++ /dev/null @@ -1,21 +0,0 @@ -# This file is maintained automatically by "terraform init". -# Manual edits may be lost in future updates. - -provider "registry.terraform.io/hashicorp/google-beta" { - version = "4.47.0" - hashes = [ - "h1:NYfsaCxorPlsWbxSVmG5pYWNoNXYiwPtEjDlnVPqiEE=", - "zh:16bfb45fa9dcbb22a2f698978c579289ec7caaac1d7fe77f3f8f7e7cbb113a86", - "zh:22865f5897e6c8dea19e24833cac134dd628724f086185d0e61188e69f073593", - "zh:287d64c3e1b62e66e31851b381328315c685ce9469a727b6684f2efd53442ce1", - "zh:437acf027068201f0a06dfef6948dd16964374717c74570cc87bb9e539019cb3", - "zh:46fc5035735b3ab7e395fa7b6e97be117912c547823fa0777865c2655ece6b07", - "zh:5c9155e6d52c309bbd8ab6cb033e73c16492f727d16aeb8eb2cadff0bf1a77a0", - "zh:86d96297013905e2d5b42263461002574ee342962ef580557aafdc72fa88f705", - "zh:a832e433563e7749895847fcb2a85a3ee1384b7c8f2eb5ac2bb88a3379a00ae1", - "zh:b72f0b585c561a337751902ae66729129613d95556bc095fc79a20560bf1f285", - "zh:e582c13cc736ad72dee4fe347d6f3071edf5979fcf9c19a9270a191007cebe51", - "zh:f246aa5648a84f30b4128977bb0bc73390b2129c2c72e737e2285e222c5afe0a", - "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", - ] -} diff --git a/modules/iap_firewall/versions.tf b/modules/iap_firewall/versions.tf index 0558e57..8e5f4af 100644 --- a/modules/iap_firewall/versions.tf +++ b/modules/iap_firewall/versions.tf @@ -20,7 +20,7 @@ terraform { google-beta = { source = "hashicorp/google-beta" - version = ">= 3.53, < 5.0" + version = ">= 3.53, < 6" } } } diff --git a/modules/instance/.terraform.lock.hcl b/modules/instance/.terraform.lock.hcl deleted file mode 100644 index 3a279f8..0000000 --- a/modules/instance/.terraform.lock.hcl +++ /dev/null @@ -1,39 +0,0 @@ -# This file is maintained automatically by "terraform init". -# Manual edits may be lost in future updates. - -provider "registry.terraform.io/hashicorp/google" { - version = "3.90.1" - constraints = "~> 3.53" - hashes = [ - "h1:91QFfSGwMX4wKH5u+/FEMf2W3mToJxHtw/Ty0nvrDEU=", - ] -} - -provider "registry.terraform.io/hashicorp/google-beta" { - version = "4.47.0" - hashes = [ - "h1:NYfsaCxorPlsWbxSVmG5pYWNoNXYiwPtEjDlnVPqiEE=", - ] -} - -provider "registry.terraform.io/hashicorp/local" { - version = "2.2.3" - hashes = [ - "h1:aWp5iSUxBGgPv1UnV5yag9Pb0N+U1I0sZb38AXBFO8A=", - ] -} - -provider "registry.terraform.io/hashicorp/null" { - version = "3.2.1" - constraints = ">= 2.0.0" - hashes = [ - "h1:FbGfc+muBsC17Ohy5g806iuI1hQc4SIexpYCrQHQd8w=", - ] -} - -provider "registry.terraform.io/hashicorp/template" { - version = "2.2.0" - hashes = [ - "h1:94qn780bi1qjrbC3uQtjJh3Wkfwd5+tTtJHOb7KTg9w=", - ] -} diff --git a/modules/instance/versions.tf b/modules/instance/versions.tf index 99bcf1c..5c95d29 100644 --- a/modules/instance/versions.tf +++ b/modules/instance/versions.tf @@ -20,15 +20,15 @@ terraform { google = { source = "hashicorp/google" - version = ">= 3.53, < 5.0" + version = ">= 3.53, < 6" } null = { source = "hashicorp/null" version = ">= 2.0" } template = { - source = "hashicorp/template" - version = "~> 2.0" + source = "hashicorp/template" # TODO: this provider is deprecated, replace with terraform 0.13+ templatefile function + version = "2.2.0" } } diff --git a/modules/template_files/.terraform.lock.hcl b/modules/template_files/.terraform.lock.hcl deleted file mode 100644 index ae2a94b..0000000 --- a/modules/template_files/.terraform.lock.hcl +++ /dev/null @@ -1,36 +0,0 @@ -# This file is maintained automatically by "terraform init". -# Manual edits may be lost in future updates. - -provider "registry.terraform.io/hashicorp/google" { - version = "4.47.0" - constraints = ">= 3.53.0, < 5.0.0" - hashes = [ - "h1:JXAoKJbm79Uo19YVObJCJcKPtNYBGVF+tQ91PtVIvt0=", - "zh:030359653ee8e3a7a0ec30f06f7ac0d2bf5cb8bf895d06155646114fa13766e5", - "zh:14b18f549466eb99cac08fd2d89c8df3591cc3688c9e5ed12fb4a957482d0e2d", - "zh:3a9b9d1878f4004a7fee0ab8f8dea600307ad75a872f591590f704bf504b25af", - "zh:412b809bc61a74857912da5c2e9deddf5edf2eb883999ffb29573146ca12097b", - "zh:456372baa4fbb397f2d67fa291a15d216937e24dd1c05a66d6484ca2e24829e8", - "zh:69dc08f0e8eb672a8be11070b4ebb319b4a1725d928498607a0534a65089f3ef", - "zh:bc582257b94b0d2bd225b829016963580c681b09b0545c474420a27909b53fea", - "zh:bf1a8bf7e54f3e709d6323bdd12b5bf5cce3b245414f8aa09cb1860aa98f407d", - "zh:dc322cd105f3d0d0268e75a646f45471158ac668ed665309483f19c16385783b", - "zh:ee3b36c484dd4aea0855300e325fe31eee067eeb759192cee3ccad6fae45f610", - "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", - "zh:f58ac64cc632d80243c2a97a009c44e8b7672adbab11cce488a77a7efeca33f0", - ] -} - -provider "registry.terraform.io/hashicorp/local" { - version = "2.2.3" - hashes = [ - "h1:aWp5iSUxBGgPv1UnV5yag9Pb0N+U1I0sZb38AXBFO8A=", - ] -} - -provider "registry.terraform.io/hashicorp/template" { - version = "2.2.0" - hashes = [ - "h1:94qn780bi1qjrbC3uQtjJh3Wkfwd5+tTtJHOb7KTg9w=", - ] -} diff --git a/modules/template_files/versions.tf b/modules/template_files/versions.tf index 7540745..c697157 100644 --- a/modules/template_files/versions.tf +++ b/modules/template_files/versions.tf @@ -20,15 +20,15 @@ terraform { google = { source = "hashicorp/google" - version = ">= 3.53, < 5.0" + version = ">= 3.53, < 6" } local = { source = "hashicorp/local" version = "~> 2.0" } template = { - source = "hashicorp/template" - version = "~> 2.0" + source = "hashicorp/template" # TODO: this provider is deprecated, replace with terraform 0.13+ templatefile function + version = "2.2.0" } } } diff --git a/test/fixtures/advance/versions.tf b/test/fixtures/advance/versions.tf deleted file mode 100644 index 069a51e..0000000 --- a/test/fixtures/advance/versions.tf +++ /dev/null @@ -1,26 +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 = ">= 3.53, < 5.0" - } - } -} diff --git a/test/fixtures/basic/versions.tf b/test/fixtures/basic/versions.tf deleted file mode 100644 index 069a51e..0000000 --- a/test/fixtures/basic/versions.tf +++ /dev/null @@ -1,26 +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 = ">= 3.53, < 5.0" - } - } -} diff --git a/test/setup/versions.tf b/test/setup/versions.tf index ce08853..7c5e9c3 100644 --- a/test/setup/versions.tf +++ b/test/setup/versions.tf @@ -20,11 +20,11 @@ terraform { google = { source = "hashicorp/google" - version = ">= 3.53, < 5.0" + version = ">= 3.53, < 6" } google-beta = { source = "hashicorp/google-beta" - version = ">= 3.53, < 5.0" + version = ">= 3.53, < 6" } } }