Move pkg/streamformatter to api/pkg/streamformatter

dmcgowan · thaJeztah · commit d00ecdc479ca · 2025-07-30T14:22:31.000+02:00
Signed-off-by: Derek McGowan &lt;derek@mcg.dev&gt;
Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
diff --git a/api/go.mod b/api/go.mod
@@ -5,11 +5,10 @@ go 1.23.0
 require (
 	github.com/docker/go-connections v0.5.0
 	github.com/docker/go-units v0.5.0
+	github.com/google/go-cmp v0.5.9
 	github.com/moby/docker-image-spec v1.3.1
 	github.com/opencontainers/go-digest v1.0.0
 	github.com/opencontainers/image-spec v1.1.1
 	golang.org/x/time v0.11.0
 	gotest.tools/v3 v3.5.2
 )
-
-require github.com/google/go-cmp v0.5.9 // indirect
diff --git a/api/pkg/streamformatter/streamformatter.go b/api/pkg/streamformatter/streamformatter.go
diff --git a/api/pkg/streamformatter/streamformatter_test.go b/api/pkg/streamformatter/streamformatter_test.go
diff --git a/api/pkg/streamformatter/streamwriter.go b/api/pkg/streamformatter/streamwriter.go
diff --git a/api/pkg/streamformatter/streamwriter_test.go b/api/pkg/streamformatter/streamwriter_test.go
diff --git a/daemon/builder/dockerfile/copy.go b/daemon/builder/dockerfile/copy.go
@@ -19,10 +19,10 @@ import (
 	"github.com/docker/docker/daemon/builder/remotecontext/urlutil"
 	"github.com/docker/docker/daemon/internal/system"
 	"github.com/docker/docker/pkg/longpath"
-	"github.com/docker/docker/pkg/streamformatter"
 	"github.com/moby/buildkit/frontend/dockerfile/instructions"
 	"github.com/moby/go-archive"
 	"github.com/moby/moby/api/pkg/progress"
+	"github.com/moby/moby/api/pkg/streamformatter"
 	"github.com/moby/sys/symlink"
 	"github.com/moby/sys/user"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
diff --git a/daemon/containerd/image_builder.go b/daemon/containerd/image_builder.go
@@ -27,10 +27,10 @@ import (
 	"github.com/docker/docker/daemon/internal/stringid"
 	"github.com/docker/docker/daemon/server/backend"
 	"github.com/docker/docker/errdefs"
-	"github.com/docker/docker/pkg/streamformatter"
 	imagespec "github.com/moby/docker-image-spec/specs-go/v1"
 	"github.com/moby/go-archive"
 	"github.com/moby/moby/api/pkg/progress"
+	"github.com/moby/moby/api/pkg/streamformatter"
 	"github.com/moby/moby/api/types/container"
 	"github.com/moby/moby/api/types/events"
 	"github.com/moby/moby/api/types/registry"
diff --git a/daemon/containerd/image_exporter.go b/daemon/containerd/image_exporter.go
@@ -17,8 +17,8 @@ import (
 	"github.com/distribution/reference"
 	"github.com/docker/docker/daemon/images"
 	"github.com/docker/docker/errdefs"
-	"github.com/docker/docker/pkg/streamformatter"
 	"github.com/moby/go-archive/compression"
+	"github.com/moby/moby/api/pkg/streamformatter"
 	"github.com/moby/moby/api/types/events"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
diff --git a/daemon/containerd/image_pull.go b/daemon/containerd/image_pull.go
@@ -20,8 +20,8 @@ import (
 	"github.com/docker/docker/daemon/internal/metrics"
 	"github.com/docker/docker/daemon/internal/stringid"
 	"github.com/docker/docker/errdefs"
-	"github.com/docker/docker/pkg/streamformatter"
 	"github.com/moby/moby/api/pkg/progress"
+	"github.com/moby/moby/api/pkg/streamformatter"
 	"github.com/moby/moby/api/types/events"
 	registrytypes "github.com/moby/moby/api/types/registry"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
diff --git a/daemon/containerd/image_push.go b/daemon/containerd/image_push.go
@@ -19,8 +19,8 @@ import (
 	"github.com/distribution/reference"
 	"github.com/docker/docker/daemon/internal/metrics"
 	"github.com/docker/docker/errdefs"
-	"github.com/docker/docker/pkg/streamformatter"
 	"github.com/moby/moby/api/pkg/progress"
+	"github.com/moby/moby/api/pkg/streamformatter"
 	"github.com/moby/moby/api/types/auxprogress"
 	"github.com/moby/moby/api/types/events"
 	"github.com/moby/moby/api/types/registry"
diff --git a/daemon/images/image_builder.go b/daemon/images/image_builder.go
@@ -14,8 +14,8 @@ import (
 	"github.com/docker/docker/daemon/internal/layer"
 	"github.com/docker/docker/daemon/internal/stringid"
 	"github.com/docker/docker/daemon/server/backend"
-	"github.com/docker/docker/pkg/streamformatter"
 	"github.com/moby/moby/api/pkg/progress"
+	"github.com/moby/moby/api/pkg/streamformatter"
 	"github.com/moby/moby/api/types/registry"
 	"github.com/opencontainers/go-digest"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
diff --git a/daemon/images/image_pull.go b/daemon/images/image_pull.go
@@ -14,8 +14,8 @@ import (
 	progressutils "github.com/docker/docker/daemon/internal/distribution/utils"
 	"github.com/docker/docker/daemon/internal/metrics"
 	"github.com/docker/docker/daemon/server/backend"
-	"github.com/docker/docker/pkg/streamformatter"
 	"github.com/moby/moby/api/pkg/progress"
+	"github.com/moby/moby/api/pkg/streamformatter"
 	"github.com/moby/moby/api/types/registry"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
diff --git a/daemon/internal/builder-next/builder.go b/daemon/internal/builder-next/builder.go
@@ -22,14 +22,14 @@ import (
 	"github.com/docker/docker/daemon/pkg/opts"
 	"github.com/docker/docker/daemon/server/backend"
 	"github.com/docker/docker/errdefs"
-	"github.com/docker/docker/pkg/streamformatter"
 	controlapi "github.com/moby/buildkit/api/services/control"
 	"github.com/moby/buildkit/client"
 	"github.com/moby/buildkit/control"
 	"github.com/moby/buildkit/identity"
 	"github.com/moby/buildkit/session"
 	"github.com/moby/buildkit/util/entitlements"
 	"github.com/moby/buildkit/util/tracing"
+	"github.com/moby/moby/api/pkg/streamformatter"
 	"github.com/moby/moby/api/types/build"
 	"github.com/moby/moby/api/types/container"
 	"github.com/moby/moby/api/types/network"
diff --git a/daemon/internal/distribution/utils/progress.go b/daemon/internal/distribution/utils/progress.go
@@ -7,8 +7,8 @@ import (
 	"syscall"
 
 	"github.com/containerd/log"
-	"github.com/docker/docker/pkg/streamformatter"
 	"github.com/moby/moby/api/pkg/progress"
+	"github.com/moby/moby/api/pkg/streamformatter"
 )
 
 // WriteDistributionProgress is a helper for writing progress from chan to JSON
diff --git a/daemon/internal/image/tarexport/load.go b/daemon/internal/image/tarexport/load.go
@@ -19,10 +19,10 @@ import (
 	"github.com/docker/docker/daemon/internal/ioutils"
 	"github.com/docker/docker/daemon/internal/layer"
 	"github.com/docker/docker/daemon/internal/stringid"
-	"github.com/docker/docker/pkg/streamformatter"
 	"github.com/moby/go-archive/chrootarchive"
 	"github.com/moby/go-archive/compression"
 	"github.com/moby/moby/api/pkg/progress"
+	"github.com/moby/moby/api/pkg/streamformatter"
 	"github.com/moby/moby/api/types/events"
 	"github.com/moby/sys/sequential"
 	"github.com/moby/sys/symlink"
diff --git a/daemon/server/router/build/build_routes.go b/daemon/server/router/build/build_routes.go
@@ -19,8 +19,8 @@ import (
 	"github.com/docker/docker/daemon/server/backend"
 	"github.com/docker/docker/daemon/server/httputils"
 	"github.com/docker/docker/pkg/ioutils"
-	"github.com/docker/docker/pkg/streamformatter"
 	"github.com/moby/moby/api/pkg/progress"
+	"github.com/moby/moby/api/pkg/streamformatter"
 	"github.com/moby/moby/api/types/build"
 	"github.com/moby/moby/api/types/container"
 	"github.com/moby/moby/api/types/filters"
diff --git a/daemon/server/router/image/image_routes.go b/daemon/server/router/image/image_routes.go
@@ -19,8 +19,8 @@ import (
 	"github.com/docker/docker/dockerversion"
 	"github.com/docker/docker/errdefs"
 	"github.com/docker/docker/pkg/ioutils"
-	"github.com/docker/docker/pkg/streamformatter"
 	"github.com/moby/moby/api/pkg/progress"
+	"github.com/moby/moby/api/pkg/streamformatter"
 	"github.com/moby/moby/api/types/filters"
 	imagetypes "github.com/moby/moby/api/types/image"
 	"github.com/moby/moby/api/types/registry"
diff --git a/daemon/server/router/plugin/plugin_routes.go b/daemon/server/router/plugin/plugin_routes.go
@@ -10,7 +10,7 @@ import (
 	"github.com/docker/docker/daemon/server/backend"
 	"github.com/docker/docker/daemon/server/httputils"
 	"github.com/docker/docker/pkg/ioutils"
-	"github.com/docker/docker/pkg/streamformatter"
+	"github.com/moby/moby/api/pkg/streamformatter"
 	"github.com/moby/moby/api/types"
 	"github.com/moby/moby/api/types/filters"
 	"github.com/moby/moby/api/types/registry"
diff --git a/vendor/github.com/moby/moby/api/pkg/streamformatter/streamformatter.go b/vendor/github.com/moby/moby/api/pkg/streamformatter/streamformatter.go
diff --git a/vendor/github.com/moby/moby/api/pkg/streamformatter/streamwriter.go b/vendor/github.com/moby/moby/api/pkg/streamformatter/streamwriter.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
