Move all internal/ packages to a root internal/ (#983)

This will simplify my life a bit.
google · Apr 16, 2021 · 23990da · 23990da
1 parent 549ee62
commit 23990da
Show file tree

Hide file tree

Showing 49 changed files with 36 additions and 36 deletions.
diff --git a/pkg/v1/internal/and/and_closer.go → internal/and/and_closer.go b/pkg/v1/internal/and/and_closer.go → internal/and/and_closer.go
diff --git a/pkg/v1/internal/and/and_closer_test.go → internal/and/and_closer_test.go b/pkg/v1/internal/and/and_closer_test.go → internal/and/and_closer_test.go
diff --git a/pkg/internal/compare/doc.go → internal/compare/doc.go b/pkg/internal/compare/doc.go → internal/compare/doc.go
diff --git a/pkg/internal/compare/image.go → internal/compare/image.go b/pkg/internal/compare/image.go → internal/compare/image.go
diff --git a/pkg/internal/compare/image_test.go → internal/compare/image_test.go b/pkg/internal/compare/image_test.go → internal/compare/image_test.go
diff --git a/pkg/internal/compare/index.go → internal/compare/index.go b/pkg/internal/compare/index.go → internal/compare/index.go
diff --git a/pkg/internal/compare/index_test.go → internal/compare/index_test.go b/pkg/internal/compare/index_test.go → internal/compare/index_test.go
diff --git a/pkg/internal/compare/layer.go → internal/compare/layer.go b/pkg/internal/compare/layer.go → internal/compare/layer.go
diff --git a/pkg/internal/compare/layer_test.go → internal/compare/layer_test.go b/pkg/internal/compare/layer_test.go → internal/compare/layer_test.go
diff --git a/pkg/v1/internal/estargz/estargz.go → internal/estargz/estargz.go b/pkg/v1/internal/estargz/estargz.go → internal/estargz/estargz.go
diff --git a/pkg/v1/internal/estargz/estargz_test.go → internal/estargz/estargz_test.go b/pkg/v1/internal/estargz/estargz_test.go → internal/estargz/estargz_test.go
@@ -23,7 +23,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/google/go-containerregistry/pkg/v1/internal/gzip"
+	"github.com/google/go-containerregistry/internal/gzip"
 )
 
 func TestReader(t *testing.T) {

diff --git a/pkg/v1/internal/gzip/zip.go → internal/gzip/zip.go b/pkg/v1/internal/gzip/zip.go → internal/gzip/zip.go
@@ -20,7 +20,7 @@ import (
 	"compress/gzip"
 	"io"
 
-	"github.com/google/go-containerregistry/pkg/v1/internal/and"
+	"github.com/google/go-containerregistry/internal/and"
 )
 
 var gzipMagicHeader = []byte{'\x1f', '\x8b'}

diff --git a/pkg/v1/internal/gzip/zip_test.go → internal/gzip/zip_test.go b/pkg/v1/internal/gzip/zip_test.go → internal/gzip/zip_test.go
diff --git a/pkg/internal/httptest/httptest.go → internal/httptest/httptest.go b/pkg/internal/httptest/httptest.go → internal/httptest/httptest.go
diff --git a/pkg/internal/legacy/copy.go → internal/legacy/copy.go b/pkg/internal/legacy/copy.go → internal/legacy/copy.go
diff --git a/pkg/internal/legacy/copy_test.go → internal/legacy/copy_test.go b/pkg/internal/legacy/copy_test.go → internal/legacy/copy_test.go
diff --git a/pkg/internal/redact/redact.go → internal/redact/redact.go b/pkg/internal/redact/redact.go → internal/redact/redact.go
diff --git a/pkg/internal/retry/retry.go → internal/retry/retry.go b/pkg/internal/retry/retry.go → internal/retry/retry.go
@@ -20,7 +20,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/google/go-containerregistry/pkg/internal/retry/wait"
+	"github.com/google/go-containerregistry/internal/retry/wait"
 )
 
 // Backoff is an alias of our own wait.Backoff to avoid name conflicts with

diff --git a/pkg/internal/retry/retry_test.go → internal/retry/retry_test.go b/pkg/internal/retry/retry_test.go → internal/retry/retry_test.go
diff --git a/...etry/wait/kubernetes_apimachinery_wait.go → ...etry/wait/kubernetes_apimachinery_wait.go b/...etry/wait/kubernetes_apimachinery_wait.go → ...etry/wait/kubernetes_apimachinery_wait.go
diff --git a/pkg/v1/internal/verify/verify.go → internal/verify/verify.go b/pkg/v1/internal/verify/verify.go → internal/verify/verify.go
@@ -20,8 +20,8 @@ import (
 	"hash"
 	"io"
 
+	"github.com/google/go-containerregistry/internal/and"
 	v1 "github.com/google/go-containerregistry/pkg/v1"
-	"github.com/google/go-containerregistry/pkg/v1/internal/and"
 )
 
 type verifyReader struct {

diff --git a/pkg/v1/internal/verify/verify_test.go → internal/verify/verify_test.go b/pkg/v1/internal/verify/verify_test.go → internal/verify/verify_test.go
diff --git a/pkg/crane/copy.go b/pkg/crane/copy.go
@@ -17,8 +17,8 @@ package crane
 import (
 	"fmt"
 
+	"github.com/google/go-containerregistry/internal/legacy"
 	"github.com/google/go-containerregistry/pkg/authn"
-	"github.com/google/go-containerregistry/pkg/internal/legacy"
 	"github.com/google/go-containerregistry/pkg/logs"
 	"github.com/google/go-containerregistry/pkg/name"
 	"github.com/google/go-containerregistry/pkg/v1/remote"

diff --git a/pkg/crane/crane_test.go b/pkg/crane/crane_test.go
@@ -28,9 +28,9 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/google/go-containerregistry/internal/compare"
 	"github.com/google/go-containerregistry/pkg/authn"
 	"github.com/google/go-containerregistry/pkg/crane"
-	"github.com/google/go-containerregistry/pkg/internal/compare"
 	"github.com/google/go-containerregistry/pkg/name"
 	"github.com/google/go-containerregistry/pkg/registry"
 	v1 "github.com/google/go-containerregistry/pkg/v1"

diff --git a/pkg/gcrane/copy.go b/pkg/gcrane/copy.go
@@ -21,9 +21,9 @@ import (
 	"strings"
 	"time"
 
+	"github.com/google/go-containerregistry/internal/retry"
 	"github.com/google/go-containerregistry/pkg/authn"
 	"github.com/google/go-containerregistry/pkg/crane"
-	"github.com/google/go-containerregistry/pkg/internal/retry"
 	"github.com/google/go-containerregistry/pkg/logs"
 	"github.com/google/go-containerregistry/pkg/name"
 	"github.com/google/go-containerregistry/pkg/v1/google"

diff --git a/pkg/gcrane/copy_test.go b/pkg/gcrane/copy_test.go
@@ -29,8 +29,8 @@ import (
 	"time"
 
 	"github.com/google/go-cmp/cmp"
-	ggcrtest "github.com/google/go-containerregistry/pkg/internal/httptest"
-	"github.com/google/go-containerregistry/pkg/internal/retry"
+	ggcrtest "github.com/google/go-containerregistry/internal/httptest"
+	"github.com/google/go-containerregistry/internal/retry"
 	"github.com/google/go-containerregistry/pkg/logs"
 	"github.com/google/go-containerregistry/pkg/name"
 	"github.com/google/go-containerregistry/pkg/registry"

diff --git a/pkg/legacy/tarball/write_test.go b/pkg/legacy/tarball/write_test.go
@@ -24,7 +24,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/google/go-containerregistry/pkg/internal/compare"
+	"github.com/google/go-containerregistry/internal/compare"
 	"github.com/google/go-containerregistry/pkg/name"
 	v1 "github.com/google/go-containerregistry/pkg/v1"
 	"github.com/google/go-containerregistry/pkg/v1/mutate"

diff --git a/pkg/registry/tls.go b/pkg/registry/tls.go
@@ -17,7 +17,7 @@ package registry
 import (
 	"net/http/httptest"
 
-	ggcrtest "github.com/google/go-containerregistry/pkg/internal/httptest"
+	ggcrtest "github.com/google/go-containerregistry/internal/httptest"
 )
 
 // TLS returns an httptest server, with an http client that has been configured to

diff --git a/pkg/v1/daemon/image_test.go b/pkg/v1/daemon/image_test.go
@@ -21,7 +21,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/google/go-containerregistry/pkg/internal/compare"
+	"github.com/google/go-containerregistry/internal/compare"
 	"github.com/google/go-containerregistry/pkg/name"
 
 	"github.com/google/go-containerregistry/pkg/v1/tarball"

diff --git a/pkg/v1/mutate/mutate.go b/pkg/v1/mutate/mutate.go
@@ -24,9 +24,9 @@ import (
 	"strings"
 	"time"
 
+	"github.com/google/go-containerregistry/internal/gzip"
 	v1 "github.com/google/go-containerregistry/pkg/v1"
 	"github.com/google/go-containerregistry/pkg/v1/empty"
-	"github.com/google/go-containerregistry/pkg/v1/internal/gzip"
 	"github.com/google/go-containerregistry/pkg/v1/match"
 	"github.com/google/go-containerregistry/pkg/v1/tarball"
 	"github.com/google/go-containerregistry/pkg/v1/types"

diff --git a/pkg/v1/partial/compressed.go b/pkg/v1/partial/compressed.go
@@ -17,8 +17,8 @@ package partial
 import (
 	"io"
 
+	"github.com/google/go-containerregistry/internal/gzip"
 	v1 "github.com/google/go-containerregistry/pkg/v1"
-	"github.com/google/go-containerregistry/pkg/v1/internal/gzip"
 	"github.com/google/go-containerregistry/pkg/v1/types"
 )
 

diff --git a/pkg/v1/partial/compressed_test.go b/pkg/v1/partial/compressed_test.go
@@ -19,7 +19,7 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
-	"github.com/google/go-containerregistry/pkg/internal/compare"
+	"github.com/google/go-containerregistry/internal/compare"
 	"github.com/google/go-containerregistry/pkg/name"
 	"github.com/google/go-containerregistry/pkg/registry"
 	v1 "github.com/google/go-containerregistry/pkg/v1"

diff --git a/pkg/v1/partial/uncompressed.go b/pkg/v1/partial/uncompressed.go
@@ -19,8 +19,8 @@ import (
 	"io"
 	"sync"
 
+	"github.com/google/go-containerregistry/internal/gzip"
 	v1 "github.com/google/go-containerregistry/pkg/v1"
-	"github.com/google/go-containerregistry/pkg/v1/internal/gzip"
 	"github.com/google/go-containerregistry/pkg/v1/types"
 )
 

diff --git a/pkg/v1/partial/uncompressed_test.go b/pkg/v1/partial/uncompressed_test.go
@@ -20,7 +20,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/google/go-containerregistry/pkg/internal/compare"
+	"github.com/google/go-containerregistry/internal/compare"
 	legacy "github.com/google/go-containerregistry/pkg/legacy/tarball"
 	"github.com/google/go-containerregistry/pkg/name"
 	v1 "github.com/google/go-containerregistry/pkg/v1"

diff --git a/pkg/v1/remote/descriptor.go b/pkg/v1/remote/descriptor.go
@@ -25,10 +25,10 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/google/go-containerregistry/internal/verify"
 	"github.com/google/go-containerregistry/pkg/logs"
 	"github.com/google/go-containerregistry/pkg/name"
 	v1 "github.com/google/go-containerregistry/pkg/v1"
-	"github.com/google/go-containerregistry/pkg/v1/internal/verify"
 	"github.com/google/go-containerregistry/pkg/v1/partial"
 	"github.com/google/go-containerregistry/pkg/v1/remote/transport"
 	"github.com/google/go-containerregistry/pkg/v1/types"

diff --git a/pkg/v1/remote/image.go b/pkg/v1/remote/image.go
@@ -21,10 +21,10 @@ import (
 	"net/url"
 	"sync"
 
-	"github.com/google/go-containerregistry/pkg/internal/redact"
+	"github.com/google/go-containerregistry/internal/redact"
+	"github.com/google/go-containerregistry/internal/verify"
 	"github.com/google/go-containerregistry/pkg/name"
 	v1 "github.com/google/go-containerregistry/pkg/v1"
-	"github.com/google/go-containerregistry/pkg/v1/internal/verify"
 	"github.com/google/go-containerregistry/pkg/v1/partial"
 	"github.com/google/go-containerregistry/pkg/v1/remote/transport"
 	"github.com/google/go-containerregistry/pkg/v1/types"

diff --git a/pkg/v1/remote/layer.go b/pkg/v1/remote/layer.go
@@ -17,7 +17,7 @@ package remote
 import (
 	"io"
 
-	"github.com/google/go-containerregistry/pkg/internal/redact"
+	"github.com/google/go-containerregistry/internal/redact"
 	"github.com/google/go-containerregistry/pkg/name"
 	v1 "github.com/google/go-containerregistry/pkg/v1"
 	"github.com/google/go-containerregistry/pkg/v1/partial"

diff --git a/pkg/v1/remote/layer_test.go b/pkg/v1/remote/layer_test.go
@@ -20,7 +20,7 @@ import (
 	"net/url"
 	"testing"
 
-	"github.com/google/go-containerregistry/pkg/internal/compare"
+	"github.com/google/go-containerregistry/internal/compare"
 	"github.com/google/go-containerregistry/pkg/name"
 	"github.com/google/go-containerregistry/pkg/registry"
 	"github.com/google/go-containerregistry/pkg/v1/empty"

diff --git a/pkg/v1/remote/transport/bearer.go b/pkg/v1/remote/transport/bearer.go
@@ -25,8 +25,8 @@ import (
 	"strings"
 
 	authchallenge "github.com/docker/distribution/registry/client/auth/challenge"
+	"github.com/google/go-containerregistry/internal/redact"
 	"github.com/google/go-containerregistry/pkg/authn"
-	"github.com/google/go-containerregistry/pkg/internal/redact"
 	"github.com/google/go-containerregistry/pkg/name"
 )
 

diff --git a/pkg/v1/remote/transport/error.go b/pkg/v1/remote/transport/error.go
@@ -100,7 +100,7 @@ func (e *Error) Temporary() bool {
 	return true
 }
 
-// TODO(jonjohnsonjr): Consider moving to pkg/internal/redact.
+// TODO(jonjohnsonjr): Consider moving to internal/redact.
 func redactURL(original *url.URL) *url.URL {
 	qs := original.Query()
 	for k, v := range qs {

diff --git a/pkg/v1/remote/transport/logger.go b/pkg/v1/remote/transport/logger.go
@@ -20,7 +20,7 @@ import (
 	"net/http/httputil"
 	"time"
 
-	"github.com/google/go-containerregistry/pkg/internal/redact"
+	"github.com/google/go-containerregistry/internal/redact"
 	"github.com/google/go-containerregistry/pkg/logs"
 )
 

diff --git a/pkg/v1/remote/transport/logger_test.go b/pkg/v1/remote/transport/logger_test.go
@@ -23,7 +23,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/google/go-containerregistry/pkg/internal/redact"
+	"github.com/google/go-containerregistry/internal/redact"
 	"github.com/google/go-containerregistry/pkg/logs"
 )
 

diff --git a/pkg/v1/remote/transport/retry.go b/pkg/v1/remote/transport/retry.go
@@ -18,7 +18,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/google/go-containerregistry/pkg/internal/retry"
+	"github.com/google/go-containerregistry/internal/retry"
 )
 
 // Sleep for 0.1, 0.3, 0.9, 2.7 seconds. This should cover networking blips.

diff --git a/pkg/v1/remote/transport/retry_test.go b/pkg/v1/remote/transport/retry_test.go
@@ -21,7 +21,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/google/go-containerregistry/pkg/internal/retry"
+	"github.com/google/go-containerregistry/internal/retry"
 )
 
 type mockTransport struct {

diff --git a/pkg/v1/remote/write.go b/pkg/v1/remote/write.go
@@ -26,8 +26,8 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/google/go-containerregistry/pkg/internal/redact"
-	"github.com/google/go-containerregistry/pkg/internal/retry"
+	"github.com/google/go-containerregistry/internal/redact"
+	"github.com/google/go-containerregistry/internal/retry"
 	"github.com/google/go-containerregistry/pkg/logs"
 	"github.com/google/go-containerregistry/pkg/name"
 	v1 "github.com/google/go-containerregistry/pkg/v1"

diff --git a/pkg/v1/tarball/image.go b/pkg/v1/tarball/image.go
@@ -25,9 +25,9 @@ import (
 	"os"
 	"sync"
 
+	"github.com/google/go-containerregistry/internal/gzip"
 	"github.com/google/go-containerregistry/pkg/name"
 	v1 "github.com/google/go-containerregistry/pkg/v1"
-	"github.com/google/go-containerregistry/pkg/v1/internal/gzip"
 	"github.com/google/go-containerregistry/pkg/v1/partial"
 	"github.com/google/go-containerregistry/pkg/v1/types"
 )

diff --git a/pkg/v1/tarball/layer.go b/pkg/v1/tarball/layer.go
@@ -23,10 +23,10 @@ import (
 	"sync"
 
 	"github.com/containerd/stargz-snapshotter/estargz"
+	"github.com/google/go-containerregistry/internal/and"
+	gestargz "github.com/google/go-containerregistry/internal/estargz"
+	ggzip "github.com/google/go-containerregistry/internal/gzip"
 	v1 "github.com/google/go-containerregistry/pkg/v1"
-	"github.com/google/go-containerregistry/pkg/v1/internal/and"
-	gestargz "github.com/google/go-containerregistry/pkg/v1/internal/estargz"
-	ggzip "github.com/google/go-containerregistry/pkg/v1/internal/gzip"
 	"github.com/google/go-containerregistry/pkg/v1/types"
 )
 

diff --git a/pkg/v1/tarball/layer_test.go b/pkg/v1/tarball/layer_test.go
@@ -23,7 +23,7 @@ import (
 	"testing"
 
 	"github.com/containerd/stargz-snapshotter/estargz"
-	"github.com/google/go-containerregistry/pkg/internal/compare"
+	"github.com/google/go-containerregistry/internal/compare"
 	"github.com/google/go-containerregistry/pkg/v1/validate"
 )
 

diff --git a/pkg/v1/tarball/write_test.go b/pkg/v1/tarball/write_test.go
@@ -25,7 +25,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/google/go-containerregistry/pkg/internal/compare"
+	"github.com/google/go-containerregistry/internal/compare"
 	"github.com/google/go-containerregistry/pkg/name"
 	v1 "github.com/google/go-containerregistry/pkg/v1"
 	"github.com/google/go-containerregistry/pkg/v1/mutate"