From 573cc5896655f6fae2462cf0a72eaed00940e190 Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Tue, 9 Aug 2022 13:58:42 -0600
Subject: [PATCH 01/77] Upload mounted files

---
 cmd/src/batch_remote.go | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/cmd/src/batch_remote.go b/cmd/src/batch_remote.go
index 261831c11c..ab5d84bd86 100644
--- a/cmd/src/batch_remote.go
+++ b/cmd/src/batch_remote.go
@@ -63,7 +63,7 @@ Examples:
 		// may as well validate it at the same time so we don't even have to go to
 		// the backend if it's invalid.
 		ui.ParsingBatchSpec()
-		spec, raw, err := parseBatchSpec(ctx, file, svc, true)
+		spec, raw, err := parseBatchSpec(ctx, file, svc)
 		if err != nil {
 			ui.ParsingBatchSpecFailure(err)
 			return err
@@ -79,7 +79,7 @@ Examples:
 		ui.ResolvingNamespaceSuccess(namespace.ID)
 
 		ui.SendingBatchChange()
-		batchChangeName, err := svc.UpsertBatchChange(ctx, spec.Name, namespace.ID)
+		batchChangeID, batchChangeName, err := svc.UpsertBatchChange(ctx, spec.Name, namespace.ID)
 		if err != nil {
 			return err
 		}
@@ -93,12 +93,23 @@ Examples:
 			flags.allowIgnored,
 			flags.allowUnsupported,
 			flags.clearCache,
+			batchChangeID,
 		)
 		if err != nil {
 			return err
 		}
 		ui.SendingBatchSpecSuccess()
 
+		ui.UploadingMounts()
+		dir, err := getBatchSpecDirectory(file)
+		if err != nil {
+			return errors.Wrap(err, "batch spec path")
+		}
+		if err = svc.UploadMounts(dir, batchSpecID, spec.Steps); err != nil {
+			return err
+		}
+		ui.UploadingMountsSuccess()
+
 		// Wait for the workspaces to be resolved.
 		ui.ResolvingWorkspaces()
 		ticker := time.NewTicker(1 * time.Second)

From 2a326cec4830ff01e85b4a0be4b2471d59368807 Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Tue, 9 Aug 2022 13:59:02 -0600
Subject: [PATCH 02/77] Temporarily point to local sourcegraph code

---
 go.mod | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/go.mod b/go.mod
index 8104a6b9ff..96848a5e2c 100644
--- a/go.mod
+++ b/go.mod
@@ -116,3 +116,7 @@ require (
 
 // See: https://github.com/ghodss/yaml/pull/65
 replace github.com/ghodss/yaml => github.com/sourcegraph/yaml v1.0.1-0.20200714132230-56936252f152
+
+replace (
+	github.com/sourcegraph/sourcegraph/lib v0.0.0-20220715132627-cb906941e8b4 => ../sourcegraph/lib
+)

From 3a214d9914b8aec70d6f2b272d039ef3b42074aa Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Tue, 9 Aug 2022 13:59:19 -0600
Subject: [PATCH 03/77] Add mount upload progress

---
 internal/batches/ui/tui.go | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/internal/batches/ui/tui.go b/internal/batches/ui/tui.go
index f146ab77fc..925ad44d77 100644
--- a/internal/batches/ui/tui.go
+++ b/internal/batches/ui/tui.go
@@ -6,6 +6,7 @@ import (
 	"os/exec"
 
 	"github.com/neelance/parallel"
+
 	"github.com/sourcegraph/sourcegraph/lib/errors"
 	"github.com/sourcegraph/sourcegraph/lib/output"
 
@@ -239,6 +240,14 @@ func (ui *TUI) SendingBatchSpecSuccess() {
 	batchCompletePending(ui.pending, "Sending batch spec")
 }
 
+func (ui *TUI) UploadingMounts() {
+	ui.pending = batchCreatePending(ui.Out, "Uploading mounts")
+}
+
+func (ui *TUI) UploadingMountsSuccess() {
+	batchCompletePending(ui.pending, "Uploading mounts")
+}
+
 func (ui *TUI) ResolvingWorkspaces() {
 	ui.pending = batchCreatePending(ui.Out, "Resolving workspaces")
 }

From 9f638670aeb57c895eb5136fb97a636bc780a90e Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Tue, 9 Aug 2022 13:59:41 -0600
Subject: [PATCH 04/77] Specify the directory where the files are located

---
 internal/batches/executor/task.go | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/internal/batches/executor/task.go b/internal/batches/executor/task.go
index aba8779004..bb38f58e30 100644
--- a/internal/batches/executor/task.go
+++ b/internal/batches/executor/task.go
@@ -14,7 +14,8 @@ import (
 )
 
 type Task struct {
-	Repository *graphql.Repository
+	BatchSpecID string
+	Repository  *graphql.Repository
 	// Path is the folder relative to the repository's root in which the steps
 	// should be executed. "" means root.
 	Path string
@@ -38,11 +39,13 @@ func (t *Task) ArchivePathToFetch() string {
 	return ""
 }
 
-func (t *Task) CacheKey(globalEnv []string, isRemote bool, stepIndex int) cache.Keyer {
+func (t *Task) CacheKey(globalEnv []string, dir string, isRemote bool, stepIndex int) cache.Keyer {
 	var metadataRetriever cache.MetadataRetriever
 	// If the task is being run locally, set the metadata retrieve to use the filesystem based implementation.
 	if !isRemote {
-		metadataRetriever = fileMetadataRetriever{}
+		metadataRetriever = fileMetadataRetriever{
+			batchSpecDir: dir,
+		}
 	}
 	return &cache.CacheKey{
 		Repository: batcheslib.Repository{
@@ -65,14 +68,16 @@ func (t *Task) CacheKey(globalEnv []string, isRemote bool, stepIndex int) cache.
 	}
 }
 
-type fileMetadataRetriever struct{}
+type fileMetadataRetriever struct {
+	batchSpecDir string
+}
 
 func (f fileMetadataRetriever) Get(steps []batcheslib.Step) ([]cache.MountMetadata, error) {
 	var mountsMetadata []cache.MountMetadata
 	for _, step := range steps {
 		// Build up the metadata for each mount for each step
 		for _, mount := range step.Mount {
-			metadata, err := getMountMetadata(mount.Path)
+			metadata, err := getMountMetadata(filepath.Join(f.batchSpecDir, mount.Path))
 			if err != nil {
 				return nil, err
 			}

From 1a1b4f38d112ad5f1c63617d1cc5c61cf650ba46 Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Tue, 9 Aug 2022 13:59:57 -0600
Subject: [PATCH 05/77] Remove unneeded tests

---
 internal/batches/service/service_test.go | 25 +-----------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

diff --git a/internal/batches/service/service_test.go b/internal/batches/service/service_test.go
index 8d2f1b604e..9f906a7869 100644
--- a/internal/batches/service/service_test.go
+++ b/internal/batches/service/service_test.go
@@ -716,7 +716,6 @@ func TestService_ParseBatchSpec(t *testing.T) {
 		name         string
 		batchSpecDir string
 		rawSpec      string
-		isRemote     bool
 		expectedSpec *batcheslib.BatchSpec
 		expectedErr  error
 	}{
@@ -1005,32 +1004,10 @@ changesetTemplate:
 `, tempOutsideDir),
 			expectedErr: errors.New("handling mount: step 1 mount path is not in the same directory or subdirectory as the batch spec"),
 		},
-		{
-			name:         "mount remote processing",
-			batchSpecDir: tempDir,
-			rawSpec: `
-name: test-spec
-description: A test spec
-steps:
-  - run: /tmp/foo/bar/sample.sh
-    container: alpine:3
-    mount:
-      - path: /valid/sample.sh
-        mountpoint: /tmp/foo/bar/sample.sh
-changesetTemplate:
-  title: Test Mount
-  body: Test a mounted path
-  branch: test
-  commit:
-    message: Test
-`,
-			isRemote:    true,
-			expectedErr: errors.New("handling mount: mounts are not supported for server-side processing"),
-		},
 	}
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
-			spec, err := svc.ParseBatchSpec(test.batchSpecDir, []byte(test.rawSpec), test.isRemote)
+			spec, err := svc.ParseBatchSpec(test.batchSpecDir, []byte(test.rawSpec))
 			if test.expectedErr != nil {
 				assert.Equal(t, test.expectedErr.Error(), err.Error())
 			} else {

From 5d8f987f8b7f22fa94e4d85b3ee7d6d37b73cfc4 Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Tue, 9 Aug 2022 14:00:13 -0600
Subject: [PATCH 06/77] Do not update the path of the mount

---
 internal/batches/service/service.go | 31 +++++++++--------------------
 1 file changed, 9 insertions(+), 22 deletions(-)

diff --git a/internal/batches/service/service.go b/internal/batches/service/service.go
index 44c97843e1..41d85942cb 100644
--- a/internal/batches/service/service.go
+++ b/internal/batches/service/service.go
@@ -458,7 +458,7 @@ func (e *duplicateBranchesErr) Error() string {
 	return out.String()
 }
 
-func (svc *Service) ParseBatchSpec(dir string, data []byte, isRemote bool) (*batcheslib.BatchSpec, error) {
+func (svc *Service) ParseBatchSpec(dir string, data []byte) (*batcheslib.BatchSpec, error) {
 	spec, err := batcheslib.ParseBatchSpec(data, batcheslib.ParseBatchSpecOptions{
 		AllowArrayEnvironments: svc.features.AllowArrayEnvironments,
 		AllowTransformChanges:  svc.features.AllowTransformChanges,
@@ -467,41 +467,28 @@ func (svc *Service) ParseBatchSpec(dir string, data []byte, isRemote bool) (*bat
 	if err != nil {
 		return nil, errors.Wrap(err, "parsing batch spec")
 	}
-	if err = validateMount(dir, spec, isRemote); err != nil {
+	if err = validateMount(dir, spec); err != nil {
 		return nil, errors.Wrap(err, "handling mount")
 	}
 	return spec, nil
 }
 
-func validateMount(batchSpecDir string, spec *batcheslib.BatchSpec, isRemote bool) error {
+func validateMount(batchSpecDir string, spec *batcheslib.BatchSpec) error {
 	for i, step := range spec.Steps {
-		for j, mount := range step.Mount {
-			if isRemote {
-				return errors.New("mounts are not supported for server-side processing")
-			}
-			p := mount.Path
-			if !filepath.IsAbs(p) {
+		for _, mount := range step.Mount {
+			if !filepath.IsAbs(mount.Path) {
 				// Try to build the absolute path since Docker will only mount absolute paths
-				p = filepath.Join(batchSpecDir, p)
+				mount.Path = filepath.Join(batchSpecDir, mount.Path)
 			}
-			pathInfo, err := os.Stat(p)
+			_, err := os.Stat(mount.Path)
 			if os.IsNotExist(err) {
-				return errors.Newf("step %d mount path %s does not exist", i+1, p)
+				return errors.Newf("step %d mount path %s does not exist", i+1, mount.Path)
 			} else if err != nil {
 				return errors.Wrapf(err, "step %d mount path validation", i+1)
 			}
-			if !strings.HasPrefix(p, batchSpecDir) {
+			if !strings.HasPrefix(mount.Path, batchSpecDir) {
 				return errors.Newf("step %d mount path is not in the same directory or subdirectory as the batch spec", i+1)
 			}
-			// Mounting a directory on Docker must end with the separator. So, append the file separator to make
-			// users' lives easier.
-			if pathInfo.IsDir() && !strings.HasSuffix(p, string(filepath.Separator)) {
-				p += string(filepath.Separator)
-			}
-			// Update the mount path to the absolute path so building the absolute path (above) does not need to be
-			// redone when adding the mount argument to the Docker container.
-			// TODO: Can this mess with caching? We wouldn't be doing that server-side.
-			step.Mount[j].Path = p
 		}
 	}
 	return nil

From d402823cb5001dc2882628b68cf70f18c3534b5b Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Tue, 9 Aug 2022 14:00:35 -0600
Subject: [PATCH 07/77] Allow mount files to be ran in executor

---
 internal/batches/executor/run_steps.go | 41 ++++++++++++++++++++------
 1 file changed, 32 insertions(+), 9 deletions(-)

diff --git a/internal/batches/executor/run_steps.go b/internal/batches/executor/run_steps.go
index 40f704a13b..a2791e4fc9 100644
--- a/internal/batches/executor/run_steps.go
+++ b/internal/batches/executor/run_steps.go
@@ -8,6 +8,7 @@ import (
 	"io"
 	"os"
 	"os/exec"
+	"path/filepath"
 	"strings"
 	"time"
 
@@ -37,7 +38,8 @@ type RunStepsOpts struct {
 	// Task is the definition of the workspace execution.
 	Task *Task
 	// TempDir points to where temporary files of the execution should live at.
-	TempDir string
+	TempDir  string
+	MountDir string
 	// Timeout sets the deadline for the execution context. When exceeded,
 	// execution will stop and an error is returned.
 	Timeout time.Duration
@@ -45,9 +47,6 @@ type RunStepsOpts struct {
 	RepoArchive repozip.Archive
 	Logger      log.TaskLogger
 	UI          StepsExecutionUI
-	// IsRemote toggles server-side execution mode. This disables file mounts using
-	// step.mounts.
-	IsRemote bool
 	// GlobalEnv is the os.Environ() for the execution. We don't read from os.Environ()
 	// directly to allow injecting variables and hiding others.
 	GlobalEnv []string
@@ -321,12 +320,13 @@ func executeSingleStep(
 		args = append(args, "--mount", fmt.Sprintf("type=bind,source=%s,target=%s,ro", source.Name(), target))
 	}
 
-	// Temporarily add a guard to prevent a path to mount path for server-side processing.
-	if !opts.IsRemote {
-		// Mount any paths on the local system to the docker container. The paths have already been validated during parsing.
-		for _, mount := range step.Mount {
-			args = append(args, "--mount", fmt.Sprintf("type=bind,source=%s,target=%s,ro", mount.Path, mount.Mountpoint))
+	// Mount any paths on the local system to the docker container. The paths have already been validated during parsing.
+	for _, mount := range step.Mount {
+		mountPath, err := getAbsoluteMountPath(opts.MountDir, mount.Path)
+		if err != nil {
+			return bytes.Buffer{}, bytes.Buffer{}, err
 		}
+		args = append(args, "--mount", fmt.Sprintf("type=bind,source=%s,target=%s,ro", mountPath, mount.Mountpoint))
 	}
 
 	for k, v := range env {
@@ -591,6 +591,29 @@ func createCidFile(ctx context.Context, tempDir string, repoSlug string) (string
 	return cidFile.Name(), cleanup, nil
 }
 
+func getAbsoluteMountPath(batchSpecDir string, mountPath string) (string, error) {
+	p := mountPath
+	if !filepath.IsAbs(p) {
+		// Try to build the absolute path since Docker will only mount absolute paths
+		p = filepath.Join(batchSpecDir, p)
+	}
+	pathInfo, err := os.Stat(p)
+	if os.IsNotExist(err) {
+		return "", errors.Newf("mount path %s does not exist", p)
+	} else if err != nil {
+		return "", errors.Wrap(err, "mount path validation")
+	}
+	if !strings.HasPrefix(p, batchSpecDir) {
+		return "", errors.Newf("mount path %s is not in the same directory or subdirectory as the batch spec", mountPath)
+	}
+	// Mounting a directory on Docker must end with the separator. So, append the file separator to make
+	// users' lives easier.
+	if pathInfo.IsDir() && !strings.HasSuffix(p, string(filepath.Separator)) {
+		p += string(filepath.Separator)
+	}
+	return p, nil
+}
+
 type stepFailedErr struct {
 	Run       string
 	Container string

From 1794e7f1030ca6534686f58457802043f1defc28 Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Tue, 9 Aug 2022 14:00:55 -0600
Subject: [PATCH 08/77] Add functions to upload files

---
 internal/batches/service/remote.go | 110 +++++++++++++++++++++++++++--
 1 file changed, 105 insertions(+), 5 deletions(-)

diff --git a/internal/batches/service/remote.go b/internal/batches/service/remote.go
index dc63a47daf..6a44f3def8 100644
--- a/internal/batches/service/remote.go
+++ b/internal/batches/service/remote.go
@@ -1,8 +1,17 @@
 package service
 
 import (
+	"bytes"
 	"context"
+	"io"
+	"mime/multipart"
+	"net/http"
+	"os"
+	"path/filepath"
 
+	"github.com/sourcegraph/src-cli/internal/api"
+
+	"github.com/sourcegraph/sourcegraph/lib/batches"
 	"github.com/sourcegraph/sourcegraph/lib/errors"
 )
 
@@ -25,6 +34,7 @@ mutation UpsertEmptyBatchChange(
 		namespace: $namespace
 	) {
 		name
+		id
 	}
 }
 `
@@ -33,14 +43,15 @@ func (svc *Service) UpsertBatchChange(
 	ctx context.Context,
 	name string,
 	namespaceID string,
-) (string, error) {
+) (string, string, error) {
 	if err := svc.areServerSideBatchChangesSupported(); err != nil {
-		return "", err
+		return "", "", err
 	}
 
 	var resp struct {
 		UpsertEmptyBatchChange struct {
 			Name string `json:"name"`
+			ID   string `json:"id"`
 		} `json:"upsertEmptyBatchChange"`
 	}
 
@@ -48,10 +59,10 @@ func (svc *Service) UpsertBatchChange(
 		"name":      name,
 		"namespace": namespaceID,
 	}).Do(ctx, &resp); err != nil || !ok {
-		return "", err
+		return "", "", err
 	}
 
-	return resp.UpsertEmptyBatchChange.Name, nil
+	return resp.UpsertEmptyBatchChange.ID, resp.UpsertEmptyBatchChange.Name, nil
 }
 
 const createBatchSpecFromRawQuery = `
@@ -61,6 +72,7 @@ mutation CreateBatchSpecFromRaw(
     $allowIgnored: Boolean!,
     $allowUnsupported: Boolean!,
     $noCache: Boolean!,
+    $batchChange: ID!,
 ) {
     createBatchSpecFromRaw(
         batchSpec: $batchSpec,
@@ -68,8 +80,10 @@ mutation CreateBatchSpecFromRaw(
         allowIgnored: $allowIgnored,
         allowUnsupported: $allowUnsupported,
         noCache: $noCache,
+        batchChange: $batchChange,
     ) {
         id
+        uploadToken
     }
 }
 `
@@ -81,6 +95,7 @@ func (svc *Service) CreateBatchSpecFromRaw(
 	allowIgnored bool,
 	allowUnsupported bool,
 	noCache bool,
+	batchChange string,
 ) (string, error) {
 	if err := svc.areServerSideBatchChangesSupported(); err != nil {
 		return "", err
@@ -88,7 +103,8 @@ func (svc *Service) CreateBatchSpecFromRaw(
 
 	var resp struct {
 		CreateBatchSpecFromRaw struct {
-			ID string `json:"id"`
+			ID          string `json:"id"`
+			UploadToken string `json:"uploadToken"`
 		} `json:"createBatchSpecFromRaw"`
 	}
 
@@ -98,6 +114,7 @@ func (svc *Service) CreateBatchSpecFromRaw(
 		"allowIgnored":     allowIgnored,
 		"allowUnsupported": allowUnsupported,
 		"noCache":          noCache,
+		"batchChange":      batchChange,
 	}).Do(ctx, &resp); err != nil || !ok {
 		return "", err
 	}
@@ -105,6 +122,89 @@ func (svc *Service) CreateBatchSpecFromRaw(
 	return resp.CreateBatchSpecFromRaw.ID, nil
 }
 
+func (svc *Service) UploadMounts(dir string, batchSpecID string, steps []batches.Step) error {
+	if err := svc.areServerSideBatchChangesSupported(); err != nil {
+		return err
+	}
+
+	for _, step := range steps {
+		// TODO bulk + parallel
+		for _, mount := range step.Mount {
+			if err := uploadMount(svc.client, batchSpecID, filepath.Join(dir, mount.Path)); err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}
+
+func uploadMount(client api.Client, batchSpecID string, mountPath string) error {
+	info, err := os.Stat(mountPath)
+	if err != nil {
+		return err
+	}
+	if info.IsDir() {
+		dir, err := os.ReadDir(mountPath)
+		if err != nil {
+			return err
+		}
+		for _, dirEntry := range dir {
+			if err = uploadMount(client, batchSpecID, filepath.Join(mountPath, dirEntry.Name())); err != nil {
+				return err
+			}
+		}
+	} else {
+		if err = uploadFile(client, batchSpecID, mountPath); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func uploadFile(client api.Client, batchSpecID string, path string) error {
+	body := &bytes.Buffer{}
+	w := multipart.NewWriter(body)
+
+	f, err := os.Open(path)
+	if err != nil {
+		return err
+	}
+	defer f.Close()
+
+	if err = w.WriteField("count", "1"); err != nil {
+		return err
+	}
+	if err = w.WriteField("batchSpecID", batchSpecID); err != nil {
+		return err
+	}
+
+	part, err := w.CreateFormFile("file_0", "foo/bar/updater.py")
+	if err != nil {
+		return err
+	}
+	if _, err = io.Copy(part, f); err != nil {
+		return err
+	}
+	if err = w.Close(); err != nil {
+		return err
+	}
+
+	request, err := client.NewHTTPRequest(context.Background(), http.MethodPost, filepath.Join(".api/batches/mount", batchSpecID), body)
+	if err != nil {
+		return err
+	}
+	request.Header.Add("Content-Type", w.FormDataContentType())
+
+	resp, err := client.Do(request)
+	if err != nil {
+		return err
+	}
+	if resp.StatusCode != http.StatusOK {
+		return errors.New("failed")
+	}
+	return nil
+}
+
 const executeBatchSpecQuery = `
 mutation ExecuteBatchSpec($batchSpec: ID!, $noCache: Boolean!) {
     executeBatchSpec(batchSpec: $batchSpec, noCache: $noCache) {

From 9d2554d2406b9f4d2a5833e1b4c82c535e563910 Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Tue, 9 Aug 2022 14:01:20 -0600
Subject: [PATCH 09/77] Save the directory of the batch spec

---
 internal/batches/executor/executor.go | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/internal/batches/executor/executor.go b/internal/batches/executor/executor.go
index 069727e82d..4d35a444ee 100644
--- a/internal/batches/executor/executor.go
+++ b/internal/batches/executor/executor.go
@@ -62,11 +62,12 @@ type NewExecutorOpts struct {
 	Logger              log.LogManager
 
 	// Config
-	Parallelism int
-	Timeout     time.Duration
-	TempDir     string
-	IsRemote    bool
-	GlobalEnv   []string
+	Parallelism        int
+	Timeout            time.Duration
+	BatchSpecDirectory string
+	TempDir            string
+	IsRemote           bool
+	GlobalEnv          []string
 }
 
 type executor struct {
@@ -173,7 +174,6 @@ func (x *executor) do(ctx context.Context, task *Task, ui TaskExecutionUI) (err
 		WC:          x.opts.Creator,
 		EnsureImage: x.opts.EnsureImage,
 		TempDir:     x.opts.TempDir,
-		IsRemote:    x.opts.IsRemote,
 		GlobalEnv:   x.opts.GlobalEnv,
 		Timeout:     x.opts.Timeout,
 		RepoArchive: repoArchive,

From bb9f6f40aabd22af4f1a8fe59742a0fd32f6edb8 Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Tue, 9 Aug 2022 14:01:42 -0600
Subject: [PATCH 10/77] Use mount directory for caching

---
 internal/batches/executor/coordinator.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/internal/batches/executor/coordinator.go b/internal/batches/executor/coordinator.go
index 970ae6c555..8e42ddc56e 100644
--- a/internal/batches/executor/coordinator.go
+++ b/internal/batches/executor/coordinator.go
@@ -70,7 +70,7 @@ func (c *Coordinator) CheckCache(ctx context.Context, batchSpec *batcheslib.Batc
 func (c *Coordinator) ClearCache(ctx context.Context, tasks []*Task) error {
 	for _, task := range tasks {
 		for i := len(task.Steps) - 1; i > -1; i-- {
-			key := task.CacheKey(c.opts.GlobalEnv, c.opts.IsRemote, i)
+			key := task.CacheKey(c.opts.GlobalEnv, c.opts.ExecOpts.BatchSpecDirectory, c.opts.IsRemote, i)
 			if err := c.opts.Cache.Clear(ctx, key); err != nil {
 				return errors.Wrapf(err, "clearing cache for step %d in %q", i, task.Repository.Name)
 			}
@@ -134,7 +134,7 @@ func (c *Coordinator) loadCachedStepResults(ctx context.Context, task *Task, glo
 	// We start at the back so that we can find the _last_ cached step,
 	// then restart execution on the following step.
 	for i := len(task.Steps) - 1; i > -1; i-- {
-		key := task.CacheKey(globalEnv, c.opts.IsRemote, i)
+		key := task.CacheKey(globalEnv, c.opts.ExecOpts.BatchSpecDirectory, c.opts.IsRemote, i)
 
 		result, found, err := c.opts.Cache.Get(ctx, key)
 		if err != nil {
@@ -187,7 +187,7 @@ func (c *Coordinator) ExecuteAndBuildSpecs(ctx context.Context, batchSpec *batch
 	// Write all step cache results to the cache.
 	for _, res := range results {
 		for _, stepRes := range res.stepResults {
-			cacheKey := res.task.CacheKey(c.opts.GlobalEnv, c.opts.IsRemote, stepRes.StepIndex)
+			cacheKey := res.task.CacheKey(c.opts.GlobalEnv, c.opts.ExecOpts.BatchSpecDirectory, c.opts.IsRemote, stepRes.StepIndex)
 			if err := c.opts.Cache.Set(ctx, cacheKey, stepRes); err != nil {
 				return nil, nil, errors.Wrapf(err, "caching result for step %d", stepRes.StepIndex)
 			}

From e836e7a318bc58e42bf1fa86d183f4cbce9dbc5a Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Tue, 9 Aug 2022 14:02:02 -0600
Subject: [PATCH 11/77] Specify the mount directory

---
 internal/batches/workspace/bind_workspace.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/internal/batches/workspace/bind_workspace.go b/internal/batches/workspace/bind_workspace.go
index 55a1e4dcb4..9229ff0e7c 100644
--- a/internal/batches/workspace/bind_workspace.go
+++ b/internal/batches/workspace/bind_workspace.go
@@ -110,7 +110,8 @@ type dockerBindWorkspace struct {
 	// dir is the directory where the repo archive is unzipped to.
 	// This is also the path that is directly mounted into the docker
 	// containers.
-	dir string
+	dir      string
+	mountDir string
 }
 
 var _ Workspace = &dockerBindWorkspace{}

From 05521861cbaa4ec4929cf9327bd19e6e88317813 Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Tue, 9 Aug 2022 14:02:11 -0600
Subject: [PATCH 12/77] Remove unused parameter

---
 cmd/src/batch_validate.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/src/batch_validate.go b/cmd/src/batch_validate.go
index ae5b20e1e4..56527f6a7d 100644
--- a/cmd/src/batch_validate.go
+++ b/cmd/src/batch_validate.go
@@ -73,7 +73,7 @@ Examples:
 			return err
 		}
 
-		if _, _, err := parseBatchSpec(ctx, file, svc, false); err != nil {
+		if _, _, err := parseBatchSpec(ctx, file, svc); err != nil {
 			ui.ParsingBatchSpecFailure(err)
 			return err
 		}

From ded8b16235f4af31863876a8e9afdb73bdb5eaf3 Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Tue, 9 Aug 2022 14:02:17 -0600
Subject: [PATCH 13/77] Remove unused parameter

---
 cmd/src/batch_repositories.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/src/batch_repositories.go b/cmd/src/batch_repositories.go
index 02d8979cee..23a8ee001e 100644
--- a/cmd/src/batch_repositories.go
+++ b/cmd/src/batch_repositories.go
@@ -73,7 +73,7 @@ Examples:
 		}
 
 		out := output.NewOutput(flagSet.Output(), output.OutputOpts{Verbose: *verbose})
-		spec, _, err := parseBatchSpec(ctx, file, svc, false)
+		spec, _, err := parseBatchSpec(ctx, file, svc)
 		if err != nil {
 			ui := &ui.TUI{Out: out}
 			ui.ParsingBatchSpecFailure(err)

From 5596cf89683cae0848c6c2f51f9e4424675dc162 Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Tue, 9 Aug 2022 14:02:50 -0600
Subject: [PATCH 14/77] Use the batch spec directory for caching

---
 cmd/src/batch_common.go | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/cmd/src/batch_common.go b/cmd/src/batch_common.go
index 91554c7850..7e2f02c516 100644
--- a/cmd/src/batch_common.go
+++ b/cmd/src/batch_common.go
@@ -298,7 +298,7 @@ func executeBatchSpec(ctx context.Context, ui ui.ExecUI, opts executeBatchSpecOp
 
 	// Parse flags and build up our service and executor options.
 	ui.ParsingBatchSpec()
-	batchSpec, rawSpec, err := parseBatchSpec(ctx, opts.file, svc, false)
+	batchSpec, rawSpec, err := parseBatchSpec(ctx, opts.file, svc)
 	if err != nil {
 		var multiErr errors.MultiError
 		if errors.As(err, &multiErr) {
@@ -395,6 +395,10 @@ func executeBatchSpec(ctx context.Context, ui ui.ExecUI, opts executeBatchSpecOp
 
 	archiveRegistry := repozip.NewArchiveRegistry(opts.client, opts.flags.cacheDir, opts.flags.cleanArchives)
 	logManager := log.NewDiskManager(opts.flags.tempDir, opts.flags.keepLogs)
+	batchSpecDirectory, err := getBatchSpecDirectory(opts.file)
+	if err != nil {
+		return err
+	}
 	coord := executor.NewCoordinator(
 		executor.NewCoordinatorOpts{
 			ExecOpts: executor.NewExecutorOpts{
@@ -403,10 +407,10 @@ func executeBatchSpec(ctx context.Context, ui ui.ExecUI, opts executeBatchSpecOp
 				Creator:             workspaceCreator,
 				EnsureImage:         imageCache.Ensure,
 				Parallelism:         parallelism,
+				BatchSpecDirectory:  batchSpecDirectory,
 				Timeout:             opts.flags.timeout,
 				TempDir:             opts.flags.tempDir,
 				GlobalEnv:           os.Environ(),
-				IsRemote:            false,
 			},
 			Features:  svc.Features(),
 			Logger:    logManager,
@@ -534,10 +538,7 @@ func setReadDeadlineOnCancel(ctx context.Context, f *os.File) {
 
 // parseBatchSpec parses and validates the given batch spec. If the spec has
 // validation errors, they are returned.
-//
-// isRemote argument is a temporary argument used to determine if the batch spec is being parsed for remote
-// (server-side) processing. Remote processing does not support mounts yet.
-func parseBatchSpec(ctx context.Context, file string, svc *service.Service, isRemote bool) (*batcheslib.BatchSpec, string, error) {
+func parseBatchSpec(ctx context.Context, file string, svc *service.Service) (*batcheslib.BatchSpec, string, error) {
 	f, err := batchOpenFileFlag(file)
 	if err != nil {
 		return nil, "", err
@@ -555,23 +556,32 @@ func parseBatchSpec(ctx context.Context, file string, svc *service.Service, isRe
 		return nil, "", errors.Wrap(err, "reading batch spec")
 	}
 
+	dir, err := getBatchSpecDirectory(file)
+	if err != nil {
+		return nil, "", errors.Wrap(err, "batch spec path")
+	}
+
+	spec, err := svc.ParseBatchSpec(dir, data)
+	return spec, string(data), err
+}
+
+func getBatchSpecDirectory(file string) (string, error) {
 	var workingDirectory string
+	var err error
 	// if the batch spec is being provided via standard input, set the working directory to the current directory
 	if file == "" || file == "-" {
 		workingDirectory, err = os.Getwd()
 		if err != nil {
-			return nil, "", errors.Wrap(err, "batch spec path")
+			return "", errors.Wrap(err, "batch spec path")
 		}
 	} else {
 		p, err := filepath.Abs(file)
 		if err != nil {
-			return nil, "", errors.Wrap(err, "batch spec path")
+			return "", errors.Wrap(err, "batch spec path")
 		}
 		workingDirectory = filepath.Dir(p)
 	}
-
-	spec, err := svc.ParseBatchSpec(workingDirectory, data, isRemote)
-	return spec, string(data), err
+	return workingDirectory, nil
 }
 
 func checkExecutable(cmd string, args ...string) error {

From dc21e08ec8687f747ce1f6d48793c9c043c78e54 Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Tue, 9 Aug 2022 14:03:03 -0600
Subject: [PATCH 15/77] Get the mount directory

---
 cmd/src/batch_exec.go | 63 ++++++++++++++++++++++++++++---------------
 1 file changed, 42 insertions(+), 21 deletions(-)

diff --git a/cmd/src/batch_exec.go b/cmd/src/batch_exec.go
index c8e0f0ead2..f3ff3e2743 100644
--- a/cmd/src/batch_exec.go
+++ b/cmd/src/batch_exec.go
@@ -10,16 +10,18 @@ import (
 	"path/filepath"
 	"time"
 
+	"github.com/sourcegraph/src-cli/internal/api"
+	"github.com/sourcegraph/src-cli/internal/batches/docker"
+	"github.com/sourcegraph/src-cli/internal/batches/log"
+	"github.com/sourcegraph/src-cli/internal/batches/repozip"
+	"github.com/sourcegraph/src-cli/internal/batches/workspace"
+
 	"github.com/sourcegraph/sourcegraph/lib/errors"
 
-	"github.com/sourcegraph/src-cli/internal/batches/docker"
 	"github.com/sourcegraph/src-cli/internal/batches/executor"
 	"github.com/sourcegraph/src-cli/internal/batches/graphql"
-	"github.com/sourcegraph/src-cli/internal/batches/log"
-	"github.com/sourcegraph/src-cli/internal/batches/repozip"
 	"github.com/sourcegraph/src-cli/internal/batches/service"
 	"github.com/sourcegraph/src-cli/internal/batches/ui"
-	"github.com/sourcegraph/src-cli/internal/batches/workspace"
 	"github.com/sourcegraph/src-cli/internal/cmderrors"
 
 	batcheslib "github.com/sourcegraph/sourcegraph/lib/batches"
@@ -30,18 +32,23 @@ const (
 )
 
 type executorModeFlags struct {
-	timeout time.Duration
-	file    string
-	tempDir string
-	repoDir string
+	timeout  time.Duration
+	file     string
+	tempDir  string
+	repoDir  string
+	mountDir string
+	api      *api.Flags
 }
 
 func newExecutorModeFlags(flagSet *flag.FlagSet) (f *executorModeFlags) {
-	f = &executorModeFlags{}
+	f = &executorModeFlags{
+		api: api.NewFlags(flagSet),
+	}
 	flagSet.DurationVar(&f.timeout, "timeout", 60*time.Minute, "The maximum duration a single batch spec step can take.")
 	flagSet.StringVar(&f.file, "f", "", "The workspace execution input file to read.")
 	flagSet.StringVar(&f.tempDir, "tmp", "", "Directory for storing temporary data.")
 	flagSet.StringVar(&f.repoDir, "repo", "", "Path of the checked out repo on disk.")
+	flagSet.StringVar(&f.mountDir, "mount", "", "Path of the files to mount on disk.")
 
 	return f
 }
@@ -56,6 +63,9 @@ func validateExecutorModeFlags(f *executorModeFlags) error {
 	if f.repoDir == "" {
 		return errors.New("repoDir parameter missing")
 	}
+	if f.mountDir == "" {
+		return errors.New("mountDir parameter missing")
+	}
 
 	return nil
 }
@@ -69,7 +79,7 @@ github.com/sourcegraph/sourcegraph/lib/batches.
 
 Usage:
 
-    src batch exec -f FILE -repo DIR [command options]
+    src batch exec -f FILE -repo DIR -mount DIR [command options]
 
 Examples:
 
@@ -96,9 +106,13 @@ Examples:
 		ctx, cancel := contextCancelOnInterrupt(context.Background())
 		defer cancel()
 
-		err := executeBatchSpecInWorkspaces(ctx, flags)
+		svc := service.New(&service.Opts{
+			Client: cfg.apiClient(flags.api, flagSet.Output()),
+		})
+
+		err := executeBatchSpecInWorkspaces(ctx, flags, svc)
 		if err != nil {
-			return cmderrors.ExitCode(1, nil)
+			return cmderrors.ExitCode(1, err)
 		}
 
 		return nil
@@ -115,7 +129,7 @@ Examples:
 	})
 }
 
-func executeBatchSpecInWorkspaces(ctx context.Context, flags *executorModeFlags) (err error) {
+func executeBatchSpecInWorkspaces(ctx context.Context, flags *executorModeFlags, svc *service.Service) (err error) {
 	ui := &ui.JSONLines{}
 
 	// Ensure the temp dir exists.
@@ -140,6 +154,15 @@ func executeBatchSpecInWorkspaces(ctx context.Context, flags *executorModeFlags)
 		}
 	}
 
+	// Grab the absolute path to the mount contents.
+	mountDir := flags.mountDir
+	if !filepath.IsAbs(mountDir) {
+		repoDir, err = filepath.Abs(mountDir)
+		if err != nil {
+			return errors.Wrap(err, "getting absolute path for repo dir")
+		}
+	}
+
 	// Test if git is available.
 	if err := checkExecutable("git", "version"); err != nil {
 		return err
@@ -177,8 +200,7 @@ func executeBatchSpecInWorkspaces(ctx context.Context, flags *executorModeFlags)
 	ui.PreparingContainerImagesSuccess()
 
 	// Empty for now until we support secrets or env var settings in SSBC.
-	globalEnv := []string{}
-	isRemote := true
+	var globalEnv []string
 
 	// Set up the execution UI.
 	taskExecUI := ui.ExecutingTasks(false, 1)
@@ -191,11 +213,10 @@ func executeBatchSpecInWorkspaces(ctx context.Context, flags *executorModeFlags)
 		EnsureImage: imageCache.Ensure,
 		Task:        task,
 		// TODO: Should be slightly less than the executor timeout. Can we somehow read that?
-		Timeout:   flags.timeout,
-		TempDir:   tempDir,
-		GlobalEnv: globalEnv,
-		// Temporarily prevent the ability to sending a batch spec with a mount for server-side processing.
-		IsRemote:    isRemote,
+		Timeout:     flags.timeout,
+		TempDir:     tempDir,
+		MountDir:    mountDir,
+		GlobalEnv:   globalEnv,
 		RepoArchive: &repozip.NoopArchive{},
 		UI:          taskExecUI.StepsExecutionUI(task),
 	}
@@ -203,7 +224,7 @@ func executeBatchSpecInWorkspaces(ctx context.Context, flags *executorModeFlags)
 
 	// Write all step cache results for all results.
 	for _, stepRes := range results {
-		cacheKey := task.CacheKey(globalEnv, isRemote, stepRes.StepIndex)
+		cacheKey := task.CacheKey(globalEnv, mountDir, true, stepRes.StepIndex)
 		k, err := cacheKey.Key()
 		if err != nil {
 			return errors.Wrap(err, "calculating step cache key")

From b56d8d108fb8deec55abc00535e015561c2368d9 Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Thu, 11 Aug 2022 13:58:14 -0600
Subject: [PATCH 16/77] Set the mount directory

---
 cmd/src/batch_exec.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmd/src/batch_exec.go b/cmd/src/batch_exec.go
index f3ff3e2743..57929ba9e0 100644
--- a/cmd/src/batch_exec.go
+++ b/cmd/src/batch_exec.go
@@ -157,9 +157,9 @@ func executeBatchSpecInWorkspaces(ctx context.Context, flags *executorModeFlags,
 	// Grab the absolute path to the mount contents.
 	mountDir := flags.mountDir
 	if !filepath.IsAbs(mountDir) {
-		repoDir, err = filepath.Abs(mountDir)
+		mountDir, err = filepath.Abs(mountDir)
 		if err != nil {
-			return errors.Wrap(err, "getting absolute path for repo dir")
+			return errors.Wrap(err, "getting absolute path for mount dir")
 		}
 	}
 

From bd2e771878b69125a5635263850877a00d324278 Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Thu, 11 Aug 2022 14:45:24 -0600
Subject: [PATCH 17/77] Be able to upload multiple files

---
 internal/batches/service/remote.go | 93 +++++++++++++++++-------------
 1 file changed, 53 insertions(+), 40 deletions(-)

diff --git a/internal/batches/service/remote.go b/internal/batches/service/remote.go
index 6a44f3def8..b2cfce7a97 100644
--- a/internal/batches/service/remote.go
+++ b/internal/batches/service/remote.go
@@ -3,13 +3,14 @@ package service
 import (
 	"bytes"
 	"context"
+	"fmt"
 	"io"
 	"mime/multipart"
 	"net/http"
 	"os"
 	"path/filepath"
-
-	"github.com/sourcegraph/src-cli/internal/api"
+	"strconv"
+	"strings"
 
 	"github.com/sourcegraph/sourcegraph/lib/batches"
 	"github.com/sourcegraph/sourcegraph/lib/errors"
@@ -83,7 +84,6 @@ mutation CreateBatchSpecFromRaw(
         batchChange: $batchChange,
     ) {
         id
-        uploadToken
     }
 }
 `
@@ -103,8 +103,7 @@ func (svc *Service) CreateBatchSpecFromRaw(
 
 	var resp struct {
 		CreateBatchSpecFromRaw struct {
-			ID          string `json:"id"`
-			UploadToken string `json:"uploadToken"`
+			ID string `json:"id"`
 		} `json:"createBatchSpecFromRaw"`
 	}
 
@@ -122,86 +121,100 @@ func (svc *Service) CreateBatchSpecFromRaw(
 	return resp.CreateBatchSpecFromRaw.ID, nil
 }
 
-func (svc *Service) UploadMounts(dir string, batchSpecID string, steps []batches.Step) error {
+// UploadMounts uploads file mounts to the server.
+func (svc *Service) UploadMounts(workingDir string, batchSpecID string, steps []batches.Step) error {
 	if err := svc.areServerSideBatchChangesSupported(); err != nil {
 		return err
 	}
 
+	body := &bytes.Buffer{}
+	w := multipart.NewWriter(body)
+
+	// TODO bulk + parallel
+	count := 0
 	for _, step := range steps {
-		// TODO bulk + parallel
 		for _, mount := range step.Mount {
-			if err := uploadMount(svc.client, batchSpecID, filepath.Join(dir, mount.Path)); err != nil {
+			if err := createFormFile(w, workingDir, mount.Path, count); err != nil {
 				return err
 			}
+			count++
 		}
 	}
+
+	// Add 1 to the count for the actual length.
+	if err := w.WriteField("count", strconv.Itoa(count+1)); err != nil {
+		return err
+	}
+
+	// Honestly, the most import thing to do. This adds the closing boundary to the request.
+	if err := w.Close(); err != nil {
+		return err
+	}
+
+	request, err := svc.client.NewHTTPRequest(context.Background(), http.MethodPost, filepath.Join(".api/batches/mount", batchSpecID), body)
+	if err != nil {
+		return err
+	}
+	request.Header.Add("Content-Type", w.FormDataContentType())
+
+	resp, err := svc.client.Do(request)
+	if err != nil {
+		return err
+	}
+	if resp.StatusCode != http.StatusOK {
+		p, err := io.ReadAll(resp.Body)
+		if err != nil {
+			return err
+		}
+		return errors.New(string(p))
+	}
 	return nil
 }
 
-func uploadMount(client api.Client, batchSpecID string, mountPath string) error {
-	info, err := os.Stat(mountPath)
+func createFormFile(w *multipart.Writer, workingDir, mountPath string, index int) error {
+	actualFilePath := filepath.Join(workingDir, mountPath)
+	info, err := os.Stat(actualFilePath)
 	if err != nil {
 		return err
 	}
 	if info.IsDir() {
-		dir, err := os.ReadDir(mountPath)
+		dir, err := os.ReadDir(actualFilePath)
 		if err != nil {
 			return err
 		}
 		for _, dirEntry := range dir {
-			if err = uploadMount(client, batchSpecID, filepath.Join(mountPath, dirEntry.Name())); err != nil {
+			if err = createFormFile(w, workingDir, filepath.Join(mountPath, dirEntry.Name()), index); err != nil {
 				return err
 			}
 		}
 	} else {
-		if err = uploadFile(client, batchSpecID, mountPath); err != nil {
+		if err = uploadFile(w, workingDir, mountPath, index); err != nil {
 			return err
 		}
 	}
 	return nil
 }
 
-func uploadFile(client api.Client, batchSpecID string, path string) error {
-	body := &bytes.Buffer{}
-	w := multipart.NewWriter(body)
-
-	f, err := os.Open(path)
+func uploadFile(w *multipart.Writer, workingDir string, mountPath string, index int) error {
+	// TODO: limit file size
+	f, err := os.Open(filepath.Join(workingDir, mountPath))
 	if err != nil {
 		return err
 	}
 	defer f.Close()
 
-	if err = w.WriteField("count", "1"); err != nil {
-		return err
-	}
-	if err = w.WriteField("batchSpecID", batchSpecID); err != nil {
+	filePath, fileName := filepath.Split(mountPath)
+	if err = w.WriteField(fmt.Sprintf("filepath_%d", index), strings.TrimLeft(filePath, "./")); err != nil {
 		return err
 	}
 
-	part, err := w.CreateFormFile("file_0", "foo/bar/updater.py")
+	part, err := w.CreateFormFile(fmt.Sprintf("file_%d", index), fileName)
 	if err != nil {
 		return err
 	}
 	if _, err = io.Copy(part, f); err != nil {
 		return err
 	}
-	if err = w.Close(); err != nil {
-		return err
-	}
-
-	request, err := client.NewHTTPRequest(context.Background(), http.MethodPost, filepath.Join(".api/batches/mount", batchSpecID), body)
-	if err != nil {
-		return err
-	}
-	request.Header.Add("Content-Type", w.FormDataContentType())
-
-	resp, err := client.Do(request)
-	if err != nil {
-		return err
-	}
-	if resp.StatusCode != http.StatusOK {
-		return errors.New("failed")
-	}
 	return nil
 }
 

From 7326479f4ba1159d82026e133d19e6ff9787824e Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Mon, 15 Aug 2022 10:50:02 -0600
Subject: [PATCH 18/77] Add test for uploading files

---
 internal/batches/service/remote_test.go | 382 ++++++++++++++++++++++++
 1 file changed, 382 insertions(+)
 create mode 100644 internal/batches/service/remote_test.go

diff --git a/internal/batches/service/remote_test.go b/internal/batches/service/remote_test.go
new file mode 100644
index 0000000000..402ccdf285
--- /dev/null
+++ b/internal/batches/service/remote_test.go
@@ -0,0 +1,382 @@
+package service_test
+
+import (
+	"bytes"
+	"context"
+	"fmt"
+	"io"
+	"net/http"
+	"net/http/httptest"
+	"os"
+	"path/filepath"
+	"strconv"
+	"strings"
+	"testing"
+
+	mockclient "github.com/sourcegraph/src-cli/internal/api/mock"
+	"github.com/sourcegraph/src-cli/internal/batches/service"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
+	"github.com/stretchr/testify/require"
+
+	"github.com/sourcegraph/sourcegraph/lib/batches"
+	"github.com/sourcegraph/sourcegraph/lib/errors"
+)
+
+func TestService_UploadMounts(t *testing.T) {
+	client := new(mockclient.Client)
+
+	// Mock SG version to enable ServerSideBatchChanges
+	versionReq := new(mockclient.Request)
+	versionReq.Response = `{"Site":{"ProductVersion":"3.42.0-0"}}`
+	client.On("NewQuery", mock.Anything).Return(versionReq)
+	versionReq.On("Do", mock.Anything, mock.Anything).Return(true, nil)
+
+	svc := service.New(&service.Opts{Client: client})
+
+	err := svc.DetermineFeatureFlags(context.Background())
+	require.NoError(t, err)
+
+	// Use a temp directory for reading files
+	workingDir := t.TempDir()
+
+	tests := []struct {
+		name  string
+		steps []batches.Step
+
+		setup       func() error
+		mockInvokes func()
+
+		expectedError error
+	}{
+		{
+			name: "Upload single file",
+			steps: []batches.Step{{
+				Mount: []batches.Mount{{
+					Path: "./hello.txt",
+				}},
+			}},
+			setup: func() error {
+				return writeTempFile(workingDir, "hello.txt", "hello world!")
+			},
+			mockInvokes: func() {
+				// Body will get set with the body argument to NewHTTPRequest
+				req := httptest.NewRequest(http.MethodPost, "http://fake.com/.api/batches/mount/123", nil)
+				client.On("NewHTTPRequest", mock.Anything, http.MethodPost, ".api/batches/mount/123", mock.Anything).
+					Run(func(args mock.Arguments) {
+						req.Body = io.NopCloser(args.Get(3).(*bytes.Buffer))
+					}).
+					Return(req, nil).
+					Once()
+				resp := &http.Response{
+					StatusCode: http.StatusOK,
+				}
+				requestMatcher := multipartFormRequestMatcher(
+					multipartFormEntry{
+						fileName: "hello.txt",
+						content:  "hello world!",
+					},
+				)
+				client.On("Do", mock.MatchedBy(requestMatcher)).
+					Return(resp, nil).
+					Once()
+			},
+		},
+		{
+			name: "Upload multiple files",
+			steps: []batches.Step{{
+				Mount: []batches.Mount{
+					{
+						Path: "./hello.txt",
+					},
+					{
+						Path: "./world.txt",
+					},
+				},
+			}},
+			setup: func() error {
+				if err := writeTempFile(workingDir, "hello.txt", "hello"); err != nil {
+					return err
+				}
+				return writeTempFile(workingDir, "world.txt", "world!")
+			},
+			mockInvokes: func() {
+				// Body will get set with the body argument to NewHTTPRequest
+				req := httptest.NewRequest(http.MethodPost, "http://fake.com/.api/batches/mount/123", nil)
+				client.On("NewHTTPRequest", mock.Anything, http.MethodPost, ".api/batches/mount/123", mock.Anything).
+					Run(func(args mock.Arguments) {
+						req.Body = io.NopCloser(args.Get(3).(*bytes.Buffer))
+					}).
+					Return(req, nil).
+					Once()
+				resp := &http.Response{
+					StatusCode: http.StatusOK,
+				}
+				requestMatcher := multipartFormRequestMatcher(
+					multipartFormEntry{
+						fileName: "hello.txt",
+						content:  "hello",
+					},
+					multipartFormEntry{
+						fileName: "world.txt",
+						content:  "world!",
+					},
+				)
+				client.On("Do", mock.MatchedBy(requestMatcher)).
+					Return(resp, nil).
+					Once()
+			},
+		},
+		{
+			name: "Upload directory",
+			steps: []batches.Step{{
+				Mount: []batches.Mount{
+					{
+						Path: "./",
+					},
+				},
+			}},
+			setup: func() error {
+				if err := writeTempFile(workingDir, "hello.txt", "hello"); err != nil {
+					return err
+				}
+				return writeTempFile(workingDir, "world.txt", "world!")
+			},
+			mockInvokes: func() {
+				// Body will get set with the body argument to NewHTTPRequest
+				req := httptest.NewRequest(http.MethodPost, "http://fake.com/.api/batches/mount/123", nil)
+				client.On("NewHTTPRequest", mock.Anything, http.MethodPost, ".api/batches/mount/123", mock.Anything).
+					Run(func(args mock.Arguments) {
+						req.Body = io.NopCloser(args.Get(3).(*bytes.Buffer))
+					}).
+					Return(req, nil).
+					Once()
+				resp := &http.Response{
+					StatusCode: http.StatusOK,
+				}
+				requestMatcher := multipartFormRequestMatcher(
+					multipartFormEntry{
+						fileName: "hello.txt",
+						content:  "hello",
+					},
+					multipartFormEntry{
+						fileName: "world.txt",
+						content:  "world!",
+					},
+				)
+				client.On("Do", mock.MatchedBy(requestMatcher)).
+					Return(resp, nil).
+					Once()
+			},
+		},
+		{
+			name: "Upload subdirectory",
+			steps: []batches.Step{{
+				Mount: []batches.Mount{
+					{
+						Path: "./scripts",
+					},
+				},
+			}},
+			setup: func() error {
+				dir := filepath.Join(workingDir, "scripts")
+				if err := os.Mkdir(dir, os.ModePerm); err != nil {
+					return err
+				}
+				return writeTempFile(dir, "hello.txt", "hello world!")
+			},
+			mockInvokes: func() {
+				// Body will get set with the body argument to NewHTTPRequest
+				req := httptest.NewRequest(http.MethodPost, "http://fake.com/.api/batches/mount/123", nil)
+				client.On("NewHTTPRequest", mock.Anything, http.MethodPost, ".api/batches/mount/123", mock.Anything).
+					Run(func(args mock.Arguments) {
+						req.Body = io.NopCloser(args.Get(3).(*bytes.Buffer))
+					}).
+					Return(req, nil).
+					Once()
+				resp := &http.Response{
+					StatusCode: http.StatusOK,
+				}
+				requestMatcher := multipartFormRequestMatcher(
+					multipartFormEntry{
+						path:     "scripts",
+						fileName: "hello.txt",
+						content:  "hello world!",
+					},
+				)
+				client.On("Do", mock.MatchedBy(requestMatcher)).
+					Return(resp, nil).
+					Once()
+			},
+		},
+		{
+			name: "Upload files and directory",
+			steps: []batches.Step{{
+				Mount: []batches.Mount{
+					{
+						Path: "./hello.txt",
+					},
+					{
+						Path: "./world.txt",
+					},
+					{
+						Path: "./scripts",
+					},
+				},
+			}},
+			setup: func() error {
+				if err := writeTempFile(workingDir, "hello.txt", "hello"); err != nil {
+					return err
+				}
+				if err = writeTempFile(workingDir, "world.txt", "world!"); err != nil {
+					return err
+				}
+				dir := filepath.Join(workingDir, "scripts")
+				if err = os.Mkdir(dir, os.ModePerm); err != nil {
+					return err
+				}
+				return writeTempFile(dir, "something-else.txt", "this is neat")
+			},
+			mockInvokes: func() {
+				// Body will get set with the body argument to NewHTTPRequest
+				req := httptest.NewRequest(http.MethodPost, "http://fake.com/.api/batches/mount/123", nil)
+				client.On("NewHTTPRequest", mock.Anything, http.MethodPost, ".api/batches/mount/123", mock.Anything).
+					Run(func(args mock.Arguments) {
+						req.Body = io.NopCloser(args.Get(3).(*bytes.Buffer))
+					}).
+					Return(req, nil).
+					Once()
+				resp := &http.Response{
+					StatusCode: http.StatusOK,
+				}
+				requestMatcher := multipartFormRequestMatcher(
+					multipartFormEntry{
+						fileName: "hello.txt",
+						content:  "hello",
+					},
+					multipartFormEntry{
+						fileName: "world.txt",
+						content:  "world!",
+					},
+					multipartFormEntry{
+						path:     "scripts",
+						fileName: "something-else.txt",
+						content:  "this is neat",
+					},
+				)
+				client.On("Do", mock.MatchedBy(requestMatcher)).
+					Return(resp, nil).
+					Once()
+			},
+		},
+		{
+			name: "File does not exist",
+			steps: []batches.Step{{
+				Mount: []batches.Mount{{
+					Path: "./this-does-not-exist.txt",
+				}},
+			}},
+			expectedError: errors.Newf("stat %s/this-does-not-exist.txt: no such file or directory", workingDir),
+		},
+		{
+			name: "Bad status code",
+			steps: []batches.Step{{
+				Mount: []batches.Mount{{
+					Path: "./hello.txt",
+				}},
+			}},
+			setup: func() error {
+				return writeTempFile(workingDir, "hello.txt", "hello world!")
+			},
+			mockInvokes: func() {
+				// Body will get set with the body argument to NewHTTPRequest
+				req := httptest.NewRequest(http.MethodPost, "http://fake.com/.api/batches/mount/123", nil)
+				client.On("NewHTTPRequest", mock.Anything, http.MethodPost, ".api/batches/mount/123", mock.Anything).
+					Return(req, nil).
+					Once()
+				resp := &http.Response{
+					StatusCode: http.StatusInternalServerError,
+					Body:       io.NopCloser(bytes.NewReader([]byte("failed to upload file"))),
+				}
+				client.On("Do", mock.Anything).
+					Return(resp, nil).
+					Once()
+			},
+			expectedError: errors.New("failed to upload file"),
+		},
+	}
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			if test.setup != nil {
+				err = test.setup()
+				require.NoError(t, err)
+			}
+
+			if test.mockInvokes != nil {
+				test.mockInvokes()
+			}
+
+			err = svc.UploadMounts(workingDir, "123", test.steps)
+			if test.expectedError != nil {
+				assert.Equal(t, test.expectedError.Error(), err.Error())
+			} else {
+				assert.NoError(t, err)
+			}
+
+			client.AssertExpectations(t)
+		})
+	}
+}
+
+func writeTempFile(dir string, name string, content string) error {
+	f, err := os.Create(filepath.Join(dir, name))
+	if err != nil {
+		return err
+	}
+	defer f.Close()
+	if _, err = io.WriteString(f, content); err != nil {
+		return err
+	}
+	return nil
+}
+
+func multipartFormRequestMatcher(entries ...multipartFormEntry) func(*http.Request) bool {
+	return func(req *http.Request) bool {
+		contentType := req.Header.Get("Content-Type")
+		if !strings.HasPrefix(contentType, "multipart/form-data") {
+			return false
+		}
+		if err := req.ParseMultipartForm(32 << 20); err != nil {
+			return false
+		}
+		if req.Form.Get("count") != strconv.Itoa(len(entries)) {
+			return false
+		}
+		for i, entry := range entries {
+			if req.Form.Get(fmt.Sprintf("filepath_%d", i)) != entry.path {
+				return false
+			}
+			f, header, err := req.FormFile(fmt.Sprintf("file_%d", i))
+			if err != nil {
+				return false
+			}
+			if header.Filename != entry.fileName {
+				return false
+			}
+			b, err := io.ReadAll(f)
+			if err != nil {
+				return false
+			}
+			if string(b) != entry.content {
+				return false
+			}
+		}
+		return true
+	}
+}
+
+type multipartFormEntry struct {
+	path     string
+	fileName string
+	content  string
+}

From f6bc5edb706b6c346432b4dc929a46d88b1781ca Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Mon, 15 Aug 2022 10:50:13 -0600
Subject: [PATCH 19/77] Add mock implementation for api client

---
 internal/api/mock/api.go | 78 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 internal/api/mock/api.go

diff --git a/internal/api/mock/api.go b/internal/api/mock/api.go
new file mode 100644
index 0000000000..43e7f795a7
--- /dev/null
+++ b/internal/api/mock/api.go
@@ -0,0 +1,78 @@
+package mock
+
+import (
+	"context"
+	"encoding/json"
+	"io"
+	"net/http"
+
+	"github.com/sourcegraph/src-cli/internal/api"
+	"github.com/stretchr/testify/mock"
+)
+
+type Client struct {
+	mock.Mock
+}
+
+func (m *Client) NewQuery(query string) api.Request {
+	args := m.Called(query)
+	return args.Get(0).(api.Request)
+}
+
+func (m *Client) NewRequest(query string, vars map[string]interface{}) api.Request {
+	args := m.Called(query, vars)
+	return args.Get(0).(api.Request)
+}
+
+func (m *Client) NewGzippedRequest(query string, vars map[string]interface{}) api.Request {
+	args := m.Called(query, vars)
+	return args.Get(0).(api.Request)
+}
+
+func (m *Client) NewGzippedQuery(query string) api.Request {
+	args := m.Called(query)
+	return args.Get(0).(api.Request)
+}
+
+func (m *Client) NewHTTPRequest(ctx context.Context, method, path string, body io.Reader) (*http.Request, error) {
+	args := m.Called(ctx, method, path, body)
+	var obj *http.Request
+	if args.Get(0) != nil {
+		obj = args.Get(0).(*http.Request)
+	}
+	return obj, args.Error(1)
+}
+
+func (m *Client) Do(req *http.Request) (*http.Response, error) {
+	args := m.Called(req)
+	var obj *http.Response
+	if args.Get(0) != nil {
+		obj = args.Get(0).(*http.Response)
+	}
+	return obj, args.Error(1)
+}
+
+type Request struct {
+	mock.Mock
+	Response string
+}
+
+func (r *Request) Do(ctx context.Context, result interface{}) (bool, error) {
+	args := r.Called(ctx, result)
+	if r.Response != "" {
+		if err := json.Unmarshal([]byte(r.Response), result); err != nil {
+			return false, err
+		}
+	}
+	return args.Bool(0), args.Error(1)
+}
+
+func (r *Request) DoRaw(ctx context.Context, result interface{}) (bool, error) {
+	args := r.Called(ctx, result)
+	if r.Response != "" {
+		if err := json.Unmarshal([]byte(r.Response), result); err != nil {
+			return false, err
+		}
+	}
+	return args.Bool(0), args.Error(1)
+}

From ff1b30d6f55f47706c9b1709ac3a8fefe32122b5 Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Mon, 15 Aug 2022 10:50:22 -0600
Subject: [PATCH 20/77] Run go mod tidy

---
 go.mod | 5 ++---
 go.sum | 3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/go.mod b/go.mod
index 422b7b7894..2c2216efed 100644
--- a/go.mod
+++ b/go.mod
@@ -92,6 +92,7 @@ require (
 	github.com/spf13/cobra v1.4.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf // indirect
+	github.com/stretchr/objx v0.1.0 // indirect
 	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
 	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
@@ -117,6 +118,4 @@ require (
 // See: https://github.com/ghodss/yaml/pull/65
 replace github.com/ghodss/yaml => github.com/sourcegraph/yaml v1.0.1-0.20200714132230-56936252f152
 
-replace (
-	github.com/sourcegraph/sourcegraph/lib v0.0.0-20220715132627-cb906941e8b4 => ../sourcegraph/lib
-)
+replace github.com/sourcegraph/sourcegraph/lib v0.0.0-20220715132627-cb906941e8b4 => ../sourcegraph/lib
diff --git a/go.sum b/go.sum
index 97063e427a..5d0c31d2b6 100644
--- a/go.sum
+++ b/go.sum
@@ -370,8 +370,6 @@ github.com/sourcegraph/log v0.0.0-20220707160925-6a936691c838 h1:8wknDSCUVYbaRT6
 github.com/sourcegraph/log v0.0.0-20220707160925-6a936691c838/go.mod h1:zWEPlKrWBUVpko/tOgDS+qrp7BmzaCcmUrh9+ver1iQ=
 github.com/sourcegraph/scip v0.1.0 h1:kTs0CJaLQvcRZjg+HpGrcJPNX2Tx31+d6szWio3ZOkQ=
 github.com/sourcegraph/scip v0.1.0/go.mod h1:/AZ8RvsnRfeCZy232PJuVZqcl9f82fJnYwdWZeU2JCo=
-github.com/sourcegraph/sourcegraph/lib v0.0.0-20220715132627-cb906941e8b4 h1:x+66tdk/r6k/t4gxs1g7WE9oY1CA35gHDAGHb0Sa6HI=
-github.com/sourcegraph/sourcegraph/lib v0.0.0-20220715132627-cb906941e8b4/go.mod h1:NOllMVD9zFtTsYX/v/M9/zTIGtzOu3uhlWe2XN2N+hE=
 github.com/sourcegraph/yaml v1.0.1-0.20200714132230-56936252f152 h1:z/MpntplPaW6QW95pzcAR/72Z5TWDyDnSo0EOcyij9o=
 github.com/sourcegraph/yaml v1.0.1-0.20200714132230-56936252f152/go.mod h1:GIjDIg/heH5DOkXY3YJ/wNhfHsQHoXGjl8G8amsYQ1I=
 github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
@@ -386,6 +384,7 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An
 github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
 github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf h1:pvbZ0lM0XWPBqUKqFU8cmavspvIl9nulOYwdy6IFRRo=
 github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf/go.mod h1:RJID2RhlZKId02nZ62WenDCkgHFerpIOmW0iT7GKmXM=
+github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=

From 7803bea0066ddd4046829b1851a8810ae731a0ef Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Mon, 15 Aug 2022 10:50:34 -0600
Subject: [PATCH 21/77] Fixes based on unit tests

---
 internal/batches/service/remote.go | 37 +++++++++++++++++-------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/internal/batches/service/remote.go b/internal/batches/service/remote.go
index b2cfce7a97..bfec1af038 100644
--- a/internal/batches/service/remote.go
+++ b/internal/batches/service/remote.go
@@ -131,18 +131,18 @@ func (svc *Service) UploadMounts(workingDir string, batchSpecID string, steps []
 	w := multipart.NewWriter(body)
 
 	// TODO bulk + parallel
-	count := 0
+	var count int
 	for _, step := range steps {
 		for _, mount := range step.Mount {
-			if err := createFormFile(w, workingDir, mount.Path, count); err != nil {
+			total, err := handlePath(w, workingDir, mount.Path, count)
+			if err != nil {
 				return err
 			}
-			count++
+			count += total
 		}
 	}
 
-	// Add 1 to the count for the actual length.
-	if err := w.WriteField("count", strconv.Itoa(count+1)); err != nil {
+	if err := w.WriteField("count", strconv.Itoa(count)); err != nil {
 		return err
 	}
 
@@ -151,7 +151,7 @@ func (svc *Service) UploadMounts(workingDir string, batchSpecID string, steps []
 		return err
 	}
 
-	request, err := svc.client.NewHTTPRequest(context.Background(), http.MethodPost, filepath.Join(".api/batches/mount", batchSpecID), body)
+	request, err := svc.client.NewHTTPRequest(context.Background(), http.MethodPost, fmt.Sprintf(".api/batches/mount/%s", batchSpecID), body)
 	if err != nil {
 		return err
 	}
@@ -171,31 +171,35 @@ func (svc *Service) UploadMounts(workingDir string, batchSpecID string, steps []
 	return nil
 }
 
-func createFormFile(w *multipart.Writer, workingDir, mountPath string, index int) error {
+func handlePath(w *multipart.Writer, workingDir, mountPath string, offset int) (int, error) {
+	total := 0
 	actualFilePath := filepath.Join(workingDir, mountPath)
 	info, err := os.Stat(actualFilePath)
 	if err != nil {
-		return err
+		return 0, err
 	}
 	if info.IsDir() {
 		dir, err := os.ReadDir(actualFilePath)
 		if err != nil {
-			return err
+			return 0, err
 		}
 		for _, dirEntry := range dir {
-			if err = createFormFile(w, workingDir, filepath.Join(mountPath, dirEntry.Name()), index); err != nil {
-				return err
+			totalFiles, err := handlePath(w, workingDir, filepath.Join(mountPath, dirEntry.Name()), offset+total)
+			if err != nil {
+				return 0, err
 			}
+			total += totalFiles
 		}
 	} else {
-		if err = uploadFile(w, workingDir, mountPath, index); err != nil {
-			return err
+		if err = createFormFile(w, workingDir, mountPath, offset+total); err != nil {
+			return 0, err
 		}
+		total++
 	}
-	return nil
+	return total, nil
 }
 
-func uploadFile(w *multipart.Writer, workingDir string, mountPath string, index int) error {
+func createFormFile(w *multipart.Writer, workingDir string, mountPath string, index int) error {
 	// TODO: limit file size
 	f, err := os.Open(filepath.Join(workingDir, mountPath))
 	if err != nil {
@@ -204,7 +208,8 @@ func uploadFile(w *multipart.Writer, workingDir string, mountPath string, index
 	defer f.Close()
 
 	filePath, fileName := filepath.Split(mountPath)
-	if err = w.WriteField(fmt.Sprintf("filepath_%d", index), strings.TrimLeft(filePath, "./")); err != nil {
+	trimmedPath := strings.Trim(strings.TrimSuffix(filePath, string(filepath.Separator)), ".")
+	if err = w.WriteField(fmt.Sprintf("filepath_%d", index), trimmedPath); err != nil {
 		return err
 	}
 

From cab085268822618fc1083dd2334e828800fbc6fe Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Mon, 15 Aug 2022 11:36:19 -0600
Subject: [PATCH 22/77] Remove TODO

---
 internal/batches/service/remote.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/internal/batches/service/remote.go b/internal/batches/service/remote.go
index bfec1af038..8cedfa9721 100644
--- a/internal/batches/service/remote.go
+++ b/internal/batches/service/remote.go
@@ -130,7 +130,6 @@ func (svc *Service) UploadMounts(workingDir string, batchSpecID string, steps []
 	body := &bytes.Buffer{}
 	w := multipart.NewWriter(body)
 
-	// TODO bulk + parallel
 	var count int
 	for _, step := range steps {
 		for _, mount := range step.Mount {

From c8b860821af33db2aed6c428a96b740953891a03 Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Mon, 15 Aug 2022 12:09:01 -0600
Subject: [PATCH 23/77] Remove special logic for caching mounts

---
 cmd/src/batch_common.go                  |  1 -
 cmd/src/batch_exec.go                    |  2 +-
 internal/batches/executor/coordinator.go |  7 +++----
 internal/batches/executor/task.go        | 14 ++++----------
 4 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/cmd/src/batch_common.go b/cmd/src/batch_common.go
index 7e2f02c516..63886d03ae 100644
--- a/cmd/src/batch_common.go
+++ b/cmd/src/batch_common.go
@@ -416,7 +416,6 @@ func executeBatchSpec(ctx context.Context, ui ui.ExecUI, opts executeBatchSpecOp
 			Logger:    logManager,
 			Cache:     executor.NewDiskCache(opts.flags.cacheDir),
 			GlobalEnv: os.Environ(),
-			IsRemote:  false,
 		},
 	)
 
diff --git a/cmd/src/batch_exec.go b/cmd/src/batch_exec.go
index 57929ba9e0..4b34114b6f 100644
--- a/cmd/src/batch_exec.go
+++ b/cmd/src/batch_exec.go
@@ -224,7 +224,7 @@ func executeBatchSpecInWorkspaces(ctx context.Context, flags *executorModeFlags,
 
 	// Write all step cache results for all results.
 	for _, stepRes := range results {
-		cacheKey := task.CacheKey(globalEnv, mountDir, true, stepRes.StepIndex)
+		cacheKey := task.CacheKey(globalEnv, mountDir, stepRes.StepIndex)
 		k, err := cacheKey.Key()
 		if err != nil {
 			return errors.Wrap(err, "calculating step cache key")
diff --git a/internal/batches/executor/coordinator.go b/internal/batches/executor/coordinator.go
index 8e42ddc56e..6adeff312e 100644
--- a/internal/batches/executor/coordinator.go
+++ b/internal/batches/executor/coordinator.go
@@ -36,7 +36,6 @@ type NewCoordinatorOpts struct {
 
 	// Used by batcheslib.BuildChangesetSpecs
 	Features batches.FeatureFlags
-	IsRemote bool
 }
 
 func NewCoordinator(opts NewCoordinatorOpts) *Coordinator {
@@ -70,7 +69,7 @@ func (c *Coordinator) CheckCache(ctx context.Context, batchSpec *batcheslib.Batc
 func (c *Coordinator) ClearCache(ctx context.Context, tasks []*Task) error {
 	for _, task := range tasks {
 		for i := len(task.Steps) - 1; i > -1; i-- {
-			key := task.CacheKey(c.opts.GlobalEnv, c.opts.ExecOpts.BatchSpecDirectory, c.opts.IsRemote, i)
+			key := task.CacheKey(c.opts.GlobalEnv, c.opts.ExecOpts.BatchSpecDirectory, i)
 			if err := c.opts.Cache.Clear(ctx, key); err != nil {
 				return errors.Wrapf(err, "clearing cache for step %d in %q", i, task.Repository.Name)
 			}
@@ -134,7 +133,7 @@ func (c *Coordinator) loadCachedStepResults(ctx context.Context, task *Task, glo
 	// We start at the back so that we can find the _last_ cached step,
 	// then restart execution on the following step.
 	for i := len(task.Steps) - 1; i > -1; i-- {
-		key := task.CacheKey(globalEnv, c.opts.ExecOpts.BatchSpecDirectory, c.opts.IsRemote, i)
+		key := task.CacheKey(globalEnv, c.opts.ExecOpts.BatchSpecDirectory, i)
 
 		result, found, err := c.opts.Cache.Get(ctx, key)
 		if err != nil {
@@ -187,7 +186,7 @@ func (c *Coordinator) ExecuteAndBuildSpecs(ctx context.Context, batchSpec *batch
 	// Write all step cache results to the cache.
 	for _, res := range results {
 		for _, stepRes := range res.stepResults {
-			cacheKey := res.task.CacheKey(c.opts.GlobalEnv, c.opts.ExecOpts.BatchSpecDirectory, c.opts.IsRemote, stepRes.StepIndex)
+			cacheKey := res.task.CacheKey(c.opts.GlobalEnv, c.opts.ExecOpts.BatchSpecDirectory, stepRes.StepIndex)
 			if err := c.opts.Cache.Set(ctx, cacheKey, stepRes); err != nil {
 				return nil, nil, errors.Wrapf(err, "caching result for step %d", stepRes.StepIndex)
 			}
diff --git a/internal/batches/executor/task.go b/internal/batches/executor/task.go
index bb38f58e30..3587c5562f 100644
--- a/internal/batches/executor/task.go
+++ b/internal/batches/executor/task.go
@@ -39,14 +39,7 @@ func (t *Task) ArchivePathToFetch() string {
 	return ""
 }
 
-func (t *Task) CacheKey(globalEnv []string, dir string, isRemote bool, stepIndex int) cache.Keyer {
-	var metadataRetriever cache.MetadataRetriever
-	// If the task is being run locally, set the metadata retrieve to use the filesystem based implementation.
-	if !isRemote {
-		metadataRetriever = fileMetadataRetriever{
-			batchSpecDir: dir,
-		}
-	}
+func (t *Task) CacheKey(globalEnv []string, dir string, stepIndex int) cache.Keyer {
 	return &cache.CacheKey{
 		Repository: batcheslib.Repository{
 			ID:          t.Repository.ID,
@@ -59,8 +52,9 @@ func (t *Task) CacheKey(globalEnv []string, dir string, isRemote bool, stepIndex
 		OnlyFetchWorkspace:    t.OnlyFetchWorkspace,
 		Steps:                 t.Steps,
 		BatchChangeAttributes: t.BatchChangeAttributes,
-		// TODO: This should be cached.
-		MetadataRetriever: metadataRetriever,
+		MetadataRetriever: fileMetadataRetriever{
+			batchSpecDir: dir,
+		},
 
 		GlobalEnv: globalEnv,
 

From 948809bc02c3bcd02b0436708f6c0e90b5cc8f6e Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Mon, 15 Aug 2022 14:26:33 -0600
Subject: [PATCH 24/77] Pass the file mod time

---
 internal/batches/service/remote.go      | 7 +++++++
 internal/batches/service/remote_test.go | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/internal/batches/service/remote.go b/internal/batches/service/remote.go
index 8cedfa9721..2c1b6dac55 100644
--- a/internal/batches/service/remote.go
+++ b/internal/batches/service/remote.go
@@ -211,6 +211,13 @@ func createFormFile(w *multipart.Writer, workingDir string, mountPath string, in
 	if err = w.WriteField(fmt.Sprintf("filepath_%d", index), trimmedPath); err != nil {
 		return err
 	}
+	fileInfo, err := f.Stat()
+	if err != nil {
+		return err
+	}
+	if err = w.WriteField(fmt.Sprintf("filemod_%d", index), fileInfo.ModTime().UTC().String()); err != nil {
+		return err
+	}
 
 	part, err := w.CreateFormFile(fmt.Sprintf("file_%d", index), fileName)
 	if err != nil {
diff --git a/internal/batches/service/remote_test.go b/internal/batches/service/remote_test.go
index 402ccdf285..4221ed2fa3 100644
--- a/internal/batches/service/remote_test.go
+++ b/internal/batches/service/remote_test.go
@@ -9,6 +9,7 @@ import (
 	"net/http/httptest"
 	"os"
 	"path/filepath"
+	"regexp"
 	"strconv"
 	"strings"
 	"testing"
@@ -340,6 +341,9 @@ func writeTempFile(dir string, name string, content string) error {
 	return nil
 }
 
+// 2006-01-02 15:04:05.999999999 -0700 MST
+var modtimeRegex = regexp.MustCompile("^[0-9]{4}-[0-9]{2}-[0-9]{2}\\s[0-9]{2}:[0-9]{2}:[0-9]{2}.[0-9]{9} \\+0000 UTC$")
+
 func multipartFormRequestMatcher(entries ...multipartFormEntry) func(*http.Request) bool {
 	return func(req *http.Request) bool {
 		contentType := req.Header.Get("Content-Type")
@@ -356,6 +360,9 @@ func multipartFormRequestMatcher(entries ...multipartFormEntry) func(*http.Reque
 			if req.Form.Get(fmt.Sprintf("filepath_%d", i)) != entry.path {
 				return false
 			}
+			if !modtimeRegex.MatchString(req.Form.Get(fmt.Sprintf("filemod_%d", i))) {
+				return false
+			}
 			f, header, err := req.FormFile(fmt.Sprintf("file_%d", i))
 			if err != nil {
 				return false

From dcc660795a1f02d5016f8145fc143055e5bf61fb Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Mon, 15 Aug 2022 14:26:45 -0600
Subject: [PATCH 25/77] Update caching to support local and remote

---
 internal/batches/executor/task.go      | 23 +++++++++++++-------
 internal/batches/executor/task_test.go | 30 ++++++++++++++------------
 2 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/internal/batches/executor/task.go b/internal/batches/executor/task.go
index 3587c5562f..0dae1d98e7 100644
--- a/internal/batches/executor/task.go
+++ b/internal/batches/executor/task.go
@@ -71,7 +71,7 @@ func (f fileMetadataRetriever) Get(steps []batcheslib.Step) ([]cache.MountMetada
 	for _, step := range steps {
 		// Build up the metadata for each mount for each step
 		for _, mount := range step.Mount {
-			metadata, err := getMountMetadata(filepath.Join(f.batchSpecDir, mount.Path))
+			metadata, err := f.getMountMetadata(f.batchSpecDir, mount.Path)
 			if err != nil {
 				return nil, err
 			}
@@ -82,8 +82,12 @@ func (f fileMetadataRetriever) Get(steps []batcheslib.Step) ([]cache.MountMetada
 	return mountsMetadata, nil
 }
 
-func getMountMetadata(path string) ([]cache.MountMetadata, error) {
-	info, err := os.Stat(path)
+func (f fileMetadataRetriever) getMountMetadata(baseDir string, path string) ([]cache.MountMetadata, error) {
+	fullPath := path
+	if !filepath.IsAbs(path) {
+		fullPath = filepath.Join(baseDir, path)
+	}
+	info, err := os.Stat(fullPath)
 	if errors.Is(err, os.ErrNotExist) {
 		return nil, errors.Newf("path %s does not exist", path)
 	} else if err != nil {
@@ -91,30 +95,33 @@ func getMountMetadata(path string) ([]cache.MountMetadata, error) {
 	}
 	var metadata []cache.MountMetadata
 	if info.IsDir() {
-		dirMetadata, err := getDirectoryMountMetadata(path)
+		dirMetadata, err := f.getDirectoryMountMetadata(fullPath)
 		if err != nil {
 			return nil, err
 		}
 		metadata = append(metadata, dirMetadata...)
 	} else {
-		metadata = append(metadata, cache.MountMetadata{Path: path, Size: info.Size(), Modified: info.ModTime().UTC()})
+		relativePath, err := filepath.Rel(f.batchSpecDir, fullPath)
+		if err != nil {
+			return nil, err
+		}
+		metadata = append(metadata, cache.MountMetadata{Path: relativePath, Size: info.Size(), Modified: info.ModTime().UTC()})
 	}
 	return metadata, nil
 }
 
 // getDirectoryMountMetadata reads all the files in the directory with the given
 // path and returns the cache.MountMetadata for all of them.
-func getDirectoryMountMetadata(path string) ([]cache.MountMetadata, error) {
+func (f fileMetadataRetriever) getDirectoryMountMetadata(path string) ([]cache.MountMetadata, error) {
 	dir, err := os.ReadDir(path)
 	if err != nil {
 		return nil, err
 	}
 	var metadata []cache.MountMetadata
 	for _, dirEntry := range dir {
-		newPath := filepath.Join(path, dirEntry.Name())
 		// Go back to the very start. Need to get the FileInfo again for the new path and figure out if it is a
 		// directory or a file.
-		fileMetadata, err := getMountMetadata(newPath)
+		fileMetadata, err := f.getMountMetadata(path, dirEntry.Name())
 		if err != nil {
 			return nil, err
 		}
diff --git a/internal/batches/executor/task_test.go b/internal/batches/executor/task_test.go
index 423eff5fc7..f76bec0477 100644
--- a/internal/batches/executor/task_test.go
+++ b/internal/batches/executor/task_test.go
@@ -39,7 +39,9 @@ func TestFileMetadataRetriever_Get(t *testing.T) {
 	err = os.Chtimes(anotherScriptPath, modDate, modDate)
 	require.NoError(t, err)
 
-	retriever := fileMetadataRetriever{}
+	retriever := fileMetadataRetriever{
+		batchSpecDir: tempDir,
+	}
 
 	tests := []struct {
 		name             string
@@ -53,13 +55,13 @@ func TestFileMetadataRetriever_Get(t *testing.T) {
 				{
 					Run: "foo",
 					Mount: []batches.Mount{{
-						Path:       sampleScriptPath,
+						Path:       "./sample.sh",
 						Mountpoint: "/tmp/foo.sh",
 					}},
 				},
 			},
 			expectedMetadata: []cache.MountMetadata{
-				{Path: sampleScriptPath, Size: 0, Modified: modDate},
+				{Path: "sample.sh", Size: 0, Modified: modDate},
 			},
 		},
 		{
@@ -69,19 +71,19 @@ func TestFileMetadataRetriever_Get(t *testing.T) {
 					Run: "foo",
 					Mount: []batches.Mount{
 						{
-							Path:       sampleScriptPath,
+							Path:       "./sample.sh",
 							Mountpoint: "/tmp/foo.sh",
 						},
 						{
-							Path:       anotherScriptPath,
+							Path:       "./another.sh",
 							Mountpoint: "/tmp/bar.sh",
 						},
 					},
 				},
 			},
 			expectedMetadata: []cache.MountMetadata{
-				{Path: sampleScriptPath, Size: 0, Modified: modDate},
-				{Path: anotherScriptPath, Size: 0, Modified: modDate},
+				{Path: "sample.sh", Size: 0, Modified: modDate},
+				{Path: "another.sh", Size: 0, Modified: modDate},
 			},
 		},
 		{
@@ -90,14 +92,14 @@ func TestFileMetadataRetriever_Get(t *testing.T) {
 				{
 					Run: "foo",
 					Mount: []batches.Mount{{
-						Path:       tempDir,
+						Path:       "./",
 						Mountpoint: "/tmp/scripts",
 					}},
 				},
 			},
 			expectedMetadata: []cache.MountMetadata{
-				{Path: anotherScriptPath, Size: 0, Modified: modDate},
-				{Path: sampleScriptPath, Size: 0, Modified: modDate},
+				{Path: "another.sh", Size: 0, Modified: modDate},
+				{Path: "sample.sh", Size: 0, Modified: modDate},
 			},
 		},
 		{
@@ -119,21 +121,21 @@ func TestFileMetadataRetriever_Get(t *testing.T) {
 				{
 					Run: "foo",
 					Mount: []batches.Mount{{
-						Path:       sampleScriptPath,
+						Path:       "./sample.sh",
 						Mountpoint: "/tmp/foo.sh",
 					}},
 				},
 				{
 					Run: "foo",
 					Mount: []batches.Mount{{
-						Path:       sampleScriptPath,
+						Path:       "./sample.sh",
 						Mountpoint: "/tmp/foo.sh",
 					}},
 				},
 			},
 			expectedMetadata: []cache.MountMetadata{
-				{Path: sampleScriptPath, Size: 0, Modified: modDate},
-				{Path: sampleScriptPath, Size: 0, Modified: modDate},
+				{Path: "sample.sh", Size: 0, Modified: modDate},
+				{Path: "sample.sh", Size: 0, Modified: modDate},
 			},
 		},
 	}

From 90c9892460531d90ae639e510ee18aff173c00c1 Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Mon, 15 Aug 2022 14:31:06 -0600
Subject: [PATCH 26/77] Remove mount directory

---
 internal/batches/workspace/bind_workspace.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/internal/batches/workspace/bind_workspace.go b/internal/batches/workspace/bind_workspace.go
index 9229ff0e7c..55a1e4dcb4 100644
--- a/internal/batches/workspace/bind_workspace.go
+++ b/internal/batches/workspace/bind_workspace.go
@@ -110,8 +110,7 @@ type dockerBindWorkspace struct {
 	// dir is the directory where the repo archive is unzipped to.
 	// This is also the path that is directly mounted into the docker
 	// containers.
-	dir      string
-	mountDir string
+	dir string
 }
 
 var _ Workspace = &dockerBindWorkspace{}

From fb1903d06de0338fc2cece3fda27a45f0d125a39 Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Thu, 18 Aug 2022 08:41:10 -0600
Subject: [PATCH 27/77] Rename from batchSpecDir to workingDirectory to fit
 with remote and local usage

---
 cmd/src/batch_common.go                  |  2 +-
 internal/batches/executor/coordinator.go |  6 +++---
 internal/batches/executor/executor.go    | 12 ++++++------
 internal/batches/executor/task.go        | 10 ++++------
 internal/batches/executor/task_test.go   |  2 +-
 5 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/cmd/src/batch_common.go b/cmd/src/batch_common.go
index 63886d03ae..eb4f949e29 100644
--- a/cmd/src/batch_common.go
+++ b/cmd/src/batch_common.go
@@ -407,7 +407,7 @@ func executeBatchSpec(ctx context.Context, ui ui.ExecUI, opts executeBatchSpecOp
 				Creator:             workspaceCreator,
 				EnsureImage:         imageCache.Ensure,
 				Parallelism:         parallelism,
-				BatchSpecDirectory:  batchSpecDirectory,
+				WorkingDirectory:    batchSpecDirectory,
 				Timeout:             opts.flags.timeout,
 				TempDir:             opts.flags.tempDir,
 				GlobalEnv:           os.Environ(),
diff --git a/internal/batches/executor/coordinator.go b/internal/batches/executor/coordinator.go
index 6adeff312e..58620b674c 100644
--- a/internal/batches/executor/coordinator.go
+++ b/internal/batches/executor/coordinator.go
@@ -69,7 +69,7 @@ func (c *Coordinator) CheckCache(ctx context.Context, batchSpec *batcheslib.Batc
 func (c *Coordinator) ClearCache(ctx context.Context, tasks []*Task) error {
 	for _, task := range tasks {
 		for i := len(task.Steps) - 1; i > -1; i-- {
-			key := task.CacheKey(c.opts.GlobalEnv, c.opts.ExecOpts.BatchSpecDirectory, i)
+			key := task.CacheKey(c.opts.GlobalEnv, c.opts.ExecOpts.WorkingDirectory, i)
 			if err := c.opts.Cache.Clear(ctx, key); err != nil {
 				return errors.Wrapf(err, "clearing cache for step %d in %q", i, task.Repository.Name)
 			}
@@ -133,7 +133,7 @@ func (c *Coordinator) loadCachedStepResults(ctx context.Context, task *Task, glo
 	// We start at the back so that we can find the _last_ cached step,
 	// then restart execution on the following step.
 	for i := len(task.Steps) - 1; i > -1; i-- {
-		key := task.CacheKey(globalEnv, c.opts.ExecOpts.BatchSpecDirectory, i)
+		key := task.CacheKey(globalEnv, c.opts.ExecOpts.WorkingDirectory, i)
 
 		result, found, err := c.opts.Cache.Get(ctx, key)
 		if err != nil {
@@ -186,7 +186,7 @@ func (c *Coordinator) ExecuteAndBuildSpecs(ctx context.Context, batchSpec *batch
 	// Write all step cache results to the cache.
 	for _, res := range results {
 		for _, stepRes := range res.stepResults {
-			cacheKey := res.task.CacheKey(c.opts.GlobalEnv, c.opts.ExecOpts.BatchSpecDirectory, stepRes.StepIndex)
+			cacheKey := res.task.CacheKey(c.opts.GlobalEnv, c.opts.ExecOpts.WorkingDirectory, stepRes.StepIndex)
 			if err := c.opts.Cache.Set(ctx, cacheKey, stepRes); err != nil {
 				return nil, nil, errors.Wrapf(err, "caching result for step %d", stepRes.StepIndex)
 			}
diff --git a/internal/batches/executor/executor.go b/internal/batches/executor/executor.go
index 4d35a444ee..e802a0ad04 100644
--- a/internal/batches/executor/executor.go
+++ b/internal/batches/executor/executor.go
@@ -62,12 +62,12 @@ type NewExecutorOpts struct {
 	Logger              log.LogManager
 
 	// Config
-	Parallelism        int
-	Timeout            time.Duration
-	BatchSpecDirectory string
-	TempDir            string
-	IsRemote           bool
-	GlobalEnv          []string
+	Parallelism      int
+	Timeout          time.Duration
+	WorkingDirectory string
+	TempDir          string
+	IsRemote         bool
+	GlobalEnv        []string
 }
 
 type executor struct {
diff --git a/internal/batches/executor/task.go b/internal/batches/executor/task.go
index 0dae1d98e7..69c5beb390 100644
--- a/internal/batches/executor/task.go
+++ b/internal/batches/executor/task.go
@@ -52,9 +52,7 @@ func (t *Task) CacheKey(globalEnv []string, dir string, stepIndex int) cache.Key
 		OnlyFetchWorkspace:    t.OnlyFetchWorkspace,
 		Steps:                 t.Steps,
 		BatchChangeAttributes: t.BatchChangeAttributes,
-		MetadataRetriever: fileMetadataRetriever{
-			batchSpecDir: dir,
-		},
+		MetadataRetriever:     fileMetadataRetriever{workingDirectory: dir},
 
 		GlobalEnv: globalEnv,
 
@@ -63,7 +61,7 @@ func (t *Task) CacheKey(globalEnv []string, dir string, stepIndex int) cache.Key
 }
 
 type fileMetadataRetriever struct {
-	batchSpecDir string
+	workingDirectory string
 }
 
 func (f fileMetadataRetriever) Get(steps []batcheslib.Step) ([]cache.MountMetadata, error) {
@@ -71,7 +69,7 @@ func (f fileMetadataRetriever) Get(steps []batcheslib.Step) ([]cache.MountMetada
 	for _, step := range steps {
 		// Build up the metadata for each mount for each step
 		for _, mount := range step.Mount {
-			metadata, err := f.getMountMetadata(f.batchSpecDir, mount.Path)
+			metadata, err := f.getMountMetadata(f.workingDirectory, mount.Path)
 			if err != nil {
 				return nil, err
 			}
@@ -101,7 +99,7 @@ func (f fileMetadataRetriever) getMountMetadata(baseDir string, path string) ([]
 		}
 		metadata = append(metadata, dirMetadata...)
 	} else {
-		relativePath, err := filepath.Rel(f.batchSpecDir, fullPath)
+		relativePath, err := filepath.Rel(f.workingDirectory, fullPath)
 		if err != nil {
 			return nil, err
 		}
diff --git a/internal/batches/executor/task_test.go b/internal/batches/executor/task_test.go
index f76bec0477..de7b9a6e3e 100644
--- a/internal/batches/executor/task_test.go
+++ b/internal/batches/executor/task_test.go
@@ -40,7 +40,7 @@ func TestFileMetadataRetriever_Get(t *testing.T) {
 	require.NoError(t, err)
 
 	retriever := fileMetadataRetriever{
-		batchSpecDir: tempDir,
+		workingDirectory: tempDir,
 	}
 
 	tests := []struct {

From af61c2d95ceca2fcf22802a785ee642528ab7904 Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Thu, 18 Aug 2022 08:41:19 -0600
Subject: [PATCH 28/77] Update dependencies

---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 2c2216efed..9ec4794b5c 100644
--- a/go.mod
+++ b/go.mod
@@ -10,7 +10,7 @@ require (
 	github.com/dustin/go-humanize v1.0.0
 	github.com/gobwas/glob v0.2.3
 	github.com/google/go-cmp v0.5.7
-	github.com/grafana/regexp v0.0.0-20220202152701-6a046c4caf32
+	github.com/grafana/regexp v0.0.0-20220304100321-149c8afcd6cb
 	github.com/hexops/autogold v1.3.0
 	github.com/jig/teereadcloser v0.0.0-20181016160506-953720c48e05
 	github.com/json-iterator/go v1.1.12
diff --git a/go.sum b/go.sum
index 5d0c31d2b6..7962fc8cd2 100644
--- a/go.sum
+++ b/go.sum
@@ -168,8 +168,8 @@ github.com/gorilla/css v1.0.0 h1:BQqNyPTi50JCFMTw/b67hByjMVXZRwGha6wxVGkeihY=
 github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c=
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/grafana/regexp v0.0.0-20220202152701-6a046c4caf32 h1:M3wP8Hwic62qJsiydSgXtev03d4f92uN1I52nVjRgw0=
-github.com/grafana/regexp v0.0.0-20220202152701-6a046c4caf32/go.mod h1:M5qHK+eWfAv8VR/265dIuEpL3fNfeC21tXXp9itM24A=
+github.com/grafana/regexp v0.0.0-20220304100321-149c8afcd6cb h1:wwzNkyaQwcXCzQuKoWz3lwngetmcyg+EhW0fF5lz73M=
+github.com/grafana/regexp v0.0.0-20220304100321-149c8afcd6cb/go.mod h1:M5qHK+eWfAv8VR/265dIuEpL3fNfeC21tXXp9itM24A=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
 github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=

From 69119aa38bd7c3f720331a98f7f6b7c4b496d170 Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Thu, 18 Aug 2022 08:41:36 -0600
Subject: [PATCH 29/77] Fix issue with mix pointer and receiver functions

---
 internal/batches/executor/coordinator.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/internal/batches/executor/coordinator.go b/internal/batches/executor/coordinator.go
index 58620b674c..d818a9629d 100644
--- a/internal/batches/executor/coordinator.go
+++ b/internal/batches/executor/coordinator.go
@@ -102,7 +102,7 @@ func (c *Coordinator) checkCacheForTask(ctx context.Context, batchSpec *batchesl
 	return specs, false, nil
 }
 
-func (c Coordinator) buildChangesetSpecs(task *Task, batchSpec *batcheslib.BatchSpec, result execution.AfterStepResult) ([]*batcheslib.ChangesetSpec, error) {
+func (c *Coordinator) buildChangesetSpecs(task *Task, batchSpec *batcheslib.BatchSpec, result execution.AfterStepResult) ([]*batcheslib.ChangesetSpec, error) {
 	input := &batcheslib.ChangesetSpecInput{
 		Repository: batcheslib.Repository{
 			ID:          task.Repository.ID,

From d2f6fcb30c8018b10a7b5a485541bbbd963010f9 Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Thu, 18 Aug 2022 09:06:58 -0600
Subject: [PATCH 30/77] Add doc

---
 internal/batches/executor/run_steps.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/internal/batches/executor/run_steps.go b/internal/batches/executor/run_steps.go
index a2791e4fc9..45678ca420 100644
--- a/internal/batches/executor/run_steps.go
+++ b/internal/batches/executor/run_steps.go
@@ -38,7 +38,8 @@ type RunStepsOpts struct {
 	// Task is the definition of the workspace execution.
 	Task *Task
 	// TempDir points to where temporary files of the execution should live at.
-	TempDir  string
+	TempDir string
+	// MountDir points to where files that should be mounted live at.
 	MountDir string
 	// Timeout sets the deadline for the execution context. When exceeded,
 	// execution will stop and an error is returned.

From 81d8e0c5d474cf2bfda86c7f922c7473a3f7d9d1 Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Thu, 18 Aug 2022 09:08:59 -0600
Subject: [PATCH 31/77] Remove unused property

---
 internal/batches/executor/task.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/internal/batches/executor/task.go b/internal/batches/executor/task.go
index 69c5beb390..97d763f926 100644
--- a/internal/batches/executor/task.go
+++ b/internal/batches/executor/task.go
@@ -14,8 +14,7 @@ import (
 )
 
 type Task struct {
-	BatchSpecID string
-	Repository  *graphql.Repository
+	Repository *graphql.Repository
 	// Path is the folder relative to the repository's root in which the steps
 	// should be executed. "" means root.
 	Path string

From aec025b0486a33b405987ae73082d8d56bd24716 Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Thu, 18 Aug 2022 09:15:03 -0600
Subject: [PATCH 32/77] Update changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a1ea649adc..a7adac6826 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,8 @@ All notable changes to `src-cli` are documented in this file.
 
 ### Added
 
+- Batch Specs can now mount files when running server side batch changes. [sourcegraph/src-cli#816](https://github.com/sourcegraph/src-cli/pull/816)
+
 ### Changed
 
 ### Fixed

From 63dfdf0955da151e10f15a3623aa73b97795157d Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Wed, 7 Sep 2022 12:54:26 -0600
Subject: [PATCH 33/77] Update dependency

---
 go.mod |  23 +++----
 go.sum | 208 +++++++++++++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 193 insertions(+), 38 deletions(-)

diff --git a/go.mod b/go.mod
index da26c1bd71..2bf98f69f3 100644
--- a/go.mod
+++ b/go.mod
@@ -9,20 +9,20 @@ require (
 	github.com/dineshappavoo/basex v0.0.0-20170425072625-481a6f6dc663
 	github.com/dustin/go-humanize v1.0.0
 	github.com/gobwas/glob v0.2.3
-	github.com/google/go-cmp v0.5.7
+	github.com/google/go-cmp v0.5.8
 	github.com/grafana/regexp v0.0.0-20220304100321-149c8afcd6cb
 	github.com/hexops/autogold v1.3.0
 	github.com/jig/teereadcloser v0.0.0-20181016160506-953720c48e05
 	github.com/json-iterator/go v1.1.12
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
-	github.com/mattn/go-isatty v0.0.14
+	github.com/mattn/go-isatty v0.0.16
 	github.com/neelance/parallel v0.0.0-20160708114440-4de9ce63d14c
 	github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8
 	github.com/sourcegraph/go-diff v0.6.1
 	github.com/sourcegraph/jsonx v0.0.0-20200629203448-1a936bd500cf
 	github.com/sourcegraph/scip v0.2.0
 	github.com/sourcegraph/sourcegraph/lib v0.0.0-20220816103048-5fb36f9b800c
-	github.com/stretchr/testify v1.7.2
+	github.com/stretchr/testify v1.8.0
 	golang.org/x/net v0.0.0-20220526153639-5463443f8c37
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
 	google.golang.org/protobuf v1.28.0
@@ -68,7 +68,7 @@ require (
 	github.com/kr/pretty v0.3.0 // indirect
 	github.com/kr/text v0.2.0 // indirect
 	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
-	github.com/mattn/go-colorable v0.1.12 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-runewidth v0.0.13 // indirect
 	github.com/microcosm-cc/bluemonday v1.0.17 // indirect
 	github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
@@ -85,30 +85,29 @@ require (
 	github.com/pseudomuto/protoc-gen-doc v1.5.1 // indirect
 	github.com/pseudomuto/protokit v0.2.0 // indirect
 	github.com/rivo/uniseg v0.2.0 // indirect
-	github.com/rogpeppe/go-internal v1.8.1 // indirect
+	github.com/rogpeppe/go-internal v1.9.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/shurcooL/go-goon v0.0.0-20210110234559-7585751d9a17 // indirect
-	github.com/sourcegraph/log v0.0.0-20220707160925-6a936691c838 // indirect
+	github.com/sourcegraph/log v0.0.0-20220901143117-fc0516a694c9 // indirect
 	github.com/spf13/cobra v1.4.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf // indirect
-	github.com/stretchr/objx v0.1.0 // indirect
+	github.com/stretchr/objx v0.4.0 // indirect
 	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
 	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
 	github.com/yuin/goldmark v1.4.4 // indirect
 	github.com/yuin/goldmark-emoji v1.0.1 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	go.uber.org/atomic v1.9.0 // indirect
+	go.uber.org/atomic v1.10.0 // indirect
 	go.uber.org/multierr v1.8.0 // indirect
-	go.uber.org/zap v1.21.0 // indirect
+	go.uber.org/zap v1.23.0 // indirect
 	golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect
 	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
-	golang.org/x/sys v0.0.0-20220712014510-0a85c31ab51e // indirect
+	golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 // indirect
 	golang.org/x/term v0.0.0-20220411215600-e5f449aeb171 // indirect
 	golang.org/x/text v0.3.7 // indirect
 	golang.org/x/tools v0.1.11 // indirect
-	golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect
 	google.golang.org/genproto v0.0.0-20220414192740-2d67ff6cf2b4 // indirect
 	google.golang.org/grpc v1.45.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
@@ -118,4 +117,4 @@ require (
 // See: https://github.com/ghodss/yaml/pull/65
 replace github.com/ghodss/yaml => github.com/sourcegraph/yaml v1.0.1-0.20200714132230-56936252f152
 
-replace github.com/sourcegraph/sourcegraph/lib v0.0.0-20220715132627-cb906941e8b4 => ../sourcegraph/lib
+replace github.com/sourcegraph/sourcegraph/lib v0.0.0-20220816103048-5fb36f9b800c => ../sourcegraph/lib
diff --git a/go.sum b/go.sum
index 6e4fc49ec9..bc76508ea8 100644
--- a/go.sum
+++ b/go.sum
@@ -1,46 +1,67 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.94.1 h1:DwuSvDZ1pTYGbXo8yOJevCTr3BoBlE+OVkHAKiYQUXc=
+github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9 h1:HD8gA2tkByhMAwYaFAX9w2l7vxvBQ5NMoxDrkhqhtn4=
 github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
 github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8=
 github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
+github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/CloudyKit/fastprinter v0.0.0-20170127035650-74b38d55f37a/go.mod h1:EFZQ978U7x8IRnstaskI3IysnWY5Ao3QgZUKOXlsAdw=
+github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53 h1:sR+/8Yb4slttB4vD+b9btVEnWgL3Q00OBTzVT8B9C0c=
 github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53/go.mod h1:+3IMCy2vIlbG1XG/0ggNQv0SvxCAIpPM5b1nCz56Xno=
+github.com/CloudyKit/jet v2.1.3-0.20180809161101-62edd43e4f88+incompatible h1:rZgFj+Gtf3NMi/U5FvCvhzaxzW/TaPYgUYx3bAPz9DE=
 github.com/CloudyKit/jet v2.1.3-0.20180809161101-62edd43e4f88+incompatible/go.mod h1:HPYO+50pSWkPoj9Q/eq0aRGByCL6ScRlUmiEX5Zgm+w=
+github.com/CloudyKit/jet/v3 v3.0.0 h1:1PwO5w5VCtlUUl+KTOBsTGZlhjWkcybsGaAau52tOy8=
 github.com/CloudyKit/jet/v3 v3.0.0/go.mod h1:HKQPgSJmdK8hdoAbKUUWajkHyHo4RaU5rMdUywE7VMo=
+github.com/Joker/hpp v1.0.0 h1:65+iuJYdRXv/XyN62C1uEmmOx3432rNG/rKlX6V7Kkc=
 github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY=
+github.com/Joker/jade v1.0.1-0.20190614124447-d475f43051e7 h1:mreN1m/5VJ/Zc3b4pzj9qU6D9SRQ6Vm+3KfI328t3S8=
 github.com/Joker/jade v1.0.1-0.20190614124447-d475f43051e7/go.mod h1:6E6s8o2AE4KhCrqr6GRJjdC/gNfTdxkIXvuGZZda2VM=
 github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
 github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
 github.com/Masterminds/sprig v2.15.0+incompatible h1:0gSxPGWS9PAr7U2NsQ2YQg6juRDINkUyuvbb4b2Xm8w=
 github.com/Masterminds/sprig v2.15.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o=
+github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398 h1:WDC6ySpJzbxGWFh4aMxFFC28wwGp5pEuoTtvA4q/qQ4=
 github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398/go.mod h1:a1uqRtAwp2Xwc6WNPJEufxJ7fx3npB4UV/JOLmbu5I0=
+github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU=
 github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY=
 github.com/alecthomas/chroma v0.10.0 h1:7XDcGkCQopCNKjZHfYrNLraA+M7e0fMiJ/Mfikbfjek=
 github.com/alecthomas/chroma v0.10.0/go.mod h1:jtJATyUxlIORhUOFNA9NZDWGAQ8wpxQQqNSB4rjA/1s=
+github.com/alecthomas/kingpin v2.2.6+incompatible h1:5svnBTFgJjZvGKyYBtMB0+m5wvrbUHiqye8wRJMlnYI=
+github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM=
+github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 h1:s6gZFSlWYmbqAuRjVTiNNhvNRfY2Wxp9nhfyel4rklc=
+github.com/antihax/optional v1.0.0 h1:xK2lYat7ZLaVVcIuj82J8kIro4V6kDe0AUDFboUCwcg=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/aokoli/goutils v1.0.1 h1:7fpzNGoJ3VA8qcrm++XEE1QUe0mIwNeLa02Nwq7RDkg=
 github.com/aokoli/goutils v1.0.1/go.mod h1:SijmP0QR8LtwsmDs8Yii5Z/S4trXFGFC2oO5g9DP+DQ=
+github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6 h1:G1bPvciwNyF7IUmKXNt9Ak3m6u9DE1rF+RmtIkBpVdA=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
 github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
 github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
+github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible h1:Ppm0npCCsmuR9oQaBtRuZcmILVE74aXE+AmrJj8L2ns=
 github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g=
-github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A=
 github.com/bufbuild/buf v1.4.0 h1:GqE3a8CMmcFvWPzuY3Mahf9Kf3S9XgZ/ORpfYFzO+90=
 github.com/bufbuild/buf v1.4.0/go.mod h1:mwHG7klTHnX+rM/ym8LXGl7vYpVmnwT96xWoRB4H5QI=
+github.com/census-instrumentation/opencensus-proto v0.2.1 h1:glEXhBS5PSLLv4IXzLA5yPRVX4bilULVyxxbrfOtDAk=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/charmbracelet/glamour v0.5.0 h1:wu15ykPdB7X6chxugG/NNfDUbyyrCLV9XBalj5wdu3g=
 github.com/charmbracelet/glamour v0.5.0/go.mod h1:9ZRtG19AUIzcTm7FGLGbq3D5WKQ5UyZBbQsMQN0XIqc=
+github.com/client9/misspell v0.3.4 h1:ta993UF76GwbvJcIo3Y68y/M3WxlpEHPWIGDkJYwzJI=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
+github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4 h1:hzAQntlaYRkVSFEfj9OTWlVV1H155FMD8BTKktLv0QI=
 github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
 github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1 h1:zH8ljVhhq7yC0MIeUL/IviMtY8hx2mK8cN9wEYb8ggw=
 github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cockroachdb/datadriven v1.0.1-0.20211007161720-b558070c3be0/go.mod h1:5Ib8Meh+jk1RlHIXej6Pzevx/NLlNvQB9pmSBZErGA4=
+github.com/cockroachdb/datadriven v1.0.1-0.20220214170620-9913f5bc19b7 h1:GCR5egmFNSTyGOv9IvMh636aELybEhZOlpPlW2NtuiU=
 github.com/cockroachdb/datadriven v1.0.1-0.20220214170620-9913f5bc19b7/go.mod h1:hi0MtSY3AYDQNDi83kDkMH5/yqM/CsIrsOITkSoH7KI=
 github.com/cockroachdb/errors v1.6.1/go.mod h1:tm6FTP5G81vwJ5lC0SizQo374JNCOPrHyXGitRJoDqM=
 github.com/cockroachdb/errors v1.8.8/go.mod h1:z6VnEL3hZ/2ONZEvG7S5Ym0bU2AqPcEKnIiA1wbsSu0=
@@ -51,11 +72,17 @@ github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f h1:6jduT9Hfc0n
 github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs=
 github.com/cockroachdb/redact v1.1.3 h1:AKZds10rFSIj7qADf0g46UixK8NNLwWTNdCIGS5wfSQ=
 github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
+github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2 h1:IKgmqgMQlVJIZj19CdocBeSfSaiCbEBZGKODaixqtHM=
 github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2/go.mod h1:8BT+cPK6xvFOcRlk0R8eg+OTkcqI6baNH4xAkpiYVvQ=
+github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0 h1:sDMmm+q/3+BukdIpxwO365v/Rbspp2Nt5XntgQRXq8Q=
 github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM=
+github.com/coreos/etcd v3.3.10+incompatible h1:jFneRYjIvLMLhDLCzuTuU4rSJUjRplcJQ7pD7MnhC04=
 github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
+github.com/coreos/go-etcd v2.0.0+incompatible h1:bXhRBIXoTm9BYHS3gE0TtQuyNZyeEMux2sDi4oo5YOo=
 github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
+github.com/coreos/go-semver v0.2.0 h1:3Jm3tLmsgAYcjC+4Up7hJrFBPr+n7rAqYeSw/SZazuY=
 github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
+github.com/cpuguy83/go-md2man v1.0.10 h1:BSKMNlYxDvnunlTymqtgONjNnaRV1sTpcovwwjF22jk=
 github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
 github.com/cpuguy83/go-md2man/v2 v2.0.1 h1:r/myEWzV9lfsM1tFLgDyu0atFtJ1fXn261LKYj/3DxU=
 github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
@@ -64,13 +91,18 @@ github.com/creack/goselect v0.1.2/go.mod h1:a/NhLweNvqIYMuxcMOuWY516Cimucms3DglD
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/creack/pty v1.1.11 h1:07n33Z8lZxZ2qwegKbObQohDhXDQxiMMz1NOUGYlesw=
 github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+github.com/dave/jennifer v1.4.1 h1:XyqG6cn5RQsTj3qlWQTKlRGAyrTcsk1kUmWdZBzRjDw=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/derision-test/glock v0.0.0-20210316032053-f5b74334bb29 h1:O07j7ewg0eFHRx+7bxCA/7z86HJexl7HLY9kyVMmPDo=
 github.com/derision-test/glock v0.0.0-20210316032053-f5b74334bb29/go.mod h1:jKtLdBMrF+XQatqvg46wiWdDfDSSDjdhO4dOM2FX9H4=
+github.com/derision-test/go-mockgen v1.1.2 h1:bMNCerr4I3dz2/UlguwgMuMuJDQXqRnBw17ezXkGvyI=
+github.com/dgraph-io/badger v1.6.0 h1:DshxFxZWXUcO0xX476VJC07Xsr6ZCBVRHKZ93Oh7Evo=
 github.com/dgraph-io/badger v1.6.0/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4=
+github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
+github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2 h1:tdlZCpZ/P9DhczCTSixgIKmwPv6+wP5DGjqLYw5SUiA=
 github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
 github.com/dineshappavoo/basex v0.0.0-20170425072625-481a6f6dc663 h1:fctNkSsavbXpt8geFWZb8n+noCqS8MrOXRJ/YfdZ2dQ=
 github.com/dineshappavoo/basex v0.0.0-20170425072625-481a6f6dc663/go.mod h1:Kad2hux31v/IyD4Rf4wAwIyK48995rs3qAl9IUAhc2k=
@@ -78,57 +110,82 @@ github.com/dlclark/regexp2 v1.4.0 h1:F1rxgk7p4uKjwIQxBs9oAXe5CqrXlCduYEJvrF4u93E
 github.com/dlclark/regexp2 v1.4.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
 github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
+github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385 h1:clC1lXBpe2kTj2VHdaIu9ajZQe4kcEY9j0NsnDDBZ3o=
 github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
 github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
+github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021 h1:fP+fF0up6oPY49OrjPrhIJ8yQfdIM85NXMLkMg1EXVs=
 github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/envoyproxy/protoc-gen-validate v0.3.0-java h1:bV5JGEB1ouEzZa0hgVDFFiClrUEuGWRaAc/3mxR2QK0=
 github.com/envoyproxy/protoc-gen-validate v0.3.0-java/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/etcd-io/bbolt v1.3.3 h1:gSJmxrs37LgTqR/oyJBWok6k6SvXEUerFTbltIhXkBM=
 github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHjkjCrw=
+github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072 h1:DddqAaWDpywytcG8w/qoQ5sAN8X12d3Z3koB0C3Rxsc=
 github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod h1:duJ4Jxv5lDcvg4QuQr0oowTf7dz4/CR8NtyCooz9HL8=
 github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
 github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
+github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
 github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
+github.com/flosch/pongo2 v0.0.0-20190707114632-bbf5a6c351f4 h1:GY1+t5Dr9OKADM64SYnQjw/w99HMYvQ0A8/JoUkxVmc=
 github.com/flosch/pongo2 v0.0.0-20190707114632-bbf5a6c351f4/go.mod h1:T9YF2M40nIgbVgp3rreNmTged+9HrbNTIQf1PsaIiTA=
 github.com/frankban/quicktest v1.14.0 h1:+cqqvzZV87b4adx/5ayVOaYZ2CrvM4ejQvUdBzPPUss=
 github.com/frankban/quicktest v1.14.0/go.mod h1:NeW+ay9A/U67EYXNFA1nPE8e/tnQv/09mUdL/ijj8og=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
+github.com/gavv/httpexpect v2.0.0+incompatible h1:1X9kcRshkSKEjNJJxX9Y9mQ5BRfbxU5kORdjhlA1yX8=
 github.com/gavv/httpexpect v2.0.0+incompatible/go.mod h1:x+9tiU1YnrOvnB725RkpoLv1M62hOWzwo5OXotisrKc=
 github.com/getsentry/sentry-go v0.12.0/go.mod h1:NSap0JBYWzHND8oMbyi0+XZhUalc1TBdRL1M71JZW2c=
 github.com/getsentry/sentry-go v0.13.0 h1:20dgTiUSfxRB/EhMPtxcL9ZEbM1ZdR+W/7f7NWD+xWo=
 github.com/getsentry/sentry-go v0.13.0/go.mod h1:EOsfu5ZdvKPfeHYV6pTVQnsjfp30+XA7//UooKNumH0=
 github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s=
+github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
 github.com/gin-gonic/gin v1.4.0/go.mod h1:OW2EZn3DO8Ln9oIKOvM++LBO+5UPHJJDH72/q/3rZdM=
+github.com/gin-gonic/gin v1.7.7 h1:3DoBmSbJbZAWqXJC3SLjAPfutPJJRN1U5pALB7EeTTs=
+github.com/go-check/check v0.0.0-20180628173108-788fd7840127 h1:0gkP6mzaMqkmpcJYCFOLkIBwI7xFExG03bbkOkCvUPI=
 github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod h1:9ES+weclKsC9YodN5RgxqK/VD9HM9JsCSh7rNhMZE98=
+github.com/go-enry/go-enry/v2 v2.7.2 h1:IBtFo783PgL7oyd/TL1/8HQFMNzOAl4NaLPbzNOvbwM=
+github.com/go-enry/go-oniguruma v1.2.1 h1:k8aAMuJfMrqm/56SG2lV9Cfti6tC4x8673aHCcBk+eo=
 github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w=
 github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
+github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab h1:xveKWz2iaueeTaUgdetzel+U7exyigDYBryyVfV/rZk=
 github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod h1:/P9AEU963A2AYjv4d1V5eVL1CQbEJq6aCNHDDjibzu8=
+github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q=
+github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no=
+github.com/go-playground/validator/v10 v10.4.1 h1:pH2c5ADXtd66mxoE0Zm9SUhxE20r7aM3F26W0hOn+GE=
 github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
 github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
+github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee h1:s+21KNqlpePfkah2I+gwHF8xmJWRjooY+5248k6m4A0=
 github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
+github.com/gobwas/pool v0.2.0 h1:QEmUOlnSjWtnpRGHF3SauEiOsy82Cup83Vf2LcMlnc8=
 github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
+github.com/gobwas/ws v1.0.2 h1:CoAavW/wd/kulfZmSIBt6p24n4j7tHgNVCjsfHVNUbo=
 github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM=
 github.com/gofrs/flock v0.8.1 h1:+gYjHKf32LDeiEEFhQaotPbLuUXjY5ZqxKgXy7n59aw=
 github.com/gofrs/flock v0.8.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU=
 github.com/gofrs/uuid v4.2.0+incompatible h1:yyYWMnhkhrKwwr8gAOcOCYxOOscHgDS9yZgBrnJfGa0=
 github.com/gofrs/uuid v4.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/gogo/googleapis v0.0.0-20180223154316-0cd9801be74a/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s=
+github.com/gogo/googleapis v1.4.1 h1:1Yx4Myt7BxzvUr5ldGSbwYiZG6t9wGBZ+8/fX3Wvtq0=
 github.com/gogo/googleapis v1.4.1/go.mod h1:2lpHqI5OcWCtVElxXnPt+s8oJvMpySlOyM6xDCrzib4=
 github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
+github.com/gogo/status v1.1.0 h1:+eIkrewn5q6b30y+g/BJINVVdi2xH7je5MPJ3ZPK3JA=
 github.com/gogo/status v1.1.0/go.mod h1:BFv9nrluPLmrS0EmGVvLaPNmRosr9KapBYd5/hpY1WM=
+github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY=
 github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/mock v1.1.1 h1:G5FRp8JnTd7RQH5kemVNlMeyXQAztQ3mOWV95KxsXH8=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -145,6 +202,7 @@ github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/gomodule/redigo v1.7.1-0.20190724094224-574c33c3df38 h1:y0Wmhvml7cGnzPa9nocn/fMraMH/lMDdeG+rkx4VgYY=
 github.com/gomodule/redigo v1.7.1-0.20190724094224-574c33c3df38/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
@@ -156,22 +214,30 @@ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
-github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
+github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
+github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk=
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
+github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/googleapis/gax-go/v2 v2.1.1 h1:dp3bWCh+PPO1zjRRiCSczJav13sBvG4UhNyVTa1KqdU=
+github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gorilla/css v1.0.0 h1:BQqNyPTi50JCFMTw/b67hByjMVXZRwGha6wxVGkeihY=
 github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c=
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
+github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM=
 github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/grafana/regexp v0.0.0-20220304100321-149c8afcd6cb h1:wwzNkyaQwcXCzQuKoWz3lwngetmcyg+EhW0fF5lz73M=
 github.com/grafana/regexp v0.0.0-20220304100321-149c8afcd6cb/go.mod h1:M5qHK+eWfAv8VR/265dIuEpL3fNfeC21tXXp9itM24A=
+github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
+github.com/hashicorp/go-version v1.2.0 h1:3vNe/fWF5CBgRIguda1meWhsZHy3m8gCJ5wx+dIzX/E=
 github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
+github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/hexops/autogold v0.8.1/go.mod h1:97HLDXyG23akzAoRYJh/2OBs3kd80eHyKPvZw0S5ZBY=
 github.com/hexops/autogold v1.3.0 h1:IEtGNPxBeBu8RMn8eKWh/Ll9dVNgSnJ7bp/qHgMQ14o=
@@ -181,26 +247,38 @@ github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSo
 github.com/hexops/valast v1.4.0/go.mod h1:uVjKZ0smVuYlgCSPz9NRi5A04sl7lp6GtFWsROKDgEs=
 github.com/hexops/valast v1.4.1 h1:vlB+usah+MLacCyDDqACn2yhAoCDlpHYkpEKtej+RXE=
 github.com/hexops/valast v1.4.1/go.mod h1:G+D6TExWuKs5he+hYlPMfYyhQ8w8qbc2vm4gDWwLdDg=
+github.com/hhatto/gocloc v0.4.2 h1:deh3Xb1uqiySNgOccMNYb3HbKsUoQDzsZRpfQmbTIhs=
+github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/huandu/xstrings v1.0.0 h1:pO2K/gKgKaat5LdpAhxhluX2GPQMaI3W5FUz/I/UnWk=
 github.com/huandu/xstrings v1.0.0/go.mod h1:4qWG/gcEcfX4z/mBDHJ++3ReCw9ibxbsNJbcucJdbSo=
 github.com/hydrogen18/memlistener v0.0.0-20141126152155-54553eb933fb/go.mod h1:qEIFzExnS6016fRpRfxrExeVn2gbClQA99gQhnIcdhE=
+github.com/hydrogen18/memlistener v0.0.0-20200120041712-dcc25e7acd91 h1:KyZDvZ/GGn+r+Y3DKZ7UOQ/TP4xV6HNkrwiVMB1GnNY=
 github.com/hydrogen18/memlistener v0.0.0-20200120041712-dcc25e7acd91/go.mod h1:qEIFzExnS6016fRpRfxrExeVn2gbClQA99gQhnIcdhE=
 github.com/imdario/mergo v0.3.4 h1:mKkfHkZWD8dC7WxKx3N9WCF0Y+dLau45704YQmY6H94=
 github.com/imdario/mergo v0.3.4/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
+github.com/imkira/go-interpol v1.1.0 h1:KIiKr0VSG2CUW1hl1jpiyuzuJeKUUpC8iM1AIE7N1Vk=
 github.com/imkira/go-interpol v1.1.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/CoI+jC3w2iA=
 github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
+github.com/iris-contrib/blackfriday v2.0.0+incompatible h1:o5sHQHHm0ToHUlAJSTjW9UWicjJSDDauOOQ2AHuIVp4=
 github.com/iris-contrib/blackfriday v2.0.0+incompatible/go.mod h1:UzZ2bDEoaSGPbkg6SAB4att1aAwTmVIx/5gCVqeyUdI=
+github.com/iris-contrib/go.uuid v2.0.0+incompatible h1:XZubAYg61/JwnJNbZilGjf3b3pB80+OQg2qf6c8BfWE=
 github.com/iris-contrib/go.uuid v2.0.0+incompatible/go.mod h1:iz2lgM/1UnEf1kP0L/+fafWORmlnuysV2EMP8MW+qe0=
+github.com/iris-contrib/i18n v0.0.0-20171121225848-987a633949d0 h1:Kyp9KiXwsyZRTeoNjgVCrWks7D8ht9+kg6yCjh8K97o=
 github.com/iris-contrib/i18n v0.0.0-20171121225848-987a633949d0/go.mod h1:pMCz62A0xJL6I+umB2YTlFRwWXaDFA0jy+5HzGiJjqI=
+github.com/iris-contrib/jade v1.1.3 h1:p7J/50I0cjo0wq/VWVCDFd8taPJbuFC+bq23SniRFX0=
 github.com/iris-contrib/jade v1.1.3/go.mod h1:H/geBymxJhShH5kecoiOCSssPX7QWYH7UaeZTSWddIk=
+github.com/iris-contrib/pongo2 v0.0.1 h1:zGP7pW51oi5eQZMIlGA3I+FHY9/HOQWDB+572yin0to=
 github.com/iris-contrib/pongo2 v0.0.1/go.mod h1:Ssh+00+3GAZqSQb30AvBRNxBx7rf0GqwkjqxNd0u65g=
+github.com/iris-contrib/schema v0.0.1 h1:10g/WnoRR+U+XXHWKBHeNy/+tZmM2kcAVGLOsz+yaDA=
 github.com/iris-contrib/schema v0.0.1/go.mod h1:urYA3uvUNG1TIIjOSCzHr9/LmbQo8LrOcOqfqxa4hXw=
 github.com/jdxcode/netrc v0.0.0-20210204082910-926c7f70242a h1:d4+I1YEKVmWZrgkt6jpXBnLgV2ZjO0YxEtLDdfIZfH4=
 github.com/jdxcode/netrc v0.0.0-20210204082910-926c7f70242a/go.mod h1:Zi/ZFkEqFHTm7qkjyNJjaWH4LQA9LQhGJyF0lTYGpxw=
 github.com/jhump/gopoet v0.0.0-20190322174617-17282ff210b3/go.mod h1:me9yfT6IJSlOL3FCfrg+L6yzUEZ+5jW6WHt4Sk+UPUI=
+github.com/jhump/gopoet v0.1.0 h1:gYjOPnzHd2nzB37xYQZxj4EIQNpBrBskRqQQ3q4ZgSg=
 github.com/jhump/gopoet v0.1.0/go.mod h1:me9yfT6IJSlOL3FCfrg+L6yzUEZ+5jW6WHt4Sk+UPUI=
+github.com/jhump/goprotoc v0.5.0 h1:Y1UgUX+txUznfqcGdDef8ZOVlyQvnV0pKWZH08RmZuo=
 github.com/jhump/goprotoc v0.5.0/go.mod h1:VrbvcYrQOrTi3i0Vf+m+oqQWk9l72mjkJCYo7UvLHRQ=
 github.com/jhump/protocompile v0.0.0-20220216033700-d705409f108f h1:BNuUg9k2EiJmlMwjoef3e8vZLHplbVw6DrjGFjLL+Yo=
 github.com/jhump/protocompile v0.0.0-20220216033700-d705409f108f/go.mod h1:qr2b5kx4HbFS7/g4uYO5qv9ei8303JMsC7ESbYiqr2Q=
@@ -213,30 +291,43 @@ github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCV
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
+github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
+github.com/juju/errors v0.0.0-20181118221551-089d3ea4e4d5 h1:rhqTjzJlm7EbkELJDKMTU7udov+Se0xZkWmugr6zGok=
 github.com/juju/errors v0.0.0-20181118221551-089d3ea4e4d5/go.mod h1:W54LbzXuIE0boCoNJfwqpmkKJ1O4TCTZMetAt6jGk7Q=
+github.com/juju/loggo v0.0.0-20180524022052-584905176618 h1:MK144iBQF9hTSwBW/9eJm034bVoG30IshVm688T2hi8=
 github.com/juju/loggo v0.0.0-20180524022052-584905176618/go.mod h1:vgyd7OREkbtVEN/8IXZe5Ooef3LQePvuBm9UWj6ZL8U=
+github.com/juju/testing v0.0.0-20180920084828-472a3e8b2073 h1:WQM1NildKThwdP7qWrNAFGzp4ijNLw8RlgENkaI4MJs=
 github.com/juju/testing v0.0.0-20180920084828-472a3e8b2073/go.mod h1:63prj8cnj0tU0S9OHjGJn+b1h0ZghCndfnbQolrYTwA=
+github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88 h1:uC1QfSlInpQF+M0ao65imhwqKnz3Q2z/d8PWZRMQvDM=
 github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k=
 github.com/kataras/golog v0.0.9/go.mod h1:12HJgwBIZFNGL0EJnMRhmvGA0PQGx8VFwrZtM4CqbAk=
+github.com/kataras/golog v0.0.10 h1:vRDRUmwacco/pmBAm8geLn8rHEdc+9Z4NAr5Sh7TG/4=
 github.com/kataras/golog v0.0.10/go.mod h1:yJ8YKCmyL+nWjERB90Qwn+bdyBZsaQwU3bTVFgkFIp8=
 github.com/kataras/iris/v12 v12.0.1/go.mod h1:udK4vLQKkdDqMGJJVd/msuMtN6hpYJhg/lSzuxjhO+U=
+github.com/kataras/iris/v12 v12.1.8 h1:O3gJasjm7ZxpxwTH8tApZsvf274scSGQAUpNe47c37U=
 github.com/kataras/iris/v12 v12.1.8/go.mod h1:LMYy4VlP67TQ3Zgriz8RE2h2kMZV2SgMYbq3UhfoFmE=
 github.com/kataras/neffos v0.0.10/go.mod h1:ZYmJC07hQPW67eKuzlfY7SO3bC0mw83A3j6im82hfqw=
+github.com/kataras/neffos v0.0.14 h1:pdJaTvUG3NQfeMbbVCI8JT2T5goPldyyfUB2PJfh1Bs=
 github.com/kataras/neffos v0.0.14/go.mod h1:8lqADm8PnbeFfL7CLXh1WHw53dG27MC3pgi2R1rmoTE=
 github.com/kataras/pio v0.0.0-20190103105442-ea782b38602d/go.mod h1:NV88laa9UiiDuX9AhMbDPkGYSPugBOV6yTZB1l2K9Z0=
+github.com/kataras/pio v0.0.2 h1:6NAi+uPJ/Zuid6mrAKlgpbI11/zK/lV4B2rxWaJN98Y=
 github.com/kataras/pio v0.0.2/go.mod h1:hAoW0t9UmXi4R5Oyq5Z4irTbaTsOemSrDGUtaTl7Dro=
+github.com/kataras/sitemap v0.0.5 h1:4HCONX5RLgVy6G4RkYOV3vKNcma9p236LdGOipJsaFE=
 github.com/kataras/sitemap v0.0.5/go.mod h1:KY2eugMKiPwsJgx7+U103YZehfvNGOXURubcGyk0Bz8=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
 github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
+github.com/kisielk/errcheck v1.5.0 h1:e8esj/e4R+SAOwFwN+n3zr0nYeCyeweozKfO23MvHzY=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
+github.com/kisielk/gotool v1.0.0 h1:AV2c/EiW3KqPNT9ZKl07ehoAGi4C5/01Cfbblndcapg=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/klauspost/compress v1.8.2/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
 github.com/klauspost/compress v1.9.0/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
 github.com/klauspost/compress v1.9.7/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
 github.com/klauspost/compress v1.15.1 h1:y9FcTHGyrebwfP0ZZqFiaxTaiDnUrGkJkI+f583BL1A=
 github.com/klauspost/compress v1.15.1/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
+github.com/klauspost/cpuid v1.2.1 h1:vJi+O/nMdFt0vqm8NZBI6wzALWdA2X+egi0ogNyrC/w=
 github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
 github.com/klauspost/pgzip v1.2.5 h1:qnWYvvKqedOF2ulHpMG72XQol4ILEJ8k2wwRl/Km8oE=
 github.com/klauspost/pgzip v1.2.5/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
@@ -244,42 +335,54 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
 github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
+github.com/kr/pty v1.1.1 h1:VkoXIwSboBpnk99O/KFauAEILuNHv5DVFKZMBN/gUgw=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/labstack/echo/v4 v4.1.11/go.mod h1:i541M3Fj6f76NZtHSj7TXnyM8n2gaodfvfxNnFqi74g=
+github.com/labstack/echo/v4 v4.5.0 h1:JXk6H5PAw9I3GwizqUHhYyS4f45iyGebR/c1xNCeOCY=
 github.com/labstack/echo/v4 v4.5.0/go.mod h1:czIriw4a0C1dFun+ObrXp7ok03xON0N1awStJ6ArI7Y=
+github.com/labstack/gommon v0.3.0 h1:JEeO0bvc78PKdyHxloTKiF8BD5iGrH8T6MSeGvSgob0=
 github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k=
+github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
 github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
 github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
+github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
-github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40=
-github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
+github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
+github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-isatty v0.0.13/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
+github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
+github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
 github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU=
 github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/mattn/goveralls v0.0.2 h1:7eJB6EqsPhRVxvwEXGnqdO2sJI0PTsrWoTMXEk9/OQc=
 github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw=
+github.com/mediocregopher/mediocre-go-lib v0.0.0-20181029021733-cb65787f37ed h1:3dQJqqDouawQgl3gBE1PNHKFkJYGEuFb1DbSlaxdosE=
 github.com/mediocregopher/mediocre-go-lib v0.0.0-20181029021733-cb65787f37ed/go.mod h1:dSsfyI2zABAdhcbvkXqgxOxrCsbYeHCPgrZkku60dSg=
 github.com/mediocregopher/radix/v3 v3.3.0/go.mod h1:EmfVyvspXz1uZEyPBMyGK+kjWiKQGvsUt6O3Pj+LDCQ=
+github.com/mediocregopher/radix/v3 v3.4.2 h1:galbPBjIwmyREgwGCfQEN4X8lxbJnKBYurgz+VfcStA=
 github.com/mediocregopher/radix/v3 v3.4.2/go.mod h1:8FL3F6UQRXHXIBSPUs5h0RybMF8i4n7wVopoX3x7Bv8=
 github.com/microcosm-cc/bluemonday v1.0.2/go.mod h1:iVP4YcDBq+n/5fb23BhYFvIMq/leAFZyRl6bYmGDlGc=
 github.com/microcosm-cc/bluemonday v1.0.17 h1:Z1a//hgsQ4yjC+8zEkV8IWySkXnsxmdSY642CTFQb5Y=
 github.com/microcosm-cc/bluemonday v1.0.17/go.mod h1:Z0r70sCuXHig8YpBzCc5eGHAap2K7e/u082ZUpDRRqM=
 github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
+github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0=
+github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
 github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 h1:dcztxKSvZ4Id8iPpHERQBbIJfabdt4wUm5qy3wOL2Zc=
@@ -291,6 +394,7 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
+github.com/moul/http2curl v1.0.0 h1:dRMWoAtb+ePxMlLkrCbAqh4TlPHXvoGUSQ323/9Zahs=
 github.com/moul/http2curl v1.0.0/go.mod h1:8UbvGypXm98wA/IqH45anm5Y2Z6ep6O31QGOAZ3H0fQ=
 github.com/muesli/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s=
 github.com/muesli/reflow v0.3.0/go.mod h1:pbwTDkVPibjO2kyvBQRBxTWEEGDGq0FlB1BIKtnHY/8=
@@ -299,11 +403,15 @@ github.com/muesli/termenv v0.12.0 h1:KuQRUE3PgxRFWhq4gHvZtPSLCGDqM5q/cYr1pZ39ytc
 github.com/muesli/termenv v0.12.0/go.mod h1:WCCv32tusQ/EEZ5S8oUIIrC/nIuBcxCVqlN4Xfkv+7A=
 github.com/mwitkow/go-proto-validators v0.0.0-20180403085117-0950a7990007 h1:28i1IjGcx8AofiB4N3q5Yls55VEaitzuEPkFJEVgGkA=
 github.com/mwitkow/go-proto-validators v0.0.0-20180403085117-0950a7990007/go.mod h1:m2XC9Qq0AlmmVksL6FktJCdTYyLk7V3fKyp0sl1yWQo=
+github.com/nats-io/jwt v0.3.0 h1:xdnzwFETV++jNc4W1mw//qFyJGb2ABOombmZJQS4+Qo=
 github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg=
 github.com/nats-io/nats.go v1.8.1/go.mod h1:BrFz9vVn0fU3AcH9Vn4Kd7W0NpJ651tD5omQ3M8LwxM=
+github.com/nats-io/nats.go v1.9.1 h1:ik3HbLhZ0YABLto7iX80pZLPw/6dx3T+++MZJwLnMrQ=
 github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w=
 github.com/nats-io/nkeys v0.0.2/go.mod h1:dab7URMsZm6Z/jp9Z5UGa87Uutgc2mVpXLC4B7TDb/4=
+github.com/nats-io/nkeys v0.1.0 h1:qMd4+pRHgdr1nAClu+2h/2a5F2TmKcCzjCDazVgRoX4=
 github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w=
+github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw=
 github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
 github.com/neelance/parallel v0.0.0-20160708114440-4de9ce63d14c h1:NZOii9TDGRAfCS5VM16XnF4K7afoLQmIiZX8EkKnxtE=
 github.com/neelance/parallel v0.0.0-20160708114440-4de9ce63d14c/go.mod h1:eTBvSIlRgLo+CNFFQRQTwUGTZOEdvXIKeZS/xG+D2yU=
@@ -311,20 +419,26 @@ github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWb
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/nightlyone/lockfile v1.0.0 h1:RHep2cFKK4PonZJDdEl4GmkabuhbsRMgk/k3uAmxBiA=
 github.com/nightlyone/lockfile v1.0.0/go.mod h1:rywoIealpdNse2r832aiD9jRk8ErCatROs6LzC841CI=
+github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
+github.com/oklog/ulid/v2 v2.0.2 h1:r4fFzBm+bv0wNKNh5eXTwU7i85y5x+uwkxCUTNVQqLc=
 github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
 github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
+github.com/onsi/ginkgo v1.13.0 h1:M76yO2HkZASFjXL0HSoZJ1AYEmQxNJmY41Jx1zNUq1Y=
 github.com/onsi/ginkgo v1.13.0/go.mod h1:+REjRxOmWfHCjfv9TTWB1jD1Frx4XydAD3zm1lskyM0=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
+github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
+github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4=
 github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8=
 github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 h1:KoWmjvw+nsYOo29YJK9vDA65RGE3NrOnUtO7a+RF9HU=
 github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI=
+github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e h1:aoZm08cpOy4WuID//EZDgcC4zIxODThtZNPirFr42+A=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
@@ -333,6 +447,7 @@ github.com/pkg/profile v1.6.0 h1:hUDfIISABYI59DyeB3OTay/HxSRwTQ8rB/H83k6r5dM=
 github.com/pkg/profile v1.6.0/go.mod h1:qBsxPvzyUincmltOk6iyRVxHYg4adc0OFOv72ZdLa18=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 h1:gQz4mCbXsO+nc9n1hCxHcGA3Zx3Eo+UHZoInFGUIXNM=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/pseudomuto/protoc-gen-doc v1.5.1 h1:Ah259kcrio7Ix1Rhb6u8FCaOkzf9qRBqXnvAufg061w=
 github.com/pseudomuto/protoc-gen-doc v1.5.1/go.mod h1:XpMKYg6zkcpgfpCfQ8GcWBDRtRxOmMR5w7pz4Xo+dYM=
@@ -341,70 +456,94 @@ github.com/pseudomuto/protokit v0.2.0/go.mod h1:2PdH30hxVHsup8KpBTOXTBeMVhJZVio3
 github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
+github.com/rogpeppe/fastuuid v1.2.0 h1:Ppwyp6VYCF1nvBTXL3trRso7mXMlRrw9ooo375wvi2s=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/rogpeppe/go-internal v1.6.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/rogpeppe/go-internal v1.8.1-0.20211023094830-115ce09fd6b4/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o=
-github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg=
 github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o=
+github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
+github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
+github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/ryanuber/columnize v2.1.0+incompatible h1:j1Wcmh8OrK4Q7GXY+V7SVSY8nUWQxHW5TkBe7YUl+2s=
 github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
+github.com/schollz/closestmatch v2.1.0+incompatible h1:Uel2GXEpJqOWBrlyI+oY9LTiyyjYS17cCYRqP13/SHk=
 github.com/schollz/closestmatch v2.1.0+incompatible/go.mod h1:RtP1ddjLong6gTkbtmuhtR2uUrrJOpYzYRvbcPAid+g=
+github.com/sclevine/agouti v3.0.0+incompatible h1:8IBJS6PWz3uTlMP3YBIR5f+KAldcGuOeFkFbUWfBgK4=
 github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
+github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
 github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
+github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e h1:MZM7FHLqUHYI0Y/mQAt3d2aYa0SiNms/hFqC9qJYolM=
 github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk=
 github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ=
 github.com/shurcooL/go-goon v0.0.0-20210110234559-7585751d9a17 h1:lRAUE0dIvigSSFAmaM2dfg7OH8T+a8zJ5smEh09a/GI=
 github.com/shurcooL/go-goon v0.0.0-20210110234559-7585751d9a17/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ=
+github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
+github.com/smacker/go-tree-sitter v0.0.0-20220209044044-0d3022e933c3 h1:WrsSqod9T70HFyq8hjL6wambOKb4ISUXzFUuNTJHDwo=
+github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
+github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/sourcegraph/go-diff v0.6.1 h1:hmA1LzxW0n1c3Q4YbrFgg4P99GSnebYa3x8gr0HZqLQ=
 github.com/sourcegraph/go-diff v0.6.1/go.mod h1:iBszgVvyxdc8SFZ7gm69go2KDdt3ag071iBaWPF6cjs=
 github.com/sourcegraph/jsonx v0.0.0-20200629203448-1a936bd500cf h1:oAdWFqhStsWiiMP/vkkHiMXqFXzl1XfUNOdxKJbd6bI=
 github.com/sourcegraph/jsonx v0.0.0-20200629203448-1a936bd500cf/go.mod h1:ppFaPm6kpcHnZGqQTFhUIAQRIEhdQDWP1PCv4/ON354=
-github.com/sourcegraph/log v0.0.0-20220707160925-6a936691c838 h1:8wknDSCUVYbaRT63OD+Iyv+stwze5kE2FAzbA1HrNMA=
-github.com/sourcegraph/log v0.0.0-20220707160925-6a936691c838/go.mod h1:zWEPlKrWBUVpko/tOgDS+qrp7BmzaCcmUrh9+ver1iQ=
+github.com/sourcegraph/log v0.0.0-20220901143117-fc0516a694c9 h1:JjFyvx9hCD5+JpuRV6t+gTQgGFvwkxXMZzOc4sLiPqc=
+github.com/sourcegraph/log v0.0.0-20220901143117-fc0516a694c9/go.mod h1:UxiwB6C3xk3xOySJpW1R0MDUyfGuJRFS5Z8C+SA5p2I=
 github.com/sourcegraph/scip v0.2.0 h1:Z9rR9TNONtRhqcpm0JP/yEBUy0fBKaSVbWIZKih5v04=
 github.com/sourcegraph/scip v0.2.0/go.mod h1:EYyT39nXdZDNVmgbJAlyIVWbEb1txnAOKpJPSYpvgXk=
-github.com/sourcegraph/sourcegraph/lib v0.0.0-20220816103048-5fb36f9b800c h1:KmI6ZEtlP8P4h59rn6s0SSbwkX8Yg7dQBtadOLPYCrc=
-github.com/sourcegraph/sourcegraph/lib v0.0.0-20220816103048-5fb36f9b800c/go.mod h1:9wnFUNfpORLAOJn4XAO7ZeWnYkf6/CxlWaTU1vlpuKc=
 github.com/sourcegraph/yaml v1.0.1-0.20200714132230-56936252f152 h1:z/MpntplPaW6QW95pzcAR/72Z5TWDyDnSo0EOcyij9o=
 github.com/sourcegraph/yaml v1.0.1-0.20200714132230-56936252f152/go.mod h1:GIjDIg/heH5DOkXY3YJ/wNhfHsQHoXGjl8G8amsYQ1I=
+github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI=
 github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
+github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8=
 github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
 github.com/spf13/cobra v1.4.0 h1:y+wJpx64xcgO1V+RcnwW0LEHxTKRi2ZDPSBjWnrg88Q=
 github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g=
+github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk=
 github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/spf13/viper v1.3.2 h1:VUFqw5KcqRf7i70GOzW7N+Q7+gxVBkSSqiXB12+JQ4M=
 github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
 github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf h1:pvbZ0lM0XWPBqUKqFU8cmavspvIl9nulOYwdy6IFRRo=
 github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf/go.mod h1:RJID2RhlZKId02nZ62WenDCkgHFerpIOmW0iT7GKmXM=
-github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.4.0 h1:M2gUjqZET1qApGOWNSnZ49BAIMX4F/1plDv3+l31EJ4=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.2 h1:4jaiDzPyXQvSd7D0EjG45355tLlV3VOECpq10pLC+8s=
-github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
+github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
 github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
+github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
+github.com/urfave/cli/v2 v2.8.1 h1:CGuYNZF9IKZY/rfBe3lJpccSoIY1ytfvmgQT90cNOl4=
+github.com/urfave/negroni v1.0.0 h1:kIimOitoypq34K7TG7DUaJ9kq/N4Ofuwi1sjz0KipXc=
 github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=
+github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
+github.com/valyala/fasthttp v1.6.0 h1:uWF8lgKmeaIewWVPwi4GRq2P6+R46IgYZdxWtM+GtEY=
 github.com/valyala/fasthttp v1.6.0/go.mod h1:FstJa9V+Pj9vQ7OJie2qMHdwemEDaDiSdBnvPM1Su9w=
 github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
+github.com/valyala/fasttemplate v1.2.1 h1:TVEnxayobAdVkhQfrfes2IzOB6o+z4roRkPF52WA1u4=
 github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
+github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a h1:0R4NLDRDZX6JcmhJgXi5E4b8Wg84ihbmUKp/GvSPEzc=
 github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio=
 github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
 github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo=
@@ -413,10 +552,16 @@ github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHo
 github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
 github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74=
 github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
+github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77 h1:ESFSdwYZvkeru3RtdrYueztKhOBCSAAzS4Gf+k0tEow=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
+github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
+github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0 h1:6fRhSjgLCkTD3JnJxvaJ4Sj+TYblw757bqYgZaOq5ZY=
 github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0/go.mod h1:/LWChgwKmvncFJFHJ7Gvn9wZArjbV5/FppcK2fKk/tI=
+github.com/yudai/gojsondiff v1.0.0 h1:27cbfqXLVEJ1o8I6v3y9lg8Ydm53EKqHXAOMxEGlCOA=
 github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg=
+github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 h1:BHyfKlQyqbsFN5p3IfnEUduWvb9is428/nNb5L3U01M=
 github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM=
+github.com/yudai/pp v2.0.1+incompatible h1:Q4//iY4pNF6yPLZIigmvcl7k/bPgrcTPIFIcmawg5bI=
 github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -428,17 +573,16 @@ github.com/yuin/goldmark-emoji v1.0.1 h1:ctuWEyzGBwiucEqxzwe0SOYDXPAucOrE9NQC18W
 github.com/yuin/goldmark-emoji v1.0.1/go.mod h1:2w1E6FEWLcDQkoTE+7HU6QF1F6SLlNGjRIBbIZQFqkQ=
 go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
+go.opentelemetry.io/proto/otlp v0.7.0 h1:rwOQPCuKAKmwGKq2aVNnYIibI6wnV7EvzgfTCzcdGg8=
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
-go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
-go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
+go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
 go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI=
-go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
-go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
 go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8=
 go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak=
-go.uber.org/zap v1.21.0 h1:WefMeulhovoZ2sYXz7st6K0sLj7bBhpiFaud4r4zST8=
-go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw=
+go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY=
+go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY=
 golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
@@ -448,11 +592,12 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
 golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4 h1:c2HOrn5iMezYjSlGPncknSEr/8x5LELb/ilJbXi9DEA=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug=
 golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
@@ -491,6 +636,7 @@ golang.org/x/net v0.0.0-20220526153639-5463443f8c37 h1:lUkvobShwKsOesNfWWlCS5q7f
 golang.org/x/net v0.0.0-20220526153639-5463443f8c37/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f h1:Qmd2pbz05z7z6lm0DrgQVVPuBm92jqujBKMHMOlOQEw=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -534,8 +680,9 @@ golang.org/x/sys v0.0.0-20211102192858-4dd72447c267/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20211117180635-dee7805ff2e1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211213223007-03aa0b5f6827/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220712014510-0a85c31ab51e h1:NHvCuwuS43lGnYhten69ZWqi2QOj/CiDNcKbVqwVoew=
-golang.org/x/sys v0.0.0-20220712014510-0a85c31ab51e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 h1:v6hYoSR9T5oet+pMXwUWkbiVqx/63mlHjefrHmxwfeY=
+golang.org/x/sys v0.0.0-20220829200755-d48e67d00261/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20220411215600-e5f449aeb171 h1:EH1Deb8WZJ0xc0WK//leUHXcX9aLE5SymusoTmMZye8=
 golang.org/x/term v0.0.0-20220411215600-e5f449aeb171/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -546,6 +693,7 @@ golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 h1:Hir2P/De0WpUhtrKGGjvSb2YxUgyZ7EFOSLIcSSpiwE=
 golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -565,7 +713,6 @@ golang.org/x/tools v0.0.0-20210101214203-2dba1e4ea05c/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
 golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.8-0.20211102182255-bb4add04ddef/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU=
 golang.org/x/tools v0.1.8/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU=
 golang.org/x/tools v0.1.11 h1:loJ25fNOEhSXfHrpoGj91eCUThwdNX6u24rO1xnNteY=
@@ -574,10 +721,11 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f h1:uF6paiQQebLeSXkrTqHqz0MXhXXS1KgF41eUdBNvxK0=
-golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
+golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f h1:GGU+dLjvlC3qDwqYgL6UgRmHXhOOgns0bZu2Ty5mm6U=
+google.golang.org/api v0.58.0 h1:MDkAbYIB1JpSgCTOCYYoIec/coMlKK4oVbpnBLLcyT0=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
 google.golang.org/genproto v0.0.0-20180518175338-11a468237815/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
@@ -617,12 +765,19 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b h1:QRR6H1YWRnHb4Y/HeNFCTJLFVxaq6wH4YuVdsUOr75U=
 gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/errgo.v2 v2.1.0 h1:0vLT13EuvQ0hNvakwLuFZ/jYrLp5F3kcWHXdRggjCE8=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
+gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
+gopkg.in/go-playground/assert.v1 v1.2.1 h1:xoYuJVE7KT85PYWrN730RguIQO0ePzVRfFMXadIrXTM=
 gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
+gopkg.in/go-playground/validator.v8 v8.18.2 h1:lFB4DoMU6B626w8ny76MV7VX6W2VHct2GVOI3xgiMrQ=
 gopkg.in/go-playground/validator.v8 v8.18.2/go.mod h1:RX2a/7Ha8BgOhfk7j780h4/u/RRjR0eouCJSH80/M2Y=
+gopkg.in/ini.v1 v1.51.1 h1:GyboHr4UqMiLUybYjd22ZjQIKEJEpgtLXtuGbR21Oho=
 gopkg.in/ini.v1 v1.51.1/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce h1:xcEWjVhvbDy+nHP67nPDDpbYrY+ILlfndk4bRioVHaU=
 gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
@@ -639,6 +794,7 @@ gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gotest.tools/v3 v3.0.2 h1:kG1BFyqVHuQoVQiR1bWGnfz/fmHvvuiSPIV7rvl360E=
 gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc h1:/hemPrYIhOhy8zYrNj+069zDB68us2sMGsfkFJO0iZs=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 jaytaylor.com/html2text v0.0.0-20200412013138-3577fbdbcff7 h1:mub0MmFLOn8XLikZOAhgLD1kXJq8jgftSrrv7m00xFo=
 jaytaylor.com/html2text v0.0.0-20200412013138-3577fbdbcff7/go.mod h1:OxvTsCwKosqQ1q7B+8FwXqg4rKZ/UG9dUW+g/VL2xH4=

From b1c89e0fa09707db55da98beb24ace9c7ee30f6e Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Wed, 7 Sep 2022 13:08:59 -0600
Subject: [PATCH 34/77] Update dependencies

---
 go.mod | 2 +-
 go.sum | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/go.mod b/go.mod
index 95a5552809..5048b67152 100644
--- a/go.mod
+++ b/go.mod
@@ -117,4 +117,4 @@ require (
 // See: https://github.com/ghodss/yaml/pull/65
 replace github.com/ghodss/yaml => github.com/sourcegraph/yaml v1.0.1-0.20200714132230-56936252f152
 
-replace github.com/sourcegraph/sourcegraph/lib v0.0.0-20220816103048-5fb36f9b800c => ../sourcegraph/lib
+replace github.com/sourcegraph/sourcegraph/lib v0.0.0-20220825181731-397a768a5290 => ../sourcegraph/lib
diff --git a/go.sum b/go.sum
index 547852d34c..3b1d449128 100644
--- a/go.sum
+++ b/go.sum
@@ -388,6 +388,7 @@ github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DM
 github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf h1:pvbZ0lM0XWPBqUKqFU8cmavspvIl9nulOYwdy6IFRRo=
 github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf/go.mod h1:RJID2RhlZKId02nZ62WenDCkgHFerpIOmW0iT7GKmXM=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.4.0 h1:M2gUjqZET1qApGOWNSnZ49BAIMX4F/1plDv3+l31EJ4=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=

From ba39dc92255df2f7a3ff5f585622e47842a8bfc6 Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Wed, 21 Sep 2022 13:44:43 -0600
Subject: [PATCH 35/77] Rename mount to workspaceFiles

---
 cmd/src/batch_exec.go | 43 ++++++++++++++++++++-----------------------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/cmd/src/batch_exec.go b/cmd/src/batch_exec.go
index 4b34114b6f..b6babcfbd1 100644
--- a/cmd/src/batch_exec.go
+++ b/cmd/src/batch_exec.go
@@ -32,12 +32,12 @@ const (
 )
 
 type executorModeFlags struct {
-	timeout  time.Duration
-	file     string
-	tempDir  string
-	repoDir  string
-	mountDir string
-	api      *api.Flags
+	timeout           time.Duration
+	file              string
+	tempDir           string
+	repoDir           string
+	workspaceFilesDir string
+	api               *api.Flags
 }
 
 func newExecutorModeFlags(flagSet *flag.FlagSet) (f *executorModeFlags) {
@@ -48,7 +48,7 @@ func newExecutorModeFlags(flagSet *flag.FlagSet) (f *executorModeFlags) {
 	flagSet.StringVar(&f.file, "f", "", "The workspace execution input file to read.")
 	flagSet.StringVar(&f.tempDir, "tmp", "", "Directory for storing temporary data.")
 	flagSet.StringVar(&f.repoDir, "repo", "", "Path of the checked out repo on disk.")
-	flagSet.StringVar(&f.mountDir, "mount", "", "Path of the files to mount on disk.")
+	flagSet.StringVar(&f.workspaceFilesDir, "workspaceFiles", "", "Path of workspace files on disk.")
 
 	return f
 }
@@ -63,9 +63,6 @@ func validateExecutorModeFlags(f *executorModeFlags) error {
 	if f.repoDir == "" {
 		return errors.New("repoDir parameter missing")
 	}
-	if f.mountDir == "" {
-		return errors.New("mountDir parameter missing")
-	}
 
 	return nil
 }
@@ -79,7 +76,7 @@ github.com/sourcegraph/sourcegraph/lib/batches.
 
 Usage:
 
-    src batch exec -f FILE -repo DIR -mount DIR [command options]
+    src batch exec -f FILE -repo DIR -workspaceFiles DIR [command options]
 
 Examples:
 
@@ -154,12 +151,12 @@ func executeBatchSpecInWorkspaces(ctx context.Context, flags *executorModeFlags,
 		}
 	}
 
-	// Grab the absolute path to the mount contents.
-	mountDir := flags.mountDir
-	if !filepath.IsAbs(mountDir) {
-		mountDir, err = filepath.Abs(mountDir)
+	// Grab the absolute path to the workspace files contents.
+	workspaceFilesDir := flags.workspaceFilesDir
+	if !filepath.IsAbs(workspaceFilesDir) {
+		workspaceFilesDir, err = filepath.Abs(workspaceFilesDir)
 		if err != nil {
-			return errors.Wrap(err, "getting absolute path for mount dir")
+			return errors.Wrap(err, "getting absolute path for workspace files dir")
 		}
 	}
 
@@ -213,18 +210,18 @@ func executeBatchSpecInWorkspaces(ctx context.Context, flags *executorModeFlags,
 		EnsureImage: imageCache.Ensure,
 		Task:        task,
 		// TODO: Should be slightly less than the executor timeout. Can we somehow read that?
-		Timeout:     flags.timeout,
-		TempDir:     tempDir,
-		MountDir:    mountDir,
-		GlobalEnv:   globalEnv,
-		RepoArchive: &repozip.NoopArchive{},
-		UI:          taskExecUI.StepsExecutionUI(task),
+		Timeout:           flags.timeout,
+		TempDir:           tempDir,
+		WorkspaceFilesDir: workspaceFilesDir,
+		GlobalEnv:         globalEnv,
+		RepoArchive:       &repozip.NoopArchive{},
+		UI:                taskExecUI.StepsExecutionUI(task),
 	}
 	results, err := executor.RunSteps(ctx, opts)
 
 	// Write all step cache results for all results.
 	for _, stepRes := range results {
-		cacheKey := task.CacheKey(globalEnv, mountDir, stepRes.StepIndex)
+		cacheKey := task.CacheKey(globalEnv, workspaceFilesDir, stepRes.StepIndex)
 		k, err := cacheKey.Key()
 		if err != nil {
 			return errors.Wrap(err, "calculating step cache key")

From 8db3a0009ae4edbe4e9f77658714826a38092a65 Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Wed, 21 Sep 2022 13:44:53 -0600
Subject: [PATCH 36/77] Merge main

---
 internal/batches/service/remote.go | 90 ++++++++++++------------------
 1 file changed, 35 insertions(+), 55 deletions(-)

diff --git a/internal/batches/service/remote.go b/internal/batches/service/remote.go
index ba0f3a51f9..2b61a446ef 100644
--- a/internal/batches/service/remote.go
+++ b/internal/batches/service/remote.go
@@ -9,15 +9,12 @@ import (
 	"net/http"
 	"os"
 	"path/filepath"
-	"strconv"
 	"strings"
 
 	"github.com/sourcegraph/sourcegraph/lib/batches"
 	"github.com/sourcegraph/sourcegraph/lib/errors"
 )
 
-var ErrServerSideBatchChangesUnsupported = errors.New("server side batch changes are not available on this Sourcegraph instance")
-
 const upsertEmptyBatchChangeQuery = `
 mutation UpsertEmptyBatchChange(
 	$name: String!
@@ -29,7 +26,6 @@ mutation UpsertEmptyBatchChange(
 	) {
 		id
 		name
-		id
 	}
 }
 `
@@ -43,7 +39,6 @@ func (svc *Service) UpsertBatchChange(
 		UpsertEmptyBatchChange struct {
 			ID   string `json:"id"`
 			Name string `json:"name"`
-			ID   string `json:"id"`
 		} `json:"upsertEmptyBatchChange"`
 	}
 
@@ -110,82 +105,67 @@ func (svc *Service) CreateBatchSpecFromRaw(
 
 // UploadMounts uploads file mounts to the server.
 func (svc *Service) UploadMounts(workingDir string, batchSpecID string, steps []batches.Step) error {
-	if err := svc.areServerSideBatchChangesSupported(); err != nil {
-		return err
-	}
-
-	body := &bytes.Buffer{}
-	w := multipart.NewWriter(body)
-
-	var count int
 	for _, step := range steps {
 		for _, mount := range step.Mount {
-			total, err := handlePath(w, workingDir, mount.Path, count)
+			body := &bytes.Buffer{}
+			w := multipart.NewWriter(body)
+			err := handlePath(w, workingDir, mount.Path)
 			if err != nil {
 				return err
 			}
-			count += total
-		}
-	}
-
-	if err := w.WriteField("count", strconv.Itoa(count)); err != nil {
-		return err
-	}
-
-	// Honestly, the most import thing to do. This adds the closing boundary to the request.
-	if err := w.Close(); err != nil {
-		return err
-	}
+			// Honestly, the most import thing to do. This adds the closing boundary to the request.
+			if err := w.Close(); err != nil {
+				return err
+			}
 
-	request, err := svc.client.NewHTTPRequest(context.Background(), http.MethodPost, fmt.Sprintf(".api/batches/mount/%s", batchSpecID), body)
-	if err != nil {
-		return err
-	}
-	request.Header.Add("Content-Type", w.FormDataContentType())
+			request, err := svc.client.NewHTTPRequest(context.Background(), http.MethodPost, fmt.Sprintf(".api/files/batch-changes/%s", batchSpecID), body)
+			if err != nil {
+				return err
+			}
+			request.Header.Add("Content-Type", w.FormDataContentType())
 
-	resp, err := svc.client.Do(request)
-	if err != nil {
-		return err
-	}
-	if resp.StatusCode != http.StatusOK {
-		p, err := io.ReadAll(resp.Body)
-		if err != nil {
-			return err
+			resp, err := svc.client.Do(request)
+			if err != nil {
+				return err
+			}
+			if resp.StatusCode != http.StatusOK {
+				p, err := io.ReadAll(resp.Body)
+				if err != nil {
+					return err
+				}
+				return errors.New(string(p))
+			}
 		}
-		return errors.New(string(p))
 	}
 	return nil
 }
 
-func handlePath(w *multipart.Writer, workingDir, mountPath string, offset int) (int, error) {
-	total := 0
+func handlePath(w *multipart.Writer, workingDir, mountPath string) error {
 	actualFilePath := filepath.Join(workingDir, mountPath)
 	info, err := os.Stat(actualFilePath)
 	if err != nil {
-		return 0, err
+		return err
 	}
 	if info.IsDir() {
 		dir, err := os.ReadDir(actualFilePath)
 		if err != nil {
-			return 0, err
+			return err
 		}
 		for _, dirEntry := range dir {
-			totalFiles, err := handlePath(w, workingDir, filepath.Join(mountPath, dirEntry.Name()), offset+total)
+			err := handlePath(w, workingDir, filepath.Join(mountPath, dirEntry.Name()))
 			if err != nil {
-				return 0, err
+				return err
 			}
-			total += totalFiles
 		}
 	} else {
-		if err = createFormFile(w, workingDir, mountPath, offset+total); err != nil {
-			return 0, err
+		if err = createFormFile(w, workingDir, mountPath); err != nil {
+			return err
 		}
-		total++
 	}
-	return total, nil
+	return nil
 }
 
-func createFormFile(w *multipart.Writer, workingDir string, mountPath string, index int) error {
+func createFormFile(w *multipart.Writer, workingDir string, mountPath string) error {
 	// TODO: limit file size
 	f, err := os.Open(filepath.Join(workingDir, mountPath))
 	if err != nil {
@@ -195,18 +175,18 @@ func createFormFile(w *multipart.Writer, workingDir string, mountPath string, in
 
 	filePath, fileName := filepath.Split(mountPath)
 	trimmedPath := strings.Trim(strings.TrimSuffix(filePath, string(filepath.Separator)), ".")
-	if err = w.WriteField(fmt.Sprintf("filepath_%d", index), trimmedPath); err != nil {
+	if err = w.WriteField("filepath", trimmedPath); err != nil {
 		return err
 	}
 	fileInfo, err := f.Stat()
 	if err != nil {
 		return err
 	}
-	if err = w.WriteField(fmt.Sprintf("filemod_%d", index), fileInfo.ModTime().UTC().String()); err != nil {
+	if err = w.WriteField("filemod", fileInfo.ModTime().UTC().String()); err != nil {
 		return err
 	}
 
-	part, err := w.CreateFormFile(fmt.Sprintf("file_%d", index), fileName)
+	part, err := w.CreateFormFile("file", fileName)
 	if err != nil {
 		return err
 	}

From 84311e3373031a0ff80f01a4407dc2f1d7a0a8e7 Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Wed, 21 Sep 2022 13:44:56 -0600
Subject: [PATCH 37/77] Merge main

---
 internal/batches/service/remote_test.go | 194 ++++++++++++++++++++++--
 1 file changed, 182 insertions(+), 12 deletions(-)

diff --git a/internal/batches/service/remote_test.go b/internal/batches/service/remote_test.go
index 4221ed2fa3..6727140730 100644
--- a/internal/batches/service/remote_test.go
+++ b/internal/batches/service/remote_test.go
@@ -3,6 +3,7 @@ package service_test
 import (
 	"bytes"
 	"context"
+	"encoding/json"
 	"fmt"
 	"io"
 	"net/http"
@@ -24,19 +25,188 @@ import (
 	"github.com/sourcegraph/sourcegraph/lib/errors"
 )
 
-func TestService_UploadMounts(t *testing.T) {
+func TestService_UpsertBatchChange(t *testing.T) {
 	client := new(mockclient.Client)
+	mockRequest := new(mockclient.Request)
+	svc := service.New(&service.Opts{Client: client})
+
+	tests := []struct {
+		name string
+
+		mockInvokes func()
 
-	// Mock SG version to enable ServerSideBatchChanges
-	versionReq := new(mockclient.Request)
-	versionReq.Response = `{"Site":{"ProductVersion":"3.42.0-0"}}`
-	client.On("NewQuery", mock.Anything).Return(versionReq)
-	versionReq.On("Do", mock.Anything, mock.Anything).Return(true, nil)
+		requestName        string
+		requestNamespaceID string
 
+		expectedID   string
+		expectedName string
+		expectedErr  error
+	}{
+		{
+			name: "New Batch Change",
+			mockInvokes: func() {
+				client.On("NewRequest", mock.Anything, map[string]interface{}{
+					"name":      "my-change",
+					"namespace": "my-namespace",
+				}).
+					Return(mockRequest, nil).
+					Once()
+				mockRequest.On("Do", mock.Anything, mock.Anything).
+					Run(func(args mock.Arguments) {
+						json.Unmarshal([]byte(`{"upsertEmptyBatchChange":{"id":"123", "name":"my-change"}}`), &args[1])
+					}).
+					Return(true, nil).
+					Once()
+			},
+			requestName:        "my-change",
+			requestNamespaceID: "my-namespace",
+			expectedID:         "123",
+			expectedName:       "my-change",
+		},
+		{
+			name: "Failed to upsert batch change",
+			mockInvokes: func() {
+				client.On("NewRequest", mock.Anything, map[string]interface{}{
+					"name":      "my-change",
+					"namespace": "my-namespace",
+				}).
+					Return(mockRequest, nil).
+					Once()
+				mockRequest.On("Do", mock.Anything, mock.Anything).
+					Return(false, errors.New("did not get a good response code")).
+					Once()
+			},
+			requestName:        "my-change",
+			requestNamespaceID: "my-namespace",
+			expectedErr:        errors.New("did not get a good response code"),
+		},
+	}
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			if test.mockInvokes != nil {
+				test.mockInvokes()
+			}
+
+			id, name, err := svc.UpsertBatchChange(context.Background(), test.requestName, test.requestNamespaceID)
+			assert.Equal(t, test.expectedID, id)
+			assert.Equal(t, test.expectedName, name)
+			if test.expectedErr != nil {
+				assert.Error(t, err)
+				assert.Equal(t, test.expectedErr.Error(), err.Error())
+			} else {
+				assert.NoError(t, err)
+			}
+
+			client.AssertExpectations(t)
+		})
+	}
+}
+
+func TestService_CreateBatchSpecFromRaw(t *testing.T) {
+	client := new(mockclient.Client)
+	mockRequest := new(mockclient.Request)
 	svc := service.New(&service.Opts{Client: client})
 
-	err := svc.DetermineFeatureFlags(context.Background())
-	require.NoError(t, err)
+	tests := []struct {
+		name string
+
+		mockInvokes func()
+
+		requestBatchSpec        string
+		requestNamespaceID      string
+		requestAllowIgnored     bool
+		requestAllowUnsupported bool
+		requestNoCache          bool
+		requestBatchChange      string
+
+		expectedID  string
+		expectedErr error
+	}{
+		{
+			name: "Create batch spec",
+			mockInvokes: func() {
+				client.On("NewRequest", mock.Anything, map[string]interface{}{
+					"batchSpec":        "abc",
+					"namespace":        "some-namespace",
+					"allowIgnored":     false,
+					"allowUnsupported": false,
+					"noCache":          false,
+					"batchChange":      "123",
+				}).
+					Return(mockRequest, nil).
+					Once()
+				mockRequest.On("Do", mock.Anything, mock.Anything).
+					Run(func(args mock.Arguments) {
+						json.Unmarshal([]byte(`{"createBatchSpecFromRaw":{"id":"xyz"}}`), &args[1])
+					}).
+					Return(true, nil).
+					Once()
+			},
+			requestBatchSpec:        "abc",
+			requestNamespaceID:      "some-namespace",
+			requestAllowIgnored:     false,
+			requestAllowUnsupported: false,
+			requestNoCache:          false,
+			requestBatchChange:      "123",
+			expectedID:              "xyz",
+		},
+		{
+			name: "Failed to create batch spec",
+			mockInvokes: func() {
+				client.On("NewRequest", mock.Anything, map[string]interface{}{
+					"batchSpec":        "abc",
+					"namespace":        "some-namespace",
+					"allowIgnored":     false,
+					"allowUnsupported": false,
+					"noCache":          false,
+					"batchChange":      "123",
+				}).
+					Return(mockRequest, nil).
+					Once()
+				mockRequest.On("Do", mock.Anything, mock.Anything).
+					Return(false, errors.New("did not get a good response code")).
+					Once()
+			},
+			requestBatchSpec:        "abc",
+			requestNamespaceID:      "some-namespace",
+			requestAllowIgnored:     false,
+			requestAllowUnsupported: false,
+			requestNoCache:          false,
+			requestBatchChange:      "123",
+			expectedErr:             errors.New("did not get a good response code"),
+		},
+	}
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			if test.mockInvokes != nil {
+				test.mockInvokes()
+			}
+
+			id, err := svc.CreateBatchSpecFromRaw(
+				context.Background(),
+				test.requestBatchSpec,
+				test.requestNamespaceID,
+				test.requestAllowIgnored,
+				test.requestAllowUnsupported,
+				test.requestNoCache,
+				test.requestBatchChange,
+			)
+			assert.Equal(t, test.expectedID, id)
+			if test.expectedErr != nil {
+				assert.Error(t, err)
+				assert.Equal(t, test.expectedErr.Error(), err.Error())
+			} else {
+				assert.NoError(t, err)
+			}
+
+			client.AssertExpectations(t)
+		})
+	}
+}
+
+func TestService_UploadMounts(t *testing.T) {
+	client := new(mockclient.Client)
+	svc := service.New(&service.Opts{Client: client})
 
 	// Use a temp directory for reading files
 	workingDir := t.TempDir()
@@ -229,11 +399,11 @@ func TestService_UploadMounts(t *testing.T) {
 				if err := writeTempFile(workingDir, "hello.txt", "hello"); err != nil {
 					return err
 				}
-				if err = writeTempFile(workingDir, "world.txt", "world!"); err != nil {
+				if err := writeTempFile(workingDir, "world.txt", "world!"); err != nil {
 					return err
 				}
 				dir := filepath.Join(workingDir, "scripts")
-				if err = os.Mkdir(dir, os.ModePerm); err != nil {
+				if err := os.Mkdir(dir, os.ModePerm); err != nil {
 					return err
 				}
 				return writeTempFile(dir, "something-else.txt", "this is neat")
@@ -309,7 +479,7 @@ func TestService_UploadMounts(t *testing.T) {
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
 			if test.setup != nil {
-				err = test.setup()
+				err := test.setup()
 				require.NoError(t, err)
 			}
 
@@ -317,7 +487,7 @@ func TestService_UploadMounts(t *testing.T) {
 				test.mockInvokes()
 			}
 
-			err = svc.UploadMounts(workingDir, "123", test.steps)
+			err := svc.UploadMounts(workingDir, "123", test.steps)
 			if test.expectedError != nil {
 				assert.Equal(t, test.expectedError.Error(), err.Error())
 			} else {

From 40b4f15640ac27d19bf4a64933030ee13ba88c00 Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Wed, 21 Sep 2022 13:45:09 -0600
Subject: [PATCH 38/77] Rename mount to workspaceFiles

---
 internal/batches/executor/run_steps.go | 8 ++++----
 internal/batches/service/service.go    | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/internal/batches/executor/run_steps.go b/internal/batches/executor/run_steps.go
index 45678ca420..cf4118517c 100644
--- a/internal/batches/executor/run_steps.go
+++ b/internal/batches/executor/run_steps.go
@@ -39,8 +39,8 @@ type RunStepsOpts struct {
 	Task *Task
 	// TempDir points to where temporary files of the execution should live at.
 	TempDir string
-	// MountDir points to where files that should be mounted live at.
-	MountDir string
+	// WorkspaceFilesDir points to where the workspace files should live at.
+	WorkspaceFilesDir string
 	// Timeout sets the deadline for the execution context. When exceeded,
 	// execution will stop and an error is returned.
 	Timeout time.Duration
@@ -323,11 +323,11 @@ func executeSingleStep(
 
 	// Mount any paths on the local system to the docker container. The paths have already been validated during parsing.
 	for _, mount := range step.Mount {
-		mountPath, err := getAbsoluteMountPath(opts.MountDir, mount.Path)
+		workspaceFilePath, err := getAbsoluteMountPath(opts.WorkspaceFilesDir, mount.Path)
 		if err != nil {
 			return bytes.Buffer{}, bytes.Buffer{}, err
 		}
-		args = append(args, "--mount", fmt.Sprintf("type=bind,source=%s,target=%s,ro", mountPath, mount.Mountpoint))
+		args = append(args, "--mount", fmt.Sprintf("type=bind,source=%s,target=%s,ro", workspaceFilePath, mount.Mountpoint))
 	}
 
 	for k, v := range env {
diff --git a/internal/batches/service/service.go b/internal/batches/service/service.go
index cad5fb24f8..4231b945dd 100644
--- a/internal/batches/service/service.go
+++ b/internal/batches/service/service.go
@@ -466,7 +466,7 @@ func (e *duplicateBranchesErr) Error() string {
 	return out.String()
 }
 
-func (svc *Service) ParseBatchSpec(dir string, data []byte, isRemote bool) (*batcheslib.BatchSpec, error) {
+func (svc *Service) ParseBatchSpec(dir string, data []byte) (*batcheslib.BatchSpec, error) {
 	spec, err := batcheslib.ParseBatchSpec(data)
 	if err != nil {
 		return nil, errors.Wrap(err, "parsing batch spec")

From 825a30b90e1805181257bfa903b68f87362a7350 Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Wed, 21 Sep 2022 14:21:59 -0600
Subject: [PATCH 39/77] Update tests for file upload

---
 internal/batches/service/remote_test.go | 142 +++++++++++-------------
 1 file changed, 63 insertions(+), 79 deletions(-)

diff --git a/internal/batches/service/remote_test.go b/internal/batches/service/remote_test.go
index 6727140730..0ebaaceb51 100644
--- a/internal/batches/service/remote_test.go
+++ b/internal/batches/service/remote_test.go
@@ -4,14 +4,12 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
-	"fmt"
 	"io"
 	"net/http"
 	"net/http/httptest"
 	"os"
 	"path/filepath"
 	"regexp"
-	"strconv"
 	"strings"
 	"testing"
 
@@ -232,8 +230,8 @@ func TestService_UploadMounts(t *testing.T) {
 			},
 			mockInvokes: func() {
 				// Body will get set with the body argument to NewHTTPRequest
-				req := httptest.NewRequest(http.MethodPost, "http://fake.com/.api/batches/mount/123", nil)
-				client.On("NewHTTPRequest", mock.Anything, http.MethodPost, ".api/batches/mount/123", mock.Anything).
+				req := httptest.NewRequest(http.MethodPost, "http://fake.com/.api/files/batch-changes/mount/123", nil)
+				client.On("NewHTTPRequest", mock.Anything, http.MethodPost, ".api/files/batch-changes/123", mock.Anything).
 					Run(func(args mock.Arguments) {
 						req.Body = io.NopCloser(args.Get(3).(*bytes.Buffer))
 					}).
@@ -273,29 +271,20 @@ func TestService_UploadMounts(t *testing.T) {
 			},
 			mockInvokes: func() {
 				// Body will get set with the body argument to NewHTTPRequest
-				req := httptest.NewRequest(http.MethodPost, "http://fake.com/.api/batches/mount/123", nil)
-				client.On("NewHTTPRequest", mock.Anything, http.MethodPost, ".api/batches/mount/123", mock.Anything).
+				req := httptest.NewRequest(http.MethodPost, "http://fake.com/.api/files/batch-changes/123", nil)
+				client.On("NewHTTPRequest", mock.Anything, http.MethodPost, ".api/files/batch-changes/123", mock.Anything).
 					Run(func(args mock.Arguments) {
 						req.Body = io.NopCloser(args.Get(3).(*bytes.Buffer))
 					}).
 					Return(req, nil).
-					Once()
+					Twice()
+
 				resp := &http.Response{
 					StatusCode: http.StatusOK,
 				}
-				requestMatcher := multipartFormRequestMatcher(
-					multipartFormEntry{
-						fileName: "hello.txt",
-						content:  "hello",
-					},
-					multipartFormEntry{
-						fileName: "world.txt",
-						content:  "world!",
-					},
-				)
-				client.On("Do", mock.MatchedBy(requestMatcher)).
+				client.On("Do", mock.Anything).
 					Return(resp, nil).
-					Once()
+					Twice()
 			},
 		},
 		{
@@ -315,8 +304,8 @@ func TestService_UploadMounts(t *testing.T) {
 			},
 			mockInvokes: func() {
 				// Body will get set with the body argument to NewHTTPRequest
-				req := httptest.NewRequest(http.MethodPost, "http://fake.com/.api/batches/mount/123", nil)
-				client.On("NewHTTPRequest", mock.Anything, http.MethodPost, ".api/batches/mount/123", mock.Anything).
+				req := httptest.NewRequest(http.MethodPost, "http://fake.com/.api/files/batch-changes/123", nil)
+				client.On("NewHTTPRequest", mock.Anything, http.MethodPost, ".api/files/batch-changes/123", mock.Anything).
 					Run(func(args mock.Arguments) {
 						req.Body = io.NopCloser(args.Get(3).(*bytes.Buffer))
 					}).
@@ -325,19 +314,17 @@ func TestService_UploadMounts(t *testing.T) {
 				resp := &http.Response{
 					StatusCode: http.StatusOK,
 				}
-				requestMatcher := multipartFormRequestMatcher(
-					multipartFormEntry{
-						fileName: "hello.txt",
-						content:  "hello",
-					},
-					multipartFormEntry{
-						fileName: "world.txt",
-						content:  "world!",
-					},
-				)
-				client.On("Do", mock.MatchedBy(requestMatcher)).
-					Return(resp, nil).
-					Once()
+				client.On("Do", mock.MatchedBy(multipartFormRequestMatcher(multipartFormEntry{
+					fileName: "hello.txt",
+					content:  "hello",
+				}))).
+					Return(resp, nil)
+				//client.On("Do", mock.MatchedBy(multipartFormRequestMatcher(multipartFormEntry{
+				//	fileName: "world.txt",
+				//	content:  "world!",
+				//}))).
+				//	Return(resp, nil).
+				//	Once()
 			},
 		},
 		{
@@ -358,8 +345,8 @@ func TestService_UploadMounts(t *testing.T) {
 			},
 			mockInvokes: func() {
 				// Body will get set with the body argument to NewHTTPRequest
-				req := httptest.NewRequest(http.MethodPost, "http://fake.com/.api/batches/mount/123", nil)
-				client.On("NewHTTPRequest", mock.Anything, http.MethodPost, ".api/batches/mount/123", mock.Anything).
+				req := httptest.NewRequest(http.MethodPost, "http://fake.com/.api/files/batch-changes/123", nil)
+				client.On("NewHTTPRequest", mock.Anything, http.MethodPost, ".api/files/batch-changes/123", mock.Anything).
 					Run(func(args mock.Arguments) {
 						req.Body = io.NopCloser(args.Get(3).(*bytes.Buffer))
 					}).
@@ -410,8 +397,8 @@ func TestService_UploadMounts(t *testing.T) {
 			},
 			mockInvokes: func() {
 				// Body will get set with the body argument to NewHTTPRequest
-				req := httptest.NewRequest(http.MethodPost, "http://fake.com/.api/batches/mount/123", nil)
-				client.On("NewHTTPRequest", mock.Anything, http.MethodPost, ".api/batches/mount/123", mock.Anything).
+				req := httptest.NewRequest(http.MethodPost, "http://fake.com/.api/files/batch-changes/123", nil)
+				client.On("NewHTTPRequest", mock.Anything, http.MethodPost, ".api/files/batch-changes/123", mock.Anything).
 					Run(func(args mock.Arguments) {
 						req.Body = io.NopCloser(args.Get(3).(*bytes.Buffer))
 					}).
@@ -420,22 +407,24 @@ func TestService_UploadMounts(t *testing.T) {
 				resp := &http.Response{
 					StatusCode: http.StatusOK,
 				}
-				requestMatcher := multipartFormRequestMatcher(
-					multipartFormEntry{
-						fileName: "hello.txt",
-						content:  "hello",
-					},
-					multipartFormEntry{
-						fileName: "world.txt",
-						content:  "world!",
-					},
-					multipartFormEntry{
-						path:     "scripts",
-						fileName: "something-else.txt",
-						content:  "this is neat",
-					},
-				)
-				client.On("Do", mock.MatchedBy(requestMatcher)).
+				client.On("Do", mock.MatchedBy(multipartFormRequestMatcher(multipartFormEntry{
+					fileName: "hello.txt",
+					content:  "hello",
+				}))).
+					Return(resp, nil).
+					Once()
+				client.On("Do", mock.MatchedBy(multipartFormRequestMatcher(multipartFormEntry{
+					path:     "scripts",
+					fileName: "something-else.txt",
+					content:  "this is neat",
+				}))).
+					Return(resp, nil).
+					Once()
+				client.On("Do", mock.MatchedBy(multipartFormRequestMatcher(multipartFormEntry{
+					path:     "scripts",
+					fileName: "something-else.txt",
+					content:  "this is neat",
+				}))).
 					Return(resp, nil).
 					Once()
 			},
@@ -461,8 +450,8 @@ func TestService_UploadMounts(t *testing.T) {
 			},
 			mockInvokes: func() {
 				// Body will get set with the body argument to NewHTTPRequest
-				req := httptest.NewRequest(http.MethodPost, "http://fake.com/.api/batches/mount/123", nil)
-				client.On("NewHTTPRequest", mock.Anything, http.MethodPost, ".api/batches/mount/123", mock.Anything).
+				req := httptest.NewRequest(http.MethodPost, "http://fake.com/.api/files/batch-changes/123", nil)
+				client.On("NewHTTPRequest", mock.Anything, http.MethodPost, ".api/files/batch-changes/123", mock.Anything).
 					Return(req, nil).
 					Once()
 				resp := &http.Response{
@@ -514,7 +503,7 @@ func writeTempFile(dir string, name string, content string) error {
 // 2006-01-02 15:04:05.999999999 -0700 MST
 var modtimeRegex = regexp.MustCompile("^[0-9]{4}-[0-9]{2}-[0-9]{2}\\s[0-9]{2}:[0-9]{2}:[0-9]{2}.[0-9]{9} \\+0000 UTC$")
 
-func multipartFormRequestMatcher(entries ...multipartFormEntry) func(*http.Request) bool {
+func multipartFormRequestMatcher(entry multipartFormEntry) func(*http.Request) bool {
 	return func(req *http.Request) bool {
 		contentType := req.Header.Get("Content-Type")
 		if !strings.HasPrefix(contentType, "multipart/form-data") {
@@ -523,30 +512,25 @@ func multipartFormRequestMatcher(entries ...multipartFormEntry) func(*http.Reque
 		if err := req.ParseMultipartForm(32 << 20); err != nil {
 			return false
 		}
-		if req.Form.Get("count") != strconv.Itoa(len(entries)) {
+		if req.Form.Get("filepath") != entry.path {
 			return false
 		}
-		for i, entry := range entries {
-			if req.Form.Get(fmt.Sprintf("filepath_%d", i)) != entry.path {
-				return false
-			}
-			if !modtimeRegex.MatchString(req.Form.Get(fmt.Sprintf("filemod_%d", i))) {
-				return false
-			}
-			f, header, err := req.FormFile(fmt.Sprintf("file_%d", i))
-			if err != nil {
-				return false
-			}
-			if header.Filename != entry.fileName {
-				return false
-			}
-			b, err := io.ReadAll(f)
-			if err != nil {
-				return false
-			}
-			if string(b) != entry.content {
-				return false
-			}
+		if !modtimeRegex.MatchString(req.Form.Get("filemod")) {
+			return false
+		}
+		f, header, err := req.FormFile("file")
+		if err != nil {
+			return false
+		}
+		if header.Filename != entry.fileName {
+			return false
+		}
+		b, err := io.ReadAll(f)
+		if err != nil {
+			return false
+		}
+		if string(b) != entry.content {
+			return false
 		}
 		return true
 	}

From 00ab6aa9bc311623513268c87acf84f7dafd37f1 Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Wed, 21 Sep 2022 14:47:58 -0600
Subject: [PATCH 40/77] Rename mount to workspace files

---
 cmd/src/batch_remote.go    | 6 +++---
 internal/batches/ui/tui.go | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/cmd/src/batch_remote.go b/cmd/src/batch_remote.go
index c6539016b0..1707296a6b 100644
--- a/cmd/src/batch_remote.go
+++ b/cmd/src/batch_remote.go
@@ -100,15 +100,15 @@ Examples:
 		}
 		ui.SendingBatchSpecSuccess()
 
-		ui.UploadingMounts()
+		ui.UploadingWorkspaceFiles()
 		dir, err := getBatchSpecDirectory(file)
 		if err != nil {
 			return errors.Wrap(err, "batch spec path")
 		}
-		if err = svc.UploadMounts(dir, batchSpecID, spec.Steps); err != nil {
+		if err = svc.UploadBatchSpecWorkspaceFile(dir, batchSpecID, spec.Steps); err != nil {
 			return err
 		}
-		ui.UploadingMountsSuccess()
+		ui.UploadingWorkspaceFilesSuccess()
 
 		// Wait for the workspaces to be resolved.
 		ui.ResolvingWorkspaces()
diff --git a/internal/batches/ui/tui.go b/internal/batches/ui/tui.go
index 60e1ce0c7d..ce1c310027 100644
--- a/internal/batches/ui/tui.go
+++ b/internal/batches/ui/tui.go
@@ -232,12 +232,12 @@ func (ui *TUI) SendingBatchSpecSuccess() {
 	batchCompletePending(ui.pending, "Sending batch spec")
 }
 
-func (ui *TUI) UploadingMounts() {
-	ui.pending = batchCreatePending(ui.Out, "Uploading mounts")
+func (ui *TUI) UploadingWorkspaceFiles() {
+	ui.pending = batchCreatePending(ui.Out, "Uploading workspace files")
 }
 
-func (ui *TUI) UploadingMountsSuccess() {
-	batchCompletePending(ui.pending, "Uploading mounts")
+func (ui *TUI) UploadingWorkspaceFilesSuccess() {
+	batchCompletePending(ui.pending, "Uploading workspace files")
 }
 
 func (ui *TUI) ResolvingWorkspaces() {

From 547f31c23f0c0f5e1f99ddcf0a079a15b2dc1015 Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Wed, 21 Sep 2022 14:48:04 -0600
Subject: [PATCH 41/77] Rename mount to workspace files

---
 internal/batches/service/remote.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/internal/batches/service/remote.go b/internal/batches/service/remote.go
index 2b61a446ef..12c26e6def 100644
--- a/internal/batches/service/remote.go
+++ b/internal/batches/service/remote.go
@@ -103,8 +103,8 @@ func (svc *Service) CreateBatchSpecFromRaw(
 	return resp.CreateBatchSpecFromRaw.ID, nil
 }
 
-// UploadMounts uploads file mounts to the server.
-func (svc *Service) UploadMounts(workingDir string, batchSpecID string, steps []batches.Step) error {
+// UploadBatchSpecWorkspaceFile uploads workspace files to the server.
+func (svc *Service) UploadBatchSpecWorkspaceFile(workingDir string, batchSpecID string, steps []batches.Step) error {
 	for _, step := range steps {
 		for _, mount := range step.Mount {
 			body := &bytes.Buffer{}

From 671d5a819d8c4010cf61da3ffe1cb9f49e09495a Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Wed, 21 Sep 2022 14:48:15 -0600
Subject: [PATCH 42/77] Update tests

---
 internal/batches/service/remote_test.go | 109 +++++++-----------------
 1 file changed, 30 insertions(+), 79 deletions(-)

diff --git a/internal/batches/service/remote_test.go b/internal/batches/service/remote_test.go
index 0ebaaceb51..376c2bfec0 100644
--- a/internal/batches/service/remote_test.go
+++ b/internal/batches/service/remote_test.go
@@ -202,19 +202,13 @@ func TestService_CreateBatchSpecFromRaw(t *testing.T) {
 	}
 }
 
-func TestService_UploadMounts(t *testing.T) {
-	client := new(mockclient.Client)
-	svc := service.New(&service.Opts{Client: client})
-
-	// Use a temp directory for reading files
-	workingDir := t.TempDir()
-
+func TestService_UploadBatchSpecWorkspaceFile(t *testing.T) {
 	tests := []struct {
 		name  string
 		steps []batches.Step
 
-		setup       func() error
-		mockInvokes func()
+		setup       func(workingDir string) error
+		mockInvokes func(client *mockclient.Client)
 
 		expectedError error
 	}{
@@ -225,12 +219,12 @@ func TestService_UploadMounts(t *testing.T) {
 					Path: "./hello.txt",
 				}},
 			}},
-			setup: func() error {
+			setup: func(workingDir string) error {
 				return writeTempFile(workingDir, "hello.txt", "hello world!")
 			},
-			mockInvokes: func() {
+			mockInvokes: func(client *mockclient.Client) {
 				// Body will get set with the body argument to NewHTTPRequest
-				req := httptest.NewRequest(http.MethodPost, "http://fake.com/.api/files/batch-changes/mount/123", nil)
+				req := httptest.NewRequest(http.MethodPost, "http://fake.com/.api/files/batch-changes/123", nil)
 				client.On("NewHTTPRequest", mock.Anything, http.MethodPost, ".api/files/batch-changes/123", mock.Anything).
 					Run(func(args mock.Arguments) {
 						req.Body = io.NopCloser(args.Get(3).(*bytes.Buffer))
@@ -240,13 +234,7 @@ func TestService_UploadMounts(t *testing.T) {
 				resp := &http.Response{
 					StatusCode: http.StatusOK,
 				}
-				requestMatcher := multipartFormRequestMatcher(
-					multipartFormEntry{
-						fileName: "hello.txt",
-						content:  "hello world!",
-					},
-				)
-				client.On("Do", mock.MatchedBy(requestMatcher)).
+				client.On("Do", mock.Anything).
 					Return(resp, nil).
 					Once()
 			},
@@ -263,13 +251,13 @@ func TestService_UploadMounts(t *testing.T) {
 					},
 				},
 			}},
-			setup: func() error {
+			setup: func(workingDir string) error {
 				if err := writeTempFile(workingDir, "hello.txt", "hello"); err != nil {
 					return err
 				}
 				return writeTempFile(workingDir, "world.txt", "world!")
 			},
-			mockInvokes: func() {
+			mockInvokes: func(client *mockclient.Client) {
 				// Body will get set with the body argument to NewHTTPRequest
 				req := httptest.NewRequest(http.MethodPost, "http://fake.com/.api/files/batch-changes/123", nil)
 				client.On("NewHTTPRequest", mock.Anything, http.MethodPost, ".api/files/batch-changes/123", mock.Anything).
@@ -296,13 +284,13 @@ func TestService_UploadMounts(t *testing.T) {
 					},
 				},
 			}},
-			setup: func() error {
+			setup: func(workingDir string) error {
 				if err := writeTempFile(workingDir, "hello.txt", "hello"); err != nil {
 					return err
 				}
 				return writeTempFile(workingDir, "world.txt", "world!")
 			},
-			mockInvokes: func() {
+			mockInvokes: func(client *mockclient.Client) {
 				// Body will get set with the body argument to NewHTTPRequest
 				req := httptest.NewRequest(http.MethodPost, "http://fake.com/.api/files/batch-changes/123", nil)
 				client.On("NewHTTPRequest", mock.Anything, http.MethodPost, ".api/files/batch-changes/123", mock.Anything).
@@ -314,17 +302,8 @@ func TestService_UploadMounts(t *testing.T) {
 				resp := &http.Response{
 					StatusCode: http.StatusOK,
 				}
-				client.On("Do", mock.MatchedBy(multipartFormRequestMatcher(multipartFormEntry{
-					fileName: "hello.txt",
-					content:  "hello",
-				}))).
+				client.On("Do", mock.Anything).
 					Return(resp, nil)
-				//client.On("Do", mock.MatchedBy(multipartFormRequestMatcher(multipartFormEntry{
-				//	fileName: "world.txt",
-				//	content:  "world!",
-				//}))).
-				//	Return(resp, nil).
-				//	Once()
 			},
 		},
 		{
@@ -336,14 +315,14 @@ func TestService_UploadMounts(t *testing.T) {
 					},
 				},
 			}},
-			setup: func() error {
+			setup: func(workingDir string) error {
 				dir := filepath.Join(workingDir, "scripts")
 				if err := os.Mkdir(dir, os.ModePerm); err != nil {
 					return err
 				}
 				return writeTempFile(dir, "hello.txt", "hello world!")
 			},
-			mockInvokes: func() {
+			mockInvokes: func(client *mockclient.Client) {
 				// Body will get set with the body argument to NewHTTPRequest
 				req := httptest.NewRequest(http.MethodPost, "http://fake.com/.api/files/batch-changes/123", nil)
 				client.On("NewHTTPRequest", mock.Anything, http.MethodPost, ".api/files/batch-changes/123", mock.Anything).
@@ -355,14 +334,7 @@ func TestService_UploadMounts(t *testing.T) {
 				resp := &http.Response{
 					StatusCode: http.StatusOK,
 				}
-				requestMatcher := multipartFormRequestMatcher(
-					multipartFormEntry{
-						path:     "scripts",
-						fileName: "hello.txt",
-						content:  "hello world!",
-					},
-				)
-				client.On("Do", mock.MatchedBy(requestMatcher)).
+				client.On("Do", mock.Anything).
 					Return(resp, nil).
 					Once()
 			},
@@ -382,7 +354,7 @@ func TestService_UploadMounts(t *testing.T) {
 					},
 				},
 			}},
-			setup: func() error {
+			setup: func(workingDir string) error {
 				if err := writeTempFile(workingDir, "hello.txt", "hello"); err != nil {
 					return err
 				}
@@ -395,7 +367,7 @@ func TestService_UploadMounts(t *testing.T) {
 				}
 				return writeTempFile(dir, "something-else.txt", "this is neat")
 			},
-			mockInvokes: func() {
+			mockInvokes: func(client *mockclient.Client) {
 				// Body will get set with the body argument to NewHTTPRequest
 				req := httptest.NewRequest(http.MethodPost, "http://fake.com/.api/files/batch-changes/123", nil)
 				client.On("NewHTTPRequest", mock.Anything, http.MethodPost, ".api/files/batch-changes/123", mock.Anything).
@@ -403,41 +375,15 @@ func TestService_UploadMounts(t *testing.T) {
 						req.Body = io.NopCloser(args.Get(3).(*bytes.Buffer))
 					}).
 					Return(req, nil).
-					Once()
+					Times(3)
 				resp := &http.Response{
 					StatusCode: http.StatusOK,
 				}
-				client.On("Do", mock.MatchedBy(multipartFormRequestMatcher(multipartFormEntry{
-					fileName: "hello.txt",
-					content:  "hello",
-				}))).
-					Return(resp, nil).
-					Once()
-				client.On("Do", mock.MatchedBy(multipartFormRequestMatcher(multipartFormEntry{
-					path:     "scripts",
-					fileName: "something-else.txt",
-					content:  "this is neat",
-				}))).
-					Return(resp, nil).
-					Once()
-				client.On("Do", mock.MatchedBy(multipartFormRequestMatcher(multipartFormEntry{
-					path:     "scripts",
-					fileName: "something-else.txt",
-					content:  "this is neat",
-				}))).
+				client.On("Do", mock.Anything).
 					Return(resp, nil).
-					Once()
+					Times(3)
 			},
 		},
-		{
-			name: "File does not exist",
-			steps: []batches.Step{{
-				Mount: []batches.Mount{{
-					Path: "./this-does-not-exist.txt",
-				}},
-			}},
-			expectedError: errors.Newf("stat %s/this-does-not-exist.txt: no such file or directory", workingDir),
-		},
 		{
 			name: "Bad status code",
 			steps: []batches.Step{{
@@ -445,10 +391,10 @@ func TestService_UploadMounts(t *testing.T) {
 					Path: "./hello.txt",
 				}},
 			}},
-			setup: func() error {
+			setup: func(workingDir string) error {
 				return writeTempFile(workingDir, "hello.txt", "hello world!")
 			},
-			mockInvokes: func() {
+			mockInvokes: func(client *mockclient.Client) {
 				// Body will get set with the body argument to NewHTTPRequest
 				req := httptest.NewRequest(http.MethodPost, "http://fake.com/.api/files/batch-changes/123", nil)
 				client.On("NewHTTPRequest", mock.Anything, http.MethodPost, ".api/files/batch-changes/123", mock.Anything).
@@ -467,16 +413,21 @@ func TestService_UploadMounts(t *testing.T) {
 	}
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
+			// Use a temp directory for reading files
+			workingDir := t.TempDir()
 			if test.setup != nil {
-				err := test.setup()
+				err := test.setup(workingDir)
 				require.NoError(t, err)
 			}
 
+			client := new(mockclient.Client)
+			svc := service.New(&service.Opts{Client: client})
+
 			if test.mockInvokes != nil {
-				test.mockInvokes()
+				test.mockInvokes(client)
 			}
 
-			err := svc.UploadMounts(workingDir, "123", test.steps)
+			err := svc.UploadBatchSpecWorkspaceFile(workingDir, "123", test.steps)
 			if test.expectedError != nil {
 				assert.Equal(t, test.expectedError.Error(), err.Error())
 			} else {

From eac16c9bd32a87791ccbabd1014d5567d7e0930d Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Wed, 21 Sep 2022 14:48:43 -0600
Subject: [PATCH 43/77] Fix tests

---
 internal/batches/service/service_test.go | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/internal/batches/service/service_test.go b/internal/batches/service/service_test.go
index 9def7cfbd5..dc5aa09c48 100644
--- a/internal/batches/service/service_test.go
+++ b/internal/batches/service/service_test.go
@@ -326,7 +326,7 @@ changesetTemplate:
 						Container: "alpine:3",
 						Mount: []batcheslib.Mount{
 							{
-								Path:       filepath.Join(tempDir, "sample.sh"),
+								Path:       "./sample.sh",
 								Mountpoint: "/tmp/sample.sh",
 							},
 						},
@@ -370,7 +370,7 @@ changesetTemplate:
 						Container: "alpine:3",
 						Mount: []batcheslib.Mount{
 							{
-								Path:       tempDir + string(filepath.Separator),
+								Path:       tempDir,
 								Mountpoint: "/tmp",
 							},
 						},
@@ -414,7 +414,7 @@ changesetTemplate:
 						Container: "alpine:3",
 						Mount: []batcheslib.Mount{
 							{
-								Path:       tempDir + string(filepath.Separator),
+								Path:       "./",
 								Mountpoint: "/tmp",
 							},
 						},
@@ -460,11 +460,11 @@ changesetTemplate:
 						Container: "alpine:3",
 						Mount: []batcheslib.Mount{
 							{
-								Path:       filepath.Join(tempDir, "sample.sh"),
+								Path:       "./sample.sh",
 								Mountpoint: "/tmp/sample.sh",
 							},
 							{
-								Path:       filepath.Join(tempDir, "another.sh"),
+								Path:       "./another.sh",
 								Mountpoint: "/tmp/another.sh",
 							},
 						},

From 37293139fa0bfbb293dc3a3099184c77217eaa33 Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Wed, 21 Sep 2022 14:49:52 -0600
Subject: [PATCH 44/77] Remove unused service

---
 cmd/src/batch_exec.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/src/batch_exec.go b/cmd/src/batch_exec.go
index b6babcfbd1..233b98c333 100644
--- a/cmd/src/batch_exec.go
+++ b/cmd/src/batch_exec.go
@@ -126,7 +126,7 @@ Examples:
 	})
 }
 
-func executeBatchSpecInWorkspaces(ctx context.Context, flags *executorModeFlags, svc *service.Service) (err error) {
+func executeBatchSpecInWorkspaces(ctx context.Context, flags *executorModeFlags) (err error) {
 	ui := &ui.JSONLines{}
 
 	// Ensure the temp dir exists.

From 25db814311bdfc61b8eef0d8e1f0e2d07a877a2e Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Wed, 21 Sep 2022 14:50:27 -0600
Subject: [PATCH 45/77] Remove unused service

---
 cmd/src/batch_exec.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/src/batch_exec.go b/cmd/src/batch_exec.go
index 233b98c333..c6c2f91b39 100644
--- a/cmd/src/batch_exec.go
+++ b/cmd/src/batch_exec.go
@@ -107,7 +107,7 @@ Examples:
 			Client: cfg.apiClient(flags.api, flagSet.Output()),
 		})
 
-		err := executeBatchSpecInWorkspaces(ctx, flags, svc)
+		err := executeBatchSpecInWorkspaces(ctx, flags)
 		if err != nil {
 			return cmderrors.ExitCode(1, err)
 		}

From 56ffa6423f8906295355266293d7ae04c7e9e5a8 Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Wed, 21 Sep 2022 14:50:45 -0600
Subject: [PATCH 46/77] Remove unused service

---
 cmd/src/batch_exec.go | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/cmd/src/batch_exec.go b/cmd/src/batch_exec.go
index c6c2f91b39..d418d6ef4c 100644
--- a/cmd/src/batch_exec.go
+++ b/cmd/src/batch_exec.go
@@ -103,10 +103,6 @@ Examples:
 		ctx, cancel := contextCancelOnInterrupt(context.Background())
 		defer cancel()
 
-		svc := service.New(&service.Opts{
-			Client: cfg.apiClient(flags.api, flagSet.Output()),
-		})
-
 		err := executeBatchSpecInWorkspaces(ctx, flags)
 		if err != nil {
 			return cmderrors.ExitCode(1, err)

From e87525a98ec89dd2ffbf21e719d37612fa5241df Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Wed, 21 Sep 2022 18:07:37 -0600
Subject: [PATCH 47/77] Update to write files in chunks

---
 internal/batches/service/remote.go | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/internal/batches/service/remote.go b/internal/batches/service/remote.go
index 12c26e6def..47c41fd785 100644
--- a/internal/batches/service/remote.go
+++ b/internal/batches/service/remote.go
@@ -1,7 +1,6 @@
 package service
 
 import (
-	"bytes"
 	"context"
 	"fmt"
 	"io"
@@ -107,18 +106,23 @@ func (svc *Service) CreateBatchSpecFromRaw(
 func (svc *Service) UploadBatchSpecWorkspaceFile(workingDir string, batchSpecID string, steps []batches.Step) error {
 	for _, step := range steps {
 		for _, mount := range step.Mount {
-			body := &bytes.Buffer{}
-			w := multipart.NewWriter(body)
-			err := handlePath(w, workingDir, mount.Path)
-			if err != nil {
-				return err
-			}
-			// Honestly, the most import thing to do. This adds the closing boundary to the request.
-			if err := w.Close(); err != nil {
-				return err
-			}
+			// Create a pipe so the requests can be chunked to the server
+			pipeReader, pipeWriter := io.Pipe()
+			w := multipart.NewWriter(pipeWriter)
+
+			// Write in a separate goroutine to properly chunk the file content. Writing to the pipe lets us not have
+			// to put the whole file in memory.
+			go func() {
+				defer pipeWriter.Close()
+				defer w.Close()
+
+				err := handlePath(w, workingDir, mount.Path)
+				if err != nil {
+					return
+				}
+			}()
 
-			request, err := svc.client.NewHTTPRequest(context.Background(), http.MethodPost, fmt.Sprintf(".api/files/batch-changes/%s", batchSpecID), body)
+			request, err := svc.client.NewHTTPRequest(context.Background(), http.MethodPost, fmt.Sprintf(".api/files/batch-changes/%s", batchSpecID), pipeReader)
 			if err != nil {
 				return err
 			}

From 4632368bc834b426c6bb2a0dd3b159d56b8a53e9 Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Wed, 21 Sep 2022 18:07:43 -0600
Subject: [PATCH 48/77] Update tests

---
 internal/batches/service/remote_test.go | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/internal/batches/service/remote_test.go b/internal/batches/service/remote_test.go
index 376c2bfec0..5acadb1ade 100644
--- a/internal/batches/service/remote_test.go
+++ b/internal/batches/service/remote_test.go
@@ -226,9 +226,6 @@ func TestService_UploadBatchSpecWorkspaceFile(t *testing.T) {
 				// Body will get set with the body argument to NewHTTPRequest
 				req := httptest.NewRequest(http.MethodPost, "http://fake.com/.api/files/batch-changes/123", nil)
 				client.On("NewHTTPRequest", mock.Anything, http.MethodPost, ".api/files/batch-changes/123", mock.Anything).
-					Run(func(args mock.Arguments) {
-						req.Body = io.NopCloser(args.Get(3).(*bytes.Buffer))
-					}).
 					Return(req, nil).
 					Once()
 				resp := &http.Response{
@@ -261,9 +258,6 @@ func TestService_UploadBatchSpecWorkspaceFile(t *testing.T) {
 				// Body will get set with the body argument to NewHTTPRequest
 				req := httptest.NewRequest(http.MethodPost, "http://fake.com/.api/files/batch-changes/123", nil)
 				client.On("NewHTTPRequest", mock.Anything, http.MethodPost, ".api/files/batch-changes/123", mock.Anything).
-					Run(func(args mock.Arguments) {
-						req.Body = io.NopCloser(args.Get(3).(*bytes.Buffer))
-					}).
 					Return(req, nil).
 					Twice()
 
@@ -294,9 +288,6 @@ func TestService_UploadBatchSpecWorkspaceFile(t *testing.T) {
 				// Body will get set with the body argument to NewHTTPRequest
 				req := httptest.NewRequest(http.MethodPost, "http://fake.com/.api/files/batch-changes/123", nil)
 				client.On("NewHTTPRequest", mock.Anything, http.MethodPost, ".api/files/batch-changes/123", mock.Anything).
-					Run(func(args mock.Arguments) {
-						req.Body = io.NopCloser(args.Get(3).(*bytes.Buffer))
-					}).
 					Return(req, nil).
 					Once()
 				resp := &http.Response{
@@ -326,9 +317,6 @@ func TestService_UploadBatchSpecWorkspaceFile(t *testing.T) {
 				// Body will get set with the body argument to NewHTTPRequest
 				req := httptest.NewRequest(http.MethodPost, "http://fake.com/.api/files/batch-changes/123", nil)
 				client.On("NewHTTPRequest", mock.Anything, http.MethodPost, ".api/files/batch-changes/123", mock.Anything).
-					Run(func(args mock.Arguments) {
-						req.Body = io.NopCloser(args.Get(3).(*bytes.Buffer))
-					}).
 					Return(req, nil).
 					Once()
 				resp := &http.Response{
@@ -371,9 +359,6 @@ func TestService_UploadBatchSpecWorkspaceFile(t *testing.T) {
 				// Body will get set with the body argument to NewHTTPRequest
 				req := httptest.NewRequest(http.MethodPost, "http://fake.com/.api/files/batch-changes/123", nil)
 				client.On("NewHTTPRequest", mock.Anything, http.MethodPost, ".api/files/batch-changes/123", mock.Anything).
-					Run(func(args mock.Arguments) {
-						req.Body = io.NopCloser(args.Get(3).(*bytes.Buffer))
-					}).
 					Return(req, nil).
 					Times(3)
 				resp := &http.Response{

From ca9824ee85842a65ae34e7990b905728e3c41830 Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Wed, 21 Sep 2022 19:30:44 -0600
Subject: [PATCH 49/77] Handle uploading a directory

---
 internal/batches/service/remote.go | 75 ++++++++++++++++--------------
 1 file changed, 41 insertions(+), 34 deletions(-)

diff --git a/internal/batches/service/remote.go b/internal/batches/service/remote.go
index 47c41fd785..79700c85f7 100644
--- a/internal/batches/service/remote.go
+++ b/internal/batches/service/remote.go
@@ -106,45 +106,15 @@ func (svc *Service) CreateBatchSpecFromRaw(
 func (svc *Service) UploadBatchSpecWorkspaceFile(workingDir string, batchSpecID string, steps []batches.Step) error {
 	for _, step := range steps {
 		for _, mount := range step.Mount {
-			// Create a pipe so the requests can be chunked to the server
-			pipeReader, pipeWriter := io.Pipe()
-			w := multipart.NewWriter(pipeWriter)
-
-			// Write in a separate goroutine to properly chunk the file content. Writing to the pipe lets us not have
-			// to put the whole file in memory.
-			go func() {
-				defer pipeWriter.Close()
-				defer w.Close()
-
-				err := handlePath(w, workingDir, mount.Path)
-				if err != nil {
-					return
-				}
-			}()
-
-			request, err := svc.client.NewHTTPRequest(context.Background(), http.MethodPost, fmt.Sprintf(".api/files/batch-changes/%s", batchSpecID), pipeReader)
-			if err != nil {
-				return err
-			}
-			request.Header.Add("Content-Type", w.FormDataContentType())
-
-			resp, err := svc.client.Do(request)
-			if err != nil {
+			if err := svc.handleWorkspaceFile(workingDir, mount.Path, batchSpecID); err != nil {
 				return err
 			}
-			if resp.StatusCode != http.StatusOK {
-				p, err := io.ReadAll(resp.Body)
-				if err != nil {
-					return err
-				}
-				return errors.New(string(p))
-			}
 		}
 	}
 	return nil
 }
 
-func handlePath(w *multipart.Writer, workingDir, mountPath string) error {
+func (svc *Service) handleWorkspaceFile(workingDir, mountPath, batchSpecID string) error {
 	actualFilePath := filepath.Join(workingDir, mountPath)
 	info, err := os.Stat(actualFilePath)
 	if err != nil {
@@ -156,15 +126,52 @@ func handlePath(w *multipart.Writer, workingDir, mountPath string) error {
 			return err
 		}
 		for _, dirEntry := range dir {
-			err := handlePath(w, workingDir, filepath.Join(mountPath, dirEntry.Name()))
+			err := svc.handleWorkspaceFile(workingDir, filepath.Join(mountPath, dirEntry.Name()), batchSpecID)
 			if err != nil {
 				return err
 			}
 		}
 	} else {
-		if err = createFormFile(w, workingDir, mountPath); err != nil {
+		if err = svc.uploadFile(workingDir, mountPath, batchSpecID); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func (svc *Service) uploadFile(workingDir, mountPath, batchSpecID string) error {
+	// Create a pipe so the requests can be chunked to the server
+	pipeReader, pipeWriter := io.Pipe()
+	w := multipart.NewWriter(pipeWriter)
+
+	// Write in a separate goroutine to properly chunk the file content. Writing to the pipe lets us not have
+	// to put the whole file in memory.
+	go func() {
+		defer pipeWriter.Close()
+		defer w.Close()
+
+		if err := createFormFile(w, workingDir, mountPath); err != nil {
+			// TODO
+			return
+		}
+	}()
+
+	request, err := svc.client.NewHTTPRequest(context.Background(), http.MethodPost, fmt.Sprintf(".api/files/batch-changes/%s", batchSpecID), pipeReader)
+	if err != nil {
+		return err
+	}
+	request.Header.Set("Content-Type", w.FormDataContentType())
+
+	resp, err := svc.client.Do(request)
+	if err != nil {
+		return err
+	}
+	if resp.StatusCode != http.StatusOK {
+		p, err := io.ReadAll(resp.Body)
+		if err != nil {
 			return err
 		}
+		return errors.New(string(p))
 	}
 	return nil
 }

From 7e9c4d63a2c928af6233e5635e87a42c48b10575 Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Wed, 21 Sep 2022 19:31:09 -0600
Subject: [PATCH 50/77] Update tests to be more regardless

---
 internal/batches/service/remote_test.go | 120 ++++++++++++++++++++----
 1 file changed, 103 insertions(+), 17 deletions(-)

diff --git a/internal/batches/service/remote_test.go b/internal/batches/service/remote_test.go
index 5acadb1ade..a5ef2f9198 100644
--- a/internal/batches/service/remote_test.go
+++ b/internal/batches/service/remote_test.go
@@ -226,12 +226,21 @@ func TestService_UploadBatchSpecWorkspaceFile(t *testing.T) {
 				// Body will get set with the body argument to NewHTTPRequest
 				req := httptest.NewRequest(http.MethodPost, "http://fake.com/.api/files/batch-changes/123", nil)
 				client.On("NewHTTPRequest", mock.Anything, http.MethodPost, ".api/files/batch-changes/123", mock.Anything).
+					Run(func(args mock.Arguments) {
+						req.Body = args[3].(*io.PipeReader)
+					}).
 					Return(req, nil).
 					Once()
+
 				resp := &http.Response{
 					StatusCode: http.StatusOK,
 				}
-				client.On("Do", mock.Anything).
+				entry := &multipartFormEntry{
+					fileName: "hello.txt",
+					content:  "hello world!",
+				}
+				requestMatcher := multipartFormRequestMatcher(entry)
+				client.On("Do", mock.MatchedBy(requestMatcher)).
 					Return(resp, nil).
 					Once()
 			},
@@ -258,15 +267,32 @@ func TestService_UploadBatchSpecWorkspaceFile(t *testing.T) {
 				// Body will get set with the body argument to NewHTTPRequest
 				req := httptest.NewRequest(http.MethodPost, "http://fake.com/.api/files/batch-changes/123", nil)
 				client.On("NewHTTPRequest", mock.Anything, http.MethodPost, ".api/files/batch-changes/123", mock.Anything).
+					Run(func(args mock.Arguments) {
+						req.Body = args[3].(*io.PipeReader)
+					}).
 					Return(req, nil).
 					Twice()
 
 				resp := &http.Response{
 					StatusCode: http.StatusOK,
 				}
-				client.On("Do", mock.Anything).
+				helloEntry := &multipartFormEntry{
+					fileName: "hello.txt",
+					content:  "hello",
+				}
+				client.
+					On("Do", mock.MatchedBy(multipartFormRequestMatcher(helloEntry))).
 					Return(resp, nil).
-					Twice()
+					Once()
+
+				worldEntry := &multipartFormEntry{
+					fileName: "world.txt",
+					content:  "world!",
+				}
+				client.
+					On("Do", mock.MatchedBy(multipartFormRequestMatcher(worldEntry))).
+					Return(resp, nil).
+					Once()
 			},
 		},
 		{
@@ -288,13 +314,32 @@ func TestService_UploadBatchSpecWorkspaceFile(t *testing.T) {
 				// Body will get set with the body argument to NewHTTPRequest
 				req := httptest.NewRequest(http.MethodPost, "http://fake.com/.api/files/batch-changes/123", nil)
 				client.On("NewHTTPRequest", mock.Anything, http.MethodPost, ".api/files/batch-changes/123", mock.Anything).
+					Run(func(args mock.Arguments) {
+						req.Body = args[3].(*io.PipeReader)
+					}).
 					Return(req, nil).
-					Once()
+					Twice()
+
 				resp := &http.Response{
 					StatusCode: http.StatusOK,
 				}
-				client.On("Do", mock.Anything).
-					Return(resp, nil)
+				helloEntry := &multipartFormEntry{
+					fileName: "hello.txt",
+					content:  "hello",
+				}
+				client.
+					On("Do", mock.MatchedBy(multipartFormRequestMatcher(helloEntry))).
+					Return(resp, nil).
+					Once()
+
+				worldEntry := &multipartFormEntry{
+					fileName: "world.txt",
+					content:  "world!",
+				}
+				client.
+					On("Do", mock.MatchedBy(multipartFormRequestMatcher(worldEntry))).
+					Return(resp, nil).
+					Once()
 			},
 		},
 		{
@@ -317,12 +362,21 @@ func TestService_UploadBatchSpecWorkspaceFile(t *testing.T) {
 				// Body will get set with the body argument to NewHTTPRequest
 				req := httptest.NewRequest(http.MethodPost, "http://fake.com/.api/files/batch-changes/123", nil)
 				client.On("NewHTTPRequest", mock.Anything, http.MethodPost, ".api/files/batch-changes/123", mock.Anything).
+					Run(func(args mock.Arguments) {
+						req.Body = args[3].(*io.PipeReader)
+					}).
 					Return(req, nil).
 					Once()
+
 				resp := &http.Response{
 					StatusCode: http.StatusOK,
 				}
-				client.On("Do", mock.Anything).
+				entry := &multipartFormEntry{
+					path:     "scripts",
+					fileName: "hello.txt",
+					content:  "hello world!",
+				}
+				client.On("Do", mock.MatchedBy(multipartFormRequestMatcher(entry))).
 					Return(resp, nil).
 					Once()
 			},
@@ -359,14 +413,37 @@ func TestService_UploadBatchSpecWorkspaceFile(t *testing.T) {
 				// Body will get set with the body argument to NewHTTPRequest
 				req := httptest.NewRequest(http.MethodPost, "http://fake.com/.api/files/batch-changes/123", nil)
 				client.On("NewHTTPRequest", mock.Anything, http.MethodPost, ".api/files/batch-changes/123", mock.Anything).
+					Run(func(args mock.Arguments) {
+						req.Body = args[3].(*io.PipeReader)
+					}).
 					Return(req, nil).
 					Times(3)
+
 				resp := &http.Response{
 					StatusCode: http.StatusOK,
 				}
-				client.On("Do", mock.Anything).
+				helloEntry := &multipartFormEntry{
+					fileName: "hello.txt",
+					content:  "hello",
+				}
+				client.On("Do", mock.MatchedBy(multipartFormRequestMatcher(helloEntry))).
 					Return(resp, nil).
-					Times(3)
+					Once()
+				worldEntry := &multipartFormEntry{
+					fileName: "world.txt",
+					content:  "world!",
+				}
+				client.On("Do", mock.MatchedBy(multipartFormRequestMatcher(worldEntry))).
+					Return(resp, nil).
+					Once()
+				somethingElseEntry := &multipartFormEntry{
+					path:     "scripts",
+					fileName: "something-else.txt",
+					content:  "this is neat",
+				}
+				client.On("Do", mock.MatchedBy(multipartFormRequestMatcher(somethingElseEntry))).
+					Return(resp, nil).
+					Once()
 			},
 		},
 		{
@@ -380,11 +457,11 @@ func TestService_UploadBatchSpecWorkspaceFile(t *testing.T) {
 				return writeTempFile(workingDir, "hello.txt", "hello world!")
 			},
 			mockInvokes: func(client *mockclient.Client) {
-				// Body will get set with the body argument to NewHTTPRequest
 				req := httptest.NewRequest(http.MethodPost, "http://fake.com/.api/files/batch-changes/123", nil)
 				client.On("NewHTTPRequest", mock.Anything, http.MethodPost, ".api/files/batch-changes/123", mock.Anything).
 					Return(req, nil).
 					Once()
+
 				resp := &http.Response{
 					StatusCode: http.StatusInternalServerError,
 					Body:       io.NopCloser(bytes.NewReader([]byte("failed to upload file"))),
@@ -437,24 +514,30 @@ func writeTempFile(dir string, name string, content string) error {
 }
 
 // 2006-01-02 15:04:05.999999999 -0700 MST
-var modtimeRegex = regexp.MustCompile("^[0-9]{4}-[0-9]{2}-[0-9]{2}\\s[0-9]{2}:[0-9]{2}:[0-9]{2}.[0-9]{9} \\+0000 UTC$")
+var modtimeRegex = regexp.MustCompile("^[0-9]{4}-[0-9]{2}-[0-9]{2}\\s[0-9]{2}:[0-9]{2}:[0-9]{2}.[0-9]{1,9} \\+0000 UTC$")
 
-func multipartFormRequestMatcher(entry multipartFormEntry) func(*http.Request) bool {
+func multipartFormRequestMatcher(entry *multipartFormEntry) func(*http.Request) bool {
 	return func(req *http.Request) bool {
-		contentType := req.Header.Get("Content-Type")
+		// Prevent parsing the body for the wrong matcher - causes all kinds of havoc.
+		if entry.calls > 0 {
+			return false
+		}
+		// Clone the request. Running ParseMultipartForm changes the behavior of the request for any additional matchers.
+		cloneReq := req.Clone(context.Background())
+		contentType := cloneReq.Header.Get("Content-Type")
 		if !strings.HasPrefix(contentType, "multipart/form-data") {
 			return false
 		}
-		if err := req.ParseMultipartForm(32 << 20); err != nil {
+		if err := cloneReq.ParseMultipartForm(32 << 20); err != nil {
 			return false
 		}
-		if req.Form.Get("filepath") != entry.path {
+		if cloneReq.Form.Get("filepath") != entry.path {
 			return false
 		}
-		if !modtimeRegex.MatchString(req.Form.Get("filemod")) {
+		if !modtimeRegex.MatchString(cloneReq.Form.Get("filemod")) {
 			return false
 		}
-		f, header, err := req.FormFile("file")
+		f, header, err := cloneReq.FormFile("file")
 		if err != nil {
 			return false
 		}
@@ -468,6 +551,7 @@ func multipartFormRequestMatcher(entry multipartFormEntry) func(*http.Request) b
 		if string(b) != entry.content {
 			return false
 		}
+		entry.calls++
 		return true
 	}
 }
@@ -476,4 +560,6 @@ type multipartFormEntry struct {
 	path     string
 	fileName string
 	content  string
+	// This prevents some weird behavior that causes the request body to get read and throw errors.
+	calls int
 }

From 5904767c3391fb0842a187bfbc86ebb455463cc5 Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Wed, 21 Sep 2022 19:37:06 -0600
Subject: [PATCH 51/77] Pass the working directory when running the steps

---
 internal/batches/executor/executor.go | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/internal/batches/executor/executor.go b/internal/batches/executor/executor.go
index e802a0ad04..c2362b7ef4 100644
--- a/internal/batches/executor/executor.go
+++ b/internal/batches/executor/executor.go
@@ -169,14 +169,15 @@ func (x *executor) do(ctx context.Context, task *Task, ui TaskExecutionUI) (err
 
 	// Actually execute the steps.
 	opts := &RunStepsOpts{
-		Task:        task,
-		Logger:      l,
-		WC:          x.opts.Creator,
-		EnsureImage: x.opts.EnsureImage,
-		TempDir:     x.opts.TempDir,
-		GlobalEnv:   x.opts.GlobalEnv,
-		Timeout:     x.opts.Timeout,
-		RepoArchive: repoArchive,
+		Task:              task,
+		Logger:            l,
+		WC:                x.opts.Creator,
+		EnsureImage:       x.opts.EnsureImage,
+		TempDir:           x.opts.TempDir,
+		GlobalEnv:         x.opts.GlobalEnv,
+		Timeout:           x.opts.Timeout,
+		RepoArchive:       repoArchive,
+		WorkspaceFilesDir: x.opts.WorkingDirectory,
 
 		UI: ui.StepsExecutionUI(task),
 	}

From 9661574f2b1be87b6b40745e32d922a7f31f45ef Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Wed, 21 Sep 2022 19:41:47 -0600
Subject: [PATCH 52/77] Fix verbage in changelog

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a7916b44d..348162d8e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,7 +13,7 @@ All notable changes to `src-cli` are documented in this file.
 
 ### Added
 
-- Batch Specs can now mount files when running server side batch changes. [sourcegraph/src-cli#816](https://github.com/sourcegraph/src-cli/pull/816)
+- Mounting files now works when running batch changes server side. [sourcegraph/src-cli#816](https://github.com/sourcegraph/src-cli/pull/816)
 
 ### Changed
 
@@ -859,4 +859,4 @@ Re-release of 3.29.3 for Sourcegraph 3.30.
 ### Changed
 
 - The terminal UI has been replaced by the logger-based UI that was previously only visible in verbose-mode (`-v`). [#228](https://github.com/sourcegraph/src-cli/pull/228)
-- Deprecated the `-endpoint` flag. Instead, use the `SRC_ENDPOINT` environment variable. [#235](https://github.com/sourcegraph/src-cli/pull/235)
\ No newline at end of file
+- Deprecated the `-endpoint` flag. Instead, use the `SRC_ENDPOINT` environment variable. [#235](https://github.com/sourcegraph/src-cli/pull/235)

From e0710fe279854c0369dcbb6bf44e3ca2eb7c5adf Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Thu, 22 Sep 2022 08:16:04 -0600
Subject: [PATCH 53/77] Remove redundant call

---
 cmd/src/batch_exec.go | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/cmd/src/batch_exec.go b/cmd/src/batch_exec.go
index d418d6ef4c..5ac32b570c 100644
--- a/cmd/src/batch_exec.go
+++ b/cmd/src/batch_exec.go
@@ -148,12 +148,9 @@ func executeBatchSpecInWorkspaces(ctx context.Context, flags *executorModeFlags)
 	}
 
 	// Grab the absolute path to the workspace files contents.
-	workspaceFilesDir := flags.workspaceFilesDir
-	if !filepath.IsAbs(workspaceFilesDir) {
-		workspaceFilesDir, err = filepath.Abs(workspaceFilesDir)
-		if err != nil {
-			return errors.Wrap(err, "getting absolute path for workspace files dir")
-		}
+	workspaceFilesDir, err := filepath.Abs(flags.workspaceFilesDir)
+	if err != nil {
+		return errors.Wrap(err, "getting absolute path for workspace files dir")
 	}
 
 	// Test if git is available.

From 108b89da5da6e9192ab5aaa2642322ab80073f8c Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Thu, 22 Sep 2022 08:42:04 -0600
Subject: [PATCH 54/77] Handle errors in goroutine and limit size of files

---
 internal/batches/service/remote.go | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/internal/batches/service/remote.go b/internal/batches/service/remote.go
index 79700c85f7..c59670d6f7 100644
--- a/internal/batches/service/remote.go
+++ b/internal/batches/service/remote.go
@@ -142,17 +142,16 @@ func (svc *Service) handleWorkspaceFile(workingDir, mountPath, batchSpecID strin
 func (svc *Service) uploadFile(workingDir, mountPath, batchSpecID string) error {
 	// Create a pipe so the requests can be chunked to the server
 	pipeReader, pipeWriter := io.Pipe()
-	w := multipart.NewWriter(pipeWriter)
+	multipartWriter := multipart.NewWriter(pipeWriter)
 
 	// Write in a separate goroutine to properly chunk the file content. Writing to the pipe lets us not have
 	// to put the whole file in memory.
 	go func() {
 		defer pipeWriter.Close()
-		defer w.Close()
+		defer multipartWriter.Close()
 
-		if err := createFormFile(w, workingDir, mountPath); err != nil {
-			// TODO
-			return
+		if err := createFormFile(multipartWriter, workingDir, mountPath); err != nil {
+			pipeWriter.CloseWithError(err)
 		}
 	}()
 
@@ -160,10 +159,11 @@ func (svc *Service) uploadFile(workingDir, mountPath, batchSpecID string) error
 	if err != nil {
 		return err
 	}
-	request.Header.Set("Content-Type", w.FormDataContentType())
+	request.Header.Set("Content-Type", multipartWriter.FormDataContentType())
 
 	resp, err := svc.client.Do(request)
 	if err != nil {
+		// Errors passed to pipeWriter.CloseWithError come through here.
 		return err
 	}
 	if resp.StatusCode != http.StatusOK {
@@ -176,14 +176,24 @@ func (svc *Service) uploadFile(workingDir, mountPath, batchSpecID string) error
 	return nil
 }
 
+const maxFileSize = 10 << 20 // 10MB
+
 func createFormFile(w *multipart.Writer, workingDir string, mountPath string) error {
-	// TODO: limit file size
 	f, err := os.Open(filepath.Join(workingDir, mountPath))
 	if err != nil {
 		return err
 	}
 	defer f.Close()
 
+	// Limit the size of file to 10MB
+	fileStat, err := f.Stat()
+	if err != nil {
+		return err
+	}
+	if fileStat.Size() > maxFileSize {
+		return errors.New("file exceeds limit of 10MB")
+	}
+
 	filePath, fileName := filepath.Split(mountPath)
 	trimmedPath := strings.Trim(strings.TrimSuffix(filePath, string(filepath.Separator)), ".")
 	if err = w.WriteField("filepath", trimmedPath); err != nil {

From ae89519fc0bb1c4d224c5ea52f766d02786c7cf7 Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Thu, 22 Sep 2022 08:42:14 -0600
Subject: [PATCH 55/77] Add test for file limit

---
 internal/batches/service/remote_test.go | 42 +++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/internal/batches/service/remote_test.go b/internal/batches/service/remote_test.go
index a5ef2f9198..f215711fce 100644
--- a/internal/batches/service/remote_test.go
+++ b/internal/batches/service/remote_test.go
@@ -472,6 +472,39 @@ func TestService_UploadBatchSpecWorkspaceFile(t *testing.T) {
 			},
 			expectedError: errors.New("failed to upload file"),
 		},
+		{
+			name: "File exceeds limit",
+			steps: []batches.Step{{
+				Mount: []batches.Mount{{
+					Path: "./hello.txt",
+				}},
+			}},
+			setup: func(workingDir string) error {
+				f, err := os.Create(filepath.Join(workingDir, "hello.txt"))
+				if err != nil {
+					return err
+				}
+				defer f.Close()
+				if _, err = io.Copy(f, io.LimitReader(neverEnding('a'), 11<<20)); err != nil {
+					return err
+				}
+				return nil
+			},
+			mockInvokes: func(client *mockclient.Client) {
+				req := httptest.NewRequest(http.MethodPost, "http://fake.com/.api/files/batch-changes/123", nil)
+				client.On("NewHTTPRequest", mock.Anything, http.MethodPost, ".api/files/batch-changes/123", mock.Anything).
+					Run(func(args mock.Arguments) {
+						req.Body = args[3].(*io.PipeReader)
+					}).
+					Return(req, nil).
+					Once()
+
+				client.On("Do", mock.Anything).
+					Return(nil, errors.New("file exceeds limit")).
+					Once()
+			},
+			expectedError: errors.New("file exceeds limit"),
+		},
 	}
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
@@ -563,3 +596,12 @@ type multipartFormEntry struct {
 	// This prevents some weird behavior that causes the request body to get read and throw errors.
 	calls int
 }
+
+type neverEnding byte
+
+func (b neverEnding) Read(p []byte) (n int, err error) {
+	for i := range p {
+		p[i] = byte(b)
+	}
+	return len(p), nil
+}

From 9bc77b6f6bd862b9d057d8d24fcb0e61dc1c6fdf Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Mon, 26 Sep 2022 10:23:03 -0600
Subject: [PATCH 56/77] Remove SG flags

---
 cmd/src/batch_exec.go | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/cmd/src/batch_exec.go b/cmd/src/batch_exec.go
index 5ac32b570c..305d7cb31b 100644
--- a/cmd/src/batch_exec.go
+++ b/cmd/src/batch_exec.go
@@ -41,9 +41,7 @@ type executorModeFlags struct {
 }
 
 func newExecutorModeFlags(flagSet *flag.FlagSet) (f *executorModeFlags) {
-	f = &executorModeFlags{
-		api: api.NewFlags(flagSet),
-	}
+	f = &executorModeFlags{}
 	flagSet.DurationVar(&f.timeout, "timeout", 60*time.Minute, "The maximum duration a single batch spec step can take.")
 	flagSet.StringVar(&f.file, "f", "", "The workspace execution input file to read.")
 	flagSet.StringVar(&f.tempDir, "tmp", "", "Directory for storing temporary data.")

From 9d21a2cefb5ee40ac7219123102c423b2039ad84 Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Mon, 26 Sep 2022 10:26:25 -0600
Subject: [PATCH 57/77] Pass context down from caller

---
 cmd/src/batch_remote.go                 |  2 +-
 internal/batches/service/remote.go      | 14 +++++++-------
 internal/batches/service/remote_test.go |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cmd/src/batch_remote.go b/cmd/src/batch_remote.go
index 1707296a6b..a0bbe55f6f 100644
--- a/cmd/src/batch_remote.go
+++ b/cmd/src/batch_remote.go
@@ -105,7 +105,7 @@ Examples:
 		if err != nil {
 			return errors.Wrap(err, "batch spec path")
 		}
-		if err = svc.UploadBatchSpecWorkspaceFile(dir, batchSpecID, spec.Steps); err != nil {
+		if err = svc.UploadBatchSpecWorkspaceFile(ctx, dir, batchSpecID, spec.Steps); err != nil {
 			return err
 		}
 		ui.UploadingWorkspaceFilesSuccess()
diff --git a/internal/batches/service/remote.go b/internal/batches/service/remote.go
index c59670d6f7..616c60d55a 100644
--- a/internal/batches/service/remote.go
+++ b/internal/batches/service/remote.go
@@ -103,10 +103,10 @@ func (svc *Service) CreateBatchSpecFromRaw(
 }
 
 // UploadBatchSpecWorkspaceFile uploads workspace files to the server.
-func (svc *Service) UploadBatchSpecWorkspaceFile(workingDir string, batchSpecID string, steps []batches.Step) error {
+func (svc *Service) UploadBatchSpecWorkspaceFile(ctx context.Context, workingDir string, batchSpecID string, steps []batches.Step) error {
 	for _, step := range steps {
 		for _, mount := range step.Mount {
-			if err := svc.handleWorkspaceFile(workingDir, mount.Path, batchSpecID); err != nil {
+			if err := svc.handleWorkspaceFile(ctx, workingDir, mount.Path, batchSpecID); err != nil {
 				return err
 			}
 		}
@@ -114,7 +114,7 @@ func (svc *Service) UploadBatchSpecWorkspaceFile(workingDir string, batchSpecID
 	return nil
 }
 
-func (svc *Service) handleWorkspaceFile(workingDir, mountPath, batchSpecID string) error {
+func (svc *Service) handleWorkspaceFile(ctx context.Context, workingDir, mountPath, batchSpecID string) error {
 	actualFilePath := filepath.Join(workingDir, mountPath)
 	info, err := os.Stat(actualFilePath)
 	if err != nil {
@@ -126,20 +126,20 @@ func (svc *Service) handleWorkspaceFile(workingDir, mountPath, batchSpecID strin
 			return err
 		}
 		for _, dirEntry := range dir {
-			err := svc.handleWorkspaceFile(workingDir, filepath.Join(mountPath, dirEntry.Name()), batchSpecID)
+			err := svc.handleWorkspaceFile(ctx, workingDir, filepath.Join(mountPath, dirEntry.Name()), batchSpecID)
 			if err != nil {
 				return err
 			}
 		}
 	} else {
-		if err = svc.uploadFile(workingDir, mountPath, batchSpecID); err != nil {
+		if err = svc.uploadFile(ctx, workingDir, mountPath, batchSpecID); err != nil {
 			return err
 		}
 	}
 	return nil
 }
 
-func (svc *Service) uploadFile(workingDir, mountPath, batchSpecID string) error {
+func (svc *Service) uploadFile(ctx context.Context, workingDir, mountPath, batchSpecID string) error {
 	// Create a pipe so the requests can be chunked to the server
 	pipeReader, pipeWriter := io.Pipe()
 	multipartWriter := multipart.NewWriter(pipeWriter)
@@ -155,7 +155,7 @@ func (svc *Service) uploadFile(workingDir, mountPath, batchSpecID string) error
 		}
 	}()
 
-	request, err := svc.client.NewHTTPRequest(context.Background(), http.MethodPost, fmt.Sprintf(".api/files/batch-changes/%s", batchSpecID), pipeReader)
+	request, err := svc.client.NewHTTPRequest(ctx, http.MethodPost, fmt.Sprintf(".api/files/batch-changes/%s", batchSpecID), pipeReader)
 	if err != nil {
 		return err
 	}
diff --git a/internal/batches/service/remote_test.go b/internal/batches/service/remote_test.go
index f215711fce..69a5af9c8c 100644
--- a/internal/batches/service/remote_test.go
+++ b/internal/batches/service/remote_test.go
@@ -522,7 +522,7 @@ func TestService_UploadBatchSpecWorkspaceFile(t *testing.T) {
 				test.mockInvokes(client)
 			}
 
-			err := svc.UploadBatchSpecWorkspaceFile(workingDir, "123", test.steps)
+			err := svc.UploadBatchSpecWorkspaceFile(context.Background(), workingDir, "123", test.steps)
 			if test.expectedError != nil {
 				assert.Equal(t, test.expectedError.Error(), err.Error())
 			} else {

From 4f83e6951b934c64bf9c77111c7b7319a8378c8d Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Mon, 26 Sep 2022 10:44:18 -0600
Subject: [PATCH 58/77] Rename UploadBatchSpecWorkspaceFile to
 UploadBatchSpecWorkspaceFiles

---
 cmd/src/batch_remote.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/src/batch_remote.go b/cmd/src/batch_remote.go
index a0bbe55f6f..8915edd578 100644
--- a/cmd/src/batch_remote.go
+++ b/cmd/src/batch_remote.go
@@ -105,7 +105,7 @@ Examples:
 		if err != nil {
 			return errors.Wrap(err, "batch spec path")
 		}
-		if err = svc.UploadBatchSpecWorkspaceFile(ctx, dir, batchSpecID, spec.Steps); err != nil {
+		if err = svc.UploadBatchSpecWorkspaceFiles(ctx, dir, batchSpecID, spec.Steps); err != nil {
 			return err
 		}
 		ui.UploadingWorkspaceFilesSuccess()

From f9d593fd88546cbb70a4b8d0bd5950995bf8ee6f Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Mon, 26 Sep 2022 10:44:26 -0600
Subject: [PATCH 59/77] Deduplicate files

---
 internal/batches/service/remote.go      | 45 ++++++++++++++++---------
 internal/batches/service/remote_test.go | 45 +++++++++++++++++++++++--
 2 files changed, 73 insertions(+), 17 deletions(-)

diff --git a/internal/batches/service/remote.go b/internal/batches/service/remote.go
index 616c60d55a..0c045a0ed4 100644
--- a/internal/batches/service/remote.go
+++ b/internal/batches/service/remote.go
@@ -102,44 +102,59 @@ func (svc *Service) CreateBatchSpecFromRaw(
 	return resp.CreateBatchSpecFromRaw.ID, nil
 }
 
-// UploadBatchSpecWorkspaceFile uploads workspace files to the server.
-func (svc *Service) UploadBatchSpecWorkspaceFile(ctx context.Context, workingDir string, batchSpecID string, steps []batches.Step) error {
+// UploadBatchSpecWorkspaceFiles uploads workspace files to the server.
+func (svc *Service) UploadBatchSpecWorkspaceFiles(ctx context.Context, workingDir string, batchSpecID string, steps []batches.Step) error {
+	filePaths := make(map[string]bool)
 	for _, step := range steps {
 		for _, mount := range step.Mount {
-			if err := svc.handleWorkspaceFile(ctx, workingDir, mount.Path, batchSpecID); err != nil {
+			paths, err := getFilePaths(workingDir, mount.Path)
+			if err != nil {
 				return err
 			}
+			// Dedupe any files.
+			for _, path := range paths {
+				if !filePaths[path] {
+					filePaths[path] = true
+				}
+			}
+		}
+	}
+
+	for filePath := range filePaths {
+		if err := svc.uploadFile(ctx, workingDir, filePath, batchSpecID); err != nil {
+			return err
 		}
 	}
 	return nil
 }
 
-func (svc *Service) handleWorkspaceFile(ctx context.Context, workingDir, mountPath, batchSpecID string) error {
-	actualFilePath := filepath.Join(workingDir, mountPath)
+func getFilePaths(workingDir, filePath string) ([]string, error) {
+	var filePaths []string
+	actualFilePath := filepath.Join(workingDir, filePath)
 	info, err := os.Stat(actualFilePath)
 	if err != nil {
-		return err
+		return nil, err
 	}
+
 	if info.IsDir() {
 		dir, err := os.ReadDir(actualFilePath)
 		if err != nil {
-			return err
+			return nil, err
 		}
 		for _, dirEntry := range dir {
-			err := svc.handleWorkspaceFile(ctx, workingDir, filepath.Join(mountPath, dirEntry.Name()), batchSpecID)
+			paths, err := getFilePaths(workingDir, filepath.Join(filePath, dirEntry.Name()))
 			if err != nil {
-				return err
+				return nil, err
 			}
+			filePaths = append(filePaths, paths...)
 		}
 	} else {
-		if err = svc.uploadFile(ctx, workingDir, mountPath, batchSpecID); err != nil {
-			return err
-		}
+		filePaths = append(filePaths, filePath)
 	}
-	return nil
+	return filePaths, nil
 }
 
-func (svc *Service) uploadFile(ctx context.Context, workingDir, mountPath, batchSpecID string) error {
+func (svc *Service) uploadFile(ctx context.Context, workingDir, filePath, batchSpecID string) error {
 	// Create a pipe so the requests can be chunked to the server
 	pipeReader, pipeWriter := io.Pipe()
 	multipartWriter := multipart.NewWriter(pipeWriter)
@@ -150,7 +165,7 @@ func (svc *Service) uploadFile(ctx context.Context, workingDir, mountPath, batch
 		defer pipeWriter.Close()
 		defer multipartWriter.Close()
 
-		if err := createFormFile(multipartWriter, workingDir, mountPath); err != nil {
+		if err := createFormFile(multipartWriter, workingDir, filePath); err != nil {
 			pipeWriter.CloseWithError(err)
 		}
 	}()
diff --git a/internal/batches/service/remote_test.go b/internal/batches/service/remote_test.go
index 69a5af9c8c..35f2e19b3a 100644
--- a/internal/batches/service/remote_test.go
+++ b/internal/batches/service/remote_test.go
@@ -202,7 +202,7 @@ func TestService_CreateBatchSpecFromRaw(t *testing.T) {
 	}
 }
 
-func TestService_UploadBatchSpecWorkspaceFile(t *testing.T) {
+func TestService_UploadBatchSpecWorkspaceFiles(t *testing.T) {
 	tests := []struct {
 		name  string
 		steps []batches.Step
@@ -245,6 +245,47 @@ func TestService_UploadBatchSpecWorkspaceFile(t *testing.T) {
 					Once()
 			},
 		},
+		{
+			name: "Deduplicate files",
+			steps: []batches.Step{{
+				Mount: []batches.Mount{
+					{
+						Path: "./hello.txt",
+					},
+					{
+						Path: "./hello.txt",
+					},
+					{
+						Path: "./hello.txt",
+					},
+				},
+			}},
+			setup: func(workingDir string) error {
+				return writeTempFile(workingDir, "hello.txt", "hello world!")
+			},
+			mockInvokes: func(client *mockclient.Client) {
+				// Body will get set with the body argument to NewHTTPRequest
+				req := httptest.NewRequest(http.MethodPost, "http://fake.com/.api/files/batch-changes/123", nil)
+				client.On("NewHTTPRequest", mock.Anything, http.MethodPost, ".api/files/batch-changes/123", mock.Anything).
+					Run(func(args mock.Arguments) {
+						req.Body = args[3].(*io.PipeReader)
+					}).
+					Return(req, nil).
+					Once()
+
+				resp := &http.Response{
+					StatusCode: http.StatusOK,
+				}
+				entry := &multipartFormEntry{
+					fileName: "hello.txt",
+					content:  "hello world!",
+				}
+				requestMatcher := multipartFormRequestMatcher(entry)
+				client.On("Do", mock.MatchedBy(requestMatcher)).
+					Return(resp, nil).
+					Once()
+			},
+		},
 		{
 			name: "Upload multiple files",
 			steps: []batches.Step{{
@@ -522,7 +563,7 @@ func TestService_UploadBatchSpecWorkspaceFile(t *testing.T) {
 				test.mockInvokes(client)
 			}
 
-			err := svc.UploadBatchSpecWorkspaceFile(context.Background(), workingDir, "123", test.steps)
+			err := svc.UploadBatchSpecWorkspaceFiles(context.Background(), workingDir, "123", test.steps)
 			if test.expectedError != nil {
 				assert.Equal(t, test.expectedError.Error(), err.Error())
 			} else {

From a7a96c90da77cac23a21d0a5ae8cc07b8f010dc9 Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Mon, 26 Sep 2022 10:55:38 -0600
Subject: [PATCH 60/77] Return the directory of the batch spec when parsing

---
 cmd/src/batch_common.go       | 18 +++++++-----------
 cmd/src/batch_remote.go       |  8 ++------
 cmd/src/batch_repositories.go |  2 +-
 cmd/src/batch_validate.go     |  2 +-
 4 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/cmd/src/batch_common.go b/cmd/src/batch_common.go
index 36995d84b9..2ac60e1a1e 100644
--- a/cmd/src/batch_common.go
+++ b/cmd/src/batch_common.go
@@ -300,7 +300,7 @@ func executeBatchSpec(ctx context.Context, ui ui.ExecUI, opts executeBatchSpecOp
 
 	// Parse flags and build up our service and executor options.
 	ui.ParsingBatchSpec()
-	batchSpec, rawSpec, err := parseBatchSpec(ctx, opts.file, svc)
+	batchSpec, batchSpecDir, rawSpec, err := parseBatchSpec(ctx, opts.file, svc)
 	if err != nil {
 		var multiErr errors.MultiError
 		if errors.As(err, &multiErr) {
@@ -366,10 +366,6 @@ func executeBatchSpec(ctx context.Context, ui ui.ExecUI, opts executeBatchSpecOp
 
 	archiveRegistry := repozip.NewArchiveRegistry(opts.client, opts.flags.cacheDir, opts.flags.cleanArchives)
 	logManager := log.NewDiskManager(opts.flags.tempDir, opts.flags.keepLogs)
-	batchSpecDirectory, err := getBatchSpecDirectory(opts.file)
-	if err != nil {
-		return err
-	}
 	coord := executor.NewCoordinator(
 		executor.NewCoordinatorOpts{
 			ExecOpts: executor.NewExecutorOpts{
@@ -378,7 +374,7 @@ func executeBatchSpec(ctx context.Context, ui ui.ExecUI, opts executeBatchSpecOp
 				Creator:             workspaceCreator,
 				EnsureImage:         imageCache.Ensure,
 				Parallelism:         parallelism,
-				WorkingDirectory:    batchSpecDirectory,
+				WorkingDirectory:    batchSpecDir,
 				Timeout:             opts.flags.timeout,
 				TempDir:             opts.flags.tempDir,
 				GlobalEnv:           os.Environ(),
@@ -507,10 +503,10 @@ func setReadDeadlineOnCancel(ctx context.Context, f *os.File) {
 
 // parseBatchSpec parses and validates the given batch spec. If the spec has
 // validation errors, they are returned.
-func parseBatchSpec(ctx context.Context, file string, svc *service.Service) (*batcheslib.BatchSpec, string, error) {
+func parseBatchSpec(ctx context.Context, file string, svc *service.Service) (*batcheslib.BatchSpec, string, string, error) {
 	f, err := batchOpenFileFlag(file)
 	if err != nil {
-		return nil, "", err
+		return nil, "", "", err
 	}
 	defer f.Close()
 
@@ -522,16 +518,16 @@ func parseBatchSpec(ctx context.Context, file string, svc *service.Service) (*ba
 
 	data, err := io.ReadAll(f)
 	if err != nil {
-		return nil, "", errors.Wrap(err, "reading batch spec")
+		return nil, "", "", errors.Wrap(err, "reading batch spec")
 	}
 
 	dir, err := getBatchSpecDirectory(file)
 	if err != nil {
-		return nil, "", errors.Wrap(err, "batch spec path")
+		return nil, "", "", errors.Wrap(err, "batch spec path")
 	}
 
 	spec, err := svc.ParseBatchSpec(dir, data)
-	return spec, string(data), err
+	return spec, dir, string(data), err
 }
 
 func getBatchSpecDirectory(file string) (string, error) {
diff --git a/cmd/src/batch_remote.go b/cmd/src/batch_remote.go
index 8915edd578..64b815c83a 100644
--- a/cmd/src/batch_remote.go
+++ b/cmd/src/batch_remote.go
@@ -63,7 +63,7 @@ Examples:
 		// may as well validate it at the same time so we don't even have to go to
 		// the backend if it's invalid.
 		ui.ParsingBatchSpec()
-		spec, raw, err := parseBatchSpec(ctx, file, svc)
+		spec, batchSpecDir, raw, err := parseBatchSpec(ctx, file, svc)
 		if err != nil {
 			ui.ParsingBatchSpecFailure(err)
 			return err
@@ -101,11 +101,7 @@ Examples:
 		ui.SendingBatchSpecSuccess()
 
 		ui.UploadingWorkspaceFiles()
-		dir, err := getBatchSpecDirectory(file)
-		if err != nil {
-			return errors.Wrap(err, "batch spec path")
-		}
-		if err = svc.UploadBatchSpecWorkspaceFiles(ctx, dir, batchSpecID, spec.Steps); err != nil {
+		if err = svc.UploadBatchSpecWorkspaceFiles(ctx, batchSpecDir, batchSpecID, spec.Steps); err != nil {
 			return err
 		}
 		ui.UploadingWorkspaceFilesSuccess()
diff --git a/cmd/src/batch_repositories.go b/cmd/src/batch_repositories.go
index e49a356a4c..b3b96d5891 100644
--- a/cmd/src/batch_repositories.go
+++ b/cmd/src/batch_repositories.go
@@ -74,7 +74,7 @@ Examples:
 		}
 
 		out := output.NewOutput(flagSet.Output(), output.OutputOpts{Verbose: *verbose})
-		spec, _, err := parseBatchSpec(ctx, file, svc)
+		spec, _, _, err := parseBatchSpec(ctx, file, svc)
 		if err != nil {
 			ui := &ui.TUI{Out: out}
 			ui.ParsingBatchSpecFailure(err)
diff --git a/cmd/src/batch_validate.go b/cmd/src/batch_validate.go
index 5534346833..e83ac3f553 100644
--- a/cmd/src/batch_validate.go
+++ b/cmd/src/batch_validate.go
@@ -73,7 +73,7 @@ Examples:
 			return err
 		}
 
-		if _, _, err := parseBatchSpec(ctx, file, svc); err != nil {
+		if _, _, _, err := parseBatchSpec(ctx, file, svc); err != nil {
 			ui.ParsingBatchSpecFailure(err)
 			return err
 		}

From 5e46abae4b60b0e7383b42fac190e50c6ba6576d Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Mon, 26 Sep 2022 10:56:18 -0600
Subject: [PATCH 61/77] Rename parameter to workingDir from dir

---
 internal/batches/executor/task.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/internal/batches/executor/task.go b/internal/batches/executor/task.go
index 97d763f926..ee7f8ad55e 100644
--- a/internal/batches/executor/task.go
+++ b/internal/batches/executor/task.go
@@ -38,7 +38,7 @@ func (t *Task) ArchivePathToFetch() string {
 	return ""
 }
 
-func (t *Task) CacheKey(globalEnv []string, dir string, stepIndex int) cache.Keyer {
+func (t *Task) CacheKey(globalEnv []string, workingDir string, stepIndex int) cache.Keyer {
 	return &cache.CacheKey{
 		Repository: batcheslib.Repository{
 			ID:          t.Repository.ID,
@@ -51,7 +51,7 @@ func (t *Task) CacheKey(globalEnv []string, dir string, stepIndex int) cache.Key
 		OnlyFetchWorkspace:    t.OnlyFetchWorkspace,
 		Steps:                 t.Steps,
 		BatchChangeAttributes: t.BatchChangeAttributes,
-		MetadataRetriever:     fileMetadataRetriever{workingDirectory: dir},
+		MetadataRetriever:     fileMetadataRetriever{workingDirectory: workingDir},
 
 		GlobalEnv: globalEnv,
 

From 0aff90f8da25ba7f444068d4b020babd21eda7c7 Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Mon, 26 Sep 2022 10:58:14 -0600
Subject: [PATCH 62/77] Rename attribute to be consistent

---
 cmd/src/batch_exec.go                  | 12 ++++++------
 internal/batches/executor/executor.go  | 18 +++++++++---------
 internal/batches/executor/run_steps.go |  6 +++---
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/cmd/src/batch_exec.go b/cmd/src/batch_exec.go
index 305d7cb31b..693beb203d 100644
--- a/cmd/src/batch_exec.go
+++ b/cmd/src/batch_exec.go
@@ -201,12 +201,12 @@ func executeBatchSpecInWorkspaces(ctx context.Context, flags *executorModeFlags)
 		EnsureImage: imageCache.Ensure,
 		Task:        task,
 		// TODO: Should be slightly less than the executor timeout. Can we somehow read that?
-		Timeout:           flags.timeout,
-		TempDir:           tempDir,
-		WorkspaceFilesDir: workspaceFilesDir,
-		GlobalEnv:         globalEnv,
-		RepoArchive:       &repozip.NoopArchive{},
-		UI:                taskExecUI.StepsExecutionUI(task),
+		Timeout:          flags.timeout,
+		TempDir:          tempDir,
+		WorkingDirectory: workspaceFilesDir,
+		GlobalEnv:        globalEnv,
+		RepoArchive:      &repozip.NoopArchive{},
+		UI:               taskExecUI.StepsExecutionUI(task),
 	}
 	results, err := executor.RunSteps(ctx, opts)
 
diff --git a/internal/batches/executor/executor.go b/internal/batches/executor/executor.go
index c2362b7ef4..463f46f8c0 100644
--- a/internal/batches/executor/executor.go
+++ b/internal/batches/executor/executor.go
@@ -169,15 +169,15 @@ func (x *executor) do(ctx context.Context, task *Task, ui TaskExecutionUI) (err
 
 	// Actually execute the steps.
 	opts := &RunStepsOpts{
-		Task:              task,
-		Logger:            l,
-		WC:                x.opts.Creator,
-		EnsureImage:       x.opts.EnsureImage,
-		TempDir:           x.opts.TempDir,
-		GlobalEnv:         x.opts.GlobalEnv,
-		Timeout:           x.opts.Timeout,
-		RepoArchive:       repoArchive,
-		WorkspaceFilesDir: x.opts.WorkingDirectory,
+		Task:             task,
+		Logger:           l,
+		WC:               x.opts.Creator,
+		EnsureImage:      x.opts.EnsureImage,
+		TempDir:          x.opts.TempDir,
+		GlobalEnv:        x.opts.GlobalEnv,
+		Timeout:          x.opts.Timeout,
+		RepoArchive:      repoArchive,
+		WorkingDirectory: x.opts.WorkingDirectory,
 
 		UI: ui.StepsExecutionUI(task),
 	}
diff --git a/internal/batches/executor/run_steps.go b/internal/batches/executor/run_steps.go
index cf4118517c..7804793e32 100644
--- a/internal/batches/executor/run_steps.go
+++ b/internal/batches/executor/run_steps.go
@@ -39,8 +39,8 @@ type RunStepsOpts struct {
 	Task *Task
 	// TempDir points to where temporary files of the execution should live at.
 	TempDir string
-	// WorkspaceFilesDir points to where the workspace files should live at.
-	WorkspaceFilesDir string
+	// WorkingDirectory points to where the workspace files should live at.
+	WorkingDirectory string
 	// Timeout sets the deadline for the execution context. When exceeded,
 	// execution will stop and an error is returned.
 	Timeout time.Duration
@@ -323,7 +323,7 @@ func executeSingleStep(
 
 	// Mount any paths on the local system to the docker container. The paths have already been validated during parsing.
 	for _, mount := range step.Mount {
-		workspaceFilePath, err := getAbsoluteMountPath(opts.WorkspaceFilesDir, mount.Path)
+		workspaceFilePath, err := getAbsoluteMountPath(opts.WorkingDirectory, mount.Path)
 		if err != nil {
 			return bytes.Buffer{}, bytes.Buffer{}, err
 		}

From d5b18644da2a4b6e34302e0aea56545b231518c1 Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Mon, 26 Sep 2022 11:52:55 -0600
Subject: [PATCH 63/77] Accept status code 2xx and 3xx

---
 internal/batches/service/remote.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/internal/batches/service/remote.go b/internal/batches/service/remote.go
index 0c045a0ed4..a842162049 100644
--- a/internal/batches/service/remote.go
+++ b/internal/batches/service/remote.go
@@ -181,7 +181,8 @@ func (svc *Service) uploadFile(ctx context.Context, workingDir, filePath, batchS
 		// Errors passed to pipeWriter.CloseWithError come through here.
 		return err
 	}
-	if resp.StatusCode != http.StatusOK {
+	// 2xx and 3xx are ok
+	if resp.StatusCode >= http.StatusBadRequest || resp.StatusCode < http.StatusOK {
 		p, err := io.ReadAll(resp.Body)
 		if err != nil {
 			return err

From c47787aa38264d8925f92a0daf4813dc229377d0 Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Mon, 26 Sep 2022 11:53:11 -0600
Subject: [PATCH 64/77] Sort status code

---
 internal/batches/service/remote.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/internal/batches/service/remote.go b/internal/batches/service/remote.go
index a842162049..25cc916791 100644
--- a/internal/batches/service/remote.go
+++ b/internal/batches/service/remote.go
@@ -182,7 +182,7 @@ func (svc *Service) uploadFile(ctx context.Context, workingDir, filePath, batchS
 		return err
 	}
 	// 2xx and 3xx are ok
-	if resp.StatusCode >= http.StatusBadRequest || resp.StatusCode < http.StatusOK {
+	if resp.StatusCode < http.StatusOK || resp.StatusCode >= http.StatusBadRequest {
 		p, err := io.ReadAll(resp.Body)
 		if err != nil {
 			return err

From 84c9041edaa76929b87310930d616c9ba15da954 Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Mon, 26 Sep 2022 11:59:31 -0600
Subject: [PATCH 65/77] Only log when there are workspace files to upload

---
 cmd/src/batch_remote.go | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/cmd/src/batch_remote.go b/cmd/src/batch_remote.go
index 64b815c83a..f83df8f6bb 100644
--- a/cmd/src/batch_remote.go
+++ b/cmd/src/batch_remote.go
@@ -100,11 +100,20 @@ Examples:
 		}
 		ui.SendingBatchSpecSuccess()
 
-		ui.UploadingWorkspaceFiles()
-		if err = svc.UploadBatchSpecWorkspaceFiles(ctx, batchSpecDir, batchSpecID, spec.Steps); err != nil {
-			return err
+		hasWorkspaceFiles := false
+		for _, step := range spec.Steps {
+			if len(step.Mount) > 0 {
+				hasWorkspaceFiles = true
+				break
+			}
+		}
+		if hasWorkspaceFiles {
+			ui.UploadingWorkspaceFiles()
+			if err = svc.UploadBatchSpecWorkspaceFiles(ctx, batchSpecDir, batchSpecID, spec.Steps); err != nil {
+				return err
+			}
+			ui.UploadingWorkspaceFilesSuccess()
 		}
-		ui.UploadingWorkspaceFilesSuccess()
 
 		// Wait for the workspaces to be resolved.
 		ui.ResolvingWorkspaces()

From 50fc20b0f016287f7fdad248ea46c13a0d9e7800 Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Tue, 27 Sep 2022 08:11:41 -0600
Subject: [PATCH 66/77] Get the relative path between working directory and
 actual path to file

---
 internal/batches/service/remote.go      |  6 +++-
 internal/batches/service/remote_test.go | 45 +++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/internal/batches/service/remote.go b/internal/batches/service/remote.go
index 25cc916791..9992eca00c 100644
--- a/internal/batches/service/remote.go
+++ b/internal/batches/service/remote.go
@@ -149,7 +149,11 @@ func getFilePaths(workingDir, filePath string) ([]string, error) {
 			filePaths = append(filePaths, paths...)
 		}
 	} else {
-		filePaths = append(filePaths, filePath)
+		relPath, err := filepath.Rel(workingDir, actualFilePath)
+		if err != nil {
+			return nil, err
+		}
+		filePaths = append(filePaths, relPath)
 	}
 	return filePaths, nil
 }
diff --git a/internal/batches/service/remote_test.go b/internal/batches/service/remote_test.go
index 35f2e19b3a..9ed9bad080 100644
--- a/internal/batches/service/remote_test.go
+++ b/internal/batches/service/remote_test.go
@@ -546,6 +546,51 @@ func TestService_UploadBatchSpecWorkspaceFiles(t *testing.T) {
 			},
 			expectedError: errors.New("file exceeds limit"),
 		},
+		{
+			name: "Long mount path",
+			steps: []batches.Step{{
+				Mount: []batches.Mount{{
+					Path: "foo/../bar/../baz/../hello.txt",
+				}},
+			}},
+			setup: func(workingDir string) error {
+				dir := filepath.Join(workingDir, "foo")
+				if err := os.Mkdir(dir, os.ModePerm); err != nil {
+					return err
+				}
+				dir = filepath.Join(workingDir, "bar")
+				if err := os.Mkdir(dir, os.ModePerm); err != nil {
+					return err
+				}
+				dir = filepath.Join(workingDir, "baz")
+				if err := os.Mkdir(dir, os.ModePerm); err != nil {
+					return err
+				}
+				return writeTempFile(workingDir, "hello.txt", "hello world!")
+			},
+			mockInvokes: func(client *mockclient.Client) {
+				// Body will get set with the body argument to NewHTTPRequest
+				req := httptest.NewRequest(http.MethodPost, "http://fake.com/.api/files/batch-changes/123", nil)
+				client.On("NewHTTPRequest", mock.Anything, http.MethodPost, ".api/files/batch-changes/123", mock.Anything).
+					Run(func(args mock.Arguments) {
+						req.Body = args[3].(*io.PipeReader)
+					}).
+					Return(req, nil).
+					Once()
+
+				resp := &http.Response{
+					StatusCode: http.StatusOK,
+				}
+				entry := &multipartFormEntry{
+					fileName: "hello.txt",
+					content:  "hello world!",
+				}
+				requestMatcher := multipartFormRequestMatcher(entry)
+				client.On("Do", mock.MatchedBy(requestMatcher)).
+					Return(resp, nil).
+					Once()
+			},
+		},
 	}
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {

From 098b052085640d814e52629ca64388d34607bf35 Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Tue, 27 Sep 2022 08:41:56 -0600
Subject: [PATCH 67/77] Update sourcegraph lib dependency

---
 go.mod | 6 ++----
 go.sum | 8 ++++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/go.mod b/go.mod
index a43b6913ba..6255e4c181 100644
--- a/go.mod
+++ b/go.mod
@@ -22,7 +22,7 @@ require (
 	github.com/sourcegraph/go-diff v0.6.1
 	github.com/sourcegraph/jsonx v0.0.0-20200629203448-1a936bd500cf
 	github.com/sourcegraph/scip v0.2.0
-	github.com/sourcegraph/sourcegraph/lib v0.0.0-20220825181731-397a768a5290
+	github.com/sourcegraph/sourcegraph/lib v0.0.0-20220927142007-d1d3f310e047
 	github.com/stretchr/testify v1.8.0
 	golang.org/x/net v0.0.0-20220722155237-a158d28d115b
 	golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4
@@ -105,7 +105,7 @@ require (
 	go.uber.org/zap v1.23.0 // indirect
 	golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect
 	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
-	golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 // indirect
+	golang.org/x/sys v0.0.0-20220926163933-8cfa568d3c25 // indirect
 	golang.org/x/term v0.0.0-20220411215600-e5f449aeb171 // indirect
 	golang.org/x/text v0.3.7 // indirect
 	golang.org/x/tools v0.1.12 // indirect
@@ -117,5 +117,3 @@ require (
 
 // See: https://github.com/ghodss/yaml/pull/65
 replace github.com/ghodss/yaml => github.com/sourcegraph/yaml v1.0.1-0.20200714132230-56936252f152
-
-replace github.com/sourcegraph/sourcegraph/lib v0.0.0-20220825181731-397a768a5290 => ../sourcegraph/lib
diff --git a/go.sum b/go.sum
index 85775bb7cc..848b480f93 100644
--- a/go.sum
+++ b/go.sum
@@ -373,8 +373,8 @@ github.com/sourcegraph/log v0.0.0-20220901143117-fc0516a694c9 h1:JjFyvx9hCD5+Jpu
 github.com/sourcegraph/log v0.0.0-20220901143117-fc0516a694c9/go.mod h1:UxiwB6C3xk3xOySJpW1R0MDUyfGuJRFS5Z8C+SA5p2I=
 github.com/sourcegraph/scip v0.2.0 h1:Z9rR9TNONtRhqcpm0JP/yEBUy0fBKaSVbWIZKih5v04=
 github.com/sourcegraph/scip v0.2.0/go.mod h1:EYyT39nXdZDNVmgbJAlyIVWbEb1txnAOKpJPSYpvgXk=
-github.com/sourcegraph/sourcegraph/lib v0.0.0-20220825181731-397a768a5290 h1:SLCu3Rf1eLZ4sNKl0Bg1oURTgDxEutRCaTQt5dpVqH4=
-github.com/sourcegraph/sourcegraph/lib v0.0.0-20220825181731-397a768a5290/go.mod h1:9wnFUNfpORLAOJn4XAO7ZeWnYkf6/CxlWaTU1vlpuKc=
+github.com/sourcegraph/sourcegraph/lib v0.0.0-20220927142007-d1d3f310e047 h1:+KnQl662D1THqbP1XybHuc6ZTSgOOCL2NBm5MQ50XJ0=
+github.com/sourcegraph/sourcegraph/lib v0.0.0-20220927142007-d1d3f310e047/go.mod h1:e3v3msUOgthv/QCWUzhFdfR3+hwUSn37rtuw49IVJg4=
 github.com/sourcegraph/yaml v1.0.1-0.20200714132230-56936252f152 h1:z/MpntplPaW6QW95pzcAR/72Z5TWDyDnSo0EOcyij9o=
 github.com/sourcegraph/yaml v1.0.1-0.20200714132230-56936252f152/go.mod h1:GIjDIg/heH5DOkXY3YJ/wNhfHsQHoXGjl8G8amsYQ1I=
 github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
@@ -540,8 +540,8 @@ golang.org/x/sys v0.0.0-20211117180635-dee7805ff2e1/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20211213223007-03aa0b5f6827/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 h1:v6hYoSR9T5oet+pMXwUWkbiVqx/63mlHjefrHmxwfeY=
-golang.org/x/sys v0.0.0-20220829200755-d48e67d00261/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220926163933-8cfa568d3c25 h1:nwzwVf0l2Y/lkov/+IYgMMbFyI+QypZDds9RxlSmsFQ=
+golang.org/x/sys v0.0.0-20220926163933-8cfa568d3c25/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20220411215600-e5f449aeb171 h1:EH1Deb8WZJ0xc0WK//leUHXcX9aLE5SymusoTmMZye8=
 golang.org/x/term v0.0.0-20220411215600-e5f449aeb171/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=

From b5e6e8492ab05af3a849a9eacbdaac52801336c2 Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Tue, 27 Sep 2022 08:48:26 -0600
Subject: [PATCH 68/77] Replace windows separators with Unix

---
 internal/batches/service/remote.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/internal/batches/service/remote.go b/internal/batches/service/remote.go
index 9992eca00c..b0492560e4 100644
--- a/internal/batches/service/remote.go
+++ b/internal/batches/service/remote.go
@@ -215,8 +215,10 @@ func createFormFile(w *multipart.Writer, workingDir string, mountPath string) er
 	}
 
 	filePath, fileName := filepath.Split(mountPath)
-	trimmedPath := strings.Trim(strings.TrimSuffix(filePath, string(filepath.Separator)), ".")
-	if err = w.WriteField("filepath", trimmedPath); err != nil {
+	filePath = strings.Trim(strings.TrimSuffix(filePath, string(filepath.Separator)), ".")
+	// Ensure Windows separators are changed to Unix.
+	filePath = strings.ReplaceAll(filePath, "\\", "/")
+	if err = w.WriteField("filepath", filePath); err != nil {
 		return err
 	}
 	fileInfo, err := f.Stat()

From 7b523fb94d5a71912cb0d541c4fbaddbc1c59758 Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Tue, 27 Sep 2022 09:08:20 -0600
Subject: [PATCH 69/77] Manually create temp directory for windows tests

---
 internal/batches/service/remote_test.go | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/internal/batches/service/remote_test.go b/internal/batches/service/remote_test.go
index 9ed9bad080..371b476ad7 100644
--- a/internal/batches/service/remote_test.go
+++ b/internal/batches/service/remote_test.go
@@ -594,8 +594,14 @@ func TestService_UploadBatchSpecWorkspaceFiles(t *testing.T) {
 	}
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
-			// Use a temp directory for reading files
-			workingDir := t.TempDir()
+			// TODO: use TempDir when https://github.com/golang/go/issues/51442 is cherry-picked into 1.18 or upgrade to 1.19+
+			//tempDir := t.TempDir()
+			workingDir, err := os.MkdirTemp("", test.name)
+			require.NoError(t, err)
+			t.Cleanup(func() {
+				os.RemoveAll(workingDir)
+			})
+
 			if test.setup != nil {
 				err := test.setup(workingDir)
 				require.NoError(t, err)
@@ -608,7 +614,7 @@ func TestService_UploadBatchSpecWorkspaceFiles(t *testing.T) {
 				test.mockInvokes(client)
 			}
 
-			err := svc.UploadBatchSpecWorkspaceFiles(context.Background(), workingDir, "123", test.steps)
+			err = svc.UploadBatchSpecWorkspaceFiles(context.Background(), workingDir, "123", test.steps)
 			if test.expectedError != nil {
 				assert.Equal(t, test.expectedError.Error(), err.Error())
 			} else {

From 2c68b77287e1cc64d4ca9d28e142f4af80fbb78d Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Tue, 27 Sep 2022 09:17:27 -0600
Subject: [PATCH 70/77] Add specific test for windows

---
 .../batches/service/remote_windows_test.go    | 71 +++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 internal/batches/service/remote_windows_test.go

diff --git a/internal/batches/service/remote_windows_test.go b/internal/batches/service/remote_windows_test.go
new file mode 100644
index 0000000000..7e5fbd3001
--- /dev/null
+++ b/internal/batches/service/remote_windows_test.go
@@ -0,0 +1,71 @@
+package service_test
+
+import (
+	"context"
+	"io"
+	"net/http"
+	"net/http/httptest"
+	"os"
+	"path/filepath"
+	"testing"
+
+	mockclient "github.com/sourcegraph/src-cli/internal/api/mock"
+	"github.com/sourcegraph/src-cli/internal/batches/service"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
+	"github.com/stretchr/testify/require"
+
+	"github.com/sourcegraph/sourcegraph/lib/batches"
+)
+
+func TestService_UploadBatchSpecWorkspaceFiles_Windows_Path(t *testing.T) {
+	// TODO: use TempDir when https://github.com/golang/go/issues/51442 is cherry-picked into 1.18 or upgrade to 1.19+
+	//tempDir := t.TempDir()
+	workingDir, err := os.MkdirTemp("", "windows_path")
+	require.NoError(t, err)
+	t.Cleanup(func() {
+		os.RemoveAll(workingDir)
+	})
+
+	// Set up test files and directories
+	dir := filepath.Join(workingDir, "scripts")
+	err = os.Mkdir(dir, os.ModePerm)
+	require.NoError(t, err)
+	err = writeTempFile(dir, "hello.txt", "hello world!")
+	require.NoError(t, err)
+
+	client := new(mockclient.Client)
+	svc := service.New(&service.Opts{Client: client})
+
+	// Body will get set with the body argument to NewHTTPRequest
+	req := httptest.NewRequest(http.MethodPost, "http://fake.com/.api/files/batch-changes/123", nil)
+	client.On("NewHTTPRequest", mock.Anything, http.MethodPost, ".api/files/batch-changes/123", mock.Anything).
+		Run(func(args mock.Arguments) {
+			req.Body = args[3].(*io.PipeReader)
+		}).
+		Return(req, nil).
+		Once()
+
+	resp := &http.Response{
+		StatusCode: http.StatusOK,
+	}
+	entry := &multipartFormEntry{
+		path:     "scripts/hello.txt",
+		fileName: "hello.txt",
+		content:  "hello world!",
+	}
+	requestMatcher := multipartFormRequestMatcher(entry)
+	client.On("Do", mock.MatchedBy(requestMatcher)).
+		Return(resp, nil).
+		Once()
+
+	steps := []batches.Step{{
+		Mount: []batches.Mount{{
+			Path: "scripts\\hello.txt",
+		}},
+	}}
+	err = svc.UploadBatchSpecWorkspaceFiles(context.Background(), workingDir, "123", steps)
+	assert.NoError(t, err)
+
+	client.AssertExpectations(t)
+}

From 762ee6514fa1551ece4e999f257b35e153ea81d7 Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Tue, 27 Sep 2022 09:33:14 -0600
Subject: [PATCH 71/77] Log when a field does not match to help narrow down
 mismatches

---
 internal/batches/service/remote_test.go | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/internal/batches/service/remote_test.go b/internal/batches/service/remote_test.go
index 371b476ad7..e182bd9760 100644
--- a/internal/batches/service/remote_test.go
+++ b/internal/batches/service/remote_test.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
+	"fmt"
 	"io"
 	"net/http"
 	"net/http/httptest"
@@ -651,29 +652,37 @@ func multipartFormRequestMatcher(entry *multipartFormEntry) func(*http.Request)
 		cloneReq := req.Clone(context.Background())
 		contentType := cloneReq.Header.Get("Content-Type")
 		if !strings.HasPrefix(contentType, "multipart/form-data") {
+			fmt.Printf("contentType: expected 'multipart/form-data', actual '%s'\n", contentType)
 			return false
 		}
 		if err := cloneReq.ParseMultipartForm(32 << 20); err != nil {
+			fmt.Printf("failed to parse multipartform: %s\n", err)
 			return false
 		}
 		if cloneReq.Form.Get("filepath") != entry.path {
+			fmt.Printf("filepath: expected '%s', actual '%s'\n", entry.path, cloneReq.Form.Get("filepath"))
 			return false
 		}
 		if !modtimeRegex.MatchString(cloneReq.Form.Get("filemod")) {
+			fmt.Printf("modified at '%s' does not match regex\n", cloneReq.Form.Get("filemod"))
 			return false
 		}
 		f, header, err := cloneReq.FormFile("file")
 		if err != nil {
+			fmt.Printf("failed to get form file: %s\n", err)
 			return false
 		}
 		if header.Filename != entry.fileName {
+			fmt.Printf("fileName: expected '%s', actual '%s'\n", entry.fileName, header.Filename)
 			return false
 		}
 		b, err := io.ReadAll(f)
 		if err != nil {
+			fmt.Printf("failed to read file: %s\n", err)
 			return false
 		}
 		if string(b) != entry.content {
+			fmt.Printf("content: expected '%s', actual '%s'\n", entry.content, string(b))
 			return false
 		}
 		entry.calls++

From 187270fceaa0707ea917962ddd6ea70afafa10a1 Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Tue, 27 Sep 2022 09:47:15 -0600
Subject: [PATCH 72/77] Properly clone the request body

---
 internal/batches/service/remote_test.go | 26 ++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/internal/batches/service/remote_test.go b/internal/batches/service/remote_test.go
index e182bd9760..e4e32f6eaf 100644
--- a/internal/batches/service/remote_test.go
+++ b/internal/batches/service/remote_test.go
@@ -6,6 +6,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
 	"os"
@@ -648,11 +649,15 @@ func multipartFormRequestMatcher(entry *multipartFormEntry) func(*http.Request)
 		if entry.calls > 0 {
 			return false
 		}
-		// Clone the request. Running ParseMultipartForm changes the behavior of the request for any additional matchers.
-		cloneReq := req.Clone(context.Background())
+		// Clone the request. Running ParseMultipartForm changes the behavior of the request for any additional
+		// matchers by consuming the request body.
+		cloneReq, err := cloneRequest(req)
+		if err != nil {
+			fmt.Printf("failed to clone request: %s\n", err)
+			return false
+		}
 		contentType := cloneReq.Header.Get("Content-Type")
 		if !strings.HasPrefix(contentType, "multipart/form-data") {
-			fmt.Printf("contentType: expected 'multipart/form-data', actual '%s'\n", contentType)
 			return false
 		}
 		if err := cloneReq.ParseMultipartForm(32 << 20); err != nil {
@@ -660,11 +665,9 @@ func multipartFormRequestMatcher(entry *multipartFormEntry) func(*http.Request)
 			return false
 		}
 		if cloneReq.Form.Get("filepath") != entry.path {
-			fmt.Printf("filepath: expected '%s', actual '%s'\n", entry.path, cloneReq.Form.Get("filepath"))
 			return false
 		}
 		if !modtimeRegex.MatchString(cloneReq.Form.Get("filemod")) {
-			fmt.Printf("modified at '%s' does not match regex\n", cloneReq.Form.Get("filemod"))
 			return false
 		}
 		f, header, err := cloneReq.FormFile("file")
@@ -673,7 +676,6 @@ func multipartFormRequestMatcher(entry *multipartFormEntry) func(*http.Request)
 			return false
 		}
 		if header.Filename != entry.fileName {
-			fmt.Printf("fileName: expected '%s', actual '%s'\n", entry.fileName, header.Filename)
 			return false
 		}
 		b, err := io.ReadAll(f)
@@ -682,7 +684,6 @@ func multipartFormRequestMatcher(entry *multipartFormEntry) func(*http.Request)
 			return false
 		}
 		if string(b) != entry.content {
-			fmt.Printf("content: expected '%s', actual '%s'\n", entry.content, string(b))
 			return false
 		}
 		entry.calls++
@@ -706,3 +707,14 @@ func (b neverEnding) Read(p []byte) (n int, err error) {
 	}
 	return len(p), nil
 }
+
+func cloneRequest(req *http.Request) (*http.Request, error) {
+	clone := req.Clone(context.TODO())
+	var b bytes.Buffer
+	if _, err := b.ReadFrom(req.Body); err != nil {
+		return nil, err
+	}
+	req.Body = ioutil.NopCloser(&b)
+	clone.Body = ioutil.NopCloser(bytes.NewReader(b.Bytes()))
+	return clone, nil
+}

From a3de5dbfb0479269348dfc770626d68e85037771 Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Tue, 27 Sep 2022 09:50:10 -0600
Subject: [PATCH 73/77] Use io instead of ioutils

---
 internal/batches/service/remote_test.go | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/internal/batches/service/remote_test.go b/internal/batches/service/remote_test.go
index e4e32f6eaf..563a862383 100644
--- a/internal/batches/service/remote_test.go
+++ b/internal/batches/service/remote_test.go
@@ -6,7 +6,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
 	"os"
@@ -714,7 +713,7 @@ func cloneRequest(req *http.Request) (*http.Request, error) {
 	if _, err := b.ReadFrom(req.Body); err != nil {
 		return nil, err
 	}
-	req.Body = ioutil.NopCloser(&b)
-	clone.Body = ioutil.NopCloser(bytes.NewReader(b.Bytes()))
+	req.Body = io.NopCloser(&b)
+	clone.Body = io.NopCloser(bytes.NewReader(b.Bytes()))
 	return clone, nil
 }

From 1ca9f3fff7510852235abfeb93798c39c5fae6de Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Tue, 27 Sep 2022 09:59:16 -0600
Subject: [PATCH 74/77] Fix test and add a sub directory

---
 internal/batches/service/remote_windows_test.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/internal/batches/service/remote_windows_test.go b/internal/batches/service/remote_windows_test.go
index 7e5fbd3001..f6473327f0 100644
--- a/internal/batches/service/remote_windows_test.go
+++ b/internal/batches/service/remote_windows_test.go
@@ -31,6 +31,11 @@ func TestService_UploadBatchSpecWorkspaceFiles_Windows_Path(t *testing.T) {
 	dir := filepath.Join(workingDir, "scripts")
 	err = os.Mkdir(dir, os.ModePerm)
 	require.NoError(t, err)
+
+	dir = filepath.Join(dir, "another-dir")
+	err = os.Mkdir(dir, os.ModePerm)
+	require.NoError(t, err)
+
 	err = writeTempFile(dir, "hello.txt", "hello world!")
 	require.NoError(t, err)
 
@@ -50,7 +55,7 @@ func TestService_UploadBatchSpecWorkspaceFiles_Windows_Path(t *testing.T) {
 		StatusCode: http.StatusOK,
 	}
 	entry := &multipartFormEntry{
-		path:     "scripts/hello.txt",
+		path:     "scripts/dir",
 		fileName: "hello.txt",
 		content:  "hello world!",
 	}

From 2dc0428fa99047c8706b9c9c31b46c73c98aca88 Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Tue, 27 Sep 2022 10:12:45 -0600
Subject: [PATCH 75/77] Fix test

---
 internal/batches/service/remote_windows_test.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/internal/batches/service/remote_windows_test.go b/internal/batches/service/remote_windows_test.go
index f6473327f0..f8e34a8be4 100644
--- a/internal/batches/service/remote_windows_test.go
+++ b/internal/batches/service/remote_windows_test.go
@@ -55,7 +55,7 @@ func TestService_UploadBatchSpecWorkspaceFiles_Windows_Path(t *testing.T) {
 		StatusCode: http.StatusOK,
 	}
 	entry := &multipartFormEntry{
-		path:     "scripts/dir",
+		path:     "scripts/another-dir",
 		fileName: "hello.txt",
 		content:  "hello world!",
 	}
@@ -66,7 +66,7 @@ func TestService_UploadBatchSpecWorkspaceFiles_Windows_Path(t *testing.T) {
 
 	steps := []batches.Step{{
 		Mount: []batches.Mount{{
-			Path: "scripts\\hello.txt",
+			Path: ".\\scripts\\another-dir\\hello.txt",
 		}},
 	}}
 	err = svc.UploadBatchSpecWorkspaceFiles(context.Background(), workingDir, "123", steps)

From c71416bc66c8e3ad5a02bfb6f726411b5e41286d Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Tue, 4 Oct 2022 10:31:36 -0600
Subject: [PATCH 76/77] Update to latest sourcegraph/lib dependency

---
 go.mod | 4 ++--
 go.sum | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/go.mod b/go.mod
index 5679c7ee98..9dd450cae6 100644
--- a/go.mod
+++ b/go.mod
@@ -22,7 +22,7 @@ require (
 	github.com/sourcegraph/go-diff v0.6.1
 	github.com/sourcegraph/jsonx v0.0.0-20200629203448-1a936bd500cf
 	github.com/sourcegraph/scip v0.2.1
-	github.com/sourcegraph/sourcegraph/lib v0.0.0-20220825181731-397a768a5290
+	github.com/sourcegraph/sourcegraph/lib v0.0.0-20221004162410-237d5855fa13
 	github.com/stretchr/testify v1.8.0
 	golang.org/x/net v0.0.0-20220722155237-a158d28d115b
 	golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4
@@ -105,7 +105,7 @@ require (
 	go.uber.org/zap v1.23.0 // indirect
 	golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect
 	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
-	golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 // indirect
+	golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec // indirect
 	golang.org/x/term v0.0.0-20220411215600-e5f449aeb171 // indirect
 	golang.org/x/text v0.3.7 // indirect
 	golang.org/x/tools v0.1.12 // indirect
diff --git a/go.sum b/go.sum
index 9a7f9524d9..fbc09ca2a3 100644
--- a/go.sum
+++ b/go.sum
@@ -373,8 +373,8 @@ github.com/sourcegraph/log v0.0.0-20220901143117-fc0516a694c9 h1:JjFyvx9hCD5+Jpu
 github.com/sourcegraph/log v0.0.0-20220901143117-fc0516a694c9/go.mod h1:UxiwB6C3xk3xOySJpW1R0MDUyfGuJRFS5Z8C+SA5p2I=
 github.com/sourcegraph/scip v0.2.1 h1:t4cTR8TU81Psfmcj3ZYer67JFzsR/Sc7w5rsuckRo1Y=
 github.com/sourcegraph/scip v0.2.1/go.mod h1:EYyT39nXdZDNVmgbJAlyIVWbEb1txnAOKpJPSYpvgXk=
-github.com/sourcegraph/sourcegraph/lib v0.0.0-20220825181731-397a768a5290 h1:SLCu3Rf1eLZ4sNKl0Bg1oURTgDxEutRCaTQt5dpVqH4=
-github.com/sourcegraph/sourcegraph/lib v0.0.0-20220825181731-397a768a5290/go.mod h1:9wnFUNfpORLAOJn4XAO7ZeWnYkf6/CxlWaTU1vlpuKc=
+github.com/sourcegraph/sourcegraph/lib v0.0.0-20221004162410-237d5855fa13 h1:HEj9QVz35nIU4plPb7iJSFjcTA14zVnfAdfYZF5jsKg=
+github.com/sourcegraph/sourcegraph/lib v0.0.0-20221004162410-237d5855fa13/go.mod h1:e3v3msUOgthv/QCWUzhFdfR3+hwUSn37rtuw49IVJg4=
 github.com/sourcegraph/yaml v1.0.1-0.20200714132230-56936252f152 h1:z/MpntplPaW6QW95pzcAR/72Z5TWDyDnSo0EOcyij9o=
 github.com/sourcegraph/yaml v1.0.1-0.20200714132230-56936252f152/go.mod h1:GIjDIg/heH5DOkXY3YJ/wNhfHsQHoXGjl8G8amsYQ1I=
 github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
@@ -540,8 +540,8 @@ golang.org/x/sys v0.0.0-20211117180635-dee7805ff2e1/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20211213223007-03aa0b5f6827/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 h1:v6hYoSR9T5oet+pMXwUWkbiVqx/63mlHjefrHmxwfeY=
-golang.org/x/sys v0.0.0-20220829200755-d48e67d00261/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec h1:BkDtF2Ih9xZ7le9ndzTA7KJow28VbQW3odyk/8drmuI=
+golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20220411215600-e5f449aeb171 h1:EH1Deb8WZJ0xc0WK//leUHXcX9aLE5SymusoTmMZye8=
 golang.org/x/term v0.0.0-20220411215600-e5f449aeb171/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=

From 2c6760340098bd88282e50c08717362ba57ae30e Mon Sep 17 00:00:00 2001
From: Randell Callahan <piszmogcode@gmail.com>
Date: Tue, 4 Oct 2022 10:32:10 -0600
Subject: [PATCH 77/77] Remove the api flags

---
 cmd/src/batch_exec.go | 2 --
 1 file changed, 2 deletions(-)

diff --git a/cmd/src/batch_exec.go b/cmd/src/batch_exec.go
index 693beb203d..76cb2bbbe2 100644
--- a/cmd/src/batch_exec.go
+++ b/cmd/src/batch_exec.go
@@ -10,7 +10,6 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/sourcegraph/src-cli/internal/api"
 	"github.com/sourcegraph/src-cli/internal/batches/docker"
 	"github.com/sourcegraph/src-cli/internal/batches/log"
 	"github.com/sourcegraph/src-cli/internal/batches/repozip"
@@ -37,7 +36,6 @@ type executorModeFlags struct {
 	tempDir           string
 	repoDir           string
 	workspaceFilesDir string
-	api               *api.Flags
 }
 
 func newExecutorModeFlags(flagSet *flag.FlagSet) (f *executorModeFlags) {