Commit8e17254

authored

fix: Add test for wrapping init script with single quotes (#2979)

This ensures our initialization script works with single uotes.

1 parentb5f5e90 commit8e17254Copy full SHA for 8e17254

File tree

-5

lines changed

-5

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,10 @@ func TestAgentScript(t *testing.T) {`
`46`	`46`	`}`
`47`	`47`	`script=strings.ReplaceAll(script,"${ACCESS_URL}",srvURL.String()+"/")`
`48`	`48`	`script=strings.ReplaceAll(script,"${AUTH_TYPE}","token")`
`49`		`-output,err:=exec.Command("sh","-c",script).CombinedOutput()`
	`49`	`+// This is intentionally ran in single quotes to mimic how a customer may`
	`50`	`+// embed our script. Our scripts should not include any single quotes.`
	`51`	`+// nolint:gosec`
	`52`	`+output,err:=exec.Command("sh","-c","sh -c '"+script+"'").CombinedOutput()`
`50`	`53`	`t.Log(string(output))`
`51`	`54`	`require.NoError(t,err)`
`52`	`55`	// Ignore debug output from `set -x`, we're only interested in the last line.

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,8 @@ cd "$BINARY_DIR"`
`16`	`16`	`# This could fail for a number of reasons, many of which are likely transient.`
`17`	`17`	`# So just keep trying!`
`18`	`18`	`while:;do`
`19`		`-# Try a number of different download tools, as we don'tknow what we'll`
`20`		`-# have available`
	`19`	`+# Try a number of different download tools, as we don notknow what we`
	`20`	`+#willhave available.`
`21`	`21`	`status=""`
`22`	`22`	`ifcommand -v curl>/dev/null2>&1;then`
`23`	`23`	`curl -fsSL --compressed"${BINARY_URL}" -o"${BINARY_NAME}"&&break`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`# Sleep for a while in case the underlying provider deletes the resource on error.`
`2`	`2`	`trap {`
`3`		`-Write-Error'=== Agent script exited with non-zero code. Sleeping 24h to preserve logs...'`
	`3`	`+Write-Error"=== Agent script exited with non-zero code. Sleeping 24h to preserve logs..."`
`4`	`4`	`Start-Sleep-Seconds86400`
`5`	`5`	`}`
`6`	`6`
`@@ -25,7 +25,7 @@ while ($true) {`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`
`28`		`-# If the below fails, retrying probablywon't help.`
	`28`	`+# If the below fails, retrying probablywill not help.`
`29`	`29`	`Set-MpPreference-DisableRealtimeMonitoring$true-ExclusionPath$env:TEMP\sshd.exe`
`30`	`30`	`$env:CODER_AGENT_AUTH="${AUTH_TYPE}"`
`31`	`31`	`$env:CODER_AGENT_URL="${ACCESS_URL}"`

Comments

(0)