Merge pull request #597 from carvel-dev/use-vanity-urls

Change module name
carvel-dev · Oct 25, 2023 · 4a96555 · 4a96555
2 parents 6e1758a + d9181e7
commit 4a96555
Show file tree

Hide file tree

Showing 101 changed files with 229 additions and 230 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/pkg/imgpkg/bundle/bundlefakes/fake_images_lock_reader.go b/pkg/imgpkg/bundle/bundlefakes/fake_images_lock_reader.go
diff --git a/pkg/imgpkg/bundle/bundlefakes/fake_images_metadata_writer.go b/pkg/imgpkg/bundle/bundlefakes/fake_images_metadata_writer.go
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 {