terraform: upgrade nixpkgs, migrate to OpenTofu
Terraform has moved to a proprietary license, so we're forced to switch to OpenTofu.
edef committed
Jul 31, 2024 at 01:38 UTC
e9017bc2ac04672bf3991afc39c85f69559ee93e
4 files changed
+64
-14
terraform/.terraform.lock.hcl
+55
-5
@@ -1,24 +1,67 @@
1
-# This file is maintained automatically by "terraform init".
1
+# This file is maintained automatically by "tofu init".
2
# Manual edits may be lost in future updates.
3
4
provider "registry.terraform.io/aegirhealth/netlify" {
5
version = "0.6.12"
6
hashes = [
7
"h1:1VYNuFGAPaN4xb0myAkP5zswx9/ql8zxW7nPkRjsW14=",
8
+ "h1:hdC/vJMPvgx7qXpHWrQdfTOGd0p0/IKj6LSMWMcVb3U=",
9
+ "zh:0ad8985b4f0a2eac7fe20a4364f0f5aa74aa5b9d51582bf844aad310fa8265ed",
10
+ "zh:21970987839c7370c7e9774de2acad2fdb99fe09751bb24f6a14e4df7c592d5d",
11
+ "zh:33d2132f59eddd7148dd8d1301247a347aa85958d309e45b4a40bb655218f637",
12
+ "zh:39585e4c528657c26a8b0d9aa6254ea3f66ce78097acd4c562d190933232e074",
13
+ "zh:741b264545f929a53f506ec061cb727244362a81da4ddc53fdafd03233cd8fc7",
14
+ "zh:963b8d1755b8f41ab5097acf248762803c8b7b25705c0ab5d26821a025a969da",
15
+ "zh:a0eedce9453bfe2277245a02a120774e5b973f091452160260968619a81914f6",
16
+ "zh:b6f20c8b209ab2f7154c18c78268878f05a12e588e9c8c97459c8a16e52861fa",
17
+ "zh:c953d3a481580d152e0860fa7bb61e0f3ef3158cf865207d9c673427fa80f0f3",
18
+ "zh:e5b76aa219ee4e4efe36676f26752e3439b5b1facff67317e91b7edb1e079693",
19
+ "zh:ec9e72decbdac77d64f3885899eeb1301159b168db4f43d916f81486c694cdc6",
20
]
21
}
22
23
provider "registry.terraform.io/fastly/fastly" {
12
- version = "5.3.1"
24
+ version = "5.6.0"
25
hashes = [
14
- "h1:4se8Sra84U6RbcuER2pc53vs3sv9SXtmPyAPHP0aIKM=",
26
+ "h1:6tDk9HTYYEdS2zQhYhTaw7qysShKR1Db7Ww5ITbduQA=",
27
+ "h1:8EljDfcxrJrLel9GGLdLUxqbQyJcY828hVG28eWUumg=",
28
+ "zh:056f4df5d358bc387df629804c3d8508af53e88e52c2e444ee40f27bcfc58c78",
29
+ "zh:0789add78a9a8964a76cda093602cefc2853f640d0f7c67cf6a209b63f5dd582",
30
+ "zh:2e26ddd68532562b51c389a7a36331bd6828eae9ddee3ea9782e9e6f6368b725",
31
+ "zh:36c3cc88ca6930b825b5057905daa836ff5c315dce5a0ea4cedb4c57a3002d69",
32
+ "zh:3a47a5497a45a06cfd214a703422a585040788a82251cbc21d0fb4732770c31b",
33
+ "zh:3adc87bd992455e013f8c79aad8cd4a75bde48037a6044ba0ad2e1247796b95c",
34
+ "zh:5fc2c843caecead98bcf0aae5930257e684c4d3aa20e8c8fa1a2d17bb80747b0",
35
+ "zh:69d9b863ed691bafca7e38547a6d37ca12759a28f948186152e433bd804dc2b8",
36
+ "zh:7b3bfbbf70d9a72823dbda25839c3ccead87bd623bde1a1f489c2fb57a450428",
37
+ "zh:933388918761730b3ad058f81e54ae486d6701fce0ae19867fd3149d49e9da9e",
38
+ "zh:a9b48f0602bba8924befd1cc22fee8d2ad809bb40c847614187eb82b4543f837",
39
+ "zh:b45d56528709ba429641eb18a07134ea286158148cdfa7a6afccdbc95a008391",
40
+ "zh:d11d72ea5c05c66f3e9659a0e38d51caf850cd1d0a3821921682fd9224bc4276",
41
+ "zh:e578dd1d29f8b14e545319ec09856cca0008f9e5a272de791fc5ea8f363e6078",
42
]
43
}
44
45
provider "registry.terraform.io/hashicorp/aws" {
19
- version = "5.14.0"
46
+ version = "5.34.0"
47
hashes = [
21
- "h1:5erkFsFaXD6DpJkaLQuk5Zx21+aGqO0vhsOARiNXfxc=",
48
+ "h1:Tbq6dKE+XyXmkup6+7eQj2vH+eCJipk8R3VXhebVYi4=",
49
+ "h1:tBaUQRlA4gmpx93QsY2KJdhxEpdkA65NTsRrf6FvxOU=",
50
+ "zh:01bb20ae12b8c66f0cacec4f417a5d6741f018009f3a66077008e67cce127aa4",
51
+ "zh:3b0c9bdbbf846beef2c9573fc27898ceb71b69cf9d2f4b1dd2d0c2b539eab114",
52
+ "zh:5226ecb9c21c2f6fbf1d662ac82459ffcd4ad058a9ea9c6200750a21a80ca009",
53
+ "zh:6021b905d9b3cd3d7892eb04d405c6fa20112718de1d6ef7b9f1db0b0c97721a",
54
+ "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425",
55
+ "zh:9e61b8e0ccf923979cd2dc1f1140dbcb02f92248578e10c1996f560b6306317c",
56
+ "zh:ad6bf62cdcf531f2f92f6416822918b7ba2af298e4a0065c6baf44991fda982d",
57
+ "zh:b698b041ef38837753bbe5265dddbc70b76e8b8b34c5c10876e6aab0eb5eaf63",
58
+ "zh:bb799843c534f6a3f072a99d93a3b53ff97c58a96742be15518adf8127706784",
59
+ "zh:cebee0d942c37cd3b21e9050457cceb26d0a6ea886b855dab64bb67d78f863d1",
60
+ "zh:e061fdd1cb99e7c81fb4485b41ae000c6792d38f73f9f50aed0d3d5c2ce6dcfb",
61
+ "zh:eeb4943f82734946362696928336357cd1d36164907ae5905da0316a67e275e1",
62
+ "zh:ef09b6ad475efa9300327a30cbbe4373d817261c8e41e5b7391750b16ef4547d",
63
+ "zh:f01aab3881cd90b3f56da7c2a75f83da37fd03cc615fc5600a44056a7e0f9af7",
64
+ "zh:fcd0f724ebc4b56a499eb6c0fc602de609af18a0d578befa2f7a8df155c55550",
65
]
66
}
67
@@ -26,5 +69,12 @@ provider "registry.terraform.io/numtide/secret" {
69
version = "1.2.1"
70
hashes = [
71
"h1:JRMvtYT7m7iODGOFK1E8lzEw2Em42dNJ1n5pdstcFc8=",
72
+ "h1:t2z3CjxVsXjKb3g59WGkLtvDIR4NzLU7UFEcyAgF2C0=",
73
+ "zh:17cbc7f3b90ee2b3ae5adfc3bd9cb70166a5ffbd8e642e64afa7cb0e32a34bae",
74
+ "zh:5d66ce2aea25fc3c12cec6fc569b8ff314df6d773b9c3449983a4e9cde8347c7",
75
+ "zh:67d02e96bf0d07f2fcf16ce9427a7a26f53e695676405d0c2b815808f950411d",
76
+ "zh:77c3c05681ce199e6b0e2e5a2dfe418f61ae8863d527e7a7d47a9699d912683b",
77
+ "zh:7f37e633b4f94ba9f347cfe68d44f80fe066188feb954b13ee0f621caae4121d",
78
+ "zh:ea16bbe494c6ddd0af7bbea9554474c387517db4e7f0d15513bb29ff893871bc",
79
]
80
}
terraform/flake.lock
+3
-3
@@ -2,11 +2,11 @@
2
"nodes": {
3
"nixpkgs": {
4
"locked": {
5
- "lastModified": 1694092552,
6
- "narHash": "sha256-kEb8kyIFTKt1RLRfsKVVuBG+EY29zp6kWLOtdK9Bcu4=",
5
+ "lastModified": 1722389349,
6
+ "narHash": "sha256-6RB4fa0fExLZ/Hp3KY6c6BSkGS6TCY1ZBRoC9y4ftr0=",
7
"owner": "NixOS",
8
"repo": "nixpkgs",
9
- "rev": "319a44b173a6467859b6c8e60d96e2287526f685",
9
+ "rev": "7b0cb66ad81ebc390ece3c73977e46090b22fbd1",
10
"type": "github"
11
},
12
"original": {
terraform/flake.nix
+2
-2
@@ -8,7 +8,7 @@
8
mkShell {
9
packages = [
10
awscli2
11
- (terraform.withPlugins (p: with p; [
11
+ (opentofu.withPlugins (p: with p; [
12
aws
13
fastly
14
netlify
@@ -17,7 +17,7 @@
17
];
18
19
shellHook = ''
20
- alias tf=terraform
20
+ alias tf=tofu
21
'';
22
};
23
terraform/terraform.tf
+4
-4
@@ -9,16 +9,16 @@ terraform {
9
10
required_providers {
11
aws = {
12
- source = "hashicorp/aws"
12
+ source = "registry.terraform.io/hashicorp/aws"
13
}
14
fastly = {
15
- source = "fastly/fastly"
15
+ source = "registry.terraform.io/fastly/fastly"
16
}
17
netlify = {
18
- source = "AegirHealth/netlify"
18
+ source = "registry.terraform.io/AegirHealth/netlify"
19
}
20
secret = {
21
- source = "numtide/secret"
21
+ source = "registry.terraform.io/numtide/secret"
22
}
23
}
24
}