WIP

Author: mrnugget

cmd/src/campaigns_common.go

@@ -237,12 +237,15 @@ 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)
+	// 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))
+	})
 	if err != nil {
 		return "", "", err
 	}
-	p.Complete()
+	// p.Complete()
 
 	if logFiles := executor.LogFiles(); len(logFiles) > 0 && flags.keepLogs {
 		func() {

internal/campaigns/campaign_spec.go

@@ -63,14 +63,18 @@ type OnQueryOrRepository struct {
 }
 
 type Step struct {
-	Run       string            `json:"run,omitempty" yaml:"run"`
-	Container string            `json:"container,omitempty" yaml:"container"`
-	Env       map[string]string `json:"env,omitempty" yaml:"env"`
-	Files     map[string]string `json:"files,omitempty" yaml:"files"`
+	Run       string                 `json:"run,omitempty" yaml:"run"`
+	Container string                 `json:"container,omitempty" yaml:"container"`
+	Env       map[string]string      `json:"env,omitempty" yaml:"env"`
+	Files     map[string]interface{} `json:"files,omitempty" yaml:"files"`
 
 	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/run_steps.go

@@ -330,7 +330,7 @@ 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]string, stepCtx *StepContext) (map[string]string, error) {
+func parseStepFiles(specFilePath string, files map[string]interface{}, stepCtx *StepContext) (map[string]string, error) {
 	containerFiles := make(map[string]string, len(files))
 
 	fnMap := stepCtx.ToFuncMap()
@@ -343,24 +343,28 @@ func parseStepFiles(specFilePath string, files map[string]string, stepCtx *StepC
 	for fileName, fileRaw := range files {
 		// If the file exists relative to the campaign spec, we read it and
 		// mount it.
-		localFileName := filepath.Join(basePath, fileRaw)
-		ok, err := fileExists(localFileName)
-		if err != nil {
-			return containerFiles, err
-		}
-		if ok {
-			content, err := ioutil.ReadFile(localFileName)
+		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
 			}
-			containerFiles[fileName] = string(content)
-			continue
+			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
 		// into a buffer that we then mount into the code host.
 		var out bytes.Buffer
 
-		tmpl, err := template.New(fileName).Delims("${{", "}}").Funcs(fnMap).Parse(fileRaw)
+		tmpl, err := template.New(fileName).Delims("${{", "}}").Funcs(fnMap).Parse(fileRaw.(string))
 		if err != nil {
 			return containerFiles, err
 		}

schema/campaign_spec.schema.json

@@ -84,7 +84,13 @@
           },
           "files": {
             "type": "object",
-            "description": "Files that should be mounted into or be created inside the Docker container."
+            "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"}}}
+              ]
+            }
           }
         }
       }