Remove shortcuts in templates for now

Author: mrnugget

internal/campaigns/executor_test.go

@@ -104,7 +104,7 @@ func TestExecutor_Integration(t *testing.T) {
 			},
 			steps: []Step{
 				{Run: `go fmt main.go`, Container: "doesntmatter:13"},
-				{Run: `touch modified-${{ modified_files }}.md`, Container: "alpine:13"},
+				{Run: `touch modified-${{ .PreviousStep.ModifiedFiles }}.md`, Container: "alpine:13"},
 			},
 			wantFilesChanged: map[string][]string{
 				srcCLIRepo.ID: []string{"main.go", "modified-main.go.md"},

internal/campaigns/graphql/repository.go

@@ -46,21 +46,13 @@ func (r *Repository) Slug() string {
 	return strings.ReplaceAll(r.Name, "/", "-")
 }
 
-func (r *Repository) FileMatchPaths() string {
-	files := []string{}
+func (r *Repository) SearchResultPaths() (list fileMatchPathList) {
 	for f := range r.FileMatches {
-		files = append(files, f)
+		list = append(list, f)
 	}
-	return strings.Join(files, " ")
+	return list
 }
 
 type fileMatchPathList []string
 
 func (f fileMatchPathList) String() string { return strings.Join(f, " ") }
-
-func (r *Repository) FileMatchPathList() (list fileMatchPathList) {
-	for f := range r.FileMatches {
-		list = append(list, f)
-	}
-	return list
-}

internal/campaigns/run_steps.go

@@ -188,20 +188,7 @@ func runSteps(ctx context.Context, wc *WorkspaceCreator, repo *graphql.Repositor
 }
 
 func parseStepRun(stepCtx StepContext, run string) (*template.Template, error) {
-	t := template.New("step-run").Delims("${{", "}}")
-
-	funcMap := template.FuncMap{
-		"repository_name":    func() string { return stepCtx.Repository.Name },
-		"search_results":     stepCtx.Repository.FileMatchPathList,
-		"search_result_list": stepCtx.Repository.FileMatchPathList,
-		"join":               func(sl []string, sep string) string { return strings.Join(sl, sep) },
-	}
-
-	funcMap["modified_files"] = stepCtx.PreviousStep.ModifiedFiles
-
-	t.Funcs(funcMap)
-
-	return t.Parse(run)
+	return template.New("step-run").Delims("${{", "}}").Parse(run)
 }
 
 type StepContext struct {

internal/campaigns/run_steps_test.go

@@ -49,15 +49,15 @@ func TestParseStepRun(t *testing.T) {
 				},
 			},
 
-			run:  `${{ modified_files }} ${{ repository_name }}`,
+			run:  `${{ .PreviousStep.ModifiedFiles }} ${{ .Repository.Name }}`,
 			want: `go.mod github.com/sourcegraph/src-cli`,
 		},
 		{
 			stepCtx: StepContext{
 				Repository: &graphql.Repository{Name: "github.com/sourcegraph/src-cli"},
 			},
 
-			run:  `${{ modified_files }} ${{ repository_name }}`,
+			run:  `${{ .PreviousStep.ModifiedFiles }} ${{ .Repository.Name }}`,
 			want: ` github.com/sourcegraph/src-cli`,
 		},
 		{
@@ -71,7 +71,7 @@ func TestParseStepRun(t *testing.T) {
 				},
 			},
 
-			run:  `${{ search_results }}`,
+			run:  `${{ .Repository.SearchResultPaths }}`,
 			want: `README.md main.go`,
 		},
 	}