Jul 13, 2022 · Jul 13, 2022 · Jul 13, 2022 · Jul 14, 2022
diff --git a/provisionersdk/agent_test.go b/provisionersdk/agent_test.go
 }
 script = strings.ReplaceAll(script, "${ACCESS_URL}", srvURL.String()+"/")
 script = strings.ReplaceAll(script, "${AUTH_TYPE}", "token")
 output, err := exec.Command("sh", "-c", script).CombinedOutput()
 // This is intentionally ran in single quotes to mimic how a customer may
 // embed our script. Our scripts should not include any single quotes.
 // nolint:gosec
 output, err := exec.Command("sh", "-c", "sh -c '"+script+"'").CombinedOutput()
 t.Log(string(output))
 require.NoError(t, err)
 // Ignore debug output from `set -x`, we're only interested in the last line.
diff --git a/provisionersdk/scripts/bootstrap_linux.sh b/provisionersdk/scripts/bootstrap_linux.sh
 # This could fail for a number of reasons, many of which are likely transient.
 # So just keep trying!
 while :; do
 # Try a number of different download tools, as we don'tknow what we'll
 # have available
 # Try a number of different download tools, as we don notknow what we
 #willhave available.
 status=""
 if command -v curl >/dev/null 2>&1; then
 curl -fsSL --compressed "${BINARY_URL}" -o "${BINARY_NAME}" && break
diff --git a/provisionersdk/scripts/bootstrap_windows.ps1 b/provisionersdk/scripts/bootstrap_windows.ps1
 # Sleep for a while in case the underlying provider deletes the resource on error.
 trap {
 Write-Error'=== Agent script exited with non-zero code. Sleeping 24h to preserve logs...'
 Write-Error"=== Agent script exited with non-zero code. Sleeping 24h to preserve logs..."
 Start-Sleep -Seconds 86400
 }

 }
 }

 # If the below fails, retrying probablywon't help.
 # If the below fails, retrying probablywill not help.
 Set-MpPreference -DisableRealtimeMonitoring $true -ExclusionPath $env:TEMP\sshd.exe
 $env:CODER_AGENT_AUTH = "${AUTH_TYPE}"
 $env:CODER_AGENT_URL = "${ACCESS_URL}"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -46,7 +46,10 @@ func TestAgentScript(t *testing.T) {
		}
		script = strings.ReplaceAll(script, "${ACCESS_URL}", srvURL.String()+"/")
		script = strings.ReplaceAll(script, "${AUTH_TYPE}", "token")
		output, err := exec.Command("sh", "-c", script).CombinedOutput()
		// This is intentionally ran in single quotes to mimic how a customer may
		// embed our script. Our scripts should not include any single quotes.
		// nolint:gosec
		output, err := exec.Command("sh", "-c", "sh -c '"+script+"'").CombinedOutput()
		t.Log(string(output))
		require.NoError(t, err)
		// Ignore debug output from `set -x`, we're only interested in the last line.
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,8 +16,8 @@ cd "$BINARY_DIR"
		# This could fail for a number of reasons, many of which are likely transient.
		# So just keep trying!
		while :; do
		# Try a number of different download tools, as we don'tknow what we'll
		# have available
		# Try a number of different download tools, as we don notknow what we
		#willhave available.
		status=""
		if command -v curl >/dev/null 2>&1; then
		curl -fsSL --compressed "${BINARY_URL}" -o "${BINARY_NAME}" && break
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,6 +1,6 @@
		# Sleep for a while in case the underlying provider deletes the resource on error.
		trap {
		Write-Error'=== Agent script exited with non-zero code. Sleeping 24h to preserve logs...'
		Write-Error"=== Agent script exited with non-zero code. Sleeping 24h to preserve logs..."
Copy link Member johnstcnJul 14, 2022 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. I'm curious how folks would be using`sh -c` on Windows, but I suppose it's good to remain consistent 👍
		Start-Sleep -Seconds 86400
		}

Expand All		@@ -25,7 +25,7 @@ while ($true) {
		}
		}

		# If the below fails, retrying probablywon't help.
		# If the below fails, retrying probablywill not help.
		Set-MpPreference -DisableRealtimeMonitoring $true -ExclusionPath $env:TEMP\sshd.exe
		$env:CODER_AGENT_AUTH = "${AUTH_TYPE}"
		$env:CODER_AGENT_URL = "${ACCESS_URL}"
Expand Down