Undo local file mounting

Author: mrnugget

cmd/src/campaigns_common.go

@@ -174,13 +174,12 @@ func campaignsExecute(ctx context.Context, out *output.Output, svc *campaigns.Se
 	}
 
 	opts := campaigns.ExecutorOpts{
-		Cache:        svc.NewExecutionCache(flags.cacheDir),
-		Creator:      svc.NewWorkspaceCreator(flags.cacheDir, flags.cleanArchives),
-		ClearCache:   flags.clearCache,
-		KeepLogs:     flags.keepLogs,
-		Timeout:      flags.timeout,
-		TempDir:      flags.tempDir,
-		SpecFilePath: flags.file,
+		Cache:      svc.NewExecutionCache(flags.cacheDir),
+		Creator:    svc.NewWorkspaceCreator(flags.cacheDir, flags.cleanArchives),
+		ClearCache: flags.clearCache,
+		KeepLogs:   flags.keepLogs,
+		Timeout:    flags.timeout,
+		TempDir:    flags.tempDir,
 	}
 	if flags.parallelism <= 0 {
 		opts.Parallelism = runtime.GOMAXPROCS(0)
@@ -237,15 +236,12 @@ func campaignsExecute(ctx context.Context, out *output.Output, svc *campaigns.Se
 		campaignsCompletePending(pending, "Resolved repositories")
 	}
 
-	// p := newCampaignProgressPrinter(out, opts.Parallelism)
-	// specs, err := svc.ExecuteCampaignSpec(ctx, repos, executor, campaignSpec, p.PrintStatuses)
-	specs, err := svc.ExecuteCampaignSpec(ctx, repos, executor, campaignSpec, func(ts []*campaigns.TaskStatus) {
-		fmt.Printf("len(ts)=%d\n", len(ts))
-	})
+	p := newCampaignProgressPrinter(out, opts.Parallelism)
+	specs, err := svc.ExecuteCampaignSpec(ctx, repos, executor, campaignSpec, p.PrintStatuses)
 	if err != nil {
 		return "", "", err
 	}
-	// p.Complete()
+	p.Complete()
 
 	if logFiles := executor.LogFiles(); len(logFiles) > 0 && flags.keepLogs {
 		func() {

internal/campaigns/campaign_spec.go

@@ -71,10 +71,6 @@ type Step struct {
 	image string
 }
 
-type StepLocalFileMount struct {
-	FromFile string `json:"fromFile,omitempty"`
-}
-
 func ParseCampaignSpec(data []byte) (*CampaignSpec, error) {
 	var spec CampaignSpec
 	if err := yaml.UnmarshalValidate(schema.CampaignSpecJSON, data, &spec); err != nil {

internal/campaigns/executor.go

@@ -248,7 +248,7 @@ func (x *executor) do(ctx context.Context, task *Task) (err error) {
 	defer cancel()
 
 	// Actually execute the steps.
-	diff, err := runSteps(runCtx, x.SpecFilePath, x.creator, task.Repository, task.Steps, log, x.tempDir, func(currentlyExecuting string) {
+	diff, err := runSteps(runCtx, x.creator, task.Repository, task.Steps, log, x.tempDir, func(currentlyExecuting string) {
 		status.CurrentlyExecuting = currentlyExecuting
 		x.updateTaskStatus(task, status)
 	})

internal/campaigns/run_steps.go

@@ -9,7 +9,6 @@ import (
 	"io/ioutil"
 	"os"
 	"os/exec"
-	"path/filepath"
 	"strings"
 	"text/template"
 	"time"
@@ -19,7 +18,7 @@ import (
 	"github.com/sourcegraph/src-cli/internal/campaigns/graphql"
 )
 
-func runSteps(ctx context.Context, specFilePath string, wc *WorkspaceCreator, repo *graphql.Repository, steps []Step, logger *TaskLogger, tempDir string, reportProgress func(string)) ([]byte, error) {
+func runSteps(ctx context.Context, wc *WorkspaceCreator, repo *graphql.Repository, steps []Step, logger *TaskLogger, tempDir string, reportProgress func(string)) ([]byte, error) {
 	reportProgress("Downloading archive")
 
 	volumeDir, err := wc.Create(ctx, repo)
@@ -102,7 +101,7 @@ func runSteps(ctx context.Context, specFilePath string, wc *WorkspaceCreator, re
 			stepContext.PreviousStep = results[i-1]
 		}
 
-		files, err := parseStepFiles(specFilePath, step.Files, &stepContext)
+		files, err := parseStepFiles(step.Files, &stepContext)
 		if err != nil {
 			return nil, errors.Wrap(err, "parsing step files")
 		}
@@ -330,37 +329,13 @@ func parseStepRun(run string, stepCtx *StepContext) (*template.Template, error)
 	return template.New("step-run").Delims("${{", "}}").Funcs(stepCtx.ToFuncMap()).Parse(run)
 }
 
-func parseStepFiles(specFilePath string, files map[string]interface{}, stepCtx *StepContext) (map[string]string, error) {
+func parseStepFiles(files map[string]interface{}, stepCtx *StepContext) (map[string]string, error) {
 	containerFiles := make(map[string]string, len(files))
 
 	fnMap := stepCtx.ToFuncMap()
 
-	if specFilePath == "-" {
-		specFilePath = ""
-	}
-	basePath := filepath.Dir(specFilePath)
-
 	for fileName, fileRaw := range files {
-		// If the file exists relative to the campaign spec, we read it and
-		// mount it.
-		fmt.Printf("fileraw=%T\n", fileRaw)
-		if local, ok := fileRaw.(StepLocalFileMount); ok {
-			fmt.Printf("local=%s\n", local)
-			localFileName := filepath.Join(basePath, local.FromFile)
-			ok, err := fileExists(localFileName)
-			if err != nil {
-				return containerFiles, err
-			}
-			if ok {
-				content, err := ioutil.ReadFile(localFileName)
-				if err != nil {
-					return containerFiles, err
-				}
-				containerFiles[fileName] = string(content)
-				continue
-			}
-		}
-		// Otherwise, we treat the file contents as a template and render it
+		// We treat the file contents as a template and render it
 		// into a buffer that we then mount into the code host.
 		var out bytes.Buffer
 

internal/campaigns/service.go

@@ -198,7 +198,6 @@ type ExecutorOpts struct {
 	VerboseLogger bool
 	TempDir       string
 	CacheDir      string
-	SpecFilePath  string
 }
 
 func (svc *Service) NewExecutor(opts ExecutorOpts) Executor {

schema/campaign_spec.schema.json

@@ -85,12 +85,7 @@
           "files": {
             "type": "object",
             "description": "Files that should be mounted into or be created inside the Docker container.",
-            "additionalProperties": {
-              "oneOf": [
-                {"type": "string"},
-                {"type":"object", "additionalProperties": false, "properties": {"fromFile": {"type":"string"}}}
-              ]
-            }
+            "additionalProperties": {"type": "string"}
           }
         }
       }