From ceda214deba683b6a2af8d30b43b6fee3ab50982 Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Wed, 31 Jul 2024 11:41:51 +0200
Subject: [PATCH] util/compression: move type definition together with
 implementation

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 util/compression/compression.go  | 7 -------
 util/compression/estargz.go      | 2 ++
 util/compression/gzip.go         | 2 ++
 util/compression/nydus.go        | 4 ++--
 util/compression/uncompressed.go | 2 ++
 util/compression/zstd.go         | 2 ++
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/util/compression/compression.go b/util/compression/compression.go
index 44319cfc9dbe..1b19d78911b5 100644
--- a/util/compression/compression.go
+++ b/util/compression/compression.go
@@ -32,13 +32,6 @@ type Type interface {
 	String() string
 }
 
-type (
-	uncompressedType struct{}
-	gzipType         struct{}
-	estargzType      struct{}
-	zstdType         struct{}
-)
-
 var (
 	// Uncompressed indicates no compression.
 	Uncompressed = uncompressedType{}
diff --git a/util/compression/estargz.go b/util/compression/estargz.go
index ef6f853a7511..c8f6df3a59bf 100644
--- a/util/compression/estargz.go
+++ b/util/compression/estargz.go
@@ -24,6 +24,8 @@ var EStargzAnnotations = []string{estargz.TOCJSONDigestAnnotation, estargz.Store
 
 const estargzLabel = "buildkit.io/compression/estargz"
 
+type estargzType struct{}
+
 func (c estargzType) Compress(ctx context.Context, comp Config) (compressorFunc Compressor, finalize Finalizer) {
 	var cInfo *compressionInfo
 	var writeErr error
diff --git a/util/compression/gzip.go b/util/compression/gzip.go
index aafded866f3a..c869de194212 100644
--- a/util/compression/gzip.go
+++ b/util/compression/gzip.go
@@ -10,6 +10,8 @@ import (
 	ocispecs "github.com/opencontainers/image-spec/specs-go/v1"
 )
 
+type gzipType struct{}
+
 func (c gzipType) Compress(ctx context.Context, comp Config) (compressorFunc Compressor, finalize Finalizer) {
 	return func(dest io.Writer, _ string) (io.WriteCloser, error) {
 		return gzipWriter(comp)(dest)
diff --git a/util/compression/nydus.go b/util/compression/nydus.go
index 99a9428094c4..80602f87f70c 100644
--- a/util/compression/nydus.go
+++ b/util/compression/nydus.go
@@ -17,8 +17,6 @@ import (
 	nydusify "github.com/containerd/nydus-snapshotter/pkg/converter"
 )
 
-type nydusType struct{}
-
 var Nydus = nydusType{}
 
 func init() {
@@ -28,6 +26,8 @@ func init() {
 	toCompressionType[Nydus.String()] = Nydus
 }
 
+type nydusType struct{}
+
 func (c nydusType) Compress(ctx context.Context, comp Config) (compressorFunc Compressor, finalize Finalizer) {
 	digester := digest.Canonical.Digester()
 	return func(dest io.Writer, requiredMediaType string) (io.WriteCloser, error) {
diff --git a/util/compression/uncompressed.go b/util/compression/uncompressed.go
index a232e58d0c69..9908c415facf 100644
--- a/util/compression/uncompressed.go
+++ b/util/compression/uncompressed.go
@@ -10,6 +10,8 @@ import (
 	ocispecs "github.com/opencontainers/image-spec/specs-go/v1"
 )
 
+type uncompressedType struct{}
+
 func (c uncompressedType) Compress(ctx context.Context, comp Config) (compressorFunc Compressor, finalize Finalizer) {
 	return func(dest io.Writer, mediaType string) (io.WriteCloser, error) {
 		return &iohelper.NopWriteCloser{Writer: dest}, nil
diff --git a/util/compression/zstd.go b/util/compression/zstd.go
index 3ef056e5de40..d05b1ee78bbd 100644
--- a/util/compression/zstd.go
+++ b/util/compression/zstd.go
@@ -10,6 +10,8 @@ import (
 	ocispecs "github.com/opencontainers/image-spec/specs-go/v1"
 )
 
+type zstdType struct{}
+
 func (c zstdType) Compress(ctx context.Context, comp Config) (compressorFunc Compressor, finalize Finalizer) {
 	return func(dest io.Writer, _ string) (io.WriteCloser, error) {
 		return zstdWriter(comp)(dest)