terraform: converge on single shell environment
and drop convert2Tofu override.
Martin Weinelt committed
Dec 1, 2025 at 15:14 UTC
1d45d46657d50a6128eb445f83ec71c767f09ee5
2 files changed
+6
-37
terraform-iam/.envrc
+1
-1
@@ -1,5 +1,5 @@
1
# shellcheck shell=bash
2
-use flake .#terraform-iam
2
+use flake .#terraform
3
4
export AWS_CONFIG_FILE=$PWD/aws-config
5
export AWS_PROFILE=nixos-prod
terraform/flake-module.nix
+5
-36
@@ -1,16 +1,3 @@
1
-let
2
- convert2Tofu =
3
- provider:
4
- provider.override (prev: {
5
- homepage =
6
- builtins.replaceStrings
7
- [ "registry.terraform.io/providers" ]
8
- [
9
- "registry.opentofu.org"
10
- ]
11
- prev.homepage;
12
- });
13
-in
1
{
2
perSystem =
3
{ pkgs, ... }:
@@ -18,30 +5,12 @@ in
5
devShells.terraform = pkgs.mkShellNoCC {
6
packages = [
7
pkgs.awscli2
21
- # TODO: migrate registry for opentofu as well.
8
(pkgs.opentofu.withPlugins (
23
- p:
24
- builtins.map convert2Tofu [
25
- p.hashicorp_aws
26
- p.fastly_fastly
27
- p.aegirhealth_netlify
28
- p.numtide_secret
29
- ]
30
- ))
31
- ];
32
- };
33
-
34
- # get rid of this, once we fix the migration above.
35
- devShells.terraform-iam = pkgs.mkShellNoCC {
36
- packages = [
37
- pkgs.awscli2
38
- (pkgs.opentofu.withPlugins (
39
- p:
40
- builtins.map convert2Tofu [
41
- p.hashicorp_aws
42
- p.fastly_fastly
43
- p.aegirhealth_netlify
44
- p.numtide_secret
9
+ plugin: with plugin; [
10
+ hashicorp_aws
11
+ fastly_fastly
12
+ aegirhealth_netlify
13
+ numtide_secret
14
]
15
))
16
];