From 5233cfd3472c9a248963bab1b1468ac6352c2727 Mon Sep 17 00:00:00 2001 From: Vojtech Mares Date: Tue, 23 Jan 2024 16:45:49 +0100 Subject: [PATCH 01/10] ci: tfenv autoinstalls terraform when not installed --- .gitlab-ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 161bc83..61fa4ea 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,9 +19,6 @@ variables: init: stage: init - before_script: - - tfenv install - - tfenv use script: - terraform init From c0e550988cc6ea701603885ad474252b88cc5f34 Mon Sep 17 00:00:00 2001 From: Vojtech Mares Date: Tue, 23 Jan 2024 16:46:22 +0100 Subject: [PATCH 02/10] ci: cache /opt/tfenv/versions - terraform installation dir (by tfenv) --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 61fa4ea..5ed880c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ default: key: terraform paths: - .terraform - - /opt/tfenv + - /opt/tfenv/versions stages: - init From f565858272c3d931c8db1db10bd1c5541d5e8bec Mon Sep 17 00:00:00 2001 From: Vojtech Mares Date: Tue, 23 Jan 2024 16:55:03 +0100 Subject: [PATCH 03/10] ci: prefix .terraform for caching with $CI_PROJECT_DIR --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5ed880c..75d3a9c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ default: cache: key: terraform paths: - - .terraform + - $CI_PROJECT_DIR/.terraform - /opt/tfenv/versions stages: From a14714ad1156cc4610f615519bae0ecd3343516f Mon Sep 17 00:00:00 2001 From: Vojtech Mares Date: Tue, 23 Jan 2024 18:41:04 +0100 Subject: [PATCH 04/10] fix: move .terraform.lock.hcl to root dir --- terraform/.terraform.lock.hcl => .terraform.lock.hcl | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename terraform/.terraform.lock.hcl => .terraform.lock.hcl (100%) diff --git a/terraform/.terraform.lock.hcl b/.terraform.lock.hcl similarity index 100% rename from terraform/.terraform.lock.hcl rename to .terraform.lock.hcl From a76701f3f8b4cba202c6aaf717bebc1671db5a61 Mon Sep 17 00:00:00 2001 From: Vojtech Mares Date: Tue, 23 Jan 2024 18:41:34 +0100 Subject: [PATCH 05/10] ci: remove stage format, run format job in validate stage (paralel run) --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 75d3a9c..0fd8014 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,7 +8,6 @@ default: stages: - init - - format - validate - plan - apply @@ -23,7 +22,7 @@ init: - terraform init format: - stage: format + stage: validate script: - terraform fmt -check -recursive -diff From bfbcb44680462918f2fb11d2ffe091a04e93d365 Mon Sep 17 00:00:00 2001 From: Vojtech Mares Date: Tue, 23 Jan 2024 18:44:55 +0100 Subject: [PATCH 06/10] ci: debug valdite job --- .gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0fd8014..f690f8a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,6 +29,9 @@ format: validate: stage: validate script: + - ls -la + - test -d .terraform + - test -d .terraform/providers - terraform validate plan: From ae44aac7e402f41b7f71f2c8df1d9df62d5725df Mon Sep 17 00:00:00 2001 From: Vojtech Mares Date: Tue, 23 Jan 2024 23:43:57 +0100 Subject: [PATCH 07/10] ci: cache key is $CI_COMMIT_BRANCH --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f690f8a..97ffc5c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ default: image: ghcr.io/vojtechmares/container-images/tfenv:sha-32fe5b4f990b687bb05717255bc1c9febd4f282e cache: - key: terraform + key: $CI_COMMIT_BRANCH paths: - $CI_PROJECT_DIR/.terraform - /opt/tfenv/versions From 20c958f33606c91c4b2e38a1d061de774ea4afb7 Mon Sep 17 00:00:00 2001 From: Vojtech Mares Date: Tue, 23 Jan 2024 23:48:24 +0100 Subject: [PATCH 08/10] chore: add checksums for darwin/amd64 and linux/amd64 terraform providers --- .terraform.lock.hcl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.terraform.lock.hcl b/.terraform.lock.hcl index 7915f68..e5301b1 100644 --- a/.terraform.lock.hcl +++ b/.terraform.lock.hcl @@ -6,6 +6,8 @@ provider "registry.terraform.io/cloudflare/cloudflare" { constraints = "4.19.0" hashes = [ "h1:3EZM8zAObdA81PcyXyiic4y2aZsTowYKG29RjZKXbJU=", + "h1:JLYiArMIeU5gf/2jEbyijUBxuR1BeJCZRjUwe2bkr44=", + "h1:tgDfKsBL4SxCgq3sz28oLZ2q+Elzlt1Anpkm7kVC3q8=", "zh:1d5315dcbd8187a3a978dc1fb08e80b6cdd353de10afe531b3d1ecb834d0dbae", "zh:2a6e5b2e5072e442b35ce6142172e15afb835e16799d04a0054a79d3067f7560", "zh:308c5690024a1f6797300018456a1ac781c8699fa4bc4892a8c36eb992604a26", @@ -28,6 +30,8 @@ provider "registry.terraform.io/hashicorp/random" { version = "3.6.0" hashes = [ "h1:I8MBeauYA8J8yheLJ8oSMWqB0kovn16dF/wKZ1QTdkk=", + "h1:R5Ucn26riKIEijcsiOMBR3uOAjuOMfI1x7XvH4P6B1w=", + "h1:p6WG1IPHnqx1fnJVKNjv733FBaArIugqy58HRZnpPCk=", "zh:03360ed3ecd31e8c5dac9c95fe0858be50f3e9a0d0c654b5e504109c2159287d", "zh:1c67ac51254ba2a2bb53a25e8ae7e4d076103483f55f39b426ec55e47d1fe211", "zh:24a17bba7f6d679538ff51b3a2f378cedadede97af8a1db7dad4fd8d6d50f829", @@ -47,6 +51,8 @@ provider "registry.terraform.io/hetznercloud/hcloud" { version = "1.44.1" constraints = "1.44.1" hashes = [ + "h1:Mw1Fn9EHSzK+SzueUUwizpOpiDAm/UlOELTidQRB47Y=", + "h1:Pb9pYnJaMf7tURy6sMx6d6vJX7WFOZDIMYGjlsL0vAY=", "h1:q2JvvbG+seeZ4A2ijxPi5Tis+NJVoB59cAt3KeQe0uA=", "zh:156df81d2c740608b9fb7f439defbb39b89585c55dc6e62e4af928808ff67f9e", "zh:32407f1df8b59afe5e35710c4acf2c8a8cbf5ea9a32126f34cb0c49ff142a047", From d50ba4a07c7814f7554cf8cbe98b13a99cb6ce5f Mon Sep 17 00:00:00 2001 From: Vojtech Mares Date: Tue, 23 Jan 2024 23:51:00 +0100 Subject: [PATCH 09/10] ci: gitlab can't cache dirs outside of repo scope --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 97ffc5c..6c72e23 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,6 @@ default: key: $CI_COMMIT_BRANCH paths: - $CI_PROJECT_DIR/.terraform - - /opt/tfenv/versions stages: - init From b51a0a33e57f2602acfc0a14700a8294347c24f1 Mon Sep 17 00:00:00 2001 From: Vojtech Mares Date: Fri, 26 Jan 2024 10:16:12 +0100 Subject: [PATCH 10/10] chore(terraform): bump to 1.7.1 --- .terraform-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.terraform-version b/.terraform-version index bd8bf88..943f9cb 100644 --- a/.terraform-version +++ b/.terraform-version @@ -1 +1 @@ -1.7.0 +1.7.1