Merge pull request #6525 from thaJeztah/rm_client_side_autorm

remove support for AutoRemove (`--rm`) on API < 1.30

cli/command/container/utils.go

@@ -3,12 +3,8 @@ package container
 import (
 	"context"
 	"errors"
-	"strconv"
 
 	"github.com/moby/moby/api/types/container"
-	"github.com/moby/moby/api/types/events"
-	"github.com/moby/moby/api/types/filters"
-	"github.com/moby/moby/api/types/versions"
 	"github.com/moby/moby/client"
 	"github.com/sirupsen/logrus"
 )
@@ -19,13 +15,6 @@ func waitExitOrRemoved(ctx context.Context, apiClient client.APIClient, containe
 		panic("Internal Error: waitExitOrRemoved needs a containerID as parameter")
 	}
 
-	// Older versions used the Events API, and even older versions did not
-	// support server-side removal. This legacyWaitExitOrRemoved method
-	// preserves that old behavior and any issues it may have.
-	if versions.LessThan(apiClient.ClientVersion(), "1.30") {
-		return legacyWaitExitOrRemoved(ctx, apiClient, containerID, waitRemove)
-	}
-
 	condition := container.WaitConditionNextExit
 	if waitRemove {
 		condition = container.WaitConditionRemoved
@@ -58,81 +47,6 @@ func waitExitOrRemoved(ctx context.Context, apiClient client.APIClient, containe
 	return statusC
 }
 
-func legacyWaitExitOrRemoved(ctx context.Context, apiClient client.APIClient, containerID string, waitRemove bool) <-chan int {
-	var removeErr error
-	statusChan := make(chan int)
-	exitCode := 125
-
-	// Get events via Events API
-	f := filters.NewArgs()
-	f.Add("type", "container")
-	f.Add("container", containerID)
-
-	eventCtx, cancel := context.WithCancel(ctx)
-	eventq, errq := apiClient.Events(eventCtx, client.EventsListOptions{
-		Filters: f,
-	})
-
-	eventProcessor := func(e events.Message) bool {
-		stopProcessing := false
-		switch e.Action { //nolint:exhaustive // TODO(thaJeztah): make exhaustive
-		case events.ActionDie:
-			if v, ok := e.Actor.Attributes["exitCode"]; ok {
-				code, cerr := strconv.Atoi(v)
-				if cerr != nil {
-					logrus.Errorf("failed to convert exitcode '%q' to int: %v", v, cerr)
-				} else {
-					exitCode = code
-				}
-			}
-			if !waitRemove {
-				stopProcessing = true
-			} else if versions.LessThan(apiClient.ClientVersion(), "1.25") {
-				// If we are talking to an older daemon, `AutoRemove` is not supported.
-				// We need to fall back to the old behavior, which is client-side removal
-				go func() {
-					removeErr = apiClient.ContainerRemove(ctx, containerID, client.ContainerRemoveOptions{RemoveVolumes: true})
-					if removeErr != nil {
-						logrus.Errorf("error removing container: %v", removeErr)
-						cancel() // cancel the event Q
-					}
-				}()
-			}
-		case events.ActionDetach:
-			exitCode = 0
-			stopProcessing = true
-		case events.ActionDestroy:
-			stopProcessing = true
-		}
-		return stopProcessing
-	}
-
-	go func() {
-		defer func() {
-			statusChan <- exitCode // must always send an exit code or the caller will block
-			cancel()
-		}()
-
-		for {
-			select {
-			case <-eventCtx.Done():
-				if removeErr != nil {
-					return
-				}
-			case evt := <-eventq:
-				if eventProcessor(evt) {
-					return
-				}
-			case err := <-errq:
-				logrus.Errorf("error getting events from daemon: %v", err)
-				return
-			}
-		}
-	}()
-
-	return statusChan
-}
-
 func parallelOperation(ctx context.Context, containers []string, op func(ctx context.Context, containerID string) error) chan error {
 	if len(containers) == 0 {
 		return nil