Use more expressive error, double-quote output

dannykopping · dannykopping · commit 70e3091ced28 · 2024-05-16T11:24:34.000+02:00
Signed-off-by: Danny Kopping &lt;danny@coder.com&gt;
diff --git a/provisionersdk/agent_test.go b/provisionersdk/agent_test.go
@@ -129,7 +129,7 @@ func TestAgentScript(t *testing.T) {
 		t.Log(output.String())
 
 		require.Eventually(t, func() bool {
-			return bytes.Contains(output.Bytes(), []byte("ERROR: Downloaded agent binary is invalid"))
+			return bytes.Contains(output.Bytes(), []byte("ERROR: Downloaded agent binary returned unexpected version output"))
 		}, testutil.WaitShort, testutil.IntervalSlow)
 	})
 }
diff --git a/provisionersdk/scripts/bootstrap_darwin.sh b/provisionersdk/scripts/bootstrap_darwin.sh
@@ -34,8 +34,8 @@ export CODER_AGENT_URL="${ACCESS_URL}"
 
 output=$(./${BINARY_NAME} --version | head -n1)
 if ! echo "${output}" | grep -q Coder; then
-	echo >&2 "ERROR: Downloaded agent binary is invalid"
-	echo >&2 "Script output: '${output}'"
+	echo >&2 "ERROR: Downloaded agent binary returned unexpected version output"
+	echo >&2 "${BINARY_NAME} --version output: \"${output}\""
 	exit 2
 fi
 
diff --git a/provisionersdk/scripts/bootstrap_linux.sh b/provisionersdk/scripts/bootstrap_linux.sh
@@ -89,8 +89,8 @@ export CODER_AGENT_URL="${ACCESS_URL}"
 
 output=$(./${BINARY_NAME} --version | head -n1)
 if ! echo "${output}" | grep -q Coder; then
-	echo >&2 "ERROR: Downloaded agent binary is invalid"
-	echo >&2 "Script output: '${output}'"
+	echo >&2 "ERROR: Downloaded agent binary returned unexpected version output"
+	echo >&2 "${BINARY_NAME} --version output: \"${output}\""
 	exit 2
 fi
 
diff --git a/provisionersdk/scripts/bootstrap_windows.ps1 b/provisionersdk/scripts/bootstrap_windows.ps1
@@ -43,9 +43,9 @@ $output = $p.StandardOutput.ReadToEnd()
 $p.WaitForExit()
 
 if ($output -notlike "*Coder*") {
-  Write-Error "ERROR: Downloaded agent binary is invalid"
-  Write-Error "Script output: '$output'"
-  Exit 2
+  Write-Output "$env:TEMP\sshd.exe --version output: `"$output"`"
+  Write-Error "ERROR: Downloaded agent binary returned unexpected version output"
+  Throw "unexpected binary"
 }
 
 # Check if we're running inside a Windows container!

Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ func TestAgentScript(t *testing.T) {`
`129`	`129`	`t.Log(output.String())`
`130`	`130`
`131`	`131`	`require.Eventually(t, func() bool {`
`132`		`- return bytes.Contains(output.Bytes(), []byte("ERROR: Downloaded agent binary is invalid"))`
	`132`	`+ return bytes.Contains(output.Bytes(), []byte("ERROR: Downloaded agent binary returned unexpected version output"))`
`133`	`133`	`}, testutil.WaitShort, testutil.IntervalSlow)`
`134`	`134`	`})`
`135`	`135`	`}`