some different jank

sreya · sreya · commit 717e4c27000e · 2022-06-24T15:56:55.000Z
diff --git a/cli/create_test.go b/cli/create_test.go
@@ -266,7 +266,7 @@ func TestCreate(t *testing.T) {
 								Description:         "description 1",
 								DefaultSource: &proto.ParameterSource{
 									Scheme: proto.ParameterSource_DATA,
-									Value:  "exit 0",
+									Value:  echo.ParameterSucceed(),
 								},
 								DefaultDestination: &proto.ParameterDestination{
 									Scheme: proto.ParameterDestination_PROVISIONER_VARIABLE,
@@ -287,7 +287,7 @@ func TestCreate(t *testing.T) {
 
 		tempDir := t.TempDir()
 		parameterFile, _ := os.CreateTemp(tempDir, "testParameterFile*.yaml")
-		_, _ = parameterFile.WriteString(fmt.Sprintf("%s: %q", echo.ParameterExecKey, "exit 1"))
+		_, _ = parameterFile.WriteString(fmt.Sprintf("%s: %q", echo.ParameterExecKey, echo.ParameterError("fail")))
 
 		// The template import job should end up failed, but we need it to be
 		// succeeded so the dry-run can begin.
diff --git a/coderd/templateversions_test.go b/coderd/templateversions_test.go
@@ -578,8 +578,10 @@ func TestTemplateVersionDryRun(t *testing.T) {
 			job, err := client.CreateTemplateVersionDryRun(context.Background(), version.ID, codersdk.CreateTemplateVersionDryRunRequest{
 				ParameterValues: []codersdk.CreateParameterRequest{
 					{
-						Name:        echo.ParameterExecKey,
-						SourceValue: "tail -f /dev/null",
+						Name: echo.ParameterExecKey,
+						// Sleep for a ridiculously long time so we don't accidentally complete
+						// before we successfully cancel the job.
+						SourceValue: echo.ParameterSleep(time.Minute * 5),
 					},
 				},
 			})
@@ -659,7 +661,7 @@ func TestTemplateVersionDryRun(t *testing.T) {
 				ParameterValues: []codersdk.CreateParameterRequest{
 					{
 						Name:        echo.ParameterExecKey,
-						SourceValue: "tail -f /dev/null",
+						SourceValue: echo.ParameterSleep(time.Minute * 5),
 					},
 				},
 			})
diff --git a/coderd/workspaces_test.go b/coderd/workspaces_test.go
@@ -629,8 +629,10 @@ func TestPostWorkspaceBuild(t *testing.T) {
 			func(req *codersdk.CreateWorkspaceRequest) {
 				req.ParameterValues = []codersdk.CreateParameterRequest{
 					{
-						Name:        echo.ParameterExecKey,
-						SourceValue: "tail -f /dev/null",
+						Name:              echo.ParameterExecKey,
+						SourceValue:       echo.ParameterSleep(time.Minute * 5),
+						SourceScheme:      codersdk.ParameterSourceSchemeData,
+						DestinationScheme: codersdk.ParameterDestinationSchemeProvisionerVariable,
 					},
 				}
 			})
diff --git a/provisioner/echo/serve.go b/provisioner/echo/serve.go
@@ -5,9 +5,9 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"os/exec"
 	"path/filepath"
 	"strings"
+	"time"
 
 	"golang.org/x/xerrors"
 	protobuf "google.golang.org/protobuf/proto"
@@ -20,8 +20,28 @@ import (
 
 const (
 	ParameterExecKey = "echo.exec"
+
+	sleepKey   = "sleep"
+	errorKey   = "error"
+	successKey = "success"
 )
 
+func ParameterError(s string) string {
+	return formatExecValue(errorKey, s)
+}
+
+func ParameterSleep(dur time.Duration) string {
+	return formatExecValue(sleepKey, dur.String())
+}
+
+func ParameterSucceed() string {
+	return formatExecValue(successKey, "")
+}
+
+func formatExecValue(key, value string) string {
+	return fmt.Sprintf("%s=%s", key, value)
+}
+
 var (
 	// ParseComplete is a helper to indicate an empty parse completion.
 	ParseComplete = []*proto.Parse_Response{{
@@ -91,15 +111,22 @@ func (e *echo) Provision(stream proto.DRPCProvisioner_ProvisionStream) error {
 
 	for _, param := range request.ParameterValues {
 		if param.Name == ParameterExecKey {
-			// #nosec G204
-			cmd := exec.Command("/bin/sh", "-c", param.Value)
-			out, err := cmd.CombinedOutput()
-			if err != nil {
-				return xerrors.Errorf("exec %q returned %q: %w",
-					strings.Join(cmd.Args, " "),
-					string(out),
-					err,
-				)
+			toks := strings.Split(param.Value, "=")
+			if len(toks) < 2 {
+				break
+			}
+
+			switch toks[0] {
+			case sleepKey:
+				dur, err := time.ParseDuration(toks[1])
+				if err != nil {
+					return xerrors.Errorf("parse duration: %w", err)
+				}
+				time.Sleep(dur)
+			case errorKey:
+				return xerrors.Errorf("returning error: %v", toks[1])
+			default:
+				// Do nothing
 			}
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -629,8 +629,10 @@ func TestPostWorkspaceBuild(t *testing.T) {`
`629`	`629`	`func(req *codersdk.CreateWorkspaceRequest) {`
`630`	`630`	`req.ParameterValues = []codersdk.CreateParameterRequest{`
`631`	`631`	`{`
`632`		`- Name: echo.ParameterExecKey,`
`633`		`- SourceValue: "tail -f /dev/null",`
	`632`	`+ Name: echo.ParameterExecKey,`
	`633`	`+ SourceValue: echo.ParameterSleep(time.Minute * 5),`
	`634`	`+ SourceScheme: codersdk.ParameterSourceSchemeData,`
	`635`	`+ DestinationScheme: codersdk.ParameterDestinationSchemeProvisionerVariable,`
`634`	`636`	`},`
`635`	`637`	`}`
`636`	`638`	`})`