remove API-version compatibility for API < v1.44

Support for API versions < v1.44 was removed in the client in [moby@96b29f5]
and [moby@7652f38], so we can remove fallback-code from the CLI as well,
as it won't be able to use those versions.

[moby@96b29f5]: moby/moby@96b29f5
[moby@7652f38]: moby/moby@7652f38

Signed-off-by: Sebastiaan van Stijn <[email protected]>

Author: thaJeztah

cli/command/builder/prune.go

@@ -12,7 +12,6 @@ import (
 	"github.com/docker/cli/internal/prompt"
 	"github.com/docker/cli/opts"
 	"github.com/docker/go-units"
-	"github.com/moby/moby/api/types/versions"
 	"github.com/moby/moby/client"
 	"github.com/spf13/cobra"
 )
@@ -112,17 +111,9 @@ type cancelledErr struct{ error }
 
 func (cancelledErr) Cancelled() {}
 
-type errNotImplemented struct{ error }
-
-func (errNotImplemented) NotImplemented() {}
-
 // pruneFn prunes the build cache for use in "docker system prune" and
 // returns the amount of space reclaimed and a detailed output string.
 func pruneFn(ctx context.Context, dockerCLI command.Cli, options pruner.PruneOptions) (uint64, string, error) {
-	if ver := dockerCLI.Client().ClientVersion(); ver != "" && versions.LessThan(ver, "1.31") {
-		// Not supported on older daemons.
-		return 0, "", errNotImplemented{errors.New("builder prune requires API version 1.31 or greater")}
-	}
 	if !options.Confirmed {
 		// Dry-run: perform validation and produce confirmation before pruning.
 		var confirmMsg string

cli/command/cli_test.go

@@ -164,7 +164,7 @@ func TestInitializeFromClient(t *testing.T) {
 		{
 			doc: "successful ping",
 			pingFunc: func() (types.Ping, error) {
-				return types.Ping{Experimental: true, OSType: "linux", APIVersion: "v1.30"}, nil
+				return types.Ping{Experimental: true, OSType: "linux", APIVersion: "v1.44"}, nil
 			},
 			expectedServer: ServerInfo{HasExperimental: true, OSType: "linux"},
 			negotiated:     true,
@@ -179,7 +179,7 @@ func TestInitializeFromClient(t *testing.T) {
 		{
 			doc: "failed ping, with API version",
 			pingFunc: func() (types.Ping, error) {
-				return types.Ping{APIVersion: "v1.33"}, errors.New("failed")
+				return types.Ping{APIVersion: "v1.44"}, errors.New("failed")
 			},
 			expectedServer: ServerInfo{HasExperimental: true},
 			negotiated:     true,

cli/command/container/create.go

@@ -25,7 +25,6 @@ import (
 	"github.com/docker/cli/internal/jsonstream"
 	"github.com/docker/cli/opts"
 	"github.com/moby/moby/api/types/mount"
-	"github.com/moby/moby/api/types/versions"
 	"github.com/moby/moby/client"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/spf13/cobra"
@@ -306,11 +305,7 @@ func createContainer(ctx context.Context, dockerCli command.Cli, containerCfg *c
 	}
 
 	var platform *ocispec.Platform
-	// Engine API version 1.41 first introduced the option to specify platform on
-	// create. It will produce an error if you try to set a platform on older API
-	// versions, so check the API version here to maintain backwards
-	// compatibility for CLI users.
-	if options.platform != "" && versions.GreaterThanOrEqualTo(dockerCli.Client().ClientVersion(), "1.41") {
+	if options.platform != "" {
 		p, err := platforms.Parse(options.platform)
 		if err != nil {
 			return "", invalidParameter(fmt.Errorf("error parsing specified platform: %w", err))

cli/command/container/run_test.go

@@ -61,7 +61,7 @@ func TestRunLabel(t *testing.T) {
 				ID: "id",
 			}, nil
 		},
-		Version: "1.36",
+		Version: client.MaxAPIVersion,
 	})
 	cmd := newRunCommand(fakeCLI)
 	cmd.SetArgs([]string{"--detach=true", "--label", "foo", "busybox"})
@@ -103,8 +103,8 @@ func TestRunAttach(t *testing.T) {
 			return responseChan, errChan
 		},
 		// use new (non-legacy) wait API
-		// see: 38591f20d07795aaef45d400df89ca12f29c603b
-		Version: "1.30",
+		// see: https://github.com/docker/cli/commit/38591f20d07795aaef45d400df89ca12f29c603b
+		Version: client.MaxAPIVersion,
 	}, func(fc *test.FakeCli) {
 		fc.SetOut(streams.NewOut(tty))
 		fc.SetIn(streams.NewIn(tty))
@@ -180,8 +180,8 @@ func TestRunAttachTermination(t *testing.T) {
 			return responseChan, errChan
 		},
 		// use new (non-legacy) wait API
-		// see: 38591f20d07795aaef45d400df89ca12f29c603b
-		Version: "1.30",
+		// see: https://github.com/docker/cli/commit/38591f20d07795aaef45d400df89ca12f29c603b
+		Version: client.MaxAPIVersion,
 	}, func(fc *test.FakeCli) {
 		fc.SetOut(streams.NewOut(tty))
 		fc.SetIn(streams.NewIn(tty))
@@ -262,7 +262,7 @@ func TestRunPullTermination(t *testing.T) {
 			attachCh <- struct{}{}
 			return respReader, nil
 		},
-		Version: "1.30",
+		Version: client.MaxAPIVersion,
 	})
 
 	cmd := newRunCommand(fakeCLI)

cli/command/formatter/buildcache.go

@@ -126,8 +126,6 @@ func (c *buildCacheContext) Parent() string {
 	var parent string
 	if len(c.v.Parents) > 0 {
 		parent = strings.Join(c.v.Parents, ", ")
-	} else {
-		parent = c.v.Parent //nolint:staticcheck // Ignore SA1019: Field was deprecated in API v1.42, but kept for backward compatibility
 	}
 	if c.trunc {
 		return TruncateID(parent)

cli/command/service/create.go

@@ -9,7 +9,6 @@ import (
 	"github.com/docker/cli/cli/command/completion"
 	cliopts "github.com/docker/cli/opts"
 	"github.com/moby/moby/api/types/swarm"
-	"github.com/moby/moby/api/types/versions"
 	"github.com/moby/moby/client"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
@@ -132,9 +131,7 @@ func runCreate(ctx context.Context, dockerCLI command.Cli, flags *pflag.FlagSet,
 	}
 
 	// query registry if flag disabling it was not set
-	if !opts.noResolveImage && versions.GreaterThanOrEqualTo(apiClient.ClientVersion(), "1.30") {
-		createOpts.QueryRegistry = true
-	}
+	createOpts.QueryRegistry = !opts.noResolveImage
 
 	response, err := apiClient.ServiceCreate(ctx, service, createOpts)
 	if err != nil {
@@ -147,7 +144,7 @@ func runCreate(ctx context.Context, dockerCLI command.Cli, flags *pflag.FlagSet,
 
 	_, _ = fmt.Fprintln(dockerCLI.Out(), response.ID)
 
-	if opts.detach || versions.LessThan(apiClient.ClientVersion(), "1.29") {
+	if opts.detach {
 		return nil
 	}
 

cli/command/service/list_test.go

@@ -10,7 +10,6 @@ import (
 	"github.com/docker/cli/internal/test"
 	"github.com/docker/cli/internal/test/builders"
 	"github.com/moby/moby/api/types/swarm"
-	"github.com/moby/moby/api/types/versions"
 	"github.com/moby/moby/client"
 	"gotest.tools/v3/assert"
 	is "gotest.tools/v3/assert/cmp"
@@ -63,59 +62,12 @@ func TestServiceListServiceStatus(t *testing.T) {
 			cluster:  &cluster{}, // force an empty cluster
 			expected: []listResponse{},
 		},
-		{
-			// Services are running, but no active nodes were found. On API v1.40
-			// and below, this will cause looking up the "running" tasks to fail,
-			// as well as looking up "desired" tasks for global services.
-			doc: "API v1.40 no active nodes",
-			opts: clusterOpts{
-				apiVersion:   "1.40",
-				activeNodes:  0,
-				runningTasks: 2,
-				desiredTasks: 4,
-			},
-			expected: []listResponse{
-				{ID: "replicated", Replicas: "0/4"},
-				{ID: "global", Replicas: "0/0"},
-				{ID: "none-id", Replicas: "0/0"},
-			},
-		},
-		{
-			doc: "API v1.40 3 active nodes, 1 task running",
-			opts: clusterOpts{
-				apiVersion:   "1.40",
-				activeNodes:  3,
-				runningTasks: 1,
-				desiredTasks: 2,
-			},
-			expected: []listResponse{
-				{ID: "replicated", Replicas: "1/2"},
-				{ID: "global", Replicas: "1/3"},
-				{ID: "none-id", Replicas: "0/0"},
-			},
-		},
-		{
-			doc: "API v1.40 3 active nodes, all tasks running",
-			opts: clusterOpts{
-				apiVersion:   "1.40",
-				activeNodes:  3,
-				runningTasks: 3,
-				desiredTasks: 3,
-			},
-			expected: []listResponse{
-				{ID: "replicated", Replicas: "3/3"},
-				{ID: "global", Replicas: "3/3"},
-				{ID: "none-id", Replicas: "0/0"},
-			},
-		},
-
 		{
 			// Services are running, but no active nodes were found. On API v1.41
 			// and up, the ServiceStatus is sent by the daemon, so this should not
 			// affect the results.
-			doc: "API v1.41 no active nodes",
+			doc: "no active nodes",
 			opts: clusterOpts{
-				apiVersion:   "1.41",
 				activeNodes:  0,
 				runningTasks: 2,
 				desiredTasks: 4,
@@ -127,9 +79,8 @@ func TestServiceListServiceStatus(t *testing.T) {
 			},
 		},
 		{
-			doc: "API v1.41 3 active nodes, 1 task running",
+			doc: "active nodes, 1 task running",
 			opts: clusterOpts{
-				apiVersion:   "1.41",
 				activeNodes:  3,
 				runningTasks: 1,
 				desiredTasks: 2,
@@ -141,9 +92,8 @@ func TestServiceListServiceStatus(t *testing.T) {
 			},
 		},
 		{
-			doc: "API v1.41 3 active nodes, all tasks running",
+			doc: "active nodes, all tasks running",
 			opts: clusterOpts{
-				apiVersion:   "1.41",
 				activeNodes:  3,
 				runningTasks: 3,
 				desiredTasks: 3,
@@ -174,7 +124,7 @@ func TestServiceListServiceStatus(t *testing.T) {
 			}
 			cli := test.NewFakeCli(&fakeClient{
 				serviceListFunc: func(ctx context.Context, options client.ServiceListOptions) ([]swarm.Service, error) {
-					if !options.Status || versions.LessThan(tc.opts.apiVersion, "1.41") {
+					if !options.Status {
 						// Don't return "ServiceStatus" if not requested, or on older API versions
 						for i := range tc.cluster.services {
 							tc.cluster.services[i].ServiceStatus = nil
@@ -214,7 +164,6 @@ func TestServiceListServiceStatus(t *testing.T) {
 }
 
 type clusterOpts struct {
-	apiVersion   string
 	activeNodes  uint64
 	desiredTasks uint64
 	runningTasks uint64

cli/command/service/rollback.go

@@ -6,7 +6,6 @@ import (
 
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
-	"github.com/moby/moby/api/types/versions"
 	"github.com/moby/moby/client"
 	"github.com/spf13/cobra"
 )
@@ -54,7 +53,7 @@ func runRollback(ctx context.Context, dockerCLI command.Cli, options *serviceOpt
 
 	_, _ = fmt.Fprintln(dockerCLI.Out(), serviceID)
 
-	if options.detach || versions.LessThan(apiClient.ClientVersion(), "1.29") {
+	if options.detach {
 		return nil
 	}
 

cli/command/service/rollback_test.go

@@ -48,7 +48,8 @@ func TestRollback(t *testing.T) {
 		})
 		cmd := newRollbackCommand(cli)
 		cmd.SetArgs(tc.args)
-		cmd.Flags().Set("quiet", "true")
+		assert.NilError(t, cmd.Flags().Set("quiet", "true"))
+		assert.NilError(t, cmd.Flags().Set("detach", "true"))
 		cmd.SetOut(io.Discard)
 		assert.NilError(t, cmd.Execute())
 		assert.Check(t, is.Equal(strings.TrimSpace(cli.ErrBuffer().String()), tc.expectedDockerCliErr))

cli/command/service/scale.go

@@ -9,7 +9,6 @@ import (
 
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
-	"github.com/moby/moby/api/types/versions"
 	"github.com/moby/moby/client"
 	"github.com/spf13/cobra"
 )
@@ -83,7 +82,7 @@ func runScale(ctx context.Context, dockerCLI command.Cli, options *scaleOptions,
 		serviceIDs = append(serviceIDs, serviceID)
 	}
 
-	if len(serviceIDs) > 0 && !options.detach && versions.GreaterThanOrEqualTo(dockerCLI.Client().ClientVersion(), "1.29") {
+	if len(serviceIDs) > 0 && !options.detach {
 		for _, serviceID := range serviceIDs {
 			if err := WaitOnService(ctx, dockerCLI, serviceID, false); err != nil {
 				errs = append(errs, fmt.Errorf("%s: %v", serviceID, err))