From d9181e71cddfa4c71a33f5c8bc3ac17cff738ec6 Mon Sep 17 00:00:00 2001 From: Joao Pereira Date: Wed, 18 Oct 2023 16:28:35 -0500 Subject: [PATCH] Change module name Signed-off-by: Joao Pereira --- .goreleaser.yml | 2 +- README.md | 2 +- cmd/imgpkg/imgpkg.go | 2 +- docs/dev.md | 6 +++--- go.mod | 2 +- hack/build-binaries.sh | 2 +- pkg/imgpkg/bundle/bundle.go | 10 +++++----- pkg/imgpkg/bundle/bundle_images_lock.go | 4 ++-- pkg/imgpkg/bundle/bundle_images_lock_test.go | 10 +++++----- pkg/imgpkg/bundle/bundle_test.go | 12 ++++++------ .../fake_images_lock_location_config.go | 2 +- .../bundlefakes/fake_images_lock_reader.go | 4 ++-- .../bundlefakes/fake_images_metadata_writer.go | 6 +++--- pkg/imgpkg/bundle/contents.go | 6 +++--- pkg/imgpkg/bundle/contents_test.go | 8 ++++---- pkg/imgpkg/bundle/fetch_bundle.go | 8 ++++---- pkg/imgpkg/bundle/fetch_images.go | 4 ++-- pkg/imgpkg/bundle/helpers_test.go | 6 +++--- .../bundle/image_locations_config_test.go | 2 +- pkg/imgpkg/bundle/images_refs.go | 2 +- pkg/imgpkg/bundle/images_refs_test.go | 8 ++++---- pkg/imgpkg/bundle/locations_configs.go | 4 ++-- pkg/imgpkg/bundle/locations_configs_test.go | 6 +++--- pkg/imgpkg/bundle/validation.go | 2 +- pkg/imgpkg/cmd/copy.go | 14 +++++++------- pkg/imgpkg/cmd/copy_repo_src.go | 16 ++++++++-------- pkg/imgpkg/cmd/copy_repo_src_test.go | 18 +++++++++--------- pkg/imgpkg/cmd/describe.go | 6 +++--- pkg/imgpkg/cmd/non_distributable_layers.go | 6 +++--- pkg/imgpkg/cmd/pull.go | 6 +++--- pkg/imgpkg/cmd/pull_test.go | 2 +- pkg/imgpkg/cmd/push.go | 10 +++++----- pkg/imgpkg/cmd/push_test.go | 2 +- pkg/imgpkg/cmd/registry_flags.go | 4 ++-- pkg/imgpkg/cmd/tag_list.go | 2 +- pkg/imgpkg/cmd/tag_resolve.go | 2 +- pkg/imgpkg/image/dir_image_test.go | 4 ++-- pkg/imgpkg/image/tar_image_test.go | 2 +- .../imagedesc/described_compressed_layer.go | 4 ++-- pkg/imgpkg/imagedesc/image_ref_descriptors.go | 2 +- pkg/imgpkg/imageset/image_set.go | 8 ++++---- pkg/imgpkg/imageset/tar_image_set.go | 6 +++--- .../imagetar/non_distributable_layers_test.go | 2 +- pkg/imgpkg/imagetar/tar_file.go | 4 ++-- pkg/imgpkg/imagetar/tar_reader.go | 4 ++-- pkg/imgpkg/imagetar/tar_writer.go | 4 ++-- pkg/imgpkg/imageutils/gzip/zip.go | 2 +- pkg/imgpkg/imageutils/verify/verify.go | 2 +- pkg/imgpkg/internal/util/level_logger_test.go | 2 +- .../internal/util/prefixed_logger_test.go | 2 +- .../util/repo_based_tag_generator_test.go | 4 ++-- pkg/imgpkg/internal/util/tag.go | 2 +- pkg/imgpkg/lockconfig/bundle_lock_test.go | 2 +- pkg/imgpkg/lockconfig/images_lock_test.go | 2 +- pkg/imgpkg/plainimage/contents.go | 4 ++-- pkg/imgpkg/plainimage/plain_image.go | 2 +- pkg/imgpkg/registry/auth/custom_keychain.go | 2 +- pkg/imgpkg/registry/auth/env_keychain.go | 2 +- pkg/imgpkg/registry/keychain.go | 2 +- pkg/imgpkg/registry/registry.go | 4 ++-- pkg/imgpkg/registry/registry_test.go | 2 +- .../registryfakes/fake_images_reader.go | 2 +- .../registryfakes/fake_images_reader_writer.go | 4 ++-- pkg/imgpkg/registry/with_progress.go | 2 +- pkg/imgpkg/signature/cosign.go | 4 ++-- pkg/imgpkg/signature/cosign_test.go | 4 ++-- pkg/imgpkg/signature/fetch_signatures.go | 6 +++--- pkg/imgpkg/signature/fetch_signatures_test.go | 8 ++++---- .../signature/signaturefakes/fake_finder.go | 4 ++-- pkg/imgpkg/v1/describe.go | 8 ++++---- pkg/imgpkg/v1/describe_test.go | 12 ++++++------ pkg/imgpkg/v1/pull.go | 6 +++--- pkg/imgpkg/v1/pull_test.go | 10 +++++----- pkg/imgpkg/v1/registry.go | 4 ++-- pkg/imgpkg/v1/registry_test.go | 6 +++--- pkg/imgpkg/v1/tag.go | 2 +- pkg/imgpkg/v1/tag_test.go | 6 +++--- test/e2e/auth_error_test.go | 2 +- test/e2e/auth_test.go | 2 +- test/e2e/bundle_test.go | 2 +- test/e2e/copy_from_bundle_image_test.go | 6 +++--- test/e2e/copy_from_image_test.go | 5 ++--- test/e2e/copy_from_lockfiles_test.go | 6 +++--- test/e2e/copy_from_tar_test.go | 4 ++-- test/e2e/debug_test.go | 2 +- test/e2e/describe_test.go | 2 +- test/e2e/deterministic_push_test.go | 2 +- test/e2e/gcloud_expired_token_test.go | 2 +- test/e2e/image_test.go | 2 +- test/e2e/pull_test.go | 6 +++--- test/e2e/pull_test_unix_only_test.go | 12 ++++++------ test/e2e/push_test.go | 2 +- test/e2e/tag_list_test.go | 2 +- test/e2e/tag_resolve_test.go | 2 +- test/e2e/version_test.go | 2 +- test/helpers/assertion.go | 4 ++-- test/helpers/fake_registry.go | 12 ++++++------ test/helpers/image_factory.go | 2 +- test/helpers/registry/blobs.go | 2 +- test/helpers/registry/tls.go | 2 +- test/perf/perf_test.go | 2 +- 101 files changed, 229 insertions(+), 230 deletions(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index 661469ccb..e6e3db9f5 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -20,7 +20,7 @@ builds: - -trimpath ldflags: - - -X github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/cmd.Version={{ .Version }} + - -X carvel.dev/imgpkg/pkg/imgpkg/cmd.Version={{ .Version }} archives: - format: binary diff --git a/README.md b/README.md index 5314781bb..2d8610f2d 100644 --- a/README.md +++ b/README.md @@ -65,4 +65,4 @@ To keep source code documentation up to date, imgpkg uses [godoc](https://go.dev To view the docs 1. install godoc: `go install golang.org/x/tools/cmd/godoc@latest` -1. Start the server: `godoc -http=:6060` and visit [`http://localhost:6060/pkg/github.com/vmware-tanzu/carvel-imgpkg/`](http://localhost:6060/pkg/github.com/vmware-tanzu/carvel-imgpkg/). +1. Start the server: `godoc -http=:6060` and visit [`http://localhost:6060/pkg/carvel.dev/imgpkg/`](http://localhost:6060/pkg/carvel.dev/imgpkg/). diff --git a/cmd/imgpkg/imgpkg.go b/cmd/imgpkg/imgpkg.go index 43728fb1a..37bbabf7a 100644 --- a/cmd/imgpkg/imgpkg.go +++ b/cmd/imgpkg/imgpkg.go @@ -8,10 +8,10 @@ import ( "log" "os" + "carvel.dev/imgpkg/pkg/imgpkg/cmd" "github.com/cppforlife/cobrautil" uierrs "github.com/cppforlife/go-cli-ui/errors" "github.com/cppforlife/go-cli-ui/ui" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/cmd" ) func main() { diff --git a/docs/dev.md b/docs/dev.md index 66e1ca3d8..3e00602e2 100644 --- a/docs/dev.md +++ b/docs/dev.md @@ -18,15 +18,15 @@ The `imgpkg` libraries can be used by pulling the dependency into your [Go modul To get the latest version: ``` -go get github.com/vmware-tanzu/carvel-imgpkg +go get carvel.dev/imgpkg ``` _Note:_ Older versions of the `imgpkg` declare their module paths as "github.com/k14s/imgpkg". GitHub re-routes those requests to the correct repository, but all future versions -should pull in the dependency as "github.com/vmware-tanzu/carvel-imgpkg" +should pull in the dependency as "carvel.dev/imgpkg" ```diff -+ require github.com/vmware-tanzu/carvel-imgpkg x.y.z ++ require carvel.dev/imgpkg x.y.z - require github.com/k14s a.b.c ``` diff --git a/go.mod b/go.mod index 575dc6806..3b1739e37 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/vmware-tanzu/carvel-imgpkg +module carvel.dev/imgpkg go 1.21 diff --git a/hack/build-binaries.sh b/hack/build-binaries.sh index a2fca3928..77027847b 100755 --- a/hack/build-binaries.sh +++ b/hack/build-binaries.sh @@ -10,7 +10,7 @@ VERSION="${1:-`get_latest_git_tag`}" # makes builds reproducible export CGO_ENABLED=0 -LDFLAGS="-X github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/cmd.Version=$VERSION" +LDFLAGS="-X carvel.dev/imgpkg/pkg/imgpkg/cmd.Version=$VERSION" GOOS=darwin GOARCH=amd64 go build -ldflags="$LDFLAGS" -trimpath -o imgpkg-darwin-amd64 ./cmd/imgpkg/... diff --git a/pkg/imgpkg/bundle/bundle.go b/pkg/imgpkg/bundle/bundle.go index a880eaf25..5049843ca 100644 --- a/pkg/imgpkg/bundle/bundle.go +++ b/pkg/imgpkg/bundle/bundle.go @@ -9,14 +9,14 @@ import ( "strings" "sync" + ctlimg "carvel.dev/imgpkg/pkg/imgpkg/image" + "carvel.dev/imgpkg/pkg/imgpkg/imageset" + "carvel.dev/imgpkg/pkg/imgpkg/internal/util" + "carvel.dev/imgpkg/pkg/imgpkg/lockconfig" + plainimg "carvel.dev/imgpkg/pkg/imgpkg/plainimage" regname "github.com/google/go-containerregistry/pkg/name" regv1 "github.com/google/go-containerregistry/pkg/v1" regremote "github.com/google/go-containerregistry/pkg/v1/remote" - ctlimg "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/image" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imageset" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/internal/util" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/lockconfig" - plainimg "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/plainimage" ) const ( diff --git a/pkg/imgpkg/bundle/bundle_images_lock.go b/pkg/imgpkg/bundle/bundle_images_lock.go index 1dbe92428..20865b36a 100644 --- a/pkg/imgpkg/bundle/bundle_images_lock.go +++ b/pkg/imgpkg/bundle/bundle_images_lock.go @@ -10,11 +10,11 @@ import ( "path/filepath" "sync" + "carvel.dev/imgpkg/pkg/imgpkg/internal/util" + "carvel.dev/imgpkg/pkg/imgpkg/lockconfig" regname "github.com/google/go-containerregistry/pkg/name" regv1 "github.com/google/go-containerregistry/pkg/v1" "github.com/google/go-containerregistry/pkg/v1/types" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/internal/util" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/lockconfig" ) // ImagesRefsWithErrors Retrieve the references for the Images of this particular bundle including images that imgpkg diff --git a/pkg/imgpkg/bundle/bundle_images_lock_test.go b/pkg/imgpkg/bundle/bundle_images_lock_test.go index aacba61b0..7ddff6745 100644 --- a/pkg/imgpkg/bundle/bundle_images_lock_test.go +++ b/pkg/imgpkg/bundle/bundle_images_lock_test.go @@ -8,13 +8,13 @@ import ( "os" "testing" + "carvel.dev/imgpkg/pkg/imgpkg/bundle" + "carvel.dev/imgpkg/pkg/imgpkg/imageset" + "carvel.dev/imgpkg/pkg/imgpkg/internal/util" + "carvel.dev/imgpkg/pkg/imgpkg/plainimage" + "carvel.dev/imgpkg/test/helpers" regname "github.com/google/go-containerregistry/pkg/name" "github.com/stretchr/testify/require" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/bundle" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imageset" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/internal/util" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/plainimage" - "github.com/vmware-tanzu/carvel-imgpkg/test/helpers" ) type allImagesLockTests struct { diff --git a/pkg/imgpkg/bundle/bundle_test.go b/pkg/imgpkg/bundle/bundle_test.go index 02fe82e32..c684d68a3 100644 --- a/pkg/imgpkg/bundle/bundle_test.go +++ b/pkg/imgpkg/bundle/bundle_test.go @@ -11,15 +11,15 @@ import ( "strings" "testing" + "carvel.dev/imgpkg/pkg/imgpkg/bundle" + "carvel.dev/imgpkg/pkg/imgpkg/imageset" + "carvel.dev/imgpkg/pkg/imgpkg/internal/util" + "carvel.dev/imgpkg/pkg/imgpkg/lockconfig" + "carvel.dev/imgpkg/pkg/imgpkg/plainimage" + "carvel.dev/imgpkg/test/helpers" regv1 "github.com/google/go-containerregistry/pkg/v1" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/bundle" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imageset" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/internal/util" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/lockconfig" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/plainimage" - "github.com/vmware-tanzu/carvel-imgpkg/test/helpers" ) func TestPullBundleWritingContentsToDisk(t *testing.T) { diff --git a/pkg/imgpkg/bundle/bundlefakes/fake_images_lock_location_config.go b/pkg/imgpkg/bundle/bundlefakes/fake_images_lock_location_config.go index 40c081734..de6cb6cb1 100644 --- a/pkg/imgpkg/bundle/bundlefakes/fake_images_lock_location_config.go +++ b/pkg/imgpkg/bundle/bundlefakes/fake_images_lock_location_config.go @@ -4,7 +4,7 @@ package bundlefakes import ( "sync" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/bundle" + "carvel.dev/imgpkg/pkg/imgpkg/bundle" ) type FakeImagesLockLocationConfig struct { diff --git a/pkg/imgpkg/bundle/bundlefakes/fake_images_lock_reader.go b/pkg/imgpkg/bundle/bundlefakes/fake_images_lock_reader.go index 24a21ef33..8e15d9a2b 100644 --- a/pkg/imgpkg/bundle/bundlefakes/fake_images_lock_reader.go +++ b/pkg/imgpkg/bundle/bundlefakes/fake_images_lock_reader.go @@ -5,8 +5,8 @@ import ( "sync" v1 "github.com/google/go-containerregistry/pkg/v1" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/bundle" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/lockconfig" + "carvel.dev/imgpkg/pkg/imgpkg/bundle" + "carvel.dev/imgpkg/pkg/imgpkg/lockconfig" ) type FakeImagesLockReader struct { diff --git a/pkg/imgpkg/bundle/bundlefakes/fake_images_metadata_writer.go b/pkg/imgpkg/bundle/bundlefakes/fake_images_metadata_writer.go index ba081c253..b9cc2e5c1 100644 --- a/pkg/imgpkg/bundle/bundlefakes/fake_images_metadata_writer.go +++ b/pkg/imgpkg/bundle/bundlefakes/fake_images_metadata_writer.go @@ -7,9 +7,9 @@ import ( "github.com/google/go-containerregistry/pkg/name" v1 "github.com/google/go-containerregistry/pkg/v1" "github.com/google/go-containerregistry/pkg/v1/remote" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/bundle" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/internal/util" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/registry" + "carvel.dev/imgpkg/pkg/imgpkg/bundle" + "carvel.dev/imgpkg/pkg/imgpkg/internal/util" + "carvel.dev/imgpkg/pkg/imgpkg/registry" ) type FakeImagesMetadataWriter struct { diff --git a/pkg/imgpkg/bundle/contents.go b/pkg/imgpkg/bundle/contents.go index 90b9a3114..da97a7c42 100644 --- a/pkg/imgpkg/bundle/contents.go +++ b/pkg/imgpkg/bundle/contents.go @@ -9,12 +9,12 @@ import ( "path/filepath" "strings" + "carvel.dev/imgpkg/pkg/imgpkg/internal/util" + "carvel.dev/imgpkg/pkg/imgpkg/plainimage" + "carvel.dev/imgpkg/pkg/imgpkg/registry" regname "github.com/google/go-containerregistry/pkg/name" regv1 "github.com/google/go-containerregistry/pkg/v1" regremote "github.com/google/go-containerregistry/pkg/v1/remote" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/internal/util" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/plainimage" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/registry" ) const ( diff --git a/pkg/imgpkg/bundle/contents_test.go b/pkg/imgpkg/bundle/contents_test.go index 8e31d2ab0..b6c294050 100644 --- a/pkg/imgpkg/bundle/contents_test.go +++ b/pkg/imgpkg/bundle/contents_test.go @@ -6,13 +6,13 @@ package bundle_test import ( "testing" + "carvel.dev/imgpkg/pkg/imgpkg/bundle" + "carvel.dev/imgpkg/pkg/imgpkg/bundle/bundlefakes" + "carvel.dev/imgpkg/pkg/imgpkg/internal/util" + "carvel.dev/imgpkg/test/helpers" "github.com/google/go-containerregistry/pkg/name" v1 "github.com/google/go-containerregistry/pkg/v1" "github.com/google/go-containerregistry/pkg/v1/fake" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/bundle" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/bundle/bundlefakes" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/internal/util" - "github.com/vmware-tanzu/carvel-imgpkg/test/helpers" ) func TestNewContentsBundleWithBundles(t *testing.T) { diff --git a/pkg/imgpkg/bundle/fetch_bundle.go b/pkg/imgpkg/bundle/fetch_bundle.go index c488de1b8..661551d22 100644 --- a/pkg/imgpkg/bundle/fetch_bundle.go +++ b/pkg/imgpkg/bundle/fetch_bundle.go @@ -6,11 +6,11 @@ package bundle import ( "fmt" + "carvel.dev/imgpkg/pkg/imgpkg/imageset" + "carvel.dev/imgpkg/pkg/imgpkg/internal/util" + "carvel.dev/imgpkg/pkg/imgpkg/lockconfig" + "carvel.dev/imgpkg/pkg/imgpkg/plainimage" regname "github.com/google/go-containerregistry/pkg/name" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imageset" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/internal/util" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/lockconfig" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/plainimage" ) // Fetcher Interface that will fetch the bundle diff --git a/pkg/imgpkg/bundle/fetch_images.go b/pkg/imgpkg/bundle/fetch_images.go index 59c760949..1620c1b39 100644 --- a/pkg/imgpkg/bundle/fetch_images.go +++ b/pkg/imgpkg/bundle/fetch_images.go @@ -6,9 +6,9 @@ package bundle import ( "fmt" + "carvel.dev/imgpkg/pkg/imgpkg/lockconfig" + "carvel.dev/imgpkg/pkg/imgpkg/signature" regname "github.com/google/go-containerregistry/pkg/name" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/lockconfig" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/signature" ) // SignatureFetcher Interface to retrieve signatures associated with Images diff --git a/pkg/imgpkg/bundle/helpers_test.go b/pkg/imgpkg/bundle/helpers_test.go index 9dc883c86..8de7467c0 100644 --- a/pkg/imgpkg/bundle/helpers_test.go +++ b/pkg/imgpkg/bundle/helpers_test.go @@ -11,12 +11,12 @@ import ( "sync" "testing" + "carvel.dev/imgpkg/pkg/imgpkg/bundle" + "carvel.dev/imgpkg/pkg/imgpkg/lockconfig" + "carvel.dev/imgpkg/test/helpers" regname "github.com/google/go-containerregistry/pkg/name" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/bundle" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/lockconfig" - "github.com/vmware-tanzu/carvel-imgpkg/test/helpers" ) // createURIMetrics Creates an instance of the uriMetrics struct diff --git a/pkg/imgpkg/bundle/image_locations_config_test.go b/pkg/imgpkg/bundle/image_locations_config_test.go index 2ec54545e..e75f21b61 100644 --- a/pkg/imgpkg/bundle/image_locations_config_test.go +++ b/pkg/imgpkg/bundle/image_locations_config_test.go @@ -6,8 +6,8 @@ package bundle_test import ( "testing" + "carvel.dev/imgpkg/pkg/imgpkg/bundle" "github.com/stretchr/testify/require" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/bundle" ) func TestNewLocationConfigFromBytes(t *testing.T) { diff --git a/pkg/imgpkg/bundle/images_refs.go b/pkg/imgpkg/bundle/images_refs.go index b9653e59b..701009a60 100644 --- a/pkg/imgpkg/bundle/images_refs.go +++ b/pkg/imgpkg/bundle/images_refs.go @@ -8,9 +8,9 @@ import ( "strings" "sync" + "carvel.dev/imgpkg/pkg/imgpkg/lockconfig" "github.com/google/go-containerregistry/pkg/name" "github.com/google/go-containerregistry/pkg/v1/remote/transport" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/lockconfig" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 github.com/cppforlife/go-cli-ui/ui.UI diff --git a/pkg/imgpkg/bundle/images_refs_test.go b/pkg/imgpkg/bundle/images_refs_test.go index d6fdcf7f2..bce906d5b 100644 --- a/pkg/imgpkg/bundle/images_refs_test.go +++ b/pkg/imgpkg/bundle/images_refs_test.go @@ -8,14 +8,14 @@ import ( "os" "testing" + ctlbundle "carvel.dev/imgpkg/pkg/imgpkg/bundle" + "carvel.dev/imgpkg/pkg/imgpkg/bundle/bundlefakes" + "carvel.dev/imgpkg/pkg/imgpkg/lockconfig" + "carvel.dev/imgpkg/pkg/imgpkg/registry/registryfakes" regv1 "github.com/google/go-containerregistry/pkg/v1" "github.com/google/go-containerregistry/pkg/v1/remote/transport" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - ctlbundle "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/bundle" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/bundle/bundlefakes" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/lockconfig" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/registry/registryfakes" ) func TestMain(m *testing.M) { diff --git a/pkg/imgpkg/bundle/locations_configs.go b/pkg/imgpkg/bundle/locations_configs.go index 6e82adb4b..8e2ac526a 100644 --- a/pkg/imgpkg/bundle/locations_configs.go +++ b/pkg/imgpkg/bundle/locations_configs.go @@ -12,12 +12,12 @@ import ( "path/filepath" "strings" + "carvel.dev/imgpkg/pkg/imgpkg/internal/util" + "carvel.dev/imgpkg/pkg/imgpkg/plainimage" "github.com/google/go-containerregistry/pkg/name" regv1 "github.com/google/go-containerregistry/pkg/v1" "github.com/google/go-containerregistry/pkg/v1/remote/transport" "github.com/google/go-containerregistry/pkg/v1/types" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/internal/util" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/plainimage" ) const ( diff --git a/pkg/imgpkg/bundle/locations_configs_test.go b/pkg/imgpkg/bundle/locations_configs_test.go index 0ea1590a0..7a33e54ae 100644 --- a/pkg/imgpkg/bundle/locations_configs_test.go +++ b/pkg/imgpkg/bundle/locations_configs_test.go @@ -6,11 +6,11 @@ package bundle_test import ( "testing" + "carvel.dev/imgpkg/pkg/imgpkg/bundle" + "carvel.dev/imgpkg/pkg/imgpkg/internal/util" + "carvel.dev/imgpkg/test/helpers" regname "github.com/google/go-containerregistry/pkg/name" "github.com/stretchr/testify/require" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/bundle" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/internal/util" - "github.com/vmware-tanzu/carvel-imgpkg/test/helpers" ) func TestLocations(t *testing.T) { diff --git a/pkg/imgpkg/bundle/validation.go b/pkg/imgpkg/bundle/validation.go index e556715f8..33b042e55 100644 --- a/pkg/imgpkg/bundle/validation.go +++ b/pkg/imgpkg/bundle/validation.go @@ -4,7 +4,7 @@ package bundle import ( - plainimg "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/plainimage" + plainimg "carvel.dev/imgpkg/pkg/imgpkg/plainimage" ) type notABundleError struct { diff --git a/pkg/imgpkg/cmd/copy.go b/pkg/imgpkg/cmd/copy.go index 7c8dd6809..1bd7343bf 100644 --- a/pkg/imgpkg/cmd/copy.go +++ b/pkg/imgpkg/cmd/copy.go @@ -6,15 +6,15 @@ package cmd import ( "fmt" + "carvel.dev/imgpkg/pkg/imgpkg/bundle" + ctlimgset "carvel.dev/imgpkg/pkg/imgpkg/imageset" + "carvel.dev/imgpkg/pkg/imgpkg/internal/util" + "carvel.dev/imgpkg/pkg/imgpkg/lockconfig" + "carvel.dev/imgpkg/pkg/imgpkg/plainimage" + "carvel.dev/imgpkg/pkg/imgpkg/registry" + "carvel.dev/imgpkg/pkg/imgpkg/signature" "github.com/cppforlife/go-cli-ui/ui" "github.com/spf13/cobra" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/bundle" - ctlimgset "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imageset" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/internal/util" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/lockconfig" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/plainimage" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/registry" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/signature" ) const rootBundleLabelKey string = "dev.carvel.imgpkg.copy.root-bundle" diff --git a/pkg/imgpkg/cmd/copy_repo_src.go b/pkg/imgpkg/cmd/copy_repo_src.go index 940162fa9..5b8eecb0f 100644 --- a/pkg/imgpkg/cmd/copy_repo_src.go +++ b/pkg/imgpkg/cmd/copy_repo_src.go @@ -6,15 +6,15 @@ package cmd import ( "fmt" + ctlbundle "carvel.dev/imgpkg/pkg/imgpkg/bundle" + "carvel.dev/imgpkg/pkg/imgpkg/imageset" + ctlimgset "carvel.dev/imgpkg/pkg/imgpkg/imageset" + "carvel.dev/imgpkg/pkg/imgpkg/imagetar" + "carvel.dev/imgpkg/pkg/imgpkg/internal/util" + "carvel.dev/imgpkg/pkg/imgpkg/lockconfig" + "carvel.dev/imgpkg/pkg/imgpkg/plainimage" + "carvel.dev/imgpkg/pkg/imgpkg/registry" regname "github.com/google/go-containerregistry/pkg/name" - ctlbundle "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/bundle" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imageset" - ctlimgset "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imageset" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imagetar" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/internal/util" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/lockconfig" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/plainimage" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/registry" ) type SignatureRetriever interface { diff --git a/pkg/imgpkg/cmd/copy_repo_src_test.go b/pkg/imgpkg/cmd/copy_repo_src_test.go index cadcc7449..5d974ebe6 100644 --- a/pkg/imgpkg/cmd/copy_repo_src_test.go +++ b/pkg/imgpkg/cmd/copy_repo_src_test.go @@ -15,21 +15,21 @@ import ( "strings" "testing" + "carvel.dev/imgpkg/pkg/imgpkg/bundle" + ctlimg "carvel.dev/imgpkg/pkg/imgpkg/image" + "carvel.dev/imgpkg/pkg/imgpkg/imagedesc" + "carvel.dev/imgpkg/pkg/imgpkg/imageset" + "carvel.dev/imgpkg/pkg/imgpkg/imagetar" + "carvel.dev/imgpkg/pkg/imgpkg/internal/util" + "carvel.dev/imgpkg/pkg/imgpkg/lockconfig" + "carvel.dev/imgpkg/pkg/imgpkg/registry" + "carvel.dev/imgpkg/test/helpers" "github.com/google/go-containerregistry/pkg/authn" "github.com/google/go-containerregistry/pkg/name" regv1 "github.com/google/go-containerregistry/pkg/v1" "github.com/google/go-containerregistry/pkg/v1/remote" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/bundle" - ctlimg "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/image" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imagedesc" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imageset" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imagetar" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/internal/util" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/lockconfig" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/registry" - "github.com/vmware-tanzu/carvel-imgpkg/test/helpers" ) var subject CopyRepoSrc diff --git a/pkg/imgpkg/cmd/describe.go b/pkg/imgpkg/cmd/describe.go index fb988c2d4..28466f2fb 100644 --- a/pkg/imgpkg/cmd/describe.go +++ b/pkg/imgpkg/cmd/describe.go @@ -7,12 +7,12 @@ import ( "fmt" "sort" + "carvel.dev/imgpkg/pkg/imgpkg/bundle" + "carvel.dev/imgpkg/pkg/imgpkg/internal/util" + "carvel.dev/imgpkg/pkg/imgpkg/v1" goui "github.com/cppforlife/go-cli-ui/ui" regname "github.com/google/go-containerregistry/pkg/name" "github.com/spf13/cobra" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/bundle" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/internal/util" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/v1" "sigs.k8s.io/yaml" ) diff --git a/pkg/imgpkg/cmd/non_distributable_layers.go b/pkg/imgpkg/cmd/non_distributable_layers.go index fbbaf5b51..c792cd8b3 100644 --- a/pkg/imgpkg/cmd/non_distributable_layers.go +++ b/pkg/imgpkg/cmd/non_distributable_layers.go @@ -6,11 +6,11 @@ package cmd import ( "fmt" + "carvel.dev/imgpkg/pkg/imgpkg/imagedesc" + ctlimgset "carvel.dev/imgpkg/pkg/imgpkg/imageset" + "carvel.dev/imgpkg/pkg/imgpkg/internal/util" "github.com/google/go-containerregistry/pkg/name" regv1 "github.com/google/go-containerregistry/pkg/v1" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imagedesc" - ctlimgset "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imageset" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/internal/util" ) type nonDistributableLayers struct { diff --git a/pkg/imgpkg/cmd/pull.go b/pkg/imgpkg/cmd/pull.go index 63c3e0d07..2d5d83e6b 100644 --- a/pkg/imgpkg/cmd/pull.go +++ b/pkg/imgpkg/cmd/pull.go @@ -7,11 +7,11 @@ import ( "errors" "fmt" + "carvel.dev/imgpkg/pkg/imgpkg/internal/util" + "carvel.dev/imgpkg/pkg/imgpkg/lockconfig" + v1 "carvel.dev/imgpkg/pkg/imgpkg/v1" "github.com/cppforlife/go-cli-ui/ui" "github.com/spf13/cobra" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/internal/util" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/lockconfig" - v1 "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/v1" ) type PullOptions struct { diff --git a/pkg/imgpkg/cmd/pull_test.go b/pkg/imgpkg/cmd/pull_test.go index 732846ee7..682cde36e 100644 --- a/pkg/imgpkg/cmd/pull_test.go +++ b/pkg/imgpkg/cmd/pull_test.go @@ -6,9 +6,9 @@ package cmd import ( "testing" + "carvel.dev/imgpkg/test/helpers" "github.com/cppforlife/go-cli-ui/ui" "github.com/stretchr/testify/require" - "github.com/vmware-tanzu/carvel-imgpkg/test/helpers" ) func TestPullErrors(t *testing.T) { diff --git a/pkg/imgpkg/cmd/push.go b/pkg/imgpkg/cmd/push.go index 7ad0c0d38..d8c127711 100644 --- a/pkg/imgpkg/cmd/push.go +++ b/pkg/imgpkg/cmd/push.go @@ -6,14 +6,14 @@ package cmd import ( "fmt" + "carvel.dev/imgpkg/pkg/imgpkg/bundle" + "carvel.dev/imgpkg/pkg/imgpkg/internal/util" + "carvel.dev/imgpkg/pkg/imgpkg/lockconfig" + "carvel.dev/imgpkg/pkg/imgpkg/plainimage" + "carvel.dev/imgpkg/pkg/imgpkg/registry" "github.com/cppforlife/go-cli-ui/ui" regname "github.com/google/go-containerregistry/pkg/name" "github.com/spf13/cobra" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/bundle" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/internal/util" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/lockconfig" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/plainimage" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/registry" ) type PushOptions struct { diff --git a/pkg/imgpkg/cmd/push_test.go b/pkg/imgpkg/cmd/push_test.go index c32b7bce8..14eb195ab 100644 --- a/pkg/imgpkg/cmd/push_test.go +++ b/pkg/imgpkg/cmd/push_test.go @@ -10,12 +10,12 @@ import ( "strings" "testing" + "carvel.dev/imgpkg/test/helpers" "github.com/google/go-containerregistry/pkg/authn" "github.com/google/go-containerregistry/pkg/name" "github.com/google/go-containerregistry/pkg/v1/remote" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/vmware-tanzu/carvel-imgpkg/test/helpers" ) const emptyImagesYaml = `apiVersion: imgpkg.carvel.dev/v1alpha1 diff --git a/pkg/imgpkg/cmd/registry_flags.go b/pkg/imgpkg/cmd/registry_flags.go index 38eacdd73..050552c06 100644 --- a/pkg/imgpkg/cmd/registry_flags.go +++ b/pkg/imgpkg/cmd/registry_flags.go @@ -7,9 +7,9 @@ import ( "os" "time" + "carvel.dev/imgpkg/pkg/imgpkg/registry" + v1 "carvel.dev/imgpkg/pkg/imgpkg/v1" "github.com/spf13/cobra" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/registry" - v1 "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/v1" ) // RegistryFlags command line flags to configure the registry connection diff --git a/pkg/imgpkg/cmd/tag_list.go b/pkg/imgpkg/cmd/tag_list.go index 940fdc4a7..77cb5be11 100644 --- a/pkg/imgpkg/cmd/tag_list.go +++ b/pkg/imgpkg/cmd/tag_list.go @@ -4,10 +4,10 @@ package cmd import ( + v1 "carvel.dev/imgpkg/pkg/imgpkg/v1" "github.com/cppforlife/go-cli-ui/ui" uitable "github.com/cppforlife/go-cli-ui/ui/table" "github.com/spf13/cobra" - v1 "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/v1" "strings" ) diff --git a/pkg/imgpkg/cmd/tag_resolve.go b/pkg/imgpkg/cmd/tag_resolve.go index 5e4edd77f..4ddfcf420 100644 --- a/pkg/imgpkg/cmd/tag_resolve.go +++ b/pkg/imgpkg/cmd/tag_resolve.go @@ -6,10 +6,10 @@ package cmd import ( "fmt" + "carvel.dev/imgpkg/pkg/imgpkg/registry" "github.com/cppforlife/go-cli-ui/ui" regname "github.com/google/go-containerregistry/pkg/name" "github.com/spf13/cobra" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/registry" ) type TagResolveOptions struct { diff --git a/pkg/imgpkg/image/dir_image_test.go b/pkg/imgpkg/image/dir_image_test.go index 6f17293aa..1157dd976 100644 --- a/pkg/imgpkg/image/dir_image_test.go +++ b/pkg/imgpkg/image/dir_image_test.go @@ -12,10 +12,10 @@ import ( "strings" "testing" + "carvel.dev/imgpkg/pkg/imgpkg/image" + "carvel.dev/imgpkg/pkg/imgpkg/internal/util" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/image" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/internal/util" ) func TestDirImage(t *testing.T) { diff --git a/pkg/imgpkg/image/tar_image_test.go b/pkg/imgpkg/image/tar_image_test.go index 2581af14a..2556ebd93 100644 --- a/pkg/imgpkg/image/tar_image_test.go +++ b/pkg/imgpkg/image/tar_image_test.go @@ -7,8 +7,8 @@ import ( "runtime" "testing" + "carvel.dev/imgpkg/pkg/imgpkg/image" "github.com/stretchr/testify/require" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/image" ) func TestTarImage(t *testing.T) { diff --git a/pkg/imgpkg/imagedesc/described_compressed_layer.go b/pkg/imgpkg/imagedesc/described_compressed_layer.go index 43c1ebf7d..e84a7c4e1 100644 --- a/pkg/imgpkg/imagedesc/described_compressed_layer.go +++ b/pkg/imgpkg/imagedesc/described_compressed_layer.go @@ -8,10 +8,10 @@ import ( "fmt" "io" + "carvel.dev/imgpkg/pkg/imgpkg/imageutils/gzip" + "carvel.dev/imgpkg/pkg/imgpkg/imageutils/verify" regv1 "github.com/google/go-containerregistry/pkg/v1" "github.com/google/go-containerregistry/pkg/v1/types" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imageutils/gzip" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imageutils/verify" ) // DescribedCompressedLayer Represents a Layer that is part of a Tar file generated by imgpkg diff --git a/pkg/imgpkg/imagedesc/image_ref_descriptors.go b/pkg/imgpkg/imagedesc/image_ref_descriptors.go index 7d1bae821..99b66da85 100644 --- a/pkg/imgpkg/imagedesc/image_ref_descriptors.go +++ b/pkg/imgpkg/imagedesc/image_ref_descriptors.go @@ -11,12 +11,12 @@ import ( "strings" "sync" + "carvel.dev/imgpkg/pkg/imgpkg/internal/util" regname "github.com/google/go-containerregistry/pkg/name" regv1 "github.com/google/go-containerregistry/pkg/v1" regremote "github.com/google/go-containerregistry/pkg/v1/remote" regtran "github.com/google/go-containerregistry/pkg/v1/remote/transport" regtypes "github.com/google/go-containerregistry/pkg/v1/types" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/internal/util" "golang.org/x/sync/errgroup" ) diff --git a/pkg/imgpkg/imageset/image_set.go b/pkg/imgpkg/imageset/image_set.go index e365541e8..fa6b6537f 100644 --- a/pkg/imgpkg/imageset/image_set.go +++ b/pkg/imgpkg/imageset/image_set.go @@ -7,13 +7,13 @@ import ( "fmt" "sync" + "carvel.dev/imgpkg/pkg/imgpkg/imagedesc" + "carvel.dev/imgpkg/pkg/imgpkg/imagedigest" + "carvel.dev/imgpkg/pkg/imgpkg/internal/util" + "carvel.dev/imgpkg/pkg/imgpkg/registry" regname "github.com/google/go-containerregistry/pkg/name" regv1 "github.com/google/go-containerregistry/pkg/v1" regremote "github.com/google/go-containerregistry/pkg/v1/remote" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imagedesc" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imagedigest" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/internal/util" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/registry" ) type Logger interface { diff --git a/pkg/imgpkg/imageset/tar_image_set.go b/pkg/imgpkg/imageset/tar_image_set.go index c0e55943d..4e7a664ed 100644 --- a/pkg/imgpkg/imageset/tar_image_set.go +++ b/pkg/imgpkg/imageset/tar_image_set.go @@ -8,11 +8,11 @@ import ( "io" "os" + "carvel.dev/imgpkg/pkg/imgpkg/imagedesc" + "carvel.dev/imgpkg/pkg/imgpkg/imagetar" + "carvel.dev/imgpkg/pkg/imgpkg/registry" regname "github.com/google/go-containerregistry/pkg/name" v1 "github.com/google/go-containerregistry/pkg/v1" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imagedesc" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imagetar" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/registry" ) type TarImageSet struct { diff --git a/pkg/imgpkg/imagetar/non_distributable_layers_test.go b/pkg/imgpkg/imagetar/non_distributable_layers_test.go index 1210bcec1..f05560156 100644 --- a/pkg/imgpkg/imagetar/non_distributable_layers_test.go +++ b/pkg/imgpkg/imagetar/non_distributable_layers_test.go @@ -6,7 +6,7 @@ package imagetar import ( "testing" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imagedesc" + "carvel.dev/imgpkg/pkg/imgpkg/imagedesc" ) func TestIncludesNonDistributableLayerWhenFlagIsProvided(t *testing.T) { diff --git a/pkg/imgpkg/imagetar/tar_file.go b/pkg/imgpkg/imagetar/tar_file.go index 1c55df6b9..a698e14f1 100644 --- a/pkg/imgpkg/imagetar/tar_file.go +++ b/pkg/imgpkg/imagetar/tar_file.go @@ -10,9 +10,9 @@ import ( "os" "strings" + "carvel.dev/imgpkg/pkg/imgpkg/imagedesc" + "carvel.dev/imgpkg/pkg/imgpkg/internal/util" regv1 "github.com/google/go-containerregistry/pkg/v1" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imagedesc" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/internal/util" ) type tarFile struct { diff --git a/pkg/imgpkg/imagetar/tar_reader.go b/pkg/imgpkg/imagetar/tar_reader.go index c18b06378..0ce145fb0 100644 --- a/pkg/imgpkg/imagetar/tar_reader.go +++ b/pkg/imgpkg/imagetar/tar_reader.go @@ -7,10 +7,10 @@ import ( "fmt" "io" + "carvel.dev/imgpkg/pkg/imgpkg/imagedesc" + "carvel.dev/imgpkg/pkg/imgpkg/imageutils/verify" "github.com/google/go-containerregistry/pkg/name" v1 "github.com/google/go-containerregistry/pkg/v1" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imagedesc" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imageutils/verify" ) type TarReader struct { diff --git a/pkg/imgpkg/imagetar/tar_writer.go b/pkg/imgpkg/imagetar/tar_writer.go index cff950c51..213eed265 100644 --- a/pkg/imgpkg/imagetar/tar_writer.go +++ b/pkg/imgpkg/imagetar/tar_writer.go @@ -12,9 +12,9 @@ import ( "sort" "time" + "carvel.dev/imgpkg/pkg/imgpkg/imagedesc" + "carvel.dev/imgpkg/pkg/imgpkg/internal/util" regv1 "github.com/google/go-containerregistry/pkg/v1" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imagedesc" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/internal/util" ) type Logger interface { diff --git a/pkg/imgpkg/imageutils/gzip/zip.go b/pkg/imgpkg/imageutils/gzip/zip.go index d7de26b36..17dbe1e5b 100644 --- a/pkg/imgpkg/imageutils/gzip/zip.go +++ b/pkg/imgpkg/imageutils/gzip/zip.go @@ -24,7 +24,7 @@ import ( "compress/gzip" "io" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imageutils/and" + "carvel.dev/imgpkg/pkg/imgpkg/imageutils/and" ) var gzipMagicHeader = []byte{'\x1f', '\x8b'} diff --git a/pkg/imgpkg/imageutils/verify/verify.go b/pkg/imgpkg/imageutils/verify/verify.go index 87f295e7d..a6c4e826c 100644 --- a/pkg/imgpkg/imageutils/verify/verify.go +++ b/pkg/imgpkg/imageutils/verify/verify.go @@ -24,8 +24,8 @@ import ( "hash" "io" + "carvel.dev/imgpkg/pkg/imgpkg/imageutils/and" v1 "github.com/google/go-containerregistry/pkg/v1" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imageutils/and" ) // SizeUnknown is a sentinel value to indicate that the expected size is not known. diff --git a/pkg/imgpkg/internal/util/level_logger_test.go b/pkg/imgpkg/internal/util/level_logger_test.go index 61ba872f9..37851f4bf 100644 --- a/pkg/imgpkg/internal/util/level_logger_test.go +++ b/pkg/imgpkg/internal/util/level_logger_test.go @@ -7,8 +7,8 @@ import ( "bytes" "testing" + "carvel.dev/imgpkg/pkg/imgpkg/internal/util" "github.com/stretchr/testify/require" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/internal/util" ) func TestLevelLogger(t *testing.T) { diff --git a/pkg/imgpkg/internal/util/prefixed_logger_test.go b/pkg/imgpkg/internal/util/prefixed_logger_test.go index 86962e3c6..7cff71358 100644 --- a/pkg/imgpkg/internal/util/prefixed_logger_test.go +++ b/pkg/imgpkg/internal/util/prefixed_logger_test.go @@ -7,8 +7,8 @@ import ( "bytes" "testing" + "carvel.dev/imgpkg/pkg/imgpkg/internal/util" "github.com/stretchr/testify/require" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/internal/util" ) func TestPrefixedLogger(t *testing.T) { diff --git a/pkg/imgpkg/internal/util/repo_based_tag_generator_test.go b/pkg/imgpkg/internal/util/repo_based_tag_generator_test.go index db7641acb..0066cd937 100644 --- a/pkg/imgpkg/internal/util/repo_based_tag_generator_test.go +++ b/pkg/imgpkg/internal/util/repo_based_tag_generator_test.go @@ -6,10 +6,10 @@ package util_test import ( "testing" + "carvel.dev/imgpkg/pkg/imgpkg/imagedigest" + util "carvel.dev/imgpkg/pkg/imgpkg/internal/util" regname "github.com/google/go-containerregistry/pkg/name" "github.com/stretchr/testify/require" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imagedigest" - util "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/internal/util" ) type testDescribe struct { diff --git a/pkg/imgpkg/internal/util/tag.go b/pkg/imgpkg/internal/util/tag.go index 80eef5b76..cf64ed2fa 100644 --- a/pkg/imgpkg/internal/util/tag.go +++ b/pkg/imgpkg/internal/util/tag.go @@ -8,9 +8,9 @@ import ( "regexp" "strings" + "carvel.dev/imgpkg/pkg/imgpkg/imagedigest" regname "github.com/google/go-containerregistry/pkg/name" regv1 "github.com/google/go-containerregistry/pkg/v1" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imagedigest" ) // WithDigest are items that Digest() can be called on diff --git a/pkg/imgpkg/lockconfig/bundle_lock_test.go b/pkg/imgpkg/lockconfig/bundle_lock_test.go index 573c1b23e..615d57a2f 100644 --- a/pkg/imgpkg/lockconfig/bundle_lock_test.go +++ b/pkg/imgpkg/lockconfig/bundle_lock_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/lockconfig" + "carvel.dev/imgpkg/pkg/imgpkg/lockconfig" ) func TestBundleLockNonDigestUnmarshalError(t *testing.T) { diff --git a/pkg/imgpkg/lockconfig/images_lock_test.go b/pkg/imgpkg/lockconfig/images_lock_test.go index 897d7c445..8b33757c7 100644 --- a/pkg/imgpkg/lockconfig/images_lock_test.go +++ b/pkg/imgpkg/lockconfig/images_lock_test.go @@ -6,9 +6,9 @@ package lockconfig_test import ( "testing" + "carvel.dev/imgpkg/pkg/imgpkg/lockconfig" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/lockconfig" ) func TestNewImagesLockFromBytes(t *testing.T) { diff --git a/pkg/imgpkg/plainimage/contents.go b/pkg/imgpkg/plainimage/contents.go index fa767f22c..a02398bfe 100644 --- a/pkg/imgpkg/plainimage/contents.go +++ b/pkg/imgpkg/plainimage/contents.go @@ -9,11 +9,11 @@ import ( "path/filepath" "strings" + ctlimg "carvel.dev/imgpkg/pkg/imgpkg/image" + "carvel.dev/imgpkg/pkg/imgpkg/internal/util" regname "github.com/google/go-containerregistry/pkg/name" regv1 "github.com/google/go-containerregistry/pkg/v1" regremote "github.com/google/go-containerregistry/pkg/v1/remote" - ctlimg "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/image" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/internal/util" ) // Contents of the OCI Image diff --git a/pkg/imgpkg/plainimage/plain_image.go b/pkg/imgpkg/plainimage/plain_image.go index 09580fd4b..2e1d79d10 100644 --- a/pkg/imgpkg/plainimage/plain_image.go +++ b/pkg/imgpkg/plainimage/plain_image.go @@ -6,11 +6,11 @@ package plainimage import ( "fmt" + ctlimg "carvel.dev/imgpkg/pkg/imgpkg/image" regname "github.com/google/go-containerregistry/pkg/name" regv1 "github.com/google/go-containerregistry/pkg/v1" regremote "github.com/google/go-containerregistry/pkg/v1/remote" "github.com/google/go-containerregistry/pkg/v1/types" - ctlimg "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/image" ) type ImagesDescriptor interface { diff --git a/pkg/imgpkg/registry/auth/custom_keychain.go b/pkg/imgpkg/registry/auth/custom_keychain.go index e6fc904da..bc25b25ee 100644 --- a/pkg/imgpkg/registry/auth/custom_keychain.go +++ b/pkg/imgpkg/registry/auth/custom_keychain.go @@ -75,7 +75,7 @@ func (k CustomRegistryKeychain) Resolve(res regauthn.Resource) (regauthn.Authent } func (k CustomRegistryKeychain) retryDefaultKeychain(doFunc func() (regauthn.Authenticator, error)) (regauthn.Authenticator, error) { - // constants copied from https://github.com/vmware-tanzu/carvel-imgpkg/blob/c8b1bc196e5f1af82e6df8c36c290940169aa896/vendor/github.com/docker/docker-credential-helpers/credentials/error.go#L4-L11 + // constants copied from https://github.com/carvel-dev/imgpkg/blob/c8b1bc196e5f1af82e6df8c36c290940169aa896/vendor/github.com/docker/docker-credential-helpers/credentials/error.go#L4-L11 // ErrCredentialsNotFound standardizes the not found error, so every helper returns // the same message and docker can handle it properly. diff --git a/pkg/imgpkg/registry/auth/env_keychain.go b/pkg/imgpkg/registry/auth/env_keychain.go index f4eade5ee..a75b7c5de 100644 --- a/pkg/imgpkg/registry/auth/env_keychain.go +++ b/pkg/imgpkg/registry/auth/env_keychain.go @@ -11,7 +11,7 @@ import ( "strings" "sync" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/registry/auth/credentialprovider" + "carvel.dev/imgpkg/pkg/imgpkg/registry/auth/credentialprovider" regauthn "github.com/google/go-containerregistry/pkg/authn" ) diff --git a/pkg/imgpkg/registry/keychain.go b/pkg/imgpkg/registry/keychain.go index b185223e5..543980031 100644 --- a/pkg/imgpkg/registry/keychain.go +++ b/pkg/imgpkg/registry/keychain.go @@ -7,12 +7,12 @@ import ( "fmt" "io" + "carvel.dev/imgpkg/pkg/imgpkg/registry/auth" "github.com/awslabs/amazon-ecr-credential-helper/ecr-login" "github.com/chrismellard/docker-credential-acr-env/pkg/credhelper" regauthn "github.com/google/go-containerregistry/pkg/authn" "github.com/google/go-containerregistry/pkg/authn/github" "github.com/google/go-containerregistry/pkg/v1/google" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/registry/auth" ) // Keychain implements an authn.Keychain interface by composing multiple keychains. diff --git a/pkg/imgpkg/registry/registry.go b/pkg/imgpkg/registry/registry.go index f7536b6b3..b9d985979 100644 --- a/pkg/imgpkg/registry/registry.go +++ b/pkg/imgpkg/registry/registry.go @@ -13,14 +13,14 @@ import ( "sync" "time" + "carvel.dev/imgpkg/pkg/imgpkg/internal/util" + "carvel.dev/imgpkg/pkg/imgpkg/registry/auth" regauthn "github.com/google/go-containerregistry/pkg/authn" "github.com/google/go-containerregistry/pkg/logs" regname "github.com/google/go-containerregistry/pkg/name" regv1 "github.com/google/go-containerregistry/pkg/v1" regremote "github.com/google/go-containerregistry/pkg/v1/remote" "github.com/google/go-containerregistry/pkg/v1/remote/transport" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/internal/util" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/registry/auth" ) type Opts struct { diff --git a/pkg/imgpkg/registry/registry_test.go b/pkg/imgpkg/registry/registry_test.go index 57dc8dacd..f6f0ecdc9 100644 --- a/pkg/imgpkg/registry/registry_test.go +++ b/pkg/imgpkg/registry/registry_test.go @@ -12,12 +12,12 @@ import ( "strings" "testing" + "carvel.dev/imgpkg/pkg/imgpkg/registry" "github.com/google/go-containerregistry/pkg/name" regremote "github.com/google/go-containerregistry/pkg/v1/remote" "github.com/google/go-containerregistry/pkg/v1/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/registry" ) func TestRegistry_Digest(t *testing.T) { diff --git a/pkg/imgpkg/registry/registryfakes/fake_images_reader.go b/pkg/imgpkg/registry/registryfakes/fake_images_reader.go index 8cf88e3de..1af18b790 100644 --- a/pkg/imgpkg/registry/registryfakes/fake_images_reader.go +++ b/pkg/imgpkg/registry/registryfakes/fake_images_reader.go @@ -7,7 +7,7 @@ import ( "github.com/google/go-containerregistry/pkg/name" v1 "github.com/google/go-containerregistry/pkg/v1" "github.com/google/go-containerregistry/pkg/v1/remote" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/registry" + "carvel.dev/imgpkg/pkg/imgpkg/registry" ) type FakeImagesReader struct { diff --git a/pkg/imgpkg/registry/registryfakes/fake_images_reader_writer.go b/pkg/imgpkg/registry/registryfakes/fake_images_reader_writer.go index 9dab948f9..5bf5d098c 100644 --- a/pkg/imgpkg/registry/registryfakes/fake_images_reader_writer.go +++ b/pkg/imgpkg/registry/registryfakes/fake_images_reader_writer.go @@ -7,8 +7,8 @@ import ( "github.com/google/go-containerregistry/pkg/name" v1 "github.com/google/go-containerregistry/pkg/v1" "github.com/google/go-containerregistry/pkg/v1/remote" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/internal/util" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/registry" + "carvel.dev/imgpkg/pkg/imgpkg/internal/util" + "carvel.dev/imgpkg/pkg/imgpkg/registry" ) type FakeImagesReaderWriter struct { diff --git a/pkg/imgpkg/registry/with_progress.go b/pkg/imgpkg/registry/with_progress.go index fa464be9f..583d6d4ba 100644 --- a/pkg/imgpkg/registry/with_progress.go +++ b/pkg/imgpkg/registry/with_progress.go @@ -6,10 +6,10 @@ package registry import ( "context" + "carvel.dev/imgpkg/pkg/imgpkg/internal/util" regname "github.com/google/go-containerregistry/pkg/name" regv1 "github.com/google/go-containerregistry/pkg/v1" "github.com/google/go-containerregistry/pkg/v1/remote" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/internal/util" ) var _ Registry = &WithProgress{} diff --git a/pkg/imgpkg/signature/cosign.go b/pkg/imgpkg/signature/cosign.go index ef4e1d5d1..b41373d69 100644 --- a/pkg/imgpkg/signature/cosign.go +++ b/pkg/imgpkg/signature/cosign.go @@ -7,11 +7,11 @@ import ( "fmt" "net/http" + "carvel.dev/imgpkg/pkg/imgpkg/imageset" + "carvel.dev/imgpkg/pkg/imgpkg/signature/cosign" regname "github.com/google/go-containerregistry/pkg/name" regv1 "github.com/google/go-containerregistry/pkg/v1" "github.com/google/go-containerregistry/pkg/v1/remote/transport" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imageset" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/signature/cosign" ) // DigestReader Interface that knows how to read a Digest from a registry diff --git a/pkg/imgpkg/signature/cosign_test.go b/pkg/imgpkg/signature/cosign_test.go index 662a2b8df..cba1b64a8 100644 --- a/pkg/imgpkg/signature/cosign_test.go +++ b/pkg/imgpkg/signature/cosign_test.go @@ -8,11 +8,11 @@ import ( "strings" "testing" + "carvel.dev/imgpkg/pkg/imgpkg/signature" + "carvel.dev/imgpkg/test/helpers" "github.com/google/go-containerregistry/pkg/name" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/signature" - "github.com/vmware-tanzu/carvel-imgpkg/test/helpers" ) func TestCosign_Signature(t *testing.T) { diff --git a/pkg/imgpkg/signature/fetch_signatures.go b/pkg/imgpkg/signature/fetch_signatures.go index cbb7ad7b6..4f99b8893 100644 --- a/pkg/imgpkg/signature/fetch_signatures.go +++ b/pkg/imgpkg/signature/fetch_signatures.go @@ -8,10 +8,10 @@ import ( "fmt" "sync" + "carvel.dev/imgpkg/pkg/imgpkg/imageset" + "carvel.dev/imgpkg/pkg/imgpkg/internal/util" + "carvel.dev/imgpkg/pkg/imgpkg/lockconfig" "github.com/google/go-containerregistry/pkg/name" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imageset" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/internal/util" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/lockconfig" "golang.org/x/sync/errgroup" ) diff --git a/pkg/imgpkg/signature/fetch_signatures_test.go b/pkg/imgpkg/signature/fetch_signatures_test.go index 5653b41ee..a84713843 100644 --- a/pkg/imgpkg/signature/fetch_signatures_test.go +++ b/pkg/imgpkg/signature/fetch_signatures_test.go @@ -7,13 +7,13 @@ import ( "fmt" "testing" + "carvel.dev/imgpkg/pkg/imgpkg/imageset" + "carvel.dev/imgpkg/pkg/imgpkg/lockconfig" + "carvel.dev/imgpkg/pkg/imgpkg/signature" + "carvel.dev/imgpkg/pkg/imgpkg/signature/signaturefakes" regname "github.com/google/go-containerregistry/pkg/name" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imageset" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/lockconfig" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/signature" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/signature/signaturefakes" ) func TestSignatureRetriever_Signatures(t *testing.T) { diff --git a/pkg/imgpkg/signature/signaturefakes/fake_finder.go b/pkg/imgpkg/signature/signaturefakes/fake_finder.go index 2358f4f7b..4c13ccfbc 100644 --- a/pkg/imgpkg/signature/signaturefakes/fake_finder.go +++ b/pkg/imgpkg/signature/signaturefakes/fake_finder.go @@ -5,8 +5,8 @@ import ( "sync" "github.com/google/go-containerregistry/pkg/name" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imageset" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/signature" + "carvel.dev/imgpkg/pkg/imgpkg/imageset" + "carvel.dev/imgpkg/pkg/imgpkg/signature" ) type FakeFinder struct { diff --git a/pkg/imgpkg/v1/describe.go b/pkg/imgpkg/v1/describe.go index ebe071d3f..7cc15d365 100644 --- a/pkg/imgpkg/v1/describe.go +++ b/pkg/imgpkg/v1/describe.go @@ -8,11 +8,11 @@ import ( "fmt" "sort" + "carvel.dev/imgpkg/pkg/imgpkg/bundle" + "carvel.dev/imgpkg/pkg/imgpkg/lockconfig" + "carvel.dev/imgpkg/pkg/imgpkg/registry" + "carvel.dev/imgpkg/pkg/imgpkg/signature" "github.com/google/go-containerregistry/pkg/name" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/bundle" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/lockconfig" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/registry" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/signature" ) // Author information from a Bundle diff --git a/pkg/imgpkg/v1/describe_test.go b/pkg/imgpkg/v1/describe_test.go index 1df47252c..964fe586a 100644 --- a/pkg/imgpkg/v1/describe_test.go +++ b/pkg/imgpkg/v1/describe_test.go @@ -10,16 +10,16 @@ import ( "strings" "testing" + ctlbundle "carvel.dev/imgpkg/pkg/imgpkg/bundle" + "carvel.dev/imgpkg/pkg/imgpkg/lockconfig" + "carvel.dev/imgpkg/pkg/imgpkg/registry" + "carvel.dev/imgpkg/pkg/imgpkg/signature/cosign" + "carvel.dev/imgpkg/pkg/imgpkg/v1" + "carvel.dev/imgpkg/test/helpers" "github.com/google/go-containerregistry/pkg/name" regv1 "github.com/google/go-containerregistry/pkg/v1" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - ctlbundle "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/bundle" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/lockconfig" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/registry" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/signature/cosign" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/v1" - "github.com/vmware-tanzu/carvel-imgpkg/test/helpers" ) type testDescribe struct { diff --git a/pkg/imgpkg/v1/pull.go b/pkg/imgpkg/v1/pull.go index 7a8f4ba0c..37bc78808 100644 --- a/pkg/imgpkg/v1/pull.go +++ b/pkg/imgpkg/v1/pull.go @@ -7,10 +7,10 @@ import ( "fmt" "path/filepath" + "carvel.dev/imgpkg/pkg/imgpkg/bundle" + "carvel.dev/imgpkg/pkg/imgpkg/plainimage" + "carvel.dev/imgpkg/pkg/imgpkg/registry" "github.com/google/go-containerregistry/pkg/name" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/bundle" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/plainimage" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/registry" ) // Logger Interface used for logging diff --git a/pkg/imgpkg/v1/pull_test.go b/pkg/imgpkg/v1/pull_test.go index cc7dc3bc7..1ece3b578 100644 --- a/pkg/imgpkg/v1/pull_test.go +++ b/pkg/imgpkg/v1/pull_test.go @@ -9,15 +9,15 @@ import ( "path/filepath" "testing" + "carvel.dev/imgpkg/pkg/imgpkg/internal/util" + "carvel.dev/imgpkg/pkg/imgpkg/lockconfig" + "carvel.dev/imgpkg/pkg/imgpkg/registry" + v1 "carvel.dev/imgpkg/pkg/imgpkg/v1" + "carvel.dev/imgpkg/test/helpers" regname "github.com/google/go-containerregistry/pkg/name" regv1 "github.com/google/go-containerregistry/pkg/v1" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/internal/util" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/lockconfig" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/registry" - v1 "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/v1" - "github.com/vmware-tanzu/carvel-imgpkg/test/helpers" ) func TestPullImage(t *testing.T) { diff --git a/pkg/imgpkg/v1/registry.go b/pkg/imgpkg/v1/registry.go index 1dec631b3..a4221137a 100644 --- a/pkg/imgpkg/v1/registry.go +++ b/pkg/imgpkg/v1/registry.go @@ -6,8 +6,8 @@ package v1 import ( "strings" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/registry" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/registry/auth" + "carvel.dev/imgpkg/pkg/imgpkg/registry" + "carvel.dev/imgpkg/pkg/imgpkg/registry/auth" ) // OptsFromEnv Using the base Opts fills up the missing information using the environment variables diff --git a/pkg/imgpkg/v1/registry_test.go b/pkg/imgpkg/v1/registry_test.go index ce295a43c..b9ba1937d 100644 --- a/pkg/imgpkg/v1/registry_test.go +++ b/pkg/imgpkg/v1/registry_test.go @@ -6,10 +6,10 @@ package v1_test import ( "testing" + "carvel.dev/imgpkg/pkg/imgpkg/registry" + "carvel.dev/imgpkg/pkg/imgpkg/registry/auth" + v1 "carvel.dev/imgpkg/pkg/imgpkg/v1" "github.com/stretchr/testify/require" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/registry" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/registry/auth" - v1 "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/v1" ) func TestOptsFromEnv(t *testing.T) { diff --git a/pkg/imgpkg/v1/tag.go b/pkg/imgpkg/v1/tag.go index 3f35b6736..099553384 100644 --- a/pkg/imgpkg/v1/tag.go +++ b/pkg/imgpkg/v1/tag.go @@ -4,8 +4,8 @@ package v1 import ( + "carvel.dev/imgpkg/pkg/imgpkg/registry" regname "github.com/google/go-containerregistry/pkg/name" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/registry" ) // TagInfo Contains the tag name and the digest associated with the tag diff --git a/pkg/imgpkg/v1/tag_test.go b/pkg/imgpkg/v1/tag_test.go index 2954f4710..c36231c4c 100644 --- a/pkg/imgpkg/v1/tag_test.go +++ b/pkg/imgpkg/v1/tag_test.go @@ -6,10 +6,10 @@ package v1_test import ( "testing" + "carvel.dev/imgpkg/pkg/imgpkg/registry" + v1 "carvel.dev/imgpkg/pkg/imgpkg/v1" + "carvel.dev/imgpkg/test/helpers" "github.com/stretchr/testify/require" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/registry" - v1 "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/v1" - "github.com/vmware-tanzu/carvel-imgpkg/test/helpers" ) func TestTagList(t *testing.T) { diff --git a/test/e2e/auth_error_test.go b/test/e2e/auth_error_test.go index b03ac75e5..769ff1933 100644 --- a/test/e2e/auth_error_test.go +++ b/test/e2e/auth_error_test.go @@ -7,9 +7,9 @@ import ( "bytes" "testing" + "carvel.dev/imgpkg/test/helpers" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/vmware-tanzu/carvel-imgpkg/test/helpers" ) func TestAuthErr(t *testing.T) { diff --git a/test/e2e/auth_test.go b/test/e2e/auth_test.go index 42d806cb0..77c3c2d4c 100644 --- a/test/e2e/auth_test.go +++ b/test/e2e/auth_test.go @@ -5,8 +5,8 @@ package e2e import ( "testing" + "carvel.dev/imgpkg/test/helpers" "github.com/stretchr/testify/assert" - "github.com/vmware-tanzu/carvel-imgpkg/test/helpers" ) func TestAuth(t *testing.T) { diff --git a/test/e2e/bundle_test.go b/test/e2e/bundle_test.go index ca9f803a2..9119ab3bd 100644 --- a/test/e2e/bundle_test.go +++ b/test/e2e/bundle_test.go @@ -11,12 +11,12 @@ import ( "strings" "testing" + "carvel.dev/imgpkg/test/helpers" "github.com/google/go-containerregistry/pkg/authn" "github.com/google/go-containerregistry/pkg/name" "github.com/google/go-containerregistry/pkg/v1/remote" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/vmware-tanzu/carvel-imgpkg/test/helpers" ) func TestPushPullBundle(t *testing.T) { diff --git a/test/e2e/copy_from_bundle_image_test.go b/test/e2e/copy_from_bundle_image_test.go index 317ad6f23..33deffcf1 100644 --- a/test/e2e/copy_from_bundle_image_test.go +++ b/test/e2e/copy_from_bundle_image_test.go @@ -11,13 +11,13 @@ import ( "testing" "time" + "carvel.dev/imgpkg/pkg/imgpkg/bundle" + "carvel.dev/imgpkg/pkg/imgpkg/lockconfig" + "carvel.dev/imgpkg/test/helpers" regname "github.com/google/go-containerregistry/pkg/name" v1 "github.com/google/go-containerregistry/pkg/v1" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/bundle" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/lockconfig" - "github.com/vmware-tanzu/carvel-imgpkg/test/helpers" ) func TestCopyBundleToDifferentRepository(t *testing.T) { diff --git a/test/e2e/copy_from_image_test.go b/test/e2e/copy_from_image_test.go index c19858928..0a1e0ce6b 100644 --- a/test/e2e/copy_from_image_test.go +++ b/test/e2e/copy_from_image_test.go @@ -13,15 +13,14 @@ import ( "testing" "time" + "carvel.dev/imgpkg/pkg/imgpkg/lockconfig" + "carvel.dev/imgpkg/test/helpers" "github.com/google/go-containerregistry/pkg/authn" "github.com/google/go-containerregistry/pkg/name" "github.com/google/go-containerregistry/pkg/v1/remote" "github.com/google/go-containerregistry/pkg/v1/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/vmware-tanzu/carvel-imgpkg/test/helpers" - - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/lockconfig" ) func TestCopyImageToRepoDestinationAndOutputImageLockFileAndPreserveImageTag(t *testing.T) { diff --git a/test/e2e/copy_from_lockfiles_test.go b/test/e2e/copy_from_lockfiles_test.go index bb22b0607..e7d6b4ea4 100644 --- a/test/e2e/copy_from_lockfiles_test.go +++ b/test/e2e/copy_from_lockfiles_test.go @@ -10,11 +10,11 @@ import ( "testing" "time" + "carvel.dev/imgpkg/pkg/imgpkg/bundle" + "carvel.dev/imgpkg/pkg/imgpkg/lockconfig" + "carvel.dev/imgpkg/test/helpers" regname "github.com/google/go-containerregistry/pkg/name" "github.com/stretchr/testify/require" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/bundle" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/lockconfig" - "github.com/vmware-tanzu/carvel-imgpkg/test/helpers" ) func TestCopyFromBundleLock(t *testing.T) { diff --git a/test/e2e/copy_from_tar_test.go b/test/e2e/copy_from_tar_test.go index 52a13bc4f..144c3ef31 100644 --- a/test/e2e/copy_from_tar_test.go +++ b/test/e2e/copy_from_tar_test.go @@ -9,12 +9,12 @@ import ( "path/filepath" "testing" + "carvel.dev/imgpkg/pkg/imgpkg/lockconfig" + "carvel.dev/imgpkg/test/helpers" "github.com/google/go-containerregistry/pkg/name" "github.com/google/go-containerregistry/pkg/v1/remote" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/lockconfig" - "github.com/vmware-tanzu/carvel-imgpkg/test/helpers" ) func TestCopyTarSrc(t *testing.T) { diff --git a/test/e2e/debug_test.go b/test/e2e/debug_test.go index 902d9a5e4..0a05a10a5 100644 --- a/test/e2e/debug_test.go +++ b/test/e2e/debug_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "testing" - "github.com/vmware-tanzu/carvel-imgpkg/test/helpers" + "carvel.dev/imgpkg/test/helpers" ) func TestDebugDisabled(t *testing.T) { diff --git a/test/e2e/describe_test.go b/test/e2e/describe_test.go index c2a686f10..35516635e 100644 --- a/test/e2e/describe_test.go +++ b/test/e2e/describe_test.go @@ -9,10 +9,10 @@ import ( "testing" "time" + "carvel.dev/imgpkg/test/helpers" regname "github.com/google/go-containerregistry/pkg/name" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/vmware-tanzu/carvel-imgpkg/test/helpers" ) func TestDescribe_TextOutput(t *testing.T) { diff --git a/test/e2e/deterministic_push_test.go b/test/e2e/deterministic_push_test.go index f874865ad..03ce2b276 100644 --- a/test/e2e/deterministic_push_test.go +++ b/test/e2e/deterministic_push_test.go @@ -7,8 +7,8 @@ import ( "runtime" "testing" + "carvel.dev/imgpkg/test/helpers" "github.com/stretchr/testify/require" - "github.com/vmware-tanzu/carvel-imgpkg/test/helpers" ) func TestDeterministicPush(t *testing.T) { diff --git a/test/e2e/gcloud_expired_token_test.go b/test/e2e/gcloud_expired_token_test.go index 186d7c74a..794719309 100644 --- a/test/e2e/gcloud_expired_token_test.go +++ b/test/e2e/gcloud_expired_token_test.go @@ -11,8 +11,8 @@ import ( "runtime" "testing" + "carvel.dev/imgpkg/test/helpers" "github.com/stretchr/testify/require" - "github.com/vmware-tanzu/carvel-imgpkg/test/helpers" ) func TestCopyWithBundleLockInputToRepoDestinationUsingGCloudWithAnExpiredToken(t *testing.T) { diff --git a/test/e2e/image_test.go b/test/e2e/image_test.go index 6045af837..79ee23a9b 100644 --- a/test/e2e/image_test.go +++ b/test/e2e/image_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "github.com/vmware-tanzu/carvel-imgpkg/test/helpers" + "carvel.dev/imgpkg/test/helpers" ) func TestPushPull(t *testing.T) { diff --git a/test/e2e/pull_test.go b/test/e2e/pull_test.go index 43ff1a9c7..bc67c67b2 100644 --- a/test/e2e/pull_test.go +++ b/test/e2e/pull_test.go @@ -13,12 +13,12 @@ import ( "testing" "time" + "carvel.dev/imgpkg/pkg/imgpkg/bundle" + "carvel.dev/imgpkg/pkg/imgpkg/lockconfig" + "carvel.dev/imgpkg/test/helpers" v1 "github.com/google/go-containerregistry/pkg/v1" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/bundle" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/lockconfig" - "github.com/vmware-tanzu/carvel-imgpkg/test/helpers" ) func TestPullImageLockRewrite(t *testing.T) { diff --git a/test/e2e/pull_test_unix_only_test.go b/test/e2e/pull_test_unix_only_test.go index 3ad618f3c..d87a662b1 100644 --- a/test/e2e/pull_test_unix_only_test.go +++ b/test/e2e/pull_test_unix_only_test.go @@ -12,9 +12,9 @@ import ( "runtime" "testing" + "carvel.dev/imgpkg/test/helpers" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/vmware-tanzu/carvel-imgpkg/test/helpers" "golang.org/x/sys/unix" ) @@ -27,7 +27,7 @@ func TestPull(t *testing.T) { t.Run("Image - copies the User Permission to group and other", func(t *testing.T) { if runtime.GOOS == "windows" { - t.Skip("Skipping test as this is a known issue: https://github.com/vmware-tanzu/carvel-imgpkg/issues/270") + t.Skip("Skipping test as this is a known issue: https://github.com/carvel-dev/imgpkg/issues/270") } folder := env.Assets.CreateTempFolder("simple-image") @@ -71,7 +71,7 @@ func TestPull(t *testing.T) { t.Run("Image - when --preserve-permissions flag is provided it keeps the original permissions on the files", func(t *testing.T) { if runtime.GOOS == "windows" { - t.Skip("Skipping test as this is a known issue: https://github.com/vmware-tanzu/carvel-imgpkg/issues/270") + t.Skip("Skipping test as this is a known issue: https://github.com/carvel-dev/imgpkg/issues/270") } folder := env.Assets.CreateTempFolder("simple-image") @@ -115,7 +115,7 @@ func TestPull(t *testing.T) { t.Run("Image - copies the User Permission to group and other but skips execution because umask is set to 0111", func(t *testing.T) { if runtime.GOOS == "windows" { - t.Skip("Skipping test as this is a known issue: https://github.com/vmware-tanzu/carvel-imgpkg/issues/270") + t.Skip("Skipping test as this is a known issue: https://github.com/carvel-dev/imgpkg/issues/270") } folder := env.Assets.CreateTempFolder("simple-image") @@ -174,7 +174,7 @@ func TestPull(t *testing.T) { t.Run("Bundle - copies the User Permission to group and other", func(t *testing.T) { if runtime.GOOS == "windows" { - t.Skip("Skipping test as this is a known issue: https://github.com/vmware-tanzu/carvel-imgpkg/issues/270") + t.Skip("Skipping test as this is a known issue: https://github.com/carvel-dev/imgpkg/issues/270") } bundleDir := env.BundleFactory.CreateBundleDir(helpers.BundleYAML, helpers.ImagesYAML) @@ -212,7 +212,7 @@ func TestPull(t *testing.T) { t.Run("Bundle - when --preserve-permissions flag is provided it keeps the original permissions on the files", func(t *testing.T) { if runtime.GOOS == "windows" { - t.Skip("Skipping test as this is a known issue: https://github.com/vmware-tanzu/carvel-imgpkg/issues/270") + t.Skip("Skipping test as this is a known issue: https://https://github.com/carvel-dev/imgpkg/issues/270") } bundleDir := env.BundleFactory.CreateBundleDir(helpers.BundleYAML, helpers.ImagesYAML) diff --git a/test/e2e/push_test.go b/test/e2e/push_test.go index e1d4408cf..6a4b3ae50 100644 --- a/test/e2e/push_test.go +++ b/test/e2e/push_test.go @@ -8,7 +8,7 @@ import ( "path/filepath" "testing" - "github.com/vmware-tanzu/carvel-imgpkg/test/helpers" + "carvel.dev/imgpkg/test/helpers" ) func TestPushBundleOfBundles(t *testing.T) { diff --git a/test/e2e/tag_list_test.go b/test/e2e/tag_list_test.go index e89e6271d..2bff0669a 100644 --- a/test/e2e/tag_list_test.go +++ b/test/e2e/tag_list_test.go @@ -6,9 +6,9 @@ package e2e import ( "testing" + "carvel.dev/imgpkg/test/helpers" uitest "github.com/cppforlife/go-cli-ui/ui/test" "github.com/stretchr/testify/require" - "github.com/vmware-tanzu/carvel-imgpkg/test/helpers" ) func TestTagList(t *testing.T) { diff --git a/test/e2e/tag_resolve_test.go b/test/e2e/tag_resolve_test.go index 5d833f792..4a627c35a 100644 --- a/test/e2e/tag_resolve_test.go +++ b/test/e2e/tag_resolve_test.go @@ -6,8 +6,8 @@ package e2e import ( "testing" + "carvel.dev/imgpkg/test/helpers" "github.com/stretchr/testify/require" - "github.com/vmware-tanzu/carvel-imgpkg/test/helpers" ) func TestTagResolve(t *testing.T) { diff --git a/test/e2e/version_test.go b/test/e2e/version_test.go index 31e830d88..712daa249 100644 --- a/test/e2e/version_test.go +++ b/test/e2e/version_test.go @@ -6,8 +6,8 @@ package e2e import ( "testing" + "carvel.dev/imgpkg/test/helpers" "github.com/stretchr/testify/require" - "github.com/vmware-tanzu/carvel-imgpkg/test/helpers" ) func TestVersion(t *testing.T) { diff --git a/test/helpers/assertion.go b/test/helpers/assertion.go index 2e5c6b3cf..538661aef 100644 --- a/test/helpers/assertion.go +++ b/test/helpers/assertion.go @@ -11,13 +11,13 @@ import ( "strings" "testing" + "carvel.dev/imgpkg/pkg/imgpkg/imagetar" + "carvel.dev/imgpkg/pkg/imgpkg/lockconfig" "github.com/google/go-containerregistry/pkg/authn" "github.com/google/go-containerregistry/pkg/name" "github.com/google/go-containerregistry/pkg/v1/remote" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imagetar" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/lockconfig" ) type Assertion struct { diff --git a/test/helpers/fake_registry.go b/test/helpers/fake_registry.go index 3e8e10955..be5016bd9 100644 --- a/test/helpers/fake_registry.go +++ b/test/helpers/fake_registry.go @@ -18,6 +18,12 @@ import ( "sync" "testing" + "carvel.dev/imgpkg/pkg/imgpkg/bundle" + "carvel.dev/imgpkg/pkg/imgpkg/image" + "carvel.dev/imgpkg/pkg/imgpkg/imageset" + "carvel.dev/imgpkg/pkg/imgpkg/lockconfig" + "carvel.dev/imgpkg/pkg/imgpkg/registry" + regregistry "carvel.dev/imgpkg/test/helpers/registry" "github.com/google/go-containerregistry/pkg/authn" "github.com/google/go-containerregistry/pkg/name" regname "github.com/google/go-containerregistry/pkg/name" @@ -28,12 +34,6 @@ import ( "github.com/google/go-containerregistry/pkg/v1/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/bundle" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/image" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imageset" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/lockconfig" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/registry" - regregistry "github.com/vmware-tanzu/carvel-imgpkg/test/helpers/registry" ) type FakeTestRegistryBuilder struct { diff --git a/test/helpers/image_factory.go b/test/helpers/image_factory.go index 606d973e5..e3e1a9998 100644 --- a/test/helpers/image_factory.go +++ b/test/helpers/image_factory.go @@ -13,6 +13,7 @@ import ( "strings" "testing" + ctlimg "carvel.dev/imgpkg/pkg/imgpkg/image" "github.com/google/go-containerregistry/pkg/authn" "github.com/google/go-containerregistry/pkg/name" "github.com/google/go-containerregistry/pkg/v1/empty" @@ -21,7 +22,6 @@ import ( "github.com/google/go-containerregistry/pkg/v1/remote" "github.com/google/go-containerregistry/pkg/v1/types" "github.com/stretchr/testify/require" - ctlimg "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/image" ) type ImageFactory struct { diff --git a/test/helpers/registry/blobs.go b/test/helpers/registry/blobs.go index fc2a05e28..1007eeb64 100644 --- a/test/helpers/registry/blobs.go +++ b/test/helpers/registry/blobs.go @@ -33,8 +33,8 @@ import ( "strings" "sync" + "carvel.dev/imgpkg/pkg/imgpkg/imageutils/verify" v1 "github.com/google/go-containerregistry/pkg/v1" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imageutils/verify" ) // Returns whether this url should be handled by the blob handler diff --git a/test/helpers/registry/tls.go b/test/helpers/registry/tls.go index dfa860c88..22095da5d 100644 --- a/test/helpers/registry/tls.go +++ b/test/helpers/registry/tls.go @@ -23,7 +23,7 @@ package registry import ( "net/http/httptest" - ggcrtest "github.com/vmware-tanzu/carvel-imgpkg/test/helpers/registry/httptest" + ggcrtest "carvel.dev/imgpkg/test/helpers/registry/httptest" ) // TLS returns an httptest server, with an http client that has been configured to diff --git a/test/perf/perf_test.go b/test/perf/perf_test.go index 50706dc5a..b5c4467ab 100644 --- a/test/perf/perf_test.go +++ b/test/perf/perf_test.go @@ -10,9 +10,9 @@ import ( "testing" "time" + "carvel.dev/imgpkg/test/helpers" regname "github.com/google/go-containerregistry/pkg/name" "github.com/stretchr/testify/require" - "github.com/vmware-tanzu/carvel-imgpkg/test/helpers" ) type ByteSize int64