From 52f140a9681d9305dec0bd2b22ec86443501e2cf Mon Sep 17 00:00:00 2001 From: Malte Poll Date: Tue, 25 Oct 2022 10:10:46 +0200 Subject: [PATCH] Pin terraform provider hashes (#361) --- .gitignore | 1 - cli/internal/terraform/loader.go | 1 + .../terraform/aws/.terraform.lock.hcl | 50 +++++++++++++++++ cli/internal/terraform/terraform/aws/main.tf | 2 +- .../aws/modules/instance_group/main.tf | 2 +- .../aws/modules/load_balancer_target/main.tf | 2 +- .../aws/modules/public_private_subnet/main.tf | 2 +- .../terraform/azure/.terraform.lock.hcl | 50 +++++++++++++++++ .../terraform/gcp/.terraform.lock.hcl | 50 +++++++++++++++++ .../terraform/qemu/.terraform.lock.hcl | 54 +++++++++++++++++++ hack/terraform/aws/iam/main.tf | 6 +-- 11 files changed, 212 insertions(+), 8 deletions(-) create mode 100644 cli/internal/terraform/terraform/aws/.terraform.lock.hcl create mode 100644 cli/internal/terraform/terraform/azure/.terraform.lock.hcl create mode 100644 cli/internal/terraform/terraform/gcp/.terraform.lock.hcl create mode 100644 cli/internal/terraform/terraform/qemu/.terraform.lock.hcl diff --git a/.gitignore b/.gitignore index 8c3a495ad..415c9173a 100644 --- a/.gitignore +++ b/.gitignore @@ -40,7 +40,6 @@ image/config.mk *.tfstate *.tfstate.backup .terraform -.terraform.lock.hcl .terraform.tfstate.lock.info *.tfvars diff --git a/cli/internal/terraform/loader.go b/cli/internal/terraform/loader.go index eb56f38f3..e662bbbfb 100644 --- a/cli/internal/terraform/loader.go +++ b/cli/internal/terraform/loader.go @@ -19,6 +19,7 @@ import ( ) //go:embed terraform/* +//go:embed terraform/*/.terraform.lock.hcl var terraformFS embed.FS // prepareWorkspace loads the embedded Terraform files, diff --git a/cli/internal/terraform/terraform/aws/.terraform.lock.hcl b/cli/internal/terraform/terraform/aws/.terraform.lock.hcl new file mode 100644 index 000000000..e4dde9289 --- /dev/null +++ b/cli/internal/terraform/terraform/aws/.terraform.lock.hcl @@ -0,0 +1,50 @@ +# This file is maintained automatically by "terraform init". +# Manual edits may be lost in future updates. + +provider "registry.terraform.io/hashicorp/aws" { + version = "4.36.1" + constraints = "4.36.1" + hashes = [ + "h1:04NI9x34nwhgghwevSGdsjssqy5zzvMsQg2Qjpmx/n0=", + "h1:3kC2d7G2MR6Jbbrv8v8L7TWyh1kWLLEwYzjrzxuUSio=", + "h1:bVdhic55ukDoSukFwOOqX2q/gZ5efe4aBTMGivEuY4o=", + "h1:joU7IYfdBSy43Ln1pDjpDJcDZPcHriVS6MG/OFtR+I4=", + "h1:sN3HFvBwuCn+ipD9Ti5OnBJ+V9CzUXviJ2py6tiCK6Q=", + "zh:19b16047b4f15e9b8538a2b925f1e860463984eed7d9bd78e870f3e884e827a7", + "zh:3c0db06a9a14b05a77f3fe1fc029a5fb153f4966964790ca8e71ecc3427d83f5", + "zh:3c7407a8229005e07bc274cbae6e3a464c441a88810bfc6eceb2414678fd08ae", + "zh:3d96fa82c037fafbd3e7f4edc1de32afb029416650f6e392c39182fc74a9e03a", + "zh:8f4f540c5f63d847c4b802ca84d148bb6275a3b0723deb09bf933a4800bc7209", + "zh:9802cb77472d6bcf24c196ce2ca6d02fac9db91558536325fec85f955b71a8a4", + "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", + "zh:a263352433878c89832c2e38f4fd56cf96ae9969c13b5c710d5ba043cbd95743", + "zh:aca7954a5f458ceb14bf0c04c961c4e1e9706bf3b854a1e90a97d0b20f0fe6d3", + "zh:d78f400332e87a97cce2e080db9d01beb01f38f5402514a6705d6b8167e7730d", + "zh:e14bdc49be1d8b7d2543d5c58078c84b76051085e8e6715a895dcfe6034b6098", + "zh:f2e400b88c8de170bb5027922226da1e9a6614c03f2a6756c15c3b930c2f460c", + ] +} + +provider "registry.terraform.io/hashicorp/random" { + version = "3.4.3" + constraints = "3.4.3" + hashes = [ + "h1:hV66lcagXXRwwCW3Y542bI1JgPo8z/taYKT7K+a2Z5U=", + "h1:hXUPrH8igYBhatzatkp80RCeeUJGu9lQFDyKemOlsTo=", + "h1:saZR+mhthL0OZl4SyHXZraxyaBNVMxiZzks78nWcZ2o=", + "h1:tL3katm68lX+4lAncjQA9AXL4GR/VM+RPwqYf4D2X8Q=", + "h1:xZGZf18JjMS06pFa4NErzANI98qi59SEcBsOcS2P2yQ=", + "zh:41c53ba47085d8261590990f8633c8906696fa0a3c4b384ff6a7ecbf84339752", + "zh:59d98081c4475f2ad77d881c4412c5129c56214892f490adf11c7e7a5a47de9b", + "zh:686ad1ee40b812b9e016317e7f34c0d63ef837e084dea4a1f578f64a6314ad53", + "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", + "zh:84103eae7251384c0d995f5a257c72b0096605048f757b749b7b62107a5dccb3", + "zh:8ee974b110adb78c7cd18aae82b2729e5124d8f115d484215fd5199451053de5", + "zh:9dd4561e3c847e45de603f17fa0c01ae14cae8c4b7b4e6423c9ef3904b308dda", + "zh:bb07bb3c2c0296beba0beec629ebc6474c70732387477a65966483b5efabdbc6", + "zh:e891339e96c9e5a888727b45b2e1bb3fcbdfe0fd7c5b4396e4695459b38c8cb1", + "zh:ea4739860c24dfeaac6c100b2a2e357106a89d18751f7693f3c31ecf6a996f8d", + "zh:f0c76ac303fd0ab59146c39bc121c5d7d86f878e9a69294e29444d4c653786f8", + "zh:f143a9a5af42b38fed328a161279906759ff39ac428ebcfe55606e05e1518b93", + ] +} diff --git a/cli/internal/terraform/terraform/aws/main.tf b/cli/internal/terraform/terraform/aws/main.tf index ec127f241..51cf3c3f0 100644 --- a/cli/internal/terraform/terraform/aws/main.tf +++ b/cli/internal/terraform/terraform/aws/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 4.0" + version = "4.36.1" } random = { source = "hashicorp/random" diff --git a/cli/internal/terraform/terraform/aws/modules/instance_group/main.tf b/cli/internal/terraform/terraform/aws/modules/instance_group/main.tf index 52078349c..521fa8af5 100644 --- a/cli/internal/terraform/terraform/aws/modules/instance_group/main.tf +++ b/cli/internal/terraform/terraform/aws/modules/instance_group/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 4.0" + version = "4.36.1" } } } diff --git a/cli/internal/terraform/terraform/aws/modules/load_balancer_target/main.tf b/cli/internal/terraform/terraform/aws/modules/load_balancer_target/main.tf index 8c3339883..4ca55acc7 100644 --- a/cli/internal/terraform/terraform/aws/modules/load_balancer_target/main.tf +++ b/cli/internal/terraform/terraform/aws/modules/load_balancer_target/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 4.0" + version = "4.36.1" } } } diff --git a/cli/internal/terraform/terraform/aws/modules/public_private_subnet/main.tf b/cli/internal/terraform/terraform/aws/modules/public_private_subnet/main.tf index 2acc76960..24a38061c 100644 --- a/cli/internal/terraform/terraform/aws/modules/public_private_subnet/main.tf +++ b/cli/internal/terraform/terraform/aws/modules/public_private_subnet/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 4.0" + version = "4.36.1" } } } diff --git a/cli/internal/terraform/terraform/azure/.terraform.lock.hcl b/cli/internal/terraform/terraform/azure/.terraform.lock.hcl new file mode 100644 index 000000000..56546967e --- /dev/null +++ b/cli/internal/terraform/terraform/azure/.terraform.lock.hcl @@ -0,0 +1,50 @@ +# This file is maintained automatically by "terraform init". +# Manual edits may be lost in future updates. + +provider "registry.terraform.io/hashicorp/azurerm" { + version = "3.28.0" + constraints = "3.28.0" + hashes = [ + "h1:4tvv5ZbzO72buPGQ1087T+Z/+LGvUfDWAgVeUgHMFPY=", + "h1:TnQAM2SUV3bttqp3OvWGdFi0Qd3NWD5C4aSR+Z/x58g=", + "h1:eQRgBnX2TQ6H4q3sg4WUV1OhN21UdhQYrcyAnyu3U/U=", + "h1:jnr5G4X8apGMF63WeMQn6gMGEoM87mI2lwTIj8D36Vg=", + "h1:o/m0W585KwCcRw83rBHTcDoiHyb8qVaBGAJGDpYaP+o=", + "zh:1c01bc8cba03c642d108df034744253ac7e625d7528d77ae57b65809cd08e519", + "zh:52e8a26edde4e9254063b0961079497defc4d3255c2adcc00caca8b960347571", + "zh:694e4f0e6c79265ebfe62656dfd7b30e245e3adba513f70711a050f46819f1a5", + "zh:6ff9fddb694afa04851dcd38e1865bf7afe02690a33b717137a27dc48c049dd1", + "zh:77152823230857b1b0f3b66ff0e38ccc1cca245d531813e8ad4ec0e7dee64b6e", + "zh:7fb273228e63de7846ae64539cf0836eac652a045b915e9cc470c63131cbf88f", + "zh:8f3c784f3b953a6de44c23828a8a47a77bfdb63b09af7cca9ae3175b2870151e", + "zh:92f5feaf7a109dd30d6982af5c68d914c62b294c872f84fa0e1ab24ffea55d1c", + "zh:b74a67fc97966184e7d111fd66316313dfa0ff592ebd9fc1ae4672df317cf3bf", + "zh:f15e22acf5a9186d8647e1539bb904c5605606094b7ebec7d8eb479735573b37", + "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + "zh:f91ddbf9310b0f815477a88bdf9969b06a50752c330250b9a6626d89e620ee23", + ] +} + +provider "registry.terraform.io/hashicorp/random" { + version = "3.4.3" + constraints = "3.4.3" + hashes = [ + "h1:hV66lcagXXRwwCW3Y542bI1JgPo8z/taYKT7K+a2Z5U=", + "h1:hXUPrH8igYBhatzatkp80RCeeUJGu9lQFDyKemOlsTo=", + "h1:saZR+mhthL0OZl4SyHXZraxyaBNVMxiZzks78nWcZ2o=", + "h1:tL3katm68lX+4lAncjQA9AXL4GR/VM+RPwqYf4D2X8Q=", + "h1:xZGZf18JjMS06pFa4NErzANI98qi59SEcBsOcS2P2yQ=", + "zh:41c53ba47085d8261590990f8633c8906696fa0a3c4b384ff6a7ecbf84339752", + "zh:59d98081c4475f2ad77d881c4412c5129c56214892f490adf11c7e7a5a47de9b", + "zh:686ad1ee40b812b9e016317e7f34c0d63ef837e084dea4a1f578f64a6314ad53", + "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", + "zh:84103eae7251384c0d995f5a257c72b0096605048f757b749b7b62107a5dccb3", + "zh:8ee974b110adb78c7cd18aae82b2729e5124d8f115d484215fd5199451053de5", + "zh:9dd4561e3c847e45de603f17fa0c01ae14cae8c4b7b4e6423c9ef3904b308dda", + "zh:bb07bb3c2c0296beba0beec629ebc6474c70732387477a65966483b5efabdbc6", + "zh:e891339e96c9e5a888727b45b2e1bb3fcbdfe0fd7c5b4396e4695459b38c8cb1", + "zh:ea4739860c24dfeaac6c100b2a2e357106a89d18751f7693f3c31ecf6a996f8d", + "zh:f0c76ac303fd0ab59146c39bc121c5d7d86f878e9a69294e29444d4c653786f8", + "zh:f143a9a5af42b38fed328a161279906759ff39ac428ebcfe55606e05e1518b93", + ] +} diff --git a/cli/internal/terraform/terraform/gcp/.terraform.lock.hcl b/cli/internal/terraform/terraform/gcp/.terraform.lock.hcl new file mode 100644 index 000000000..3f0b52cf4 --- /dev/null +++ b/cli/internal/terraform/terraform/gcp/.terraform.lock.hcl @@ -0,0 +1,50 @@ +# This file is maintained automatically by "terraform init". +# Manual edits may be lost in future updates. + +provider "registry.terraform.io/hashicorp/google" { + version = "4.41.0" + constraints = "4.41.0" + hashes = [ + "h1:2Bl3jLwdZpzp70yuCIxfn7gL/858f0I/Cv7yuzRySM0=", + "h1:QKDvTl9jstVCRcJ2ZjWOgSaeoadNVxYDBqoqUIZlBps=", + "h1:oDdRec2G1qEVElLh416/lwnanGJZZNsSRfTXuJMCkTI=", + "h1:pEu2st2CcWDinLQN8EGgab3ZG2Yr3w0DcoGF+SEOAKY=", + "h1:y93m+LUJaInSsUB1gN/BKrUL97rizTh//5oFUdA7pFM=", + "zh:0c31cae2ec737150987554993f0e332b022bf8e369217967f10029259441db0a", + "zh:4d477e5412575353267cde02d028d8b53b4f9b472548d4079a0512c3ba11751f", + "zh:52a14d7cd851f050a5bf2ba6789200b40bccb0e6240865bcc94f496ae0f77bc0", + "zh:55e18f98ef6f310d93ac84ec0233e0bcd4668f87df7cfe8f81c1fe3a082255a4", + "zh:6017ed02e028ebab6fb4029475f9af6569ee9d69f3c103e7b17d11f2674b2110", + "zh:73e601e534379471fe737136d850ee6f7d3e28efc5befcc7c5a6c6926e3f9dc7", + "zh:886de755287c5a95b53827d3ff77326a9974e17dc27b7a30b05450c1e197622e", + "zh:a80507fb2a92bf698e4c68597d3a36949065a27bc570a19fcaf07552e2b7a5d2", + "zh:ba1b274c95d98da8baadbb2a1dfc4d822b9c1c2cabffc22614423fb9ba48881e", + "zh:bd87817c8e1af629951985d45896627d0e0c16d8c8f23ec479e2f25e04149729", + "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + "zh:fa451d8caec68902496ec2446ac0074bb51e43f749b76b7d077b81eb3948d0d8", + ] +} + +provider "registry.terraform.io/hashicorp/random" { + version = "3.4.3" + constraints = "3.4.3" + hashes = [ + "h1:hV66lcagXXRwwCW3Y542bI1JgPo8z/taYKT7K+a2Z5U=", + "h1:hXUPrH8igYBhatzatkp80RCeeUJGu9lQFDyKemOlsTo=", + "h1:saZR+mhthL0OZl4SyHXZraxyaBNVMxiZzks78nWcZ2o=", + "h1:tL3katm68lX+4lAncjQA9AXL4GR/VM+RPwqYf4D2X8Q=", + "h1:xZGZf18JjMS06pFa4NErzANI98qi59SEcBsOcS2P2yQ=", + "zh:41c53ba47085d8261590990f8633c8906696fa0a3c4b384ff6a7ecbf84339752", + "zh:59d98081c4475f2ad77d881c4412c5129c56214892f490adf11c7e7a5a47de9b", + "zh:686ad1ee40b812b9e016317e7f34c0d63ef837e084dea4a1f578f64a6314ad53", + "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", + "zh:84103eae7251384c0d995f5a257c72b0096605048f757b749b7b62107a5dccb3", + "zh:8ee974b110adb78c7cd18aae82b2729e5124d8f115d484215fd5199451053de5", + "zh:9dd4561e3c847e45de603f17fa0c01ae14cae8c4b7b4e6423c9ef3904b308dda", + "zh:bb07bb3c2c0296beba0beec629ebc6474c70732387477a65966483b5efabdbc6", + "zh:e891339e96c9e5a888727b45b2e1bb3fcbdfe0fd7c5b4396e4695459b38c8cb1", + "zh:ea4739860c24dfeaac6c100b2a2e357106a89d18751f7693f3c31ecf6a996f8d", + "zh:f0c76ac303fd0ab59146c39bc121c5d7d86f878e9a69294e29444d4c653786f8", + "zh:f143a9a5af42b38fed328a161279906759ff39ac428ebcfe55606e05e1518b93", + ] +} diff --git a/cli/internal/terraform/terraform/qemu/.terraform.lock.hcl b/cli/internal/terraform/terraform/qemu/.terraform.lock.hcl new file mode 100644 index 000000000..b9a3bd69f --- /dev/null +++ b/cli/internal/terraform/terraform/qemu/.terraform.lock.hcl @@ -0,0 +1,54 @@ +# This file is maintained automatically by "terraform init". +# Manual edits may be lost in future updates. + +provider "registry.terraform.io/dmacvicar/libvirt" { + version = "0.7.0" + constraints = "0.7.0" + hashes = [ + "h1:1RiomFBEdgi6GvqaAf16mW6bRqrxAV0P47HKKwETH3E=", + "h1:Bb59i2q8hL9FWh4bbWbBRGj69jzqJT1dxBLr0ntVwRc=", + "h1:dGNuFh+qQP6+/I+WlJUVFWyvbmYu+bbESfDuc2u643U=", + "h1:qlFJg+eUoh6PPdKrbUgdFPp0x+GdThHp8Z3UhVCHuy0=", + "h1:zJ7j+DIfjPqoNA7rXnOu/ZstXos2YBhGZs/7ruAIthg=", + "zh:1161bfcac075d5790c9b36145811d95241622636b859222f995888471ba04efa", + "zh:317bca5edd36e2497e0ac2ed07dd5e7f09cfd5561a96607cb53fe1af6b0632c0", + "zh:4fa67e3baf6845148f2b4e617fb01c47f0971ce2d945efa805ac5c3820bb0ca6", + "zh:6e17f5f24373e21c0ff463d36d9caa4f08528e13764c5d1d7eceb719dcef6a14", + "zh:84622e2aca8bc91d71d3596fcd1b298c5dfe572c8722ab98084495d26b5c5e7d", + "zh:8ce125d872b26ce9b71a729437eb8ab36944a86da3784edaab7368af43ca3858", + "zh:8fc7eee76776d515c023d013c018a7b9816f0e840578af01bfaf58e49f020c03", + "zh:a4d6fccc0188746be35488396c431e4b313cd1221df408871c710d3a7382b02e", + "zh:b575bb2d2f8987043aecbb22ac3bbf1e9c8b9da49b201b6b225baf2b4595dae4", + "zh:b65b1733c29a09491912a98a829b19c9842af5971fbb358bc0e979b95bf33248", + "zh:b8266ed7b4bce4791fee5433d102d89187974a273574d69f637cfdeb913462c2", + "zh:bd0b842d6f694c6d558d3329a2c157dd9d84074d618d5ced891ef36798b1c97b", + "zh:dacf0299c2c11d84bdaa2f614ca14aeac36ffba0f20dff5a63437a81a61f6867", + "zh:e8c92794a06df42c15ff071859e99c6e95e93dcb40797c4128d31d3a47a27923", + ] +} + +provider "registry.terraform.io/kreuzwerker/docker" { + version = "2.22.0" + constraints = "2.22.0" + hashes = [ + "h1:BvF0ViuZe/FnMd5oZY5KdKeLhAw622v+aHTT4qM1fnU=", + "h1:S0mNuiPM/XhAn6LbbFttnokBVV6quUhg1lyAlfYH/js=", + "h1:Yxf1BmXYIWGLVcPkopA5YEWuZ9QJ2rq93/Ny/CzNA3U=", + "h1:Zlzwv3FB1nyeIwSH9XvEWRDSHhU96UtD3wTX/Qdg6N0=", + "h1:u8JIt5znX2gjtGEtdJbJ7enOB9P7GlOj7q5cWjPmzYI=", + "zh:22b8dbc38e8b39027ae4ac3b49353a5ae15234d6cb20d090b9c6bbdc5e3a03a9", + "zh:37fe359bac07024c7e52293fc2f11266dd8f6831dbc3b80c1328f7c909caad81", + "zh:59995947ed9108ec11136c10b2a0fee516953cf9d094fcb953a07e9d01eb6916", + "zh:84a81fdea21d92568ad7758fcb3396df0d39098d199dc9db54b2e64c079e443b", + "zh:86e54a5c321d56882bd0dc14eb7cfc7344b1b58c480177546fe9e22986cd520d", + "zh:8d1d8df69b54a7688164eaf4f8c2d967e81bf80ff8060bac3141a408344bc37e", + "zh:970c2e2cef9a3ae4afca2468decf72515b111a55d9c79c2a274c6bda1c21cab3", + "zh:984fa6ec2d63150e262115ba374d54079d23eb400392a985c2f72e44d9374cbc", + "zh:b48c22a046cb9529bad845f81af7b5598aaed030353b5fb863f091cd985b1bbf", + "zh:ba5bd719d375610e71ce5a35ce3286463c9223f6f12a4def62b9f32d9afc2848", + "zh:c653ee034f26e9e3d62a6fca010eff0c206182df21cc5c255a2a54dc091b56bd", + "zh:cefc62326d0a4c7cd484ce293d0b1446bdec2c08d275e79eced36d04e619812c", + "zh:e99d9cb163557647f6160fa37218cb887e7b6f3e58d56d471f118dc6405487cc", + "zh:eed72d000a046ef079a90adba9f8df1f60d7ff512955df3949fd0aaab0976180", + ] +} diff --git a/hack/terraform/aws/iam/main.tf b/hack/terraform/aws/iam/main.tf index f43b4ec92..fbd215681 100644 --- a/hack/terraform/aws/iam/main.tf +++ b/hack/terraform/aws/iam/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 4.0" + version = "4.36.1" } } } @@ -39,7 +39,7 @@ resource "aws_iam_role" "control_plane_role" { } ] } -EOF +EOF } resource "aws_iam_policy" "control_plane_policy" { @@ -144,7 +144,7 @@ resource "aws_iam_role" "worker_node_role" { } ] } -EOF +EOF } resource "aws_iam_policy" "worker_node_policy" {