Skip to content
Merged
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
12 changes: 11 additions & 1 deletion pkg/builtin/builtin.go
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,10 @@ func SysExec(ctx context.Context, env []string, input string) (string, error) {
if err != nil {
_, _ = os.Stdout.Write(out)
}
return string(out), err
if err != nil {
return string(out), fmt.Errorf("OUTPUT: %s, ERROR: %w", out, err)
}
return string(out), nil
}

func getWorkspaceDir(envs []string) (string, error) {
Expand Down Expand Up @@ -617,6 +620,13 @@ func SysGetenv(ctx context.Context, env []string, input string) (string, error)
return "", err
}
log.Debugf("looking up env var %s", params.Name)
for _, env := range env {
k, v, ok := strings.Cut(env, "=")
if ok && k == params.Name {
log.Debugf("found env var %s in local environment", params.Name)
return v, nil
}
}
return os.Getenv(params.Name), nil
}

Expand Down
23 changes: 23 additions & 0 deletions pkg/builtin/builtin_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package builtin

import (
"context"
"testing"

"github.com/hexops/autogold/v2"
"github.com/stretchr/testify/require"
)

func TestSysGetenv(t *testing.T) {
v, err := SysGetenv(context.Background(), []string{
"MAGIC=VALUE",
}, `{"name":"MAGIC"}`)
require.NoError(t, err)
autogold.Expect("VALUE").Equal(t, v)

v, err = SysGetenv(context.Background(), []string{
"MAGIC=VALUE",
}, `{"name":"MAGIC2"}`)
require.NoError(t, err)
autogold.Expect("").Equal(t, v)
}