Don't keep unsupported/ignored repos error for server-side resolution (#804)

The error was the global error and wasn't unset ever, so the execution would go on and eventually it fails with that error in the end.
Also fixes a swallowed error for clear cache.

Author: eseliger

CHANGELOG.md

@@ -19,6 +19,12 @@ All notable changes to `src-cli` are documented in this file.
 
 ### Removed
 
+## 3.42.2
+
+### Fixed
+
+- Fixed an issue where execution would eventually fail with an error when there were unsupported or ignored workspaces found by server-side execution.
+
 ## 3.42.1
 
 ### Fixed

cmd/src/batch_common.go

@@ -354,6 +354,7 @@ func executeBatchSpec(ctx context.Context, ui ui.ExecUI, opts executeBatchSpecOp
 	)
 	if svc.Features().ServerSideWorkspaceResolution {
 		ui.ResolvingRepositories()
+		var err error
 		workspaces, repos, err = svc.ResolveWorkspacesForBatchSpec(ctx, batchSpec, opts.flags.allowUnsupported, opts.flags.allowIgnored)
 		if err != nil {
 			if repoSet, ok := err.(batches.UnsupportedRepoSet); ok {
@@ -417,7 +418,6 @@ func executeBatchSpec(ctx context.Context, ui ui.ExecUI, opts executeBatchSpecOp
 
 	ui.CheckingCache()
 	tasks := svc.BuildTasks(
-		ctx,
 		&template.BatchChangeAttributes{
 			Name:        batchSpec.Name,
 			Description: batchSpec.Description,
@@ -430,7 +430,9 @@ func executeBatchSpec(ctx context.Context, ui ui.ExecUI, opts executeBatchSpecOp
 		uncachedTasks []*executor.Task
 	)
 	if opts.flags.clearCache {
-		coord.ClearCache(ctx, tasks)
+		if err := coord.ClearCache(ctx, tasks); err != nil {
+			return err
+		}
 		uncachedTasks = tasks
 	} else {
 		// Check the cache for completely cached executions.

internal/batches/service/build_tasks.go

@@ -1,16 +1,14 @@
 package service
 
 import (
-	"context"
-
 	batcheslib "github.com/sourcegraph/sourcegraph/lib/batches"
 	"github.com/sourcegraph/sourcegraph/lib/batches/template"
 
 	"github.com/sourcegraph/src-cli/internal/batches/executor"
 )
 
 // buildTasks returns *executor.Tasks for all the workspaces determined for the given spec.
-func buildTasks(ctx context.Context, attributes *template.BatchChangeAttributes, steps []batcheslib.Step, workspaces []RepoWorkspace) []*executor.Task {
+func buildTasks(attributes *template.BatchChangeAttributes, steps []batcheslib.Step, workspaces []RepoWorkspace) []*executor.Task {
 	tasks := make([]*executor.Task, 0, len(workspaces))
 
 	for _, ws := range workspaces {

internal/batches/service/service.go

@@ -368,8 +368,8 @@ func (svc *Service) DetermineWorkspaces(ctx context.Context, repos []*graphql.Re
 	return findWorkspaces(ctx, spec, svc, repos)
 }
 
-func (svc *Service) BuildTasks(ctx context.Context, attributes *templatelib.BatchChangeAttributes, steps []batcheslib.Step, workspaces []RepoWorkspace) []*executor.Task {
-	return buildTasks(ctx, attributes, steps, workspaces)
+func (svc *Service) BuildTasks(attributes *templatelib.BatchChangeAttributes, steps []batcheslib.Step, workspaces []RepoWorkspace) []*executor.Task {
+	return buildTasks(attributes, steps, workspaces)
 }
 
 func (svc *Service) Features() batches.FeatureFlags {

internal/batches/service/service_test.go

@@ -134,7 +134,7 @@ func mockGraphQLClient(responses ...string) (client api.Client, done func()) {
 	mux := http.NewServeMux()
 
 	var count int
-	mux.HandleFunc("/.api/graphql", func(w http.ResponseWriter, r *http.Request) {
+	mux.HandleFunc("/.api/graphql", func(w http.ResponseWriter, _ *http.Request) {
 		w.Header().Set("Content-Type", "application/json")
 
 		_, _ = w.Write([]byte(responses[count]))