Commit64a2214

authored

fix(agent/agentcontainers): remove shellquote in favor of %q (#18544)

1 parentb6c493d commit64a2214Copy full SHA for 64a2214

File tree

-4

lines changed

-4

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2040,7 +2040,7 @@ func TestAPI(t *testing.T) {`
`2040`	`2040`	`// Verify commands were executed through the custom shell and environment.`
`2041`	`2041`	`require.NotEmpty(t,fakeExec.commands,"commands should be executed")`
`2042`	`2042`
`2043`		`-// Want: /bin/custom-shell -c "docker ps--all--quiet--no-trunc"`
	`2043`	`+// Want: /bin/custom-shell -c'"docker" "ps" "--all" "--quiet" "--no-trunc"'`
`2044`	`2044`	`require.Equal(t,testShell,fakeExec.commands[0][0],"custom shell should be used")`
`2045`	`2045`	`ifruntime.GOOS=="windows" {`
`2046`	`2046`	`require.Equal(t,"/c",fakeExec.commands[0][1],"shell should be called with /c on Windows")`
`@@ -2049,6 +2049,7 @@ func TestAPI(t *testing.T) {`
`2049`	`2049`	`}`
`2050`	`2050`	`require.Len(t,fakeExec.commands[0],3,"command should have 3 arguments")`
`2051`	`2051`	`require.GreaterOrEqual(t,strings.Count(fakeExec.commands[0][2]," "),2,"command/script should have multiple arguments")`
	`2052`	+require.True(t,strings.HasPrefix(fakeExec.commands[0][2],`"docker" "ps"`),"command should start with\"docker\"\"ps\"")
`2052`	`2053`
`2053`	`2054`	`// Verify the environment was set on the command.`
`2054`	`2055`	`lastCmd:=fakeExec.getLastCommand()`

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,10 @@ package agentcontainers`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"context"`
	`5`	`+"fmt"`
`5`	`6`	`"os/exec"`
`6`	`7`	`"runtime"`
`7`		`-`
`8`		`-"github.com/kballard/go-shellquote"`
	`8`	`+"strings"`
`9`	`9`
`10`	`10`	`"cdr.dev/slog"`
`11`	`11`	`"github.com/coder/coder/v2/agent/agentexec"`
`@@ -56,7 +56,10 @@ func (e *commandEnvExecer) prepare(ctx context.Context, inName string, inArgs ..`
`56`	`56`	`caller="/c"`
`57`	`57`	`}`
`58`	`58`	`name=shell`
`59`		`-args= []string{caller,shellquote.Join(append([]string{inName},inArgs...)...)}`
	`59`	`+for_,arg:=rangeappend([]string{inName},inArgs...) {`
	`60`	`+args=append(args,fmt.Sprintf("%q",arg))`
	`61`	`+}`
	`62`	`+args= []string{caller,strings.Join(args," ")}`
`60`	`63`	`returnname,args,dir,env`
`61`	`64`	`}`
`62`	`65`

Comments

(0)