Refactor to remove dependency on github.com/moby/moby/pkg/progress

Co-authored-by: Claude <[email protected]>
Signed-off-by: Austin Vazquez <[email protected]>

Author: austinvazquez

cli/command/container/run_test.go

@@ -12,10 +12,10 @@ import (
 	"github.com/creack/pty"
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/streams"
+	"github.com/docker/cli/internal/progress"
 	"github.com/docker/cli/internal/streamformatter"
 	"github.com/docker/cli/internal/test"
 	"github.com/docker/cli/internal/test/notary"
-	"github.com/moby/moby/api/pkg/progress"
 	"github.com/moby/moby/api/types"
 	"github.com/moby/moby/api/types/container"
 	"github.com/moby/moby/api/types/network"

cli/command/image/build.go

@@ -19,10 +19,10 @@ import (
 	"github.com/docker/cli/cli/command/image/build"
 	"github.com/docker/cli/cli/streams"
 	"github.com/docker/cli/internal/jsonstream"
+	"github.com/docker/cli/internal/progress"
 	"github.com/docker/cli/internal/streamformatter"
 	"github.com/docker/cli/opts"
 	"github.com/moby/go-archive"
-	"github.com/moby/moby/api/pkg/progress"
 	buildtypes "github.com/moby/moby/api/types/build"
 	"github.com/moby/moby/api/types/container"
 	registrytypes "github.com/moby/moby/api/types/registry"

cli/command/image/build/context.go

@@ -18,10 +18,10 @@ import (
 	"time"
 
 	"github.com/docker/cli/cli/command/image/build/internal/git"
+	"github.com/docker/cli/internal/progress"
 	"github.com/docker/cli/internal/streamformatter"
 	"github.com/moby/go-archive"
 	"github.com/moby/go-archive/compression"
-	"github.com/moby/moby/api/pkg/progress"
 	"github.com/moby/patternmatcher"
 )
 

cli/command/service/progress/progress.go

@@ -12,8 +12,8 @@ import (
 	"time"
 
 	"github.com/docker/cli/cli/command/formatter"
+	"github.com/docker/cli/internal/progress"
 	"github.com/docker/cli/internal/streamformatter"
-	"github.com/moby/moby/api/pkg/progress"
 	"github.com/moby/moby/api/types/swarm"
 	"github.com/moby/moby/client"
 )

cli/command/service/progress/progress_test.go

@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/moby/moby/api/pkg/progress"
+	"github.com/docker/cli/internal/progress"
 	"github.com/moby/moby/api/types/swarm"
 	"gotest.tools/v3/assert"
 	is "gotest.tools/v3/assert/cmp"

cli/command/swarm/progress/root_rotation.go

@@ -8,8 +8,8 @@ import (
 	"os/signal"
 	"time"
 
+	"github.com/docker/cli/internal/progress"
 	"github.com/docker/cli/internal/streamformatter"
-	"github.com/moby/moby/api/pkg/progress"
 	"github.com/moby/moby/api/types/swarm"
 	"github.com/moby/moby/client"
 	"github.com/opencontainers/go-digest"

vendor/github.com/moby/moby/api/pkg/progress/progress.go renamed to internal/progress/progress.go

@@ -0,0 +1,74 @@
+package progress
+
+import (
+	"bytes"
+	"io"
+	"testing"
+)
+
+func TestOutputOnPrematureClose(t *testing.T) {
+	content := []byte("TESTING")
+	reader := io.NopCloser(bytes.NewReader(content))
+	progressChan := make(chan Progress, 10)
+
+	pr := NewProgressReader(reader, ChanOutput(progressChan), int64(len(content)), "Test", "Read")
+
+	part := make([]byte, 4)
+	_, err := io.ReadFull(pr, part)
+	if err != nil {
+		pr.Close()
+		t.Fatal(err)
+	}
+
+drainLoop:
+	for {
+		select {
+		case <-progressChan:
+		default:
+			break drainLoop
+		}
+	}
+
+	pr.Close()
+
+	select {
+	case <-progressChan:
+	default:
+		t.Fatalf("Expected some output when closing prematurely")
+	}
+}
+
+func TestCompleteSilently(t *testing.T) {
+	content := []byte("TESTING")
+	reader := io.NopCloser(bytes.NewReader(content))
+	progressChan := make(chan Progress, 10)
+
+	pr := NewProgressReader(reader, ChanOutput(progressChan), int64(len(content)), "Test", "Read")
+
+	out, err := io.ReadAll(pr)
+	if err != nil {
+		pr.Close()
+		t.Fatal(err)
+	}
+	if string(out) != "TESTING" {
+		pr.Close()
+		t.Fatalf("Unexpected output %q from reader", string(out))
+	}
+
+drainLoop:
+	for {
+		select {
+		case <-progressChan:
+		default:
+			break drainLoop
+		}
+	}
+
+	pr.Close()
+
+	select {
+	case <-progressChan:
+		t.Fatalf("Should have closed silently when read is complete")
+	default:
+	}
+}

vendor/github.com/moby/moby/api/pkg/progress/progressreader.go renamed to internal/progress/progressreader.go

@@ -9,8 +9,8 @@ import (
 	"sync"
 	"time"
 
+	"github.com/docker/cli/internal/progress"
 	"github.com/docker/go-units"
-	"github.com/moby/moby/api/pkg/progress"
 	"github.com/moby/moby/api/types/jsonstream"
 )