Remove old feature gates from pre-4.0

Author: eseliger

cmd/src/batch_common.go

@@ -177,37 +177,17 @@ func batchDefaultCacheDir() string {
 	if err != nil {
 		return ""
 	}
-
-	// Check if there's an old campaigns cache directory but not a new batch
-	// directory: if so, we should rename the old directory and carry on.
-	//
-	// TODO(campaigns-deprecation): we can remove this migration shim after June
-	// 2021.
-	old := path.Join(uc, "sourcegraph", "campaigns")
 	dir := path.Join(uc, "sourcegraph", "batch")
-	if _, err := os.Stat(dir); os.IsNotExist(err) {
-		if _, err := os.Stat(old); os.IsExist(err) {
-			// We'll just try to do this without checking for an error: if it
-			// fails, we'll carry on and let the normal cache directory handling
-			// logic take care of it.
-			os.Rename(old, dir)
-		}
-	}
 
 	return dir
 }
 
 // batchDefaultTempDirPrefix returns the prefix to be passed to ioutil.TempFile.
-// If one of the environment variables SRC_BATCH_TMP_DIR or
-// SRC_CAMPAIGNS_TMP_DIR is set, that is used as the prefix. Otherwise we use
-// "/tmp".
+// If the environment variable SRC_BATCH_TMP_DIR is set, that is used as the prefix.
+// Otherwise we use "/tmp".
 func batchDefaultTempDirPrefix() string {
-	// TODO(campaigns-deprecation): we can remove this migration shim in
-	// Sourcegraph 4.0.
-	for _, env := range []string{"SRC_BATCH_TMP_DIR", "SRC_CAMPAIGNS_TMP_DIR"} {
-		if p := os.Getenv(env); p != "" {
-			return p
-		}
+	if p := os.Getenv("SRC_BATCH_TMP_DIR"); p != "" {
+		return p
 	}
 
 	// On macOS, we use an explicit prefix for our temp directories, because
@@ -280,7 +260,7 @@ func executeBatchSpec(ctx context.Context, ui ui.ExecUI, opts executeBatchSpecOp
 
 	imageCache := docker.NewImageCache()
 
-	if err := svc.DetermineFeatureFlags(ctx); err != nil {
+	if err := validateSourcegraphVersionConstraint(ctx, svc); err != nil {
 		return err
 	}
 
@@ -399,7 +379,6 @@ func executeBatchSpec(ctx context.Context, ui ui.ExecUI, opts executeBatchSpecOp
 				GlobalEnv:           os.Environ(),
 				IsRemote:            false,
 			},
-			Features:  svc.Features(),
 			Logger:    logManager,
 			Cache:     executor.NewDiskCache(opts.flags.cacheDir),
 			GlobalEnv: os.Environ(),
@@ -604,3 +583,14 @@ func getBatchParallelism(ctx context.Context, flag int) (int, error) {
 
 	return docker.NCPU(ctx)
 }
+
+func validateSourcegraphVersionConstraint(ctx context.Context, svc *service.Service) error {
+	ffs, err := svc.DetermineFeatureFlags(ctx)
+	if err != nil {
+		return err
+	}
+	if ffs.Sourcegraph40 {
+		return nil
+	}
+	return errors.Newf("\n\n * Warning:\n This version of src-cli requires Sourcegraph version 4.0 or newer. If you're not on Sourcegraph 4.0 or newer, please use any 3.x release of src-cli.\n\n")
+}

cmd/src/batch_new.go

@@ -48,7 +48,7 @@ Examples:
 			Client: cfg.apiClient(apiFlags, flagSet.Output()),
 		})
 
-		if err := svc.DetermineFeatureFlags(ctx); err != nil {
+		if err := validateSourcegraphVersionConstraint(ctx, svc); err != nil {
 			return err
 		}
 

cmd/src/batch_remote.go

@@ -52,7 +52,7 @@ Examples:
 			Client: cfg.apiClient(flags.api, flagSet.Output()),
 		})
 
-		if err := svc.DetermineFeatureFlags(ctx); err != nil {
+		if err := validateSourcegraphVersionConstraint(ctx, svc); err != nil {
 			return err
 		}
 

cmd/src/batch_repositories.go

@@ -64,7 +64,7 @@ Examples:
 			Client: client,
 		})
 
-		if err := svc.DetermineFeatureFlags(ctx); err != nil {
+		if err := validateSourcegraphVersionConstraint(ctx, svc); err != nil {
 			return err
 		}
 

cmd/src/batch_validate.go

@@ -63,7 +63,7 @@ Examples:
 			Client: cfg.apiClient(apiFlags, flagSet.Output()),
 		})
 
-		if err := svc.DetermineFeatureFlags(ctx); err != nil {
+		if err := validateSourcegraphVersionConstraint(ctx, svc); err != nil {
 			ui.ExecutionError(err)
 			return err
 		}

internal/api/api.go

@@ -16,6 +16,7 @@ import (
 	ioaux "github.com/jig/teereadcloser"
 	"github.com/kballard/go-shellquote"
 	"github.com/mattn/go-isatty"
+
 	"github.com/sourcegraph/src-cli/internal/version"
 )
 
@@ -25,16 +26,9 @@ type Client interface {
 	// variables.
 	NewQuery(query string) Request
 
-	// NewRequest creates a GraphQL request.
+	// NewRequest creates a GraphQL request with gzip compression turned on.
 	NewRequest(query string, vars map[string]interface{}) Request
 
-	// NewGzippedRequest creates a GraphQL request with gzip compression turned on.
-	NewGzippedRequest(query string, vars map[string]interface{}) Request
-
-	// NewGzippedQuery is a convenience wrapper around NewQuery with gzip
-	// compression turned on.
-	NewGzippedQuery(query string) Request
-
 	// NewHTTPRequest creates an http.Request for the Sourcegraph API.
 	//
 	// path is joined against the API route. For example on Sourcegraph.com this
@@ -72,7 +66,6 @@ type request struct {
 	client *client
 	query  string
 	vars   map[string]interface{}
-	gzip   bool
 }
 
 // ClientOpts encapsulates the options given to NewClient.
@@ -132,19 +125,6 @@ func (c *client) NewRequest(query string, vars map[string]interface{}) Request {
 	}
 }
 
-func (c *client) NewGzippedRequest(query string, vars map[string]interface{}) Request {
-	return &request{
-		client: c,
-		query:  query,
-		vars:   vars,
-		gzip:   true,
-	}
-}
-
-func (c *client) NewGzippedQuery(query string) Request {
-	return c.NewGzippedRequest(query, nil)
-}
-
 func (c *client) Do(req *http.Request) (*http.Response, error) {
 	return c.httpClient.Do(req)
 }
@@ -216,19 +196,16 @@ func (r *request) do(ctx context.Context, result interface{}) (bool, error) {
 	}
 
 	var bufBody io.Reader = bytes.NewBuffer(reqBody)
-	if r.gzip {
-		bufBody = gzipReader(bufBody)
-	}
+	bufBody = gzipReader(bufBody)
 
 	// Create the HTTP request.
 	req, err := r.client.NewHTTPRequest(ctx, "POST", ".api/graphql", bufBody)
 	if err != nil {
 		return false, err
 	}
 
-	if r.gzip {
-		req.Header.Set("Content-Encoding", "gzip")
-	}
+	// Use gzip compression.
+	req.Header.Set("Content-Encoding", "gzip")
 
 	// Perform the request.
 	resp, err := r.client.httpClient.Do(req)

internal/batches/executor/coordinator.go

@@ -9,7 +9,6 @@ import (
 	"github.com/sourcegraph/sourcegraph/lib/batches/execution"
 	"github.com/sourcegraph/sourcegraph/lib/batches/execution/cache"
 
-	"github.com/sourcegraph/src-cli/internal/batches"
 	"github.com/sourcegraph/src-cli/internal/batches/log"
 )
 
@@ -34,8 +33,6 @@ type NewCoordinatorOpts struct {
 	Logger    log.LogManager
 	GlobalEnv []string
 
-	// Used by batcheslib.BuildChangesetSpecs
-	Features batches.FeatureFlags
 	IsRemote bool
 }
 
@@ -124,10 +121,7 @@ func (c Coordinator) buildChangesetSpecs(task *Task, batchSpec *batcheslib.Batch
 		},
 	}
 
-	return batcheslib.BuildChangesetSpecs(input, batcheslib.ChangesetSpecFeatureFlags{
-		IncludeAutoAuthorDetails: c.opts.Features.IncludeAutoAuthorDetails,
-		AllowOptionalPublished:   c.opts.Features.AllowOptionalPublished,
-	})
+	return batcheslib.BuildChangesetSpecs(input)
 }
 
 func (c *Coordinator) loadCachedStepResults(ctx context.Context, task *Task, globalEnv []string) error {

internal/batches/executor/coordinator_test.go

@@ -82,7 +82,7 @@ func TestCoordinator_Execute(t *testing.T) {
 					{task: sourcegraphTask, stepResults: []execution.AfterStepResult{{Diff: `dummydiff2`}}},
 				},
 			},
-			opts: NewCoordinatorOpts{Features: featuresAllEnabled()},
+			opts: NewCoordinatorOpts{},
 
 			wantCacheEntries: 2,
 			wantSpecs: []*batcheslib.ChangesetSpec{
@@ -150,7 +150,7 @@ func TestCoordinator_Execute(t *testing.T) {
 					},
 				},
 			},
-			opts: NewCoordinatorOpts{Features: featuresAllEnabled()},
+			opts: NewCoordinatorOpts{},
 
 			wantCacheEntries: 1,
 			wantSpecs: []*batcheslib.ChangesetSpec{
@@ -201,7 +201,7 @@ func TestCoordinator_Execute(t *testing.T) {
 					{task: sourcegraphTask, stepResults: []execution.AfterStepResult{{Diff: nestedChangesDiff}}},
 				},
 			},
-			opts: NewCoordinatorOpts{Features: featuresAllEnabled()},
+			opts: NewCoordinatorOpts{},
 
 			// TODO: Fix comment.
 			// We have 4 ChangesetSpecs, but we only want 2 cache entries,
@@ -249,7 +249,7 @@ func TestCoordinator_Execute(t *testing.T) {
 					{task: sourcegraphTask, stepResults: []execution.AfterStepResult{{Diff: `dummydiff2`, StepIndex: 0}}},
 				},
 			},
-			opts: NewCoordinatorOpts{Features: featuresAllEnabled()},
+			opts: NewCoordinatorOpts{},
 
 			wantCacheEntries: 2,
 			wantSpecs: []*batcheslib.ChangesetSpec{

internal/batches/executor/executor_test.go

@@ -25,7 +25,6 @@ import (
 	"github.com/sourcegraph/sourcegraph/lib/batches/template"
 
 	"github.com/sourcegraph/src-cli/internal/api"
-	"github.com/sourcegraph/src-cli/internal/batches"
 	"github.com/sourcegraph/src-cli/internal/batches/docker"
 	"github.com/sourcegraph/src-cli/internal/batches/mock"
 	"github.com/sourcegraph/src-cli/internal/batches/repozip"
@@ -510,18 +509,6 @@ func addToPath(t *testing.T, relPath string) {
 	os.Setenv("PATH", fmt.Sprintf("%s%c%s", dummyDockerPath, os.PathListSeparator, os.Getenv("PATH")))
 }
 
-func featuresAllEnabled() batches.FeatureFlags {
-	return batches.FeatureFlags{
-		AllowArrayEnvironments:   true,
-		IncludeAutoAuthorDetails: true,
-		UseGzipCompression:       true,
-		AllowTransformChanges:    true,
-		AllowWorkspaces:          true,
-		AllowConditionalExec:     true,
-		AllowOptionalPublished:   true,
-	}
-}
-
 func TestExecutor_CachedStepResults(t *testing.T) {
 	t.Run("single step cached", func(t *testing.T) {
 		archive := mock.RepoArchive{

internal/batches/features.go

@@ -9,16 +9,7 @@ import (
 // FeatureFlags represent features that are only available on certain
 // Sourcegraph versions and we therefore have to detect at runtime.
 type FeatureFlags struct {
-	AllowArrayEnvironments   bool
-	IncludeAutoAuthorDetails bool
-	UseGzipCompression       bool
-	AllowTransformChanges    bool
-	AllowWorkspaces          bool
-	BatchChanges             bool
-	AllowConditionalExec     bool
-	AllowOptionalPublished   bool
-	ServerSideBatchChanges   bool
-	BitbucketCloud           bool
+	Sourcegraph40 bool
 }
 
 func (ff *FeatureFlags) SetFromVersion(version string) error {
@@ -34,16 +25,9 @@ func (ff *FeatureFlags) SetFromVersion(version string) error {
 		// ">= 3.23.0". However, the same version IS considered to satisfy the constraint
 		// "3.23.0-0". See
 		// https://github.com/Masterminds/semver#working-with-prerelease-versions for more.
-		{&ff.AllowArrayEnvironments, ">= 3.23.0-0", "2020-11-24"},
-		{&ff.IncludeAutoAuthorDetails, ">= 3.20.0-0", "2020-09-10"},
-		{&ff.UseGzipCompression, ">= 3.21.0-0", "2020-10-12"},
-		{&ff.AllowTransformChanges, ">= 3.23.0-0", "2020-12-11"},
-		{&ff.AllowWorkspaces, ">= 3.25.0-0", "2021-01-29"},
-		{&ff.BatchChanges, ">= 3.26.0-0", "2021-03-07"},
-		{&ff.AllowConditionalExec, ">= 3.28.0-0", "2021-05-05"},
-		{&ff.AllowOptionalPublished, ">= 3.30.0-0", "2021-06-21"},
-		{&ff.ServerSideBatchChanges, ">= 3.37.0-0", "2022-02-08"},
-		{&ff.BitbucketCloud, ">= 3.40.0-0", "2022-04-20"},
+		// Example usage:
+		// {&ff.FlagName, ">= 3.23.0-0", "2020-11-24"},
+		{&ff.Sourcegraph40, ">= 4.0.0-0", "2022-08-17"},
 	} {
 		value, err := api.CheckSourcegraphVersion(version, feature.constraint, feature.minDate)
 		if err != nil {