Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions pkg/cluster/provisioner/terraform/cmd_default.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ package terraform

import (
"fmt"
"os"
"os/exec"

"github.com/MusicDin/kubitect/pkg/ui"
Expand All @@ -28,10 +27,7 @@ func (t *terraform) runCmd(action string, args []string, showOutput bool) (int,
cmd.Stdout = ui.Streams().Out().File()
}

cmd.Env = []string{fmt.Sprintf("PATH=%s", os.Getenv("PATH"))}
if ui.Debug() {
cmd.Env = append(cmd.Env, "TF_LOG=INFO")
}
cmd.Env = terraformCmdEnv(ui.Debug())

err := cmd.Run()
exitCode := cmd.ProcessState.ExitCode()
Expand Down
42 changes: 42 additions & 0 deletions pkg/cluster/provisioner/terraform/cmd_env.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
package terraform

import (
"fmt"
"os"
)

func terraformCmdEnv(debug bool) []string {
envMap := make(map[string]string)

for _, env := range os.Environ() {
key, value, ok := splitEnvVar(env)
if !ok {
continue
}

envMap[key] = value
}

envMap["PATH"] = os.Getenv("PATH")

if debug {
envMap["TF_LOG"] = "INFO"
}

env := make([]string, 0, len(envMap))
for key, value := range envMap {
env = append(env, fmt.Sprintf("%s=%s", key, value))
}

return env
}

func splitEnvVar(env string) (string, string, bool) {
for i := 0; i < len(env); i++ {
if env[i] == '=' {
return env[:i], env[i+1:], true
}
}

return "", "", false
}
51 changes: 51 additions & 0 deletions pkg/cluster/provisioner/terraform/cmd_env_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
package terraform

import (
"os"
"testing"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)

func TestTerraformCmdEnv_PreservesHomeAndAddsTFLog(t *testing.T) {
oldHome := os.Getenv("HOME")
oldPath := os.Getenv("PATH")
defer func() {
require.NoError(t, os.Setenv("HOME", oldHome))
require.NoError(t, os.Setenv("PATH", oldPath))
}()

require.NoError(t, os.Setenv("HOME", "/tmp/test-home"))
require.NoError(t, os.Setenv("PATH", "/tmp/test-bin"))

env := terraformCmdEnv(true)
envMap := envSliceToMap(env)

assert.Equal(t, "/tmp/test-home", envMap["HOME"])
assert.Equal(t, "/tmp/test-bin", envMap["PATH"])
assert.Equal(t, "INFO", envMap["TF_LOG"])
}

func TestTerraformCmdEnv_OmitsTFLogWhenDebugDisabled(t *testing.T) {
env := terraformCmdEnv(false)
envMap := envSliceToMap(env)

_, ok := envMap["TF_LOG"]
assert.False(t, ok)
}

func envSliceToMap(env []string) map[string]string {
result := make(map[string]string, len(env))

for _, item := range env {
key, value, ok := splitEnvVar(item)
if !ok {
continue
}

result[key] = value
}

return result
}
6 changes: 1 addition & 5 deletions pkg/cluster/provisioner/terraform/cmd_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package terraform

import (
"fmt"
"os"
"os/exec"
"syscall"

Expand Down Expand Up @@ -30,10 +29,7 @@ func (t *terraform) runCmd(action string, args []string, showOutput bool) (int,
cmd.Stdout = ui.Streams().Out().File()
}

cmd.Env = []string{fmt.Sprintf("PATH=%s", os.Getenv("PATH"))}
if ui.Debug() {
cmd.Env = append(cmd.Env, "TF_LOG=INFO")
}
cmd.Env = terraformCmdEnv(ui.Debug())

err := cmd.Run()
exitCode := cmd.ProcessState.ExitCode()
Expand Down