Commitf7ccfa2

authored

feat: SetCODER=true in workspaces (#3637)

1 parent8343a4f commitf7ccfa2Copy full SHA for f7ccfa2

File tree

+24

-0

lines changed

+24

-0

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -394,6 +394,10 @@ func (a *agent) createCommand(ctx context.Context, rawCommand string, env []stri`
`394`	`394`	`iferr!=nil {`
`395`	`395`	`returnnil,xerrors.Errorf("getting os executable: %w",err)`
`396`	`396`	`}`
	`397`	`+// Set environment variables reliable detection of being inside a`
	`398`	`+// Coder workspace.`
	`399`	`+cmd.Env=append(cmd.Env,"CODER=true")`
	`400`	`+`
`397`	`401`	`cmd.Env=append(cmd.Env,fmt.Sprintf("USER=%s",username))`
`398`	`402`	`// Git on Windows resolves with UNIX-style paths.`
`399`	`403`	`// If using backslashes, it's unable to find the executable.`

Lines changed: 20 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -232,6 +232,26 @@ func TestAgent(t *testing.T) {`
`232`	`232`	`require.Equal(t,expect,strings.TrimSpace(string(output)))`
`233`	`233`	`})`
`234`	`234`
	`235`	`+t.Run("Coder env vars",func(t*testing.T) {`
	`236`	`+t.Parallel()`
	`237`	`+`
	`238`	`+for_,key:=range []string{"CODER"} {`
	`239`	`+key:=key`
	`240`	`+t.Run(key,func(t*testing.T) {`
	`241`	`+t.Parallel()`
	`242`	`+`
	`243`	`+session:=setupSSHSession(t, agent.Metadata{})`
	`244`	`+command:="sh -c 'echo $"+key+"'"`
	`245`	`+ifruntime.GOOS=="windows" {`
	`246`	`+command="cmd.exe /c echo %"+key+"%"`
	`247`	`+}`
	`248`	`+output,err:=session.Output(command)`
	`249`	`+require.NoError(t,err)`
	`250`	`+require.NotEmpty(t,strings.TrimSpace(string(output)))`
	`251`	`+})`
	`252`	`+}`
	`253`	`+})`
	`254`	`+`
`235`	`255`	`t.Run("StartupScript",func(t*testing.T) {`
`236`	`256`	`t.Parallel()`
`237`	`257`	`tempPath:=filepath.Join(t.TempDir(),"content.txt")`

Comments

(0)