Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from
Apr 16, 2021
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 pkg/v1/internal/and/and_closer.go → internal/and/and_closer.go
View file
Open in desktop
File renamed without changes.
0 pkg/v1/internal/and/and_closer_test.go → internal/and/and_closer_test.go
View file
Open in desktop
File renamed without changes.
0 pkg/internal/compare/doc.go → internal/compare/doc.go
View file
Open in desktop
File renamed without changes.
0 pkg/internal/compare/image.go → internal/compare/image.go
View file
Open in desktop
File renamed without changes.
0 pkg/internal/compare/image_test.go → internal/compare/image_test.go
View file
Open in desktop
File renamed without changes.
0 pkg/internal/compare/index.go → internal/compare/index.go
View file
Open in desktop
File renamed without changes.
0 pkg/internal/compare/index_test.go → internal/compare/index_test.go
View file
Open in desktop
File renamed without changes.
0 pkg/internal/compare/layer.go → internal/compare/layer.go
View file
Open in desktop
File renamed without changes.
0 pkg/internal/compare/layer_test.go → internal/compare/layer_test.go
View file
Open in desktop
File renamed without changes.
0 pkg/v1/internal/estargz/estargz.go → internal/estargz/estargz.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/v1/internal/estargz/estargz_test.go → internal/estargz/estargz_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/v1/internal/gzip/zip.go → internal/gzip/zip.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'}
Expand Down
0 pkg/v1/internal/gzip/zip_test.go → internal/gzip/zip_test.go
View file
Open in desktop
File renamed without changes.
0 pkg/internal/httptest/httptest.go → internal/httptest/httptest.go
View file
Open in desktop
File renamed without changes.
0 pkg/internal/legacy/copy.go → internal/legacy/copy.go
View file
Open in desktop
File renamed without changes.
0 pkg/internal/legacy/copy_test.go → internal/legacy/copy_test.go
View file
Open in desktop
File renamed without changes.
0 pkg/internal/redact/redact.go → internal/redact/redact.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/internal/retry/retry.go → internal/retry/retry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 pkg/internal/retry/retry_test.go → internal/retry/retry_test.go
View file
Open in desktop
File renamed without changes.
0 ...etry/wait/kubernetes_apimachinery_wait.go → ...etry/wait/kubernetes_apimachinery_wait.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/v1/internal/verify/verify.go → internal/verify/verify.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
0 pkg/v1/internal/verify/verify_test.go → internal/verify/verify_test.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/crane/copy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/crane/crane_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/gcrane/copy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions pkg/gcrane/copy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/legacy/tarball/write_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/registry/tls.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/v1/daemon/image_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/v1/mutate/mutate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/v1/partial/compressed.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/v1/partial/compressed_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/v1/partial/uncompressed.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/v1/partial/uncompressed_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/v1/remote/descriptor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions pkg/v1/remote/image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/v1/remote/layer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/v1/remote/layer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/v1/remote/transport/bearer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/v1/remote/transport/error.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion pkg/v1/remote/transport/logger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/v1/remote/transport/logger_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/v1/remote/transport/retry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion pkg/v1/remote/transport/retry_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions pkg/v1/remote/write.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/v1/tarball/image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
6 changes: 3 additions & 3 deletions pkg/v1/tarball/layer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/v1/tarball/layer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/v1/tarball/write_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down