Make search results accessible in campaign spec templates

Author: mrnugget

internal/campaigns/graphql/repository.go

@@ -30,6 +30,8 @@ type Repository struct {
 	URL                string
 	ExternalRepository struct{ ServiceType string }
 	DefaultBranch      *Branch
+
+	FileMatches map[string]bool
 }
 
 func (r *Repository) BaseRef() string {
@@ -43,3 +45,22 @@ func (r *Repository) Rev() string {
 func (r *Repository) Slug() string {
 	return strings.ReplaceAll(r.Name, "/", "-")
 }
+
+func (r *Repository) FileMatchPaths() string {
+	files := []string{}
+	for f := range r.FileMatches {
+		files = append(files, f)
+	}
+	return strings.Join(files, " ")
+}
+
+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

@@ -186,7 +186,10 @@ 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 },
+		"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

internal/campaigns/run_steps_test.go

@@ -60,6 +60,20 @@ func TestParseStepRun(t *testing.T) {
 			run:  `${{ modified_files }} ${{ repository_name }}`,
 			want: ` github.com/sourcegraph/src-cli`,
 		},
+		{
+			stepCtx: StepContext{
+				Repository: &graphql.Repository{
+					Name: "github.com/sourcegraph/src-cli",
+					FileMatches: map[string]bool{
+						"README.md": true,
+						"main.go":   true,
+					},
+				},
+			},
+
+			run:  `${{ search_results }}`,
+			want: `README.md main.go`,
+		},
 	}
 
 	for _, tc := range tests {

internal/campaigns/service.go

@@ -380,6 +380,7 @@ query ChangesetRepos(
                     ...repositoryFields
                 }
                 ... on FileMatch {
+                    file { path }
                     repository {
                         ...repositoryFields
                     }
@@ -404,13 +405,18 @@ func (svc *Service) resolveRepositorySearch(ctx context.Context, query string) (
 		return nil, err
 	}
 
-	ids := map[string]struct{}{}
+	ids := map[string]*graphql.Repository{}
 	var repos []*graphql.Repository
 	for _, r := range result.Search.Results.Results {
-		if _, ok := ids[r.ID]; !ok {
+		existing, ok := ids[r.ID]
+		if !ok {
 			repo := r.Repository
 			repos = append(repos, &repo)
-			ids[r.ID] = struct{}{}
+			ids[r.ID] = &repo
+		} else {
+			for file := range r.FileMatches {
+				existing.FileMatches[file] = true
+			}
 		}
 	}
 	return repos, nil
@@ -442,12 +448,18 @@ func (sr *searchResult) UnmarshalJSON(data []byte) error {
 
 	switch tn.Typename {
 	case "FileMatch":
-		var result struct{ Repository graphql.Repository }
+		var result struct {
+			Repository graphql.Repository
+			File       struct {
+				Path string
+			}
+		}
 		if err := json.Unmarshal(data, &result); err != nil {
 			return err
 		}
 
 		sr.Repository = result.Repository
+		sr.Repository.FileMatches = map[string]bool{result.File.Path: true}
 		return nil
 
 	case "Repository":