upstream/terraform
1
0
Fork 0
mirror of https://github.com/hashicorp/terraform.git synced 2026-06-09 00:42:48 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Ensure environment variables are set when interpolating rawPath

Browse source
This commit is contained in:
Craig Sloggett 2024-03-22 09:14:31 -04:00
parent 302c6deddc
commit b53db4ef14
No known key found for this signature in database
GPG key ID: 3D5272A2CA547996
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
internal/command/cliconfig/provider_installation.go
View file

@ -254,7 +254,18 @@ func decodeProviderInstallationFromConfig(hclFile *hclast.File) ([]*ProviderInst
))
continue
}
interpolatedPath := os.ExpandEnv(rawPath)
interpolatedPath := os.Expand(rawPath, func(envVarName string) string {
if value, ok := os.LookupEnv(envVarName); ok {
return value
} else {
diags = diags.Append(tfdiags.Sourceless(
tfdiags.Error,
"Interpolated environment variable not set",
fmt.Sprintf("The environment variable %s is not set or empty and can result in undesired behavior", envVarName),
))
return ""
}
})
dirPath := filepath.Clean(interpolatedPath)
devOverrides[addr] = getproviders.PackageLocalDir(dirPath)
}