From 334ea5b56974bfab3404b177f82259f3b969b1c7 Mon Sep 17 00:00:00 2001 From: Maxwell Brown Date: Tue, 23 Jan 2024 09:10:28 -0500 Subject: [PATCH] migrate to opentofu from terraform --- flake.lock | 44 +++++++++++++------------- flake.nix | 2 +- shell.nix | 1 + terraform/aws/.terraform.lock.hcl | 37 ++++++++++------------ terraform/github/.terraform.lock.hcl | 46 ++++++++++++++-------------- 5 files changed, 63 insertions(+), 67 deletions(-) diff --git a/flake.lock b/flake.lock index b7a6cde37..6e2dd38a3 100644 --- a/flake.lock +++ b/flake.lock @@ -25,11 +25,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1703087360, - "narHash": "sha256-0VUbWBW8VyiDRuimMuLsEO4elGuUw/nc2WDeuO1eN1M=", + "lastModified": 1704875591, + "narHash": "sha256-eWRLbqRcrILgztU/m/k7CYLzETKNbv0OsT2GjkaNm8A=", "owner": "serokell", "repo": "deploy-rs", - "rev": "b709d63debafce9f5645a5ba550c9e0983b3d1f7", + "rev": "1776009f1f3fb2b5d236b84d9815f2edee463a9b", "type": "github" }, "original": { @@ -97,11 +97,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1702453208, - "narHash": "sha256-0wRi9SposfE2wHqjuKt8WO2izKB/ASDOV91URunIqgo=", + "lastModified": 1705312285, + "narHash": "sha256-rd+dY+v61Y8w3u9bukO/hB55Xl4wXv4/yC8rCGVnK5U=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "7763c6fd1f299cb9361ff2abf755ed9619ef01d6", + "rev": "bee2202bec57e521e3bd8acd526884b9767d7fa0", "type": "github" }, "original": { @@ -113,16 +113,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1688392541, - "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=", + "lastModified": 1705916986, + "narHash": "sha256-iBpfltu6QvN4xMpen6jGGEb6jOqmmVQKUrXdOJ32u8w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b", + "rev": "d7f206b723e42edb09d9d753020a84b3061a79d8", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-22.11", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } @@ -144,11 +144,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1703166787, - "narHash": "sha256-OnhZqQdVvhBytYthnjsnQtH/zRn6wR8P4U478lGpktw=", + "lastModified": 1706014056, + "narHash": "sha256-Bz0FXHOv96uWY8fwXroUhvMq6OIXgBbvdOi6zAE+i4M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d644f3882d553e717e225e69ec8254d6736b8cba", + "rev": "a95d98f05a5da6cf66bef2584cf7a70b474d4518", "type": "github" }, "original": { @@ -160,11 +160,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1702777222, - "narHash": "sha256-/SYmqgxTYzqZnQEfbOCHCN4GzqB9uAIsR9IWLzo0/8I=", + "lastModified": 1705033721, + "narHash": "sha256-K5eJHmL1/kev6WuqyqqbS1cdNnSidIZ3jeqJ7GbrYnQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a19a71d1ee93226fd71984359552affbc1cd3dc3", + "rev": "a1982c92d8980a0114372973cbdfe0a307f1bdea", "type": "github" }, "original": { @@ -176,11 +176,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1703013332, - "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", + "lastModified": 1705856552, + "narHash": "sha256-JXfnuEf5Yd6bhMs/uvM67/joxYKoysyE3M2k6T3eWbg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", + "rev": "612f97239e2cc474c13c9dafa0df378058c5ad8d", "type": "github" }, "original": { @@ -210,11 +210,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1702937567, - "narHash": "sha256-bUNl3GPqRgTGp13+oV1DrYa1/NHuGHo5SKmr+RqC/2g=", + "lastModified": 1705805983, + "narHash": "sha256-HluB9w7l75I4kK25uO4y6baY4fcDm2Rho0WI1DN2Hmc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "f7db64b88dabc95e4f7bee20455f418e7ab805d4", + "rev": "ae171b54e76ced88d506245249609f8c87305752", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 57cba59a6..73f170d66 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { inputs = { nixpkgs = { - url = "github:nixos/nixpkgs/nixos-22.11"; + url = "github:nixos/nixpkgs/nixos-23.11"; }; nixpkgs-master = { diff --git a/shell.nix b/shell.nix index b412c3dad..0ca156377 100644 --- a/shell.nix +++ b/shell.nix @@ -26,6 +26,7 @@ in home-manager kubectl kubernetes-helm + opentofu nix nil nixos-rebuild diff --git a/terraform/aws/.terraform.lock.hcl b/terraform/aws/.terraform.lock.hcl index 7270f0e97..9ae47c41a 100644 --- a/terraform/aws/.terraform.lock.hcl +++ b/terraform/aws/.terraform.lock.hcl @@ -1,28 +1,23 @@ -# This file is maintained automatically by "terraform init". +# This file is maintained automatically by "tofu init". # Manual edits may be lost in future updates. -provider "registry.terraform.io/hashicorp/aws" { +provider "registry.opentofu.org/hashicorp/aws" { version = "5.4.0" constraints = "5.4.0" hashes = [ - "h1:4eGsUS3r5eApQc19t8woc6d+sQLaOBaCSaK5GyGcWf0=", - "h1:Jol4lNIzMrREQzUBSveCLX0iQLy7dm0OF+IYY2GKrhY=", - "h1:V2yz+EYWnLU/fWdsk8UX7oFuAKTBLTHDdLKB6NG7th0=", - "h1:ny1YPz2LiHTasDVNh6/HEvh1c9+TN/ftgAHh84bmy1E=", - "zh:1db5f81089216831bb0fdff9ddc3772efa133397c66ec276bc75b96eec06e23f", - "zh:26fe5fdf399192b5724d21854fbec650c158f8ee9eb1dc52a50f7da0f2bc07ac", - "zh:2946d9e333b1efe01588ee9f9771169fd3c3a4a7cb78ed8f91e8b3efd1a73850", - "zh:36ed69e8d3029332c8a52a70940f714fd579b9fd95f5569cc010ef11162f5bf7", - "zh:46ba5ad1c3a3ef98c346356cfa4bdd9c2501c661c2513bb92f4413f2482fb24b", - "zh:46c10aaa9672b54a14b0e0effdd6ecd9b8a539b3bfe273ac54111e7352a7bb4b", - "zh:47d7f57bcbe4fba2f960ab6c4228c5e9e586be2f233a8baa8962b51a63337179", - "zh:47e41c198439ba1c4d933f808b6f47e518f8f0aae25ca42abcac97f149121e90", - "zh:526c5834de71654ee14039cb973322bf5032cb684a2a113b48fb48a0584f46f3", - "zh:6169316517b95677819ba2904dcea204fb9b55e868348e906af9164104fe7198", - "zh:7c063ef2b8d69a8db7e8bf0dcd45793ede22b259b30464ed114d330df304cdbb", - "zh:87c4f2faca636715a08be3121d26b3354415401eab89349077ca9436a0822c23", - "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:b184b8a268f45258edd27d389ca793708f1bc3ee4d6706d154a45e93deaddde1", - "zh:ba1a998cbf4b639fa3e04b9069f0f5a289662457940726a8a51c81df400aa852", + "h1:4XtNx4rga+KqAEqCArWBeiS967S5DAxr3jtcXoQRRgI=", + "h1:KQWJ/uBOClsQzYqx3nMmt8MZraVAD5IpBH/K0pUnbvE=", + "h1:ZcJLma/lYXTqRbmOeYzoRTcD3IJqeYSt3YAmF2SVBF4=", + "h1:iTRE9uqBmdE8nmjQHFBSFy9Gz9a5d202AXvrBz5HPRQ=", + "zh:2601a311502449b2fd8a98fdd9cc2f843768a2b299467bdb3f7890bd18723ce6", + "zh:3bded83b88d14f30576acd5c3a592721a9b588632f08c6dfb6295fc5a96f04c4", + "zh:922e919e2756d32cf2ff0521d90e47d9a967ddaf3fd0eada8d3d6fb924ef703a", + "zh:de2e4aaff95be3dd17701c9025b4c08ead1f9d4b23cc6019a7be70e082fdf40e", + "zh:de37cdefc15805669422e9f9761f2ec081424c2a6b4fe15b9222615187c123d1", + "zh:dfd9a13958da7a882fb501bebcac71e86649b234c4d862c2dc6f2228a25d29c3", + "zh:f1f4d22ad47adf90ce36582d0bb10f659f3110b39a3669494b027de2e2b0aefe", + "zh:f2730e9cf7c580b2e6986077261158779d64fd06404411326eed497286f82c01", + "zh:f877aaaff9186d8fc9d6019318e512c2898d1b3949901784ef6334644c511b74", + "zh:fd2cd5d74aaec6607fe8b9bc3cb46ee0b29b28b2666a52efa898428c919182d9", ] } diff --git a/terraform/github/.terraform.lock.hcl b/terraform/github/.terraform.lock.hcl index 8de57f52e..b28a0730b 100644 --- a/terraform/github/.terraform.lock.hcl +++ b/terraform/github/.terraform.lock.hcl @@ -1,7 +1,7 @@ -# This file is maintained automatically by "terraform init". +# This file is maintained automatically by "tofu init". # Manual edits may be lost in future updates. -provider "registry.terraform.io/carlpett/sops" { +provider "registry.opentofu.org/carlpett/sops" { version = "1.0.0" constraints = "1.0.0" hashes = [ @@ -19,27 +19,27 @@ provider "registry.terraform.io/carlpett/sops" { ] } -provider "registry.terraform.io/integrations/github" { - version = "5.41.0" - constraints = "5.41.0" +provider "registry.opentofu.org/integrations/github" { + version = "5.45.0" + constraints = "~> 5.0" hashes = [ - "h1:/L5tlvUrlRUsfLjF3M7ygTCL+AfVgB2CbSk8p8vW5dE=", - "h1:2CR1kaelJPU2E8jH6FtL4q4LW5qdk/gKpeEVEqe5is8=", - "h1:HYNijFnRwDHU5h/IJv+/j8oV3JRyqEOVRJxo8X+1v2c=", - "h1:kcUwo3XrhkcDQwgynF/p57Hpp0GUcqf7KTzUNbSrN6k=", - "zh:05ccd9a029cf34ebb2854a2aedc1b0ae969c9ba412a3be67d54f24bead85ec67", - "zh:100de3d1ff152a54801e168ae6ba11d3d7b284f2ca88179227a8ee0ee048200a", - "zh:236125b40405005614c0940f9b1bf861034ca09859cbe0a9b23325a12bdd3541", - "zh:4270cac2acc5996fc06ea1d429eafd80564529600846b3c35f7bcb937fea5a79", - "zh:47b4370b1d0d3268db9675f9a0a4ca55d881b0b7152db7a3d7ac0507a5881c7e", - "zh:59bd884c2ccc2bcfcf77d8861486cb91e0a82778a9434117fc482353f185c4d5", - "zh:638e1dc47f22d75bb14c00512a99128ef4a96ba48c29d511817ec49195adbdf5", - "zh:6d3dca7b298fa75cf776e1f1a03438e83105f3c25ce1814376ff8e59e8edc63f", - "zh:6e991e82a9ebc5141a5c9925fb4ee79f0b09d83a2b60912e864a77aa92282d5a", - "zh:7aae66b8242f0a32ecf0ba748e520045f07fa9f3b5ef86a9d55a0dbe48b0966b", - "zh:82dca6c117f4445476e67acdded8e8d956b261518b53d60431e5e2d4e4ed6a19", - "zh:8ee4dd233acb0cdcb7373b4c71c4d71c6bc09de054adb30e3affb49af9340d56", - "zh:e8b70c87f19970541837e8c19275b35b12b744e6da2d9ba18757ccabd7738945", - "zh:f2a4712f059a1dceb94d1f5c70b3781cfef413c1240f18450c23ec7114f80db2", + "h1:S1Tnx+0a1XzSyTwWMerCj1UNpVeQMkiG2laTZH1CoW0=", + "h1:cP5uEN9jpePr+/Kc7OyAZMhysbDhQoLGpLqgQpLFewg=", + "h1:mX5tPDK7RNmtEjSoaI47oimBJBnujcAI7REnhpGqZhg=", + "h1:sP/Er9osOsz4vhKZAul+GeV0c5XdvMblJBMiP+T5tWc=", + "zh:2afb8ee5b847071e51d5a39bcad5cf466c4d22452450d37c44a5f9d2eb9879e5", + "zh:38d087b88c86ddd63b60d14d613f86a5885d154048098c0484266a9a69018b16", + "zh:3e6a787e3e40f1535d85f8dc5f2e8c90242ab8237feebd027f696fa154261394", + "zh:55dac5a813b3774b48ca45b8a797c32e6d787d4f282b43b622155cad3daac46a", + "zh:563f2782f3c4c584b249c5fa0628951a57b4593f3c5805a4efb6d494f8686716", + "zh:677180ec9376d5f926286592998e2864c85f06d6b416c1d89031d817a285c72e", + "zh:80eec141fa47131e8f60a6478e51b3a5920efe803444e684f9605fca09a24e34", + "zh:8b9f1e1f4b42b51e53767f4f927eabdcefe55fb0369e996ac2a0063148b5e48d", + "zh:95627f75848561830f8c20949f024f902a2100a022c68aa8d84320f43e75cc46", + "zh:95ac41b99dfca3ce556092e036bb04dc03367d0779071112e59d4bf11259a89d", + "zh:9e966482729ba8214b480bdd786aff9a15234e9c093c5406b56ce89ccb07dcab", + "zh:b7a9d563613f1b9a233f8f285848cc9d8c08c556aad7ea57cd63e0abb19b10cf", + "zh:ce56bb7ca876f47f5beee01de3ab84d27964b972c9adceb8e2f7824891e05c27", + "zh:f73e063ad5b84f1943eafb8a52a26dd805d06ac11d6c951175ac76c07187f553", ] }