terraform: 1.8.5 -> 1.9.2 (#326158)

This commit is contained in:
James Cleverley-Prance
2024-07-11 11:55:24 +02:00
committed by GitHub
parent bbb60ff023
commit 199a76eaf7
2 changed files with 14 additions and 14 deletions
@@ -165,9 +165,9 @@ rec {
mkTerraform = attrs: pluggable (generic attrs);
terraform_1 = mkTerraform {
version = "1.8.5";
hash = "sha256-5PzP0LUJPpOQQ8YqwBFyEFcsHF2O1uDD8Yh8wB3uJ8s=";
vendorHash = "sha256-PXA2AWq1IFmnqhhU92S9UaIYTUAAn5lsg3S7h5hBOQE=";
version = "1.9.2";
hash = "sha256-g1CsDWjwjBVfSNFZ9PRGlPlJOrqXP2eMYk1P+ohtYNU=";
vendorHash = "sha256-cPWJtrGad8VsvyjJHQwpfDitsJY/Q0iCtp1MRyzGT+U=";
patches = [ ./provider-path-0_15.patch ];
passthru = {
inherit plugins;
@@ -1,23 +1,23 @@
diff -Naur terraform.old/internal/command/init.go terraform.new/internal/command/init.go
--- terraform.old/internal/command/init.go
+++ terraform.new/internal/command/init.go
@@ -3,6 +3,7 @@
import (
@@ -7,6 +7,7 @@
"context"
"errors"
"fmt"
+ "os"
"log"
"strings"
@@ -55,6 +56,11 @@
var diags tfdiags.Diagnostics
"reflect"
"sort"
@@ -79,6 +80,11 @@
c.migrateState = true
}
+ val, ok := os.LookupEnv("NIX_TERRAFORM_PLUGIN_DIR")
+ if ok {
+ flagPluginPath = append(flagPluginPath, val)
+ initArgs.PluginPath = append(initArgs.PluginPath, val)
+ }
+
if len(flagPluginPath) > 0 {
c.pluginPath = flagPluginPath
if len(initArgs.PluginPath) > 0 {
c.pluginPath = initArgs.PluginPath
}