From df34d3ca6f99488b90ef497880def019e2b269f7 Mon Sep 17 00:00:00 2001 From: Joao Pereira Date: Wed, 25 Oct 2023 15:47:26 -0500 Subject: [PATCH 1/2] Use carvel.dev/imgpkg to import imgpkg Signed-off-by: Joao Pereira --- go.mod | 2 +- go.sum | 4 +- pkg/vendir/fetch/image/imgpkg.go | 4 +- pkg/vendir/fetch/image/imgpkg_test.go | 4 +- .../imgpkg}/LICENSE | 0 .../imgpkg}/NOTICE | 0 .../imgpkg}/pkg/imgpkg/bundle/bundle.go | 10 ++--- .../pkg/imgpkg/bundle/bundle_images_lock.go | 4 +- .../imgpkg}/pkg/imgpkg/bundle/contents.go | 6 +-- .../imgpkg}/pkg/imgpkg/bundle/fetch_bundle.go | 8 ++-- .../imgpkg}/pkg/imgpkg/bundle/fetch_images.go | 4 +- .../imgpkg/bundle/image_locations_config.go | 0 .../imgpkg}/pkg/imgpkg/bundle/images_refs.go | 2 +- .../pkg/imgpkg/bundle/locations_configs.go | 4 +- .../pkg/imgpkg/bundle/lock_with_key.go | 0 .../imgpkg}/pkg/imgpkg/bundle/validation.go | 2 +- .../imgpkg}/pkg/imgpkg/image/dir_image.go | 0 .../imgpkg}/pkg/imgpkg/image/file_image.go | 0 .../imgpkg}/pkg/imgpkg/image/file_layer.go | 0 .../imgpkg}/pkg/imgpkg/image/tar_image.go | 0 .../imagedesc/described_compressed_layer.go | 4 +- .../pkg/imgpkg/imagedesc/described_image.go | 0 .../imgpkg/imagedesc/described_image_index.go | 0 .../pkg/imgpkg/imagedesc/described_reader.go | 0 .../imgpkg/imagedesc/image_ref_descriptors.go | 2 +- .../imgpkg}/pkg/imgpkg/imagedesc/types.go | 0 .../pkg/imgpkg/imagedigest/imagedigest.go | 0 .../imgpkg}/pkg/imgpkg/imageset/image_set.go | 8 ++-- .../pkg/imgpkg/imageset/processed_images.go | 0 .../pkg/imgpkg/imageset/tar_image_set.go | 6 +-- .../imgpkg/imageset/unprocessed_image_refs.go | 0 .../imagetar/non_distributable_layers.go | 0 .../imgpkg}/pkg/imgpkg/imagetar/tar_file.go | 4 +- .../imgpkg}/pkg/imgpkg/imagetar/tar_reader.go | 4 +- .../imgpkg}/pkg/imgpkg/imagetar/tar_writer.go | 4 +- .../pkg/imgpkg/imageutils/and/and_closer.go | 0 .../imgpkg}/pkg/imgpkg/imageutils/gzip/zip.go | 2 +- .../pkg/imgpkg/imageutils/verify/verify.go | 2 +- .../pkg/imgpkg/internal/util/level_logger.go | 0 .../pkg/imgpkg/internal/util/logger.go | 0 .../imgpkg/internal/util/prefixed_logger.go | 0 .../imgpkg/internal/util/progress_logger.go | 0 .../imgpkg}/pkg/imgpkg/internal/util/retry.go | 0 .../imgpkg}/pkg/imgpkg/internal/util/tag.go | 2 +- .../pkg/imgpkg/internal/util/throttle.go | 0 .../pkg/imgpkg/lockconfig/bundle_lock.go | 0 .../imgpkg}/pkg/imgpkg/lockconfig/generic.go | 0 .../pkg/imgpkg/lockconfig/images_lock.go | 0 .../imgpkg}/pkg/imgpkg/plainimage/contents.go | 4 +- .../pkg/imgpkg/plainimage/plain_image.go | 2 +- .../auth/credentialprovider/keyring.go | 0 .../imgpkg/registry/auth/custom_keychain.go | 2 +- .../pkg/imgpkg/registry/auth/env_keychain.go | 2 +- .../imgpkg}/pkg/imgpkg/registry/doc.go | 0 .../imgpkg}/pkg/imgpkg/registry/keychain.go | 2 +- .../imgpkg}/pkg/imgpkg/registry/registry.go | 4 +- .../imgpkg}/pkg/imgpkg/registry/transport.go | 0 .../pkg/imgpkg/registry/with_progress.go | 2 +- .../imgpkg}/pkg/imgpkg/signature/cosign.go | 4 +- .../pkg/imgpkg/signature/cosign/fetch.go | 0 .../pkg/imgpkg/signature/fetch_signatures.go | 6 +-- .../imgpkg}/pkg/imgpkg/v1/describe.go | 8 ++-- .../imgpkg}/pkg/imgpkg/v1/error.go | 0 .../imgpkg}/pkg/imgpkg/v1/pull.go | 6 +-- .../imgpkg}/pkg/imgpkg/v1/registry.go | 4 +- .../imgpkg}/pkg/imgpkg/v1/tag.go | 2 +- vendor/modules.txt | 40 +++++++++---------- 67 files changed, 90 insertions(+), 90 deletions(-) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/LICENSE (100%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/NOTICE (100%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/bundle/bundle.go (97%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/bundle/bundle_images_lock.go (98%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/bundle/contents.go (95%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/bundle/fetch_bundle.go (95%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/bundle/fetch_images.go (94%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/bundle/image_locations_config.go (100%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/bundle/images_refs.go (99%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/bundle/locations_configs.go (98%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/bundle/lock_with_key.go (100%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/bundle/validation.go (90%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/image/dir_image.go (100%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/image/file_image.go (100%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/image/file_layer.go (100%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/image/tar_image.go (100%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/imagedesc/described_compressed_layer.go (93%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/imagedesc/described_image.go (100%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/imagedesc/described_image_index.go (100%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/imagedesc/described_reader.go (100%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/imagedesc/image_ref_descriptors.go (99%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/imagedesc/types.go (100%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/imagedigest/imagedigest.go (100%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/imageset/image_set.go (97%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/imageset/processed_images.go (100%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/imageset/tar_image_set.go (95%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/imageset/unprocessed_image_refs.go (100%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/imagetar/non_distributable_layers.go (100%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/imagetar/tar_file.go (94%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/imagetar/tar_reader.go (96%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/imagetar/tar_writer.go (98%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/imageutils/and/and_closer.go (100%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/imageutils/gzip/zip.go (97%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/imageutils/verify/verify.go (98%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/internal/util/level_logger.go (100%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/internal/util/logger.go (100%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/internal/util/prefixed_logger.go (100%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/internal/util/progress_logger.go (100%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/internal/util/retry.go (100%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/internal/util/tag.go (98%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/internal/util/throttle.go (100%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/lockconfig/bundle_lock.go (100%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/lockconfig/generic.go (100%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/lockconfig/images_lock.go (100%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/plainimage/contents.go (95%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/plainimage/plain_image.go (98%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/registry/auth/credentialprovider/keyring.go (100%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/registry/auth/custom_keychain.go (94%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/registry/auth/env_keychain.go (98%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/registry/doc.go (100%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/registry/keychain.go (97%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/registry/registry.go (99%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/registry/transport.go (100%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/registry/with_progress.go (98%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/signature/cosign.go (93%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/signature/cosign/fetch.go (100%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/signature/fetch_signatures.go (96%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/v1/describe.go (96%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/v1/error.go (100%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/v1/pull.go (97%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/v1/registry.go (90%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/v1/tag.go (96%) diff --git a/go.mod b/go.mod index 8e4768ae..2990bb05 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,7 @@ module github.com/vmware-tanzu/carvel-vendir go 1.21 require ( + carvel.dev/imgpkg v0.39.0 github.com/bmatcuk/doublestar v1.2.1 github.com/carvel-dev/semver/v4 v4.0.1-0.20230221220520-8090ce423695 github.com/cppforlife/cobrautil v0.0.0-20221021151949-d60711905d65 @@ -17,7 +18,6 @@ require ( github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5 github.com/spf13/cobra v1.7.0 github.com/stretchr/testify v1.8.4 - github.com/vmware-tanzu/carvel-imgpkg v0.38.2 golang.org/x/crypto v0.14.0 golang.org/x/oauth2 v0.8.0 golang.org/x/tools v0.12.0 diff --git a/go.sum b/go.sum index 0ff48faf..fed95bfd 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,5 @@ +carvel.dev/imgpkg v0.39.0 h1:faaWTLGo+CyhryyihSfSQpMoE5eHJDI1eloRbmCy7gM= +carvel.dev/imgpkg v0.39.0/go.mod h1:7aFGpUJsheXAZ8/fXMiMwU4pKXafS/ddLRjTHW9fMx8= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go/compute v1.19.3 h1:DcTwsFgGev/wV5+q8o2fzgcHOaac+DKGC91ZlvpsQds= cloud.google.com/go/compute v1.19.3/go.mod h1:qxvISKp/gYnXkSAD1ppcSOveRAmzxicEv/JlizULFrI= @@ -335,8 +337,6 @@ github.com/vbatts/tar-split v0.11.3 h1:hLFqsOLQ1SsppQNTMpkpPXClLDfC2A3Zgy9OUU+RV github.com/vbatts/tar-split v0.11.3/go.mod h1:9QlHN18E+fEH7RdG+QAJJcuya3rqT7eXSTY7wGrAokY= github.com/vito/go-interact v1.0.1 h1:O8xi8c93bRUv2Tb/v6HdiuGc+WnWt+AQzF74MOOdlBs= github.com/vito/go-interact v1.0.1/go.mod h1:HrdHSJXD2yn1MhlTwSIMeFgQ5WftiIorszVGd3S/DAA= -github.com/vmware-tanzu/carvel-imgpkg v0.38.2 h1:fSeYT7TbLV6P2JcfLW6MF9miNVJaEDpV3gfLxpZA6nA= -github.com/vmware-tanzu/carvel-imgpkg v0.38.2/go.mod h1:v9BcO1qfXwwIQFw2zmksdUkx8eI1e+/a0Md3xG2BzDE= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= diff --git a/pkg/vendir/fetch/image/imgpkg.go b/pkg/vendir/fetch/image/imgpkg.go index dfe8c3de..2fd81a04 100644 --- a/pkg/vendir/fetch/image/imgpkg.go +++ b/pkg/vendir/fetch/image/imgpkg.go @@ -10,9 +10,9 @@ import ( "strings" "time" + "carvel.dev/imgpkg/pkg/imgpkg/registry" + v1 "carvel.dev/imgpkg/pkg/imgpkg/v1" "github.com/google/go-containerregistry/pkg/name" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/registry" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/v1" ctlconf "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config" ctlfetch "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch" ctlcache "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch/cache" diff --git a/pkg/vendir/fetch/image/imgpkg_test.go b/pkg/vendir/fetch/image/imgpkg_test.go index 5b670fcb..01b055d8 100644 --- a/pkg/vendir/fetch/image/imgpkg_test.go +++ b/pkg/vendir/fetch/image/imgpkg_test.go @@ -13,14 +13,14 @@ import ( "strings" "testing" + ctlregistry "carvel.dev/imgpkg/pkg/imgpkg/registry" + "carvel.dev/imgpkg/pkg/imgpkg/registry/auth" regname "github.com/google/go-containerregistry/pkg/name" "github.com/google/go-containerregistry/pkg/registry" regrandom "github.com/google/go-containerregistry/pkg/v1/random" regremote "github.com/google/go-containerregistry/pkg/v1/remote" "github.com/phayes/freeport" "github.com/stretchr/testify/require" - ctlregistry "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/registry" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/registry/auth" ctlconf "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config" ctlfetch "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch" ctlcache "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch/cache" diff --git a/vendor/github.com/vmware-tanzu/carvel-imgpkg/LICENSE b/vendor/carvel.dev/imgpkg/LICENSE similarity index 100% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/LICENSE rename to vendor/carvel.dev/imgpkg/LICENSE diff --git a/vendor/github.com/vmware-tanzu/carvel-imgpkg/NOTICE b/vendor/carvel.dev/imgpkg/NOTICE similarity index 100% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/NOTICE rename to vendor/carvel.dev/imgpkg/NOTICE diff --git a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/bundle/bundle.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/bundle/bundle.go similarity index 97% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/bundle/bundle.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/bundle/bundle.go index a880eaf2..5049843c 100644 --- a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/bundle/bundle.go +++ b/vendor/carvel.dev/imgpkg/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/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/bundle/bundle_images_lock.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/bundle/bundle_images_lock.go similarity index 98% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/bundle/bundle_images_lock.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/bundle/bundle_images_lock.go index 1dbe9242..20865b36 100644 --- a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/bundle/bundle_images_lock.go +++ b/vendor/carvel.dev/imgpkg/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/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/bundle/contents.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/bundle/contents.go similarity index 95% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/bundle/contents.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/bundle/contents.go index 90b9a311..da97a7c4 100644 --- a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/bundle/contents.go +++ b/vendor/carvel.dev/imgpkg/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/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/bundle/fetch_bundle.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/bundle/fetch_bundle.go similarity index 95% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/bundle/fetch_bundle.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/bundle/fetch_bundle.go index c488de1b..661551d2 100644 --- a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/bundle/fetch_bundle.go +++ b/vendor/carvel.dev/imgpkg/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/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/bundle/fetch_images.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/bundle/fetch_images.go similarity index 94% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/bundle/fetch_images.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/bundle/fetch_images.go index 59c76094..1620c1b3 100644 --- a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/bundle/fetch_images.go +++ b/vendor/carvel.dev/imgpkg/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/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/bundle/image_locations_config.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/bundle/image_locations_config.go similarity index 100% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/bundle/image_locations_config.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/bundle/image_locations_config.go diff --git a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/bundle/images_refs.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/bundle/images_refs.go similarity index 99% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/bundle/images_refs.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/bundle/images_refs.go index b9653e59..701009a6 100644 --- a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/bundle/images_refs.go +++ b/vendor/carvel.dev/imgpkg/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/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/bundle/locations_configs.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/bundle/locations_configs.go similarity index 98% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/bundle/locations_configs.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/bundle/locations_configs.go index 6e82adb4..8e2ac526 100644 --- a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/bundle/locations_configs.go +++ b/vendor/carvel.dev/imgpkg/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/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/bundle/lock_with_key.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/bundle/lock_with_key.go similarity index 100% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/bundle/lock_with_key.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/bundle/lock_with_key.go diff --git a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/bundle/validation.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/bundle/validation.go similarity index 90% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/bundle/validation.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/bundle/validation.go index e556715f..33b042e5 100644 --- a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/bundle/validation.go +++ b/vendor/carvel.dev/imgpkg/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/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/image/dir_image.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/image/dir_image.go similarity index 100% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/image/dir_image.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/image/dir_image.go diff --git a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/image/file_image.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/image/file_image.go similarity index 100% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/image/file_image.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/image/file_image.go diff --git a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/image/file_layer.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/image/file_layer.go similarity index 100% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/image/file_layer.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/image/file_layer.go diff --git a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/image/tar_image.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/image/tar_image.go similarity index 100% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/image/tar_image.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/image/tar_image.go diff --git a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imagedesc/described_compressed_layer.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/imagedesc/described_compressed_layer.go similarity index 93% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imagedesc/described_compressed_layer.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/imagedesc/described_compressed_layer.go index 43c1ebf7..e84a7c4e 100644 --- a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imagedesc/described_compressed_layer.go +++ b/vendor/carvel.dev/imgpkg/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/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imagedesc/described_image.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/imagedesc/described_image.go similarity index 100% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imagedesc/described_image.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/imagedesc/described_image.go diff --git a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imagedesc/described_image_index.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/imagedesc/described_image_index.go similarity index 100% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imagedesc/described_image_index.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/imagedesc/described_image_index.go diff --git a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imagedesc/described_reader.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/imagedesc/described_reader.go similarity index 100% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imagedesc/described_reader.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/imagedesc/described_reader.go diff --git a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imagedesc/image_ref_descriptors.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/imagedesc/image_ref_descriptors.go similarity index 99% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imagedesc/image_ref_descriptors.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/imagedesc/image_ref_descriptors.go index 7d1bae82..99b66da8 100644 --- a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imagedesc/image_ref_descriptors.go +++ b/vendor/carvel.dev/imgpkg/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/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imagedesc/types.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/imagedesc/types.go similarity index 100% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imagedesc/types.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/imagedesc/types.go diff --git a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imagedigest/imagedigest.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/imagedigest/imagedigest.go similarity index 100% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imagedigest/imagedigest.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/imagedigest/imagedigest.go diff --git a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imageset/image_set.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/imageset/image_set.go similarity index 97% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imageset/image_set.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/imageset/image_set.go index e365541e..fa6b6537 100644 --- a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imageset/image_set.go +++ b/vendor/carvel.dev/imgpkg/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/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imageset/processed_images.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/imageset/processed_images.go similarity index 100% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imageset/processed_images.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/imageset/processed_images.go diff --git a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imageset/tar_image_set.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/imageset/tar_image_set.go similarity index 95% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imageset/tar_image_set.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/imageset/tar_image_set.go index c0e55943..4e7a664e 100644 --- a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imageset/tar_image_set.go +++ b/vendor/carvel.dev/imgpkg/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/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imageset/unprocessed_image_refs.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/imageset/unprocessed_image_refs.go similarity index 100% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imageset/unprocessed_image_refs.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/imageset/unprocessed_image_refs.go diff --git a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imagetar/non_distributable_layers.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/imagetar/non_distributable_layers.go similarity index 100% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imagetar/non_distributable_layers.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/imagetar/non_distributable_layers.go diff --git a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imagetar/tar_file.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/imagetar/tar_file.go similarity index 94% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imagetar/tar_file.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/imagetar/tar_file.go index 1c55df6b..a698e14f 100644 --- a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imagetar/tar_file.go +++ b/vendor/carvel.dev/imgpkg/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/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imagetar/tar_reader.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/imagetar/tar_reader.go similarity index 96% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imagetar/tar_reader.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/imagetar/tar_reader.go index c18b0637..0ce145fb 100644 --- a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imagetar/tar_reader.go +++ b/vendor/carvel.dev/imgpkg/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/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imagetar/tar_writer.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/imagetar/tar_writer.go similarity index 98% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imagetar/tar_writer.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/imagetar/tar_writer.go index cff950c5..213eed26 100644 --- a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imagetar/tar_writer.go +++ b/vendor/carvel.dev/imgpkg/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/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imageutils/and/and_closer.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/imageutils/and/and_closer.go similarity index 100% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imageutils/and/and_closer.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/imageutils/and/and_closer.go diff --git a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imageutils/gzip/zip.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/imageutils/gzip/zip.go similarity index 97% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imageutils/gzip/zip.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/imageutils/gzip/zip.go index d7de26b3..17dbe1e5 100644 --- a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imageutils/gzip/zip.go +++ b/vendor/carvel.dev/imgpkg/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/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imageutils/verify/verify.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/imageutils/verify/verify.go similarity index 98% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imageutils/verify/verify.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/imageutils/verify/verify.go index 87f295e7..a6c4e826 100644 --- a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imageutils/verify/verify.go +++ b/vendor/carvel.dev/imgpkg/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/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/internal/util/level_logger.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/internal/util/level_logger.go similarity index 100% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/internal/util/level_logger.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/internal/util/level_logger.go diff --git a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/internal/util/logger.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/internal/util/logger.go similarity index 100% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/internal/util/logger.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/internal/util/logger.go diff --git a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/internal/util/prefixed_logger.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/internal/util/prefixed_logger.go similarity index 100% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/internal/util/prefixed_logger.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/internal/util/prefixed_logger.go diff --git a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/internal/util/progress_logger.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/internal/util/progress_logger.go similarity index 100% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/internal/util/progress_logger.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/internal/util/progress_logger.go diff --git a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/internal/util/retry.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/internal/util/retry.go similarity index 100% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/internal/util/retry.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/internal/util/retry.go diff --git a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/internal/util/tag.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/internal/util/tag.go similarity index 98% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/internal/util/tag.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/internal/util/tag.go index 80eef5b7..cf64ed2f 100644 --- a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/internal/util/tag.go +++ b/vendor/carvel.dev/imgpkg/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/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/internal/util/throttle.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/internal/util/throttle.go similarity index 100% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/internal/util/throttle.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/internal/util/throttle.go diff --git a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/lockconfig/bundle_lock.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/lockconfig/bundle_lock.go similarity index 100% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/lockconfig/bundle_lock.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/lockconfig/bundle_lock.go diff --git a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/lockconfig/generic.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/lockconfig/generic.go similarity index 100% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/lockconfig/generic.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/lockconfig/generic.go diff --git a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/lockconfig/images_lock.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/lockconfig/images_lock.go similarity index 100% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/lockconfig/images_lock.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/lockconfig/images_lock.go diff --git a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/plainimage/contents.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/plainimage/contents.go similarity index 95% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/plainimage/contents.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/plainimage/contents.go index fa767f22..a02398bf 100644 --- a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/plainimage/contents.go +++ b/vendor/carvel.dev/imgpkg/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/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/plainimage/plain_image.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/plainimage/plain_image.go similarity index 98% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/plainimage/plain_image.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/plainimage/plain_image.go index 09580fd4..2e1d79d1 100644 --- a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/plainimage/plain_image.go +++ b/vendor/carvel.dev/imgpkg/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/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/registry/auth/credentialprovider/keyring.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/registry/auth/credentialprovider/keyring.go similarity index 100% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/registry/auth/credentialprovider/keyring.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/registry/auth/credentialprovider/keyring.go diff --git a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/registry/auth/custom_keychain.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/registry/auth/custom_keychain.go similarity index 94% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/registry/auth/custom_keychain.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/registry/auth/custom_keychain.go index e6fc904d..bc25b25e 100644 --- a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/registry/auth/custom_keychain.go +++ b/vendor/carvel.dev/imgpkg/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/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/registry/auth/env_keychain.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/registry/auth/env_keychain.go similarity index 98% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/registry/auth/env_keychain.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/registry/auth/env_keychain.go index f4eade5e..a75b7c5d 100644 --- a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/registry/auth/env_keychain.go +++ b/vendor/carvel.dev/imgpkg/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/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/registry/doc.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/registry/doc.go similarity index 100% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/registry/doc.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/registry/doc.go diff --git a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/registry/keychain.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/registry/keychain.go similarity index 97% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/registry/keychain.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/registry/keychain.go index b185223e..54398003 100644 --- a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/registry/keychain.go +++ b/vendor/carvel.dev/imgpkg/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/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/registry/registry.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/registry/registry.go similarity index 99% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/registry/registry.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/registry/registry.go index f7536b6b..b9d98597 100644 --- a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/registry/registry.go +++ b/vendor/carvel.dev/imgpkg/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/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/registry/transport.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/registry/transport.go similarity index 100% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/registry/transport.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/registry/transport.go diff --git a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/registry/with_progress.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/registry/with_progress.go similarity index 98% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/registry/with_progress.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/registry/with_progress.go index fa464be9..583d6d4b 100644 --- a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/registry/with_progress.go +++ b/vendor/carvel.dev/imgpkg/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/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/signature/cosign.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/signature/cosign.go similarity index 93% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/signature/cosign.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/signature/cosign.go index ef4e1d5d..b41373d6 100644 --- a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/signature/cosign.go +++ b/vendor/carvel.dev/imgpkg/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/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/signature/cosign/fetch.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/signature/cosign/fetch.go similarity index 100% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/signature/cosign/fetch.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/signature/cosign/fetch.go diff --git a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/signature/fetch_signatures.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/signature/fetch_signatures.go similarity index 96% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/signature/fetch_signatures.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/signature/fetch_signatures.go index cbb7ad7b..4f99b889 100644 --- a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/signature/fetch_signatures.go +++ b/vendor/carvel.dev/imgpkg/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/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/v1/describe.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/v1/describe.go similarity index 96% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/v1/describe.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/v1/describe.go index ebe071d3..7cc15d36 100644 --- a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/v1/describe.go +++ b/vendor/carvel.dev/imgpkg/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/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/v1/error.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/v1/error.go similarity index 100% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/v1/error.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/v1/error.go diff --git a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/v1/pull.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/v1/pull.go similarity index 97% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/v1/pull.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/v1/pull.go index 7a8f4ba0..37bc7880 100644 --- a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/v1/pull.go +++ b/vendor/carvel.dev/imgpkg/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/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/v1/registry.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/v1/registry.go similarity index 90% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/v1/registry.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/v1/registry.go index 1dec631b..a4221137 100644 --- a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/v1/registry.go +++ b/vendor/carvel.dev/imgpkg/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/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/v1/tag.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/v1/tag.go similarity index 96% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/v1/tag.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/v1/tag.go index 3f35b673..09955338 100644 --- a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/v1/tag.go +++ b/vendor/carvel.dev/imgpkg/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/vendor/modules.txt b/vendor/modules.txt index de9deafb..07e4a0a5 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,3 +1,23 @@ +# carvel.dev/imgpkg v0.39.0 +## explicit; go 1.21 +carvel.dev/imgpkg/pkg/imgpkg/bundle +carvel.dev/imgpkg/pkg/imgpkg/image +carvel.dev/imgpkg/pkg/imgpkg/imagedesc +carvel.dev/imgpkg/pkg/imgpkg/imagedigest +carvel.dev/imgpkg/pkg/imgpkg/imageset +carvel.dev/imgpkg/pkg/imgpkg/imagetar +carvel.dev/imgpkg/pkg/imgpkg/imageutils/and +carvel.dev/imgpkg/pkg/imgpkg/imageutils/gzip +carvel.dev/imgpkg/pkg/imgpkg/imageutils/verify +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/registry/auth +carvel.dev/imgpkg/pkg/imgpkg/registry/auth/credentialprovider +carvel.dev/imgpkg/pkg/imgpkg/signature +carvel.dev/imgpkg/pkg/imgpkg/signature/cosign +carvel.dev/imgpkg/pkg/imgpkg/v1 # cloud.google.com/go/compute v1.19.3 ## explicit; go 1.19 cloud.google.com/go/compute/internal @@ -367,26 +387,6 @@ github.com/vbatts/tar-split/archive/tar # github.com/vito/go-interact v1.0.1 ## explicit; go 1.12 github.com/vito/go-interact/interact -# github.com/vmware-tanzu/carvel-imgpkg v0.38.2 -## explicit; go 1.21 -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/imagedesc -github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imagedigest -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/imageutils/and -github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imageutils/gzip -github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imageutils/verify -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/registry/auth -github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/registry/auth/credentialprovider -github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/signature -github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/signature/cosign -github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/v1 # golang.org/x/crypto v0.14.0 ## explicit; go 1.17 golang.org/x/crypto/cast5 From 0abbf418522f2077221ac56bc8ce74a747850673 Mon Sep 17 00:00:00 2001 From: Joao Pereira Date: Wed, 25 Oct 2023 16:17:50 -0500 Subject: [PATCH 2/2] Update go mod to carvel.dev/vendir Signed-off-by: Joao Pereira --- .goreleaser.yml | 2 +- cmd/vendir/vendir.go | 2 +- go.mod | 2 +- hack/build-binaries.sh | 2 +- hack/build.sh | 2 +- hack/gen.sh | 6 ++--- pkg/vendir/cmd/sort_semver.go | 4 ++-- pkg/vendir/cmd/sync.go | 6 ++--- pkg/vendir/cmd/vendir.go | 2 +- pkg/vendir/cmd/version.go | 2 +- pkg/vendir/config/config.go | 2 +- pkg/vendir/config/config_test.go | 2 +- pkg/vendir/config/directory.go | 2 +- pkg/vendir/config/dockerconfigjson_test.go | 2 +- pkg/vendir/config/lock_config_test.go | 2 +- pkg/vendir/directory/directory.go | 22 +++++++++---------- pkg/vendir/directory/file_filter.go | 2 +- pkg/vendir/directory/named_ref_fetcher.go | 4 ++-- pkg/vendir/directory/staging_dir.go | 2 +- pkg/vendir/directory/sub_path.go | 2 +- pkg/vendir/fetch/cache/cache.go | 2 +- pkg/vendir/fetch/cache/cache_test.go | 2 +- pkg/vendir/fetch/git/git.go | 6 ++--- pkg/vendir/fetch/git/sync.go | 4 ++-- pkg/vendir/fetch/git/verification.go | 6 ++--- .../release_notes_checksums_test.go | 2 +- pkg/vendir/fetch/githubrelease/sync.go | 8 +++---- pkg/vendir/fetch/helmchart/http_source.go | 4 ++-- pkg/vendir/fetch/helmchart/oci_source.go | 4 ++-- pkg/vendir/fetch/helmchart/sync.go | 4 ++-- pkg/vendir/fetch/hg/hg.go | 4 ++-- pkg/vendir/fetch/hg/sync.go | 4 ++-- pkg/vendir/fetch/http/sync.go | 4 ++-- pkg/vendir/fetch/image/guessed_ref_test.go | 2 +- pkg/vendir/fetch/image/imgpkg.go | 6 ++--- pkg/vendir/fetch/image/imgpkg_test.go | 8 +++---- pkg/vendir/fetch/image/sync.go | 8 +++---- pkg/vendir/fetch/imgpkgbundle/sync.go | 10 ++++----- pkg/vendir/fetch/inline/sync.go | 4 ++-- pkg/vendir/fetch/move_test.go | 2 +- pkg/vendir/fetch/ref_fetcher.go | 2 +- pkg/vendir/versions/selector.go | 2 +- pkg/vendir/versions/semvers.go | 2 +- pkg/vendir/versions/semvers_test.go | 4 ++-- pkg/vendir/versions/v1alpha1/generated.pb.go | 4 ++-- test/e2e/directory_permissions_test.go | 2 +- test/e2e/example_lazy_test.go | 5 +++-- test/e2e/invalid_symlink_test.go | 2 +- 48 files changed, 95 insertions(+), 94 deletions(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index 2dd7f563..d6c42a4b 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -20,7 +20,7 @@ builds: - -trimpath ldflags: - - -X github.com/vmware-tanzu/carvel-vendir/pkg/vendir/version.Version={{ .Version }} + - -X carvel.dev/vendir/pkg/vendir/version.Version={{ .Version }} archives: - format: binary diff --git a/cmd/vendir/vendir.go b/cmd/vendir/vendir.go index 71f1f9d5..ca93e3ef 100644 --- a/cmd/vendir/vendir.go +++ b/cmd/vendir/vendir.go @@ -10,9 +10,9 @@ import ( "os" "time" + "carvel.dev/vendir/pkg/vendir/cmd" uierrs "github.com/cppforlife/go-cli-ui/errors" "github.com/cppforlife/go-cli-ui/ui" - "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/cmd" ) func main() { diff --git a/go.mod b/go.mod index 2990bb05..998b0f9c 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/vmware-tanzu/carvel-vendir +module carvel.dev/vendir go 1.21 diff --git a/hack/build-binaries.sh b/hack/build-binaries.sh index e49267a7..9a61fc51 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-vendir/pkg/vendir/version.Version=$VERSION" +LDFLAGS="-X carvel.dev/vendir/pkg/vendir/version.Version=$VERSION" repro_flags="-trimpath -mod=vendor" diff --git a/hack/build.sh b/hack/build.sh index db50eff6..c7076354 100755 --- a/hack/build.sh +++ b/hack/build.sh @@ -6,7 +6,7 @@ VERSION="${1:-0.0.0+develop}" # makes builds reproducible export CGO_ENABLED=0 -LDFLAGS="-X github.com/vmware-tanzu/carvel-vendir/pkg/vendir/version.Version=$VERSION" +LDFLAGS="-X carvel.dev/vendir/pkg/vendir/version.Version=$VERSION" repro_flags="-trimpath -mod=vendor" go mod vendor diff --git a/hack/gen.sh b/hack/gen.sh index 39449639..1d377e9e 100755 --- a/hack/gen.sh +++ b/hack/gen.sh @@ -7,9 +7,9 @@ set -e -x # Based on vendor/k8s.io/code-generator/generate-groups.sh go run vendor/k8s.io/code-generator/cmd/deepcopy-gen/main.go \ - --input-dirs github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1 \ + --input-dirs carvel.dev/vendir/pkg/vendir/versions/v1alpha1 \ -O zz_generated.deepcopy \ - --bounding-dirs github.com/vmware-tanzu/carvel-vendir/pkg/vendir \ + --bounding-dirs carvel.dev/vendir/pkg/vendir \ --go-header-file ./hack/gen-boilerplate.txt # Install protoc binary as directed by https://github.com/gogo/protobuf#installation @@ -28,7 +28,7 @@ export PATH=$PWD/tmp/gen-apiserver-bin/:$PATH go run vendor/k8s.io/code-generator/cmd/go-to-protobuf/main.go \ --proto-import vendor \ - --packages "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1" \ + --packages "carvel.dev/vendir/pkg/vendir/versions/v1alpha1" \ --go-header-file ./hack/gen-boilerplate.txt # TODO It seems that above command messes around with protos in vendor directory diff --git a/pkg/vendir/cmd/sort_semver.go b/pkg/vendir/cmd/sort_semver.go index 7465fda7..774a96a5 100644 --- a/pkg/vendir/cmd/sort_semver.go +++ b/pkg/vendir/cmd/sort_semver.go @@ -6,11 +6,11 @@ package cmd import ( "strings" + ctlver "carvel.dev/vendir/pkg/vendir/versions" + "carvel.dev/vendir/pkg/vendir/versions/v1alpha1" "github.com/cppforlife/go-cli-ui/ui" uitable "github.com/cppforlife/go-cli-ui/ui/table" "github.com/spf13/cobra" - ctlver "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions" - "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1" ) type SortSemverOptions struct { diff --git a/pkg/vendir/cmd/sync.go b/pkg/vendir/cmd/sync.go index 4357ca30..4e5d728b 100644 --- a/pkg/vendir/cmd/sync.go +++ b/pkg/vendir/cmd/sync.go @@ -9,12 +9,12 @@ import ( "path/filepath" "strings" + ctlconf "carvel.dev/vendir/pkg/vendir/config" + ctldir "carvel.dev/vendir/pkg/vendir/directory" + ctlcache "carvel.dev/vendir/pkg/vendir/fetch/cache" "github.com/cppforlife/go-cli-ui/ui" "github.com/mitchellh/go-homedir" "github.com/spf13/cobra" - ctlconf "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config" - ctldir "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/directory" - ctlcache "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch/cache" ) const ( diff --git a/pkg/vendir/cmd/vendir.go b/pkg/vendir/cmd/vendir.go index d369a298..1f364879 100644 --- a/pkg/vendir/cmd/vendir.go +++ b/pkg/vendir/cmd/vendir.go @@ -6,10 +6,10 @@ package cmd import ( "io" + "carvel.dev/vendir/pkg/vendir/version" "github.com/cppforlife/cobrautil" "github.com/cppforlife/go-cli-ui/ui" "github.com/spf13/cobra" - "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/version" ) type VendirOptions struct { diff --git a/pkg/vendir/cmd/version.go b/pkg/vendir/cmd/version.go index f64c87a8..38a8447f 100644 --- a/pkg/vendir/cmd/version.go +++ b/pkg/vendir/cmd/version.go @@ -6,9 +6,9 @@ package cmd import ( "fmt" + "carvel.dev/vendir/pkg/vendir/version" "github.com/cppforlife/go-cli-ui/ui" "github.com/spf13/cobra" - "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/version" ) type VersionOptions struct { diff --git a/pkg/vendir/config/config.go b/pkg/vendir/config/config.go index a5842324..41dfc5a2 100644 --- a/pkg/vendir/config/config.go +++ b/pkg/vendir/config/config.go @@ -9,8 +9,8 @@ import ( "reflect" "strings" + "carvel.dev/vendir/pkg/vendir/version" semver "github.com/hashicorp/go-version" - "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/version" "sigs.k8s.io/yaml" ) diff --git a/pkg/vendir/config/config_test.go b/pkg/vendir/config/config_test.go index aa975f9c..f4255e90 100644 --- a/pkg/vendir/config/config_test.go +++ b/pkg/vendir/config/config_test.go @@ -8,9 +8,9 @@ import ( "path/filepath" "testing" + "carvel.dev/vendir/pkg/vendir/config" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config" ) func TestEmptyLineStartsConfig(t *testing.T) { diff --git a/pkg/vendir/config/directory.go b/pkg/vendir/config/directory.go index 7ae4b653..66ac73e1 100644 --- a/pkg/vendir/config/directory.go +++ b/pkg/vendir/config/directory.go @@ -8,7 +8,7 @@ import ( "os" "strings" - ctlver "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1" + ctlver "carvel.dev/vendir/pkg/vendir/versions/v1alpha1" ) const ( diff --git a/pkg/vendir/config/dockerconfigjson_test.go b/pkg/vendir/config/dockerconfigjson_test.go index c998a637..6c7b31c6 100644 --- a/pkg/vendir/config/dockerconfigjson_test.go +++ b/pkg/vendir/config/dockerconfigjson_test.go @@ -6,8 +6,8 @@ package config_test import ( "testing" + . "carvel.dev/vendir/pkg/vendir/config" "github.com/stretchr/testify/require" - . "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config" ) func TestSecretToRegistryAuthSecretsNoop(t *testing.T) { diff --git a/pkg/vendir/config/lock_config_test.go b/pkg/vendir/config/lock_config_test.go index 59b3f243..36fa32bf 100644 --- a/pkg/vendir/config/lock_config_test.go +++ b/pkg/vendir/config/lock_config_test.go @@ -8,8 +8,8 @@ import ( "path/filepath" "testing" + "carvel.dev/vendir/pkg/vendir/config" "github.com/stretchr/testify/require" - "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config" ) func TestNewLockConfigFromBytes(t *testing.T) { diff --git a/pkg/vendir/directory/directory.go b/pkg/vendir/directory/directory.go index d0ba0bb1..4477337f 100644 --- a/pkg/vendir/directory/directory.go +++ b/pkg/vendir/directory/directory.go @@ -11,19 +11,19 @@ import ( "path/filepath" "sigs.k8s.io/yaml" + ctlconf "carvel.dev/vendir/pkg/vendir/config" + ctlfetch "carvel.dev/vendir/pkg/vendir/fetch" + ctlcache "carvel.dev/vendir/pkg/vendir/fetch/cache" + ctlgit "carvel.dev/vendir/pkg/vendir/fetch/git" + ctlghr "carvel.dev/vendir/pkg/vendir/fetch/githubrelease" + ctlhelmc "carvel.dev/vendir/pkg/vendir/fetch/helmchart" + ctlhg "carvel.dev/vendir/pkg/vendir/fetch/hg" + ctlhttp "carvel.dev/vendir/pkg/vendir/fetch/http" + ctlimg "carvel.dev/vendir/pkg/vendir/fetch/image" + ctlimgpkgbundle "carvel.dev/vendir/pkg/vendir/fetch/imgpkgbundle" + ctlinl "carvel.dev/vendir/pkg/vendir/fetch/inline" "github.com/cppforlife/go-cli-ui/ui" dircopy "github.com/otiai10/copy" - ctlconf "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config" - ctlfetch "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch" - ctlcache "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch/cache" - ctlgit "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch/git" - ctlghr "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch/githubrelease" - ctlhelmc "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch/helmchart" - ctlhg "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch/hg" - ctlhttp "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch/http" - ctlimg "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch/image" - ctlimgpkgbundle "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch/imgpkgbundle" - ctlinl "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch/inline" ) type Directory struct { diff --git a/pkg/vendir/directory/file_filter.go b/pkg/vendir/directory/file_filter.go index ff4a6437..6a5c4e36 100644 --- a/pkg/vendir/directory/file_filter.go +++ b/pkg/vendir/directory/file_filter.go @@ -8,8 +8,8 @@ import ( "os" "path/filepath" + ctlconf "carvel.dev/vendir/pkg/vendir/config" "github.com/bmatcuk/doublestar" - ctlconf "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config" ) type FileFilter struct { diff --git a/pkg/vendir/directory/named_ref_fetcher.go b/pkg/vendir/directory/named_ref_fetcher.go index 2ab0ce12..19bcd708 100644 --- a/pkg/vendir/directory/named_ref_fetcher.go +++ b/pkg/vendir/directory/named_ref_fetcher.go @@ -6,8 +6,8 @@ package directory import ( "fmt" - ctlconf "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config" - ctlfetch "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch" + ctlconf "carvel.dev/vendir/pkg/vendir/config" + ctlfetch "carvel.dev/vendir/pkg/vendir/fetch" ) type NamedRefFetcher struct { diff --git a/pkg/vendir/directory/staging_dir.go b/pkg/vendir/directory/staging_dir.go index 4b7baa39..f9bb1d8d 100644 --- a/pkg/vendir/directory/staging_dir.go +++ b/pkg/vendir/directory/staging_dir.go @@ -10,8 +10,8 @@ import ( "path/filepath" "strings" + ctlfetch "carvel.dev/vendir/pkg/vendir/fetch" "github.com/bmatcuk/doublestar" - ctlfetch "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch" ) type StagingDir struct { diff --git a/pkg/vendir/directory/sub_path.go b/pkg/vendir/directory/sub_path.go index 5536e5cb..53cc3025 100644 --- a/pkg/vendir/directory/sub_path.go +++ b/pkg/vendir/directory/sub_path.go @@ -9,7 +9,7 @@ import ( "path/filepath" "strings" - ctlfetch "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch" + ctlfetch "carvel.dev/vendir/pkg/vendir/fetch" ) type SubPath struct { diff --git a/pkg/vendir/fetch/cache/cache.go b/pkg/vendir/fetch/cache/cache.go index 88ae8a44..9c3aca9d 100644 --- a/pkg/vendir/fetch/cache/cache.go +++ b/pkg/vendir/fetch/cache/cache.go @@ -13,7 +13,7 @@ import ( "runtime" "strings" - "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch/cache/resources" + "carvel.dev/vendir/pkg/vendir/fetch/cache/resources" ) // Cache functionality diff --git a/pkg/vendir/fetch/cache/cache_test.go b/pkg/vendir/fetch/cache/cache_test.go index 1990c377..3ebe17a9 100644 --- a/pkg/vendir/fetch/cache/cache_test.go +++ b/pkg/vendir/fetch/cache/cache_test.go @@ -10,8 +10,8 @@ import ( "path/filepath" "testing" + "carvel.dev/vendir/pkg/vendir/fetch/cache" "github.com/stretchr/testify/require" - "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch/cache" ) type hitTest struct { diff --git a/pkg/vendir/fetch/git/git.go b/pkg/vendir/fetch/git/git.go index b5d52293..24bfd1e8 100644 --- a/pkg/vendir/fetch/git/git.go +++ b/pkg/vendir/fetch/git/git.go @@ -14,9 +14,9 @@ import ( "strconv" "strings" - ctlconf "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config" - ctlfetch "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch" - ctlver "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions" + ctlconf "carvel.dev/vendir/pkg/vendir/config" + ctlfetch "carvel.dev/vendir/pkg/vendir/fetch" + ctlver "carvel.dev/vendir/pkg/vendir/versions" ) type Git struct { diff --git a/pkg/vendir/fetch/git/sync.go b/pkg/vendir/fetch/git/sync.go index deadb3b3..e4e25835 100644 --- a/pkg/vendir/fetch/git/sync.go +++ b/pkg/vendir/fetch/git/sync.go @@ -9,8 +9,8 @@ import ( "os" "strings" - ctlconf "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config" - ctlfetch "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch" + ctlconf "carvel.dev/vendir/pkg/vendir/config" + ctlfetch "carvel.dev/vendir/pkg/vendir/fetch" ) type Sync struct { diff --git a/pkg/vendir/fetch/git/verification.go b/pkg/vendir/fetch/git/verification.go index d326f773..fb2bd59e 100644 --- a/pkg/vendir/fetch/git/verification.go +++ b/pkg/vendir/fetch/git/verification.go @@ -9,9 +9,9 @@ import ( "os/exec" "strings" - ctlconf "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config" - ctlfetch "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch" - oarmor "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/openpgparmor" + ctlconf "carvel.dev/vendir/pkg/vendir/config" + ctlfetch "carvel.dev/vendir/pkg/vendir/fetch" + oarmor "carvel.dev/vendir/pkg/vendir/openpgparmor" "golang.org/x/crypto/openpgp" //nolint:staticcheck ) diff --git a/pkg/vendir/fetch/githubrelease/release_notes_checksums_test.go b/pkg/vendir/fetch/githubrelease/release_notes_checksums_test.go index 1e3df384..3b102e81 100644 --- a/pkg/vendir/fetch/githubrelease/release_notes_checksums_test.go +++ b/pkg/vendir/fetch/githubrelease/release_notes_checksums_test.go @@ -7,7 +7,7 @@ import ( "reflect" "testing" - . "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch/githubrelease" + . "carvel.dev/vendir/pkg/vendir/fetch/githubrelease" ) func TestReleaseNotesChecksums(t *testing.T) { diff --git a/pkg/vendir/fetch/githubrelease/sync.go b/pkg/vendir/fetch/githubrelease/sync.go index 01393900..43e42fd1 100644 --- a/pkg/vendir/fetch/githubrelease/sync.go +++ b/pkg/vendir/fetch/githubrelease/sync.go @@ -14,12 +14,12 @@ import ( "path/filepath" "strings" + ctlconf "carvel.dev/vendir/pkg/vendir/config" + ctlfetch "carvel.dev/vendir/pkg/vendir/fetch" + ctlhttp "carvel.dev/vendir/pkg/vendir/fetch/http" + ctlver "carvel.dev/vendir/pkg/vendir/versions" "github.com/bmatcuk/doublestar" "github.com/google/go-github/github" - ctlconf "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config" - ctlfetch "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch" - ctlhttp "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch/http" - ctlver "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions" "golang.org/x/oauth2" ) diff --git a/pkg/vendir/fetch/helmchart/http_source.go b/pkg/vendir/fetch/helmchart/http_source.go index 7d970500..0d8c287b 100644 --- a/pkg/vendir/fetch/helmchart/http_source.go +++ b/pkg/vendir/fetch/helmchart/http_source.go @@ -10,8 +10,8 @@ import ( "os/exec" "strings" - ctlconf "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config" - ctlfetch "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch" + ctlconf "carvel.dev/vendir/pkg/vendir/config" + ctlfetch "carvel.dev/vendir/pkg/vendir/fetch" ) type HTTPSource struct { diff --git a/pkg/vendir/fetch/helmchart/oci_source.go b/pkg/vendir/fetch/helmchart/oci_source.go index 1005cf91..ee2462b0 100644 --- a/pkg/vendir/fetch/helmchart/oci_source.go +++ b/pkg/vendir/fetch/helmchart/oci_source.go @@ -11,8 +11,8 @@ import ( "os/exec" "strings" - ctlconf "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config" - ctlfetch "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch" + ctlconf "carvel.dev/vendir/pkg/vendir/config" + ctlfetch "carvel.dev/vendir/pkg/vendir/fetch" ) /* diff --git a/pkg/vendir/fetch/helmchart/sync.go b/pkg/vendir/fetch/helmchart/sync.go index 4aa27cd4..797289a0 100644 --- a/pkg/vendir/fetch/helmchart/sync.go +++ b/pkg/vendir/fetch/helmchart/sync.go @@ -9,8 +9,8 @@ import ( "path/filepath" "strings" - ctlconf "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config" - ctlfetch "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch" + ctlconf "carvel.dev/vendir/pkg/vendir/config" + ctlfetch "carvel.dev/vendir/pkg/vendir/fetch" "sigs.k8s.io/yaml" ) diff --git a/pkg/vendir/fetch/hg/hg.go b/pkg/vendir/fetch/hg/hg.go index 941a2b57..a3f50937 100644 --- a/pkg/vendir/fetch/hg/hg.go +++ b/pkg/vendir/fetch/hg/hg.go @@ -13,8 +13,8 @@ import ( "path/filepath" "strings" - ctlconf "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config" - ctlfetch "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch" + ctlconf "carvel.dev/vendir/pkg/vendir/config" + ctlfetch "carvel.dev/vendir/pkg/vendir/fetch" ) type Hg struct { diff --git a/pkg/vendir/fetch/hg/sync.go b/pkg/vendir/fetch/hg/sync.go index 47674b90..4d36ae0a 100644 --- a/pkg/vendir/fetch/hg/sync.go +++ b/pkg/vendir/fetch/hg/sync.go @@ -9,8 +9,8 @@ import ( "os" "strings" - ctlconf "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config" - ctlfetch "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch" + ctlconf "carvel.dev/vendir/pkg/vendir/config" + ctlfetch "carvel.dev/vendir/pkg/vendir/fetch" ) type Sync struct { diff --git a/pkg/vendir/fetch/http/sync.go b/pkg/vendir/fetch/http/sync.go index 90ca7662..800aabf3 100644 --- a/pkg/vendir/fetch/http/sync.go +++ b/pkg/vendir/fetch/http/sync.go @@ -13,8 +13,8 @@ import ( "path" "path/filepath" - ctlconf "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config" - ctlfetch "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch" + ctlconf "carvel.dev/vendir/pkg/vendir/config" + ctlfetch "carvel.dev/vendir/pkg/vendir/fetch" ) type Sync struct { diff --git a/pkg/vendir/fetch/image/guessed_ref_test.go b/pkg/vendir/fetch/image/guessed_ref_test.go index 1c06c356..ddc173c2 100644 --- a/pkg/vendir/fetch/image/guessed_ref_test.go +++ b/pkg/vendir/fetch/image/guessed_ref_test.go @@ -6,8 +6,8 @@ package image_test import ( "testing" + ctlimg "carvel.dev/vendir/pkg/vendir/fetch/image" "github.com/stretchr/testify/assert" - ctlimg "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch/image" ) func TestGuessedRefParts(t *testing.T) { diff --git a/pkg/vendir/fetch/image/imgpkg.go b/pkg/vendir/fetch/image/imgpkg.go index 2fd81a04..40565060 100644 --- a/pkg/vendir/fetch/image/imgpkg.go +++ b/pkg/vendir/fetch/image/imgpkg.go @@ -12,10 +12,10 @@ import ( "carvel.dev/imgpkg/pkg/imgpkg/registry" v1 "carvel.dev/imgpkg/pkg/imgpkg/v1" + ctlconf "carvel.dev/vendir/pkg/vendir/config" + ctlfetch "carvel.dev/vendir/pkg/vendir/fetch" + ctlcache "carvel.dev/vendir/pkg/vendir/fetch/cache" "github.com/google/go-containerregistry/pkg/name" - ctlconf "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config" - ctlfetch "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch" - ctlcache "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch/cache" ) const ( diff --git a/pkg/vendir/fetch/image/imgpkg_test.go b/pkg/vendir/fetch/image/imgpkg_test.go index 01b055d8..ca5aa9dc 100644 --- a/pkg/vendir/fetch/image/imgpkg_test.go +++ b/pkg/vendir/fetch/image/imgpkg_test.go @@ -15,16 +15,16 @@ import ( ctlregistry "carvel.dev/imgpkg/pkg/imgpkg/registry" "carvel.dev/imgpkg/pkg/imgpkg/registry/auth" + ctlconf "carvel.dev/vendir/pkg/vendir/config" + ctlfetch "carvel.dev/vendir/pkg/vendir/fetch" + ctlcache "carvel.dev/vendir/pkg/vendir/fetch/cache" + ctlimg "carvel.dev/vendir/pkg/vendir/fetch/image" regname "github.com/google/go-containerregistry/pkg/name" "github.com/google/go-containerregistry/pkg/registry" regrandom "github.com/google/go-containerregistry/pkg/v1/random" regremote "github.com/google/go-containerregistry/pkg/v1/remote" "github.com/phayes/freeport" "github.com/stretchr/testify/require" - ctlconf "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config" - ctlfetch "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch" - ctlcache "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch/cache" - ctlimg "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch/image" ) var localRegistryAddress string diff --git a/pkg/vendir/fetch/image/sync.go b/pkg/vendir/fetch/image/sync.go index 0fbb8b5e..78dd2ea8 100644 --- a/pkg/vendir/fetch/image/sync.go +++ b/pkg/vendir/fetch/image/sync.go @@ -6,10 +6,10 @@ package image import ( "fmt" - ctlconf "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config" - ctlfetch "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch" - ctlcache "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch/cache" - ctlver "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions" + ctlconf "carvel.dev/vendir/pkg/vendir/config" + ctlfetch "carvel.dev/vendir/pkg/vendir/fetch" + ctlcache "carvel.dev/vendir/pkg/vendir/fetch/cache" + ctlver "carvel.dev/vendir/pkg/vendir/versions" ) type Sync struct { diff --git a/pkg/vendir/fetch/imgpkgbundle/sync.go b/pkg/vendir/fetch/imgpkgbundle/sync.go index e023de88..c003dbb8 100644 --- a/pkg/vendir/fetch/imgpkgbundle/sync.go +++ b/pkg/vendir/fetch/imgpkgbundle/sync.go @@ -5,11 +5,11 @@ package imgpkgbundle import ( "fmt" - ctlconf "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config" - ctlfetch "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch" - ctlcache "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch/cache" - ctlimg "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch/image" - ctlver "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions" + ctlconf "carvel.dev/vendir/pkg/vendir/config" + ctlfetch "carvel.dev/vendir/pkg/vendir/fetch" + ctlcache "carvel.dev/vendir/pkg/vendir/fetch/cache" + ctlimg "carvel.dev/vendir/pkg/vendir/fetch/image" + ctlver "carvel.dev/vendir/pkg/vendir/versions" ) type Sync struct { diff --git a/pkg/vendir/fetch/inline/sync.go b/pkg/vendir/fetch/inline/sync.go index c3074a30..72226fcd 100644 --- a/pkg/vendir/fetch/inline/sync.go +++ b/pkg/vendir/fetch/inline/sync.go @@ -8,8 +8,8 @@ import ( "os" "path/filepath" - ctlconf "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config" - ctlfetch "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch" + ctlconf "carvel.dev/vendir/pkg/vendir/config" + ctlfetch "carvel.dev/vendir/pkg/vendir/fetch" ) type Sync struct { diff --git a/pkg/vendir/fetch/move_test.go b/pkg/vendir/fetch/move_test.go index 8eb816bd..b9951ea4 100644 --- a/pkg/vendir/fetch/move_test.go +++ b/pkg/vendir/fetch/move_test.go @@ -8,8 +8,8 @@ import ( "path/filepath" "testing" + ctlfetch "carvel.dev/vendir/pkg/vendir/fetch" "github.com/stretchr/testify/require" - ctlfetch "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch" ) func TestMoveFile(t *testing.T) { diff --git a/pkg/vendir/fetch/ref_fetcher.go b/pkg/vendir/fetch/ref_fetcher.go index 811c4138..b4f1e596 100644 --- a/pkg/vendir/fetch/ref_fetcher.go +++ b/pkg/vendir/fetch/ref_fetcher.go @@ -6,7 +6,7 @@ package fetch import ( "fmt" - ctlconf "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config" + ctlconf "carvel.dev/vendir/pkg/vendir/config" ) type RefFetcher interface { diff --git a/pkg/vendir/versions/selector.go b/pkg/vendir/versions/selector.go index 292650a5..14ed3311 100644 --- a/pkg/vendir/versions/selector.go +++ b/pkg/vendir/versions/selector.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1" + "carvel.dev/vendir/pkg/vendir/versions/v1alpha1" ) type ConstraintCallback struct { diff --git a/pkg/vendir/versions/semvers.go b/pkg/vendir/versions/semvers.go index 517829f2..29cba730 100644 --- a/pkg/vendir/versions/semvers.go +++ b/pkg/vendir/versions/semvers.go @@ -8,8 +8,8 @@ import ( "sort" "strings" + "carvel.dev/vendir/pkg/vendir/versions/v1alpha1" semver "github.com/carvel-dev/semver/v4" - "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1" ) type Semvers struct { diff --git a/pkg/vendir/versions/semvers_test.go b/pkg/vendir/versions/semvers_test.go index c5b32467..194cfdc3 100644 --- a/pkg/vendir/versions/semvers_test.go +++ b/pkg/vendir/versions/semvers_test.go @@ -7,10 +7,10 @@ import ( "strings" "testing" + versions "carvel.dev/vendir/pkg/vendir/versions" + "carvel.dev/vendir/pkg/vendir/versions/v1alpha1" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - versions "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions" - "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1" ) func TestSemverOrder(t *testing.T) { diff --git a/pkg/vendir/versions/v1alpha1/generated.pb.go b/pkg/vendir/versions/v1alpha1/generated.pb.go index c67facc7..53865db4 100644 --- a/pkg/vendir/versions/v1alpha1/generated.pb.go +++ b/pkg/vendir/versions/v1alpha1/generated.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1/generated.proto +// source: carvel.dev/vendir/pkg/vendir/versions/v1alpha1/generated.proto package v1alpha1 @@ -117,7 +117,7 @@ func init() { } func init() { - proto.RegisterFile("github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1/generated.proto", fileDescriptor_8d3ef80c738fc456) + proto.RegisterFile("carvel.dev/vendir/pkg/vendir/versions/v1alpha1/generated.proto", fileDescriptor_8d3ef80c738fc456) } var fileDescriptor_8d3ef80c738fc456 = []byte{ diff --git a/test/e2e/directory_permissions_test.go b/test/e2e/directory_permissions_test.go index 74e58185..4645f455 100644 --- a/test/e2e/directory_permissions_test.go +++ b/test/e2e/directory_permissions_test.go @@ -8,9 +8,9 @@ import ( "path/filepath" "testing" + "carvel.dev/vendir/pkg/vendir/config" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config" "sigs.k8s.io/yaml" ) diff --git a/test/e2e/example_lazy_test.go b/test/e2e/example_lazy_test.go index e460a74f..b3263f1f 100644 --- a/test/e2e/example_lazy_test.go +++ b/test/e2e/example_lazy_test.go @@ -4,10 +4,11 @@ package e2e import ( - "github.com/stretchr/testify/require" - ctlconf "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config" "os" "testing" + + ctlconf "carvel.dev/vendir/pkg/vendir/config" + "github.com/stretchr/testify/require" ) func TestExampleLazy(t *testing.T) { diff --git a/test/e2e/invalid_symlink_test.go b/test/e2e/invalid_symlink_test.go index 97a16202..884ac3d5 100644 --- a/test/e2e/invalid_symlink_test.go +++ b/test/e2e/invalid_symlink_test.go @@ -8,8 +8,8 @@ import ( "path/filepath" "testing" + "carvel.dev/vendir/pkg/vendir/config" "github.com/stretchr/testify/require" - "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config" "sigs.k8s.io/yaml" )