Aug 30, 2022 · Aug 30, 2022 · Aug 30, 2022 · Aug 30, 2022 · Aug 30, 2022 · Aug 30, 2022
diff --git a/cli/configssh_internal_test.go b/cli/configssh_internal_test.go
 t.Run(tt.name, func(t *testing.T) {
 t.Parallel()

 if runtime.GOOS == "windows"&& !tt.windows{
 t.SkipNow()
 if runtime.GOOS == "windows" {
 t.Skip("Windows doesn't typically execute via /bin/sh or cmd.exe, so this test is not applicable.")
 }

 dir := filepath.Join(t.TempDir(), tt.path)
 err := os.MkdirAll(dir, 0o755)
 require.NoError(t, err)
 bin := filepath.Join(dir, "coder")
 contents := []byte("#!/bin/sh\necho yay\n")
 if runtime.GOOS == "windows" {
 contents = []byte("cls\r\n@echo off\r\necho \"yay\"\r\n")
 }
 err = os.WriteFile(bin, contents, 0o755) //nolint:gosec
 require.NoError(t, err)

 }
 require.NoError(t, err)

 args := []string{"/bin/sh", "-c", escaped}
 if runtime.GOOS == "windows" {
 args = []string{"cmd.exe", "/c", escaped}
 }
 b, err := exec.Command(args[0], args[1:]...).CombinedOutput() //nolint:gosec
 b, err := exec.Command("/bin/sh", "-c", escaped).CombinedOutput() //nolint:gosec
 require.NoError(t, err)
 got := strings.TrimSpace(string(b))
 require.Equal(t, "yay", got)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -34,18 +34,15 @@ func Test_sshConfigExecEscape(t *testing.T) {
		t.Run(tt.name, func(t *testing.T) {
		t.Parallel()

		if runtime.GOOS == "windows"&& !tt.windows{
		t.SkipNow()
		if runtime.GOOS == "windows" {
		t.Skip("Windows doesn't typically execute via /bin/sh or cmd.exe, so this test is not applicable.")
		}

		dir := filepath.Join(t.TempDir(), tt.path)
		err := os.MkdirAll(dir, 0o755)
		require.NoError(t, err)
		bin := filepath.Join(dir, "coder")
		contents := []byte("#!/bin/sh\necho yay\n")
		if runtime.GOOS == "windows" {
		contents = []byte("cls\r\n@echo off\r\necho \"yay\"\r\n")
		}
		err = os.WriteFile(bin, contents, 0o755) //nolint:gosec
		require.NoError(t, err)

Expand All		@@ -56,11 +53,7 @@ func Test_sshConfigExecEscape(t *testing.T) {
		}
		require.NoError(t, err)

		args := []string{"/bin/sh", "-c", escaped}
		if runtime.GOOS == "windows" {
		args = []string{"cmd.exe", "/c", escaped}
		}
		b, err := exec.Command(args[0], args[1:]...).CombinedOutput() //nolint:gosec
		b, err := exec.Command("/bin/sh", "-c", escaped).CombinedOutput() //nolint:gosec
		require.NoError(t, err)
		got := strings.TrimSpace(string(b))
		require.Equal(t, "yay", got)
Expand Down