IntenseWebs/opentofu
3
0
Fork 0
mirror of https://github.com/opentofu/opentofu.git synced 2024-12-30 10:47:14 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22125 from hashicorp/appilon/move-VarEnvPrefix

Browse Source 
[SDK cleanup] Move VarEnvPrefix out of terraform pkg
This commit is contained in:
appilon 2019-07-18 14:44:54 -04:00 committed by GitHub
commit b143c04216
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
command/meta_vars.go
View File

@ -15,6 +15,10 @@ import (
"github.com/hashicorp/terraform/tfdiags"
)
// VarEnvPrefix is the prefix for environment variables that represent values
// for root module input variables.
const VarEnvPrefix = "TF_VAR_"
// collectVariableValues inspects the various places that root module input variable
// values can come from and constructs a map ready to be passed to the
// backend as part of a backend.Operation.
@ -31,10 +35,10 @@ func (m *Meta) collectVariableValues() (map[string]backend.UnparsedVariableValue
{
env := os.Environ()
for _, raw := range env {
if !strings.HasPrefix(raw, terraform.VarEnvPrefix) {
if !strings.HasPrefix(raw, VarEnvPrefix) {
continue
}
raw = raw[len(terraform.VarEnvPrefix):] // trim the prefix
raw = raw[len(VarEnvPrefix):] // trim the prefix
eq := strings.Index(raw, "=")
if eq == -1 {

6
terraform/interpolate.go
View File

@ -16,12 +16,6 @@ import (
"github.com/hashicorp/terraform/flatmap"
)
const (
// VarEnvPrefix is the prefix of variables that are read from
// the environment to set variables here.
VarEnvPrefix = "TF_VAR_"
)
// Interpolater is the structure responsible for determining the values
// for interpolations such as `aws_instance.foo.bar`.
type Interpolater struct {