diff --git a/.goreleaser.yaml b/.goreleaser.yaml index a0ac032..4587ba3 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -14,7 +14,7 @@ release: make_latest: false env: - - vpkg=hauler.dev/go/hauler/internal/version + - vpkg=hauler.dev/go/hauler/v2/internal/version builds: - dir: ./cmd/hauler/. diff --git a/cmd/hauler/cli/cli.go b/cmd/hauler/cli/cli.go index ff64527..a32950c 100644 --- a/cmd/hauler/cli/cli.go +++ b/cmd/hauler/cli/cli.go @@ -6,9 +6,9 @@ import ( cranecmd "github.com/google/go-containerregistry/cmd/crane/cmd" "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "hauler.dev/go/hauler/internal/flags" - "hauler.dev/go/hauler/pkg/consts" - "hauler.dev/go/hauler/pkg/log" + "hauler.dev/go/hauler/v2/internal/flags" + "hauler.dev/go/hauler/v2/pkg/consts" + "hauler.dev/go/hauler/v2/pkg/log" ) func New(ctx context.Context, ro *flags.CliRootOpts) *cobra.Command { diff --git a/cmd/hauler/cli/completion.go b/cmd/hauler/cli/completion.go index 97cf025..a2ceaed 100644 --- a/cmd/hauler/cli/completion.go +++ b/cmd/hauler/cli/completion.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" - "hauler.dev/go/hauler/internal/flags" + "hauler.dev/go/hauler/v2/internal/flags" ) func addCompletion(parent *cobra.Command, ro *flags.CliRootOpts) { diff --git a/cmd/hauler/cli/store.go b/cmd/hauler/cli/store.go index e2bb56b..87da7a5 100644 --- a/cmd/hauler/cli/store.go +++ b/cmd/hauler/cli/store.go @@ -6,9 +6,9 @@ import ( "github.com/spf13/cobra" "helm.sh/helm/v3/pkg/action" - "hauler.dev/go/hauler/cmd/hauler/cli/store" - "hauler.dev/go/hauler/internal/flags" - "hauler.dev/go/hauler/pkg/log" + "hauler.dev/go/hauler/v2/cmd/hauler/cli/store" + "hauler.dev/go/hauler/v2/internal/flags" + "hauler.dev/go/hauler/v2/pkg/log" ) func addStore(parent *cobra.Command, ro *flags.CliRootOpts) { diff --git a/cmd/hauler/cli/store/add.go b/cmd/hauler/cli/store/add.go index 7007083..8cb9762 100644 --- a/cmd/hauler/cli/store/add.go +++ b/cmd/hauler/cli/store/add.go @@ -16,17 +16,17 @@ import ( "helm.sh/helm/v3/pkg/engine" "k8s.io/apimachinery/pkg/util/yaml" - "hauler.dev/go/hauler/internal/flags" - v1 "hauler.dev/go/hauler/pkg/apis/hauler.cattle.io/v1" - "hauler.dev/go/hauler/pkg/artifacts/file" - "hauler.dev/go/hauler/pkg/consts" - "hauler.dev/go/hauler/pkg/content/chart" - "hauler.dev/go/hauler/pkg/cosign" - "hauler.dev/go/hauler/pkg/getter" - "hauler.dev/go/hauler/pkg/log" - "hauler.dev/go/hauler/pkg/reference" - "hauler.dev/go/hauler/pkg/retry" - "hauler.dev/go/hauler/pkg/store" + "hauler.dev/go/hauler/v2/internal/flags" + v1 "hauler.dev/go/hauler/v2/pkg/apis/hauler.cattle.io/v1" + "hauler.dev/go/hauler/v2/pkg/artifacts/file" + "hauler.dev/go/hauler/v2/pkg/consts" + "hauler.dev/go/hauler/v2/pkg/content/chart" + "hauler.dev/go/hauler/v2/pkg/cosign" + "hauler.dev/go/hauler/v2/pkg/getter" + "hauler.dev/go/hauler/v2/pkg/log" + "hauler.dev/go/hauler/v2/pkg/reference" + "hauler.dev/go/hauler/v2/pkg/retry" + "hauler.dev/go/hauler/v2/pkg/store" ) func AddFileCmd(ctx context.Context, o *flags.AddFileOpts, s *store.Layout, reference string) error { diff --git a/cmd/hauler/cli/store/add_test.go b/cmd/hauler/cli/store/add_test.go index baad66c..cfed0c6 100644 --- a/cmd/hauler/cli/store/add_test.go +++ b/cmd/hauler/cli/store/add_test.go @@ -16,9 +16,9 @@ import ( helmchart "helm.sh/helm/v3/pkg/chart" "helm.sh/helm/v3/pkg/chartutil" - "hauler.dev/go/hauler/internal/flags" - v1 "hauler.dev/go/hauler/pkg/apis/hauler.cattle.io/v1" - "hauler.dev/go/hauler/pkg/consts" + "hauler.dev/go/hauler/v2/internal/flags" + v1 "hauler.dev/go/hauler/v2/pkg/apis/hauler.cattle.io/v1" + "hauler.dev/go/hauler/v2/pkg/consts" ) // newLocalhostRegistry creates an in-memory OCI registry server listening on diff --git a/cmd/hauler/cli/store/copy.go b/cmd/hauler/cli/store/copy.go index c56b2bb..c2e7338 100644 --- a/cmd/hauler/cli/store/copy.go +++ b/cmd/hauler/cli/store/copy.go @@ -13,13 +13,13 @@ import ( "github.com/containerd/errdefs" ocispec "github.com/opencontainers/image-spec/specs-go/v1" - "hauler.dev/go/hauler/internal/flags" - "hauler.dev/go/hauler/internal/mapper" - "hauler.dev/go/hauler/pkg/consts" - "hauler.dev/go/hauler/pkg/content" - "hauler.dev/go/hauler/pkg/log" - "hauler.dev/go/hauler/pkg/retry" - "hauler.dev/go/hauler/pkg/store" + "hauler.dev/go/hauler/v2/internal/flags" + "hauler.dev/go/hauler/v2/internal/mapper" + "hauler.dev/go/hauler/v2/pkg/consts" + "hauler.dev/go/hauler/v2/pkg/content" + "hauler.dev/go/hauler/v2/pkg/log" + "hauler.dev/go/hauler/v2/pkg/retry" + "hauler.dev/go/hauler/v2/pkg/store" ) func CopyCmd(ctx context.Context, o *flags.CopyOpts, s *store.Layout, targetRef string, ro *flags.CliRootOpts) error { diff --git a/cmd/hauler/cli/store/copy_test.go b/cmd/hauler/cli/store/copy_test.go index 16fbe8c..17b77a5 100644 --- a/cmd/hauler/cli/store/copy_test.go +++ b/cmd/hauler/cli/store/copy_test.go @@ -14,8 +14,8 @@ import ( "github.com/google/go-containerregistry/pkg/v1/remote" "github.com/rs/zerolog" - "hauler.dev/go/hauler/internal/flags" - v1 "hauler.dev/go/hauler/pkg/apis/hauler.cattle.io/v1" + "hauler.dev/go/hauler/v2/internal/flags" + v1 "hauler.dev/go/hauler/v2/pkg/apis/hauler.cattle.io/v1" ) // -------------------------------------------------------------------------- diff --git a/cmd/hauler/cli/store/extract.go b/cmd/hauler/cli/store/extract.go index c712e57..0bb1dbd 100644 --- a/cmd/hauler/cli/store/extract.go +++ b/cmd/hauler/cli/store/extract.go @@ -8,12 +8,12 @@ import ( ocispec "github.com/opencontainers/image-spec/specs-go/v1" - "hauler.dev/go/hauler/internal/flags" - "hauler.dev/go/hauler/internal/mapper" - "hauler.dev/go/hauler/pkg/consts" - "hauler.dev/go/hauler/pkg/log" - "hauler.dev/go/hauler/pkg/reference" - "hauler.dev/go/hauler/pkg/store" + "hauler.dev/go/hauler/v2/internal/flags" + "hauler.dev/go/hauler/v2/internal/mapper" + "hauler.dev/go/hauler/v2/pkg/consts" + "hauler.dev/go/hauler/v2/pkg/log" + "hauler.dev/go/hauler/v2/pkg/reference" + "hauler.dev/go/hauler/v2/pkg/store" ) // isIndexMediaType returns true for OCI and Docker manifest list media types. diff --git a/cmd/hauler/cli/store/extract_test.go b/cmd/hauler/cli/store/extract_test.go index 498a190..91ba593 100644 --- a/cmd/hauler/cli/store/extract_test.go +++ b/cmd/hauler/cli/store/extract_test.go @@ -18,9 +18,9 @@ import ( ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/rs/zerolog" - "hauler.dev/go/hauler/internal/flags" - v1 "hauler.dev/go/hauler/pkg/apis/hauler.cattle.io/v1" - "hauler.dev/go/hauler/pkg/consts" + "hauler.dev/go/hauler/v2/internal/flags" + v1 "hauler.dev/go/hauler/v2/pkg/apis/hauler.cattle.io/v1" + "hauler.dev/go/hauler/v2/pkg/consts" ) // chartTestdataDir is defined in add_test.go as "../../../../testdata". diff --git a/cmd/hauler/cli/store/info.go b/cmd/hauler/cli/store/info.go index 086aa4c..9d5d202 100644 --- a/cmd/hauler/cli/store/info.go +++ b/cmd/hauler/cli/store/info.go @@ -12,10 +12,10 @@ import ( "github.com/olekukonko/tablewriter/tw" ocispec "github.com/opencontainers/image-spec/specs-go/v1" - "hauler.dev/go/hauler/internal/flags" - "hauler.dev/go/hauler/pkg/consts" - "hauler.dev/go/hauler/pkg/reference" - "hauler.dev/go/hauler/pkg/store" + "hauler.dev/go/hauler/v2/internal/flags" + "hauler.dev/go/hauler/v2/pkg/consts" + "hauler.dev/go/hauler/v2/pkg/reference" + "hauler.dev/go/hauler/v2/pkg/store" ) func InfoCmd(ctx context.Context, o *flags.InfoOpts, s *store.Layout) error { diff --git a/cmd/hauler/cli/store/info_test.go b/cmd/hauler/cli/store/info_test.go index 51af7e0..25c9175 100644 --- a/cmd/hauler/cli/store/info_test.go +++ b/cmd/hauler/cli/store/info_test.go @@ -7,9 +7,9 @@ import ( ocispec "github.com/opencontainers/image-spec/specs-go/v1" - "hauler.dev/go/hauler/internal/flags" - v1 "hauler.dev/go/hauler/pkg/apis/hauler.cattle.io/v1" - "hauler.dev/go/hauler/pkg/consts" + "hauler.dev/go/hauler/v2/internal/flags" + v1 "hauler.dev/go/hauler/v2/pkg/apis/hauler.cattle.io/v1" + "hauler.dev/go/hauler/v2/pkg/consts" ) func TestByteCountSI(t *testing.T) { diff --git a/cmd/hauler/cli/store/lifecycle_test.go b/cmd/hauler/cli/store/lifecycle_test.go index f1f7a9e..bef8a4f 100644 --- a/cmd/hauler/cli/store/lifecycle_test.go +++ b/cmd/hauler/cli/store/lifecycle_test.go @@ -15,9 +15,9 @@ import ( "github.com/google/go-containerregistry/pkg/name" "github.com/google/go-containerregistry/pkg/v1/remote" - "hauler.dev/go/hauler/internal/flags" - v1 "hauler.dev/go/hauler/pkg/apis/hauler.cattle.io/v1" - "hauler.dev/go/hauler/pkg/store" + "hauler.dev/go/hauler/v2/internal/flags" + v1 "hauler.dev/go/hauler/v2/pkg/apis/hauler.cattle.io/v1" + "hauler.dev/go/hauler/v2/pkg/store" ) // TestLifecycle_FileArtifact_AddSaveLoadCopy exercises the full lifecycle for a diff --git a/cmd/hauler/cli/store/load.go b/cmd/hauler/cli/store/load.go index 62d1917..9a912ad 100644 --- a/cmd/hauler/cli/store/load.go +++ b/cmd/hauler/cli/store/load.go @@ -9,13 +9,13 @@ import ( "path/filepath" "strings" - "hauler.dev/go/hauler/internal/flags" - "hauler.dev/go/hauler/pkg/archives" - "hauler.dev/go/hauler/pkg/consts" - "hauler.dev/go/hauler/pkg/content" - "hauler.dev/go/hauler/pkg/getter" - "hauler.dev/go/hauler/pkg/log" - "hauler.dev/go/hauler/pkg/store" + "hauler.dev/go/hauler/v2/internal/flags" + "hauler.dev/go/hauler/v2/pkg/archives" + "hauler.dev/go/hauler/v2/pkg/consts" + "hauler.dev/go/hauler/v2/pkg/content" + "hauler.dev/go/hauler/v2/pkg/getter" + "hauler.dev/go/hauler/v2/pkg/log" + "hauler.dev/go/hauler/v2/pkg/store" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/cmd/hauler/cli/store/load_test.go b/cmd/hauler/cli/store/load_test.go index 15d2804..fd6d6ee 100644 --- a/cmd/hauler/cli/store/load_test.go +++ b/cmd/hauler/cli/store/load_test.go @@ -20,10 +20,10 @@ import ( mholtarchives "github.com/mholt/archives" ocispec "github.com/opencontainers/image-spec/specs-go/v1" - "hauler.dev/go/hauler/internal/flags" - "hauler.dev/go/hauler/pkg/archives" - "hauler.dev/go/hauler/pkg/consts" - "hauler.dev/go/hauler/pkg/store" + "hauler.dev/go/hauler/v2/internal/flags" + "hauler.dev/go/hauler/v2/pkg/archives" + "hauler.dev/go/hauler/v2/pkg/consts" + "hauler.dev/go/hauler/v2/pkg/store" ) // testHaulArchive is the relative path from cmd/hauler/cli/store/ to the diff --git a/cmd/hauler/cli/store/remove.go b/cmd/hauler/cli/store/remove.go index 8eab88e..e72b390 100644 --- a/cmd/hauler/cli/store/remove.go +++ b/cmd/hauler/cli/store/remove.go @@ -11,9 +11,9 @@ import ( ocispec "github.com/opencontainers/image-spec/specs-go/v1" - "hauler.dev/go/hauler/internal/flags" - "hauler.dev/go/hauler/pkg/log" - "hauler.dev/go/hauler/pkg/store" + "hauler.dev/go/hauler/v2/internal/flags" + "hauler.dev/go/hauler/v2/pkg/log" + "hauler.dev/go/hauler/v2/pkg/store" ) func formatReference(ref string) string { diff --git a/cmd/hauler/cli/store/remove_test.go b/cmd/hauler/cli/store/remove_test.go index a013e3d..a06dbda 100644 --- a/cmd/hauler/cli/store/remove_test.go +++ b/cmd/hauler/cli/store/remove_test.go @@ -6,8 +6,8 @@ import ( ocispec "github.com/opencontainers/image-spec/specs-go/v1" - "hauler.dev/go/hauler/internal/flags" - v1 "hauler.dev/go/hauler/pkg/apis/hauler.cattle.io/v1" + "hauler.dev/go/hauler/v2/internal/flags" + v1 "hauler.dev/go/hauler/v2/pkg/apis/hauler.cattle.io/v1" ) // -------------------------------------------------------------------------- diff --git a/cmd/hauler/cli/store/save.go b/cmd/hauler/cli/store/save.go index 9db2f39..f0615e4 100644 --- a/cmd/hauler/cli/store/save.go +++ b/cmd/hauler/cli/store/save.go @@ -20,10 +20,10 @@ import ( "github.com/google/go-containerregistry/pkg/v1/types" ocispec "github.com/opencontainers/image-spec/specs-go/v1" - "hauler.dev/go/hauler/internal/flags" - "hauler.dev/go/hauler/pkg/archives" - "hauler.dev/go/hauler/pkg/consts" - "hauler.dev/go/hauler/pkg/log" + "hauler.dev/go/hauler/v2/internal/flags" + "hauler.dev/go/hauler/v2/pkg/archives" + "hauler.dev/go/hauler/v2/pkg/consts" + "hauler.dev/go/hauler/v2/pkg/log" ) // saves a content store to store archives diff --git a/cmd/hauler/cli/store/save_test.go b/cmd/hauler/cli/store/save_test.go index 5902519..2a251a8 100644 --- a/cmd/hauler/cli/store/save_test.go +++ b/cmd/hauler/cli/store/save_test.go @@ -12,10 +12,10 @@ import ( "path/filepath" "testing" - "hauler.dev/go/hauler/internal/flags" - v1 "hauler.dev/go/hauler/pkg/apis/hauler.cattle.io/v1" - "hauler.dev/go/hauler/pkg/archives" - "hauler.dev/go/hauler/pkg/consts" + "hauler.dev/go/hauler/v2/internal/flags" + v1 "hauler.dev/go/hauler/v2/pkg/apis/hauler.cattle.io/v1" + "hauler.dev/go/hauler/v2/pkg/archives" + "hauler.dev/go/hauler/v2/pkg/consts" ) // manifestEntry mirrors tarball.Descriptor for asserting manifest.json contents. diff --git a/cmd/hauler/cli/store/serve.go b/cmd/hauler/cli/store/serve.go index b4cb168..d1548dd 100644 --- a/cmd/hauler/cli/store/serve.go +++ b/cmd/hauler/cli/store/serve.go @@ -18,10 +18,10 @@ import ( "github.com/distribution/distribution/v3/version" "gopkg.in/yaml.v3" - "hauler.dev/go/hauler/internal/flags" - "hauler.dev/go/hauler/internal/server" - "hauler.dev/go/hauler/pkg/log" - "hauler.dev/go/hauler/pkg/store" + "hauler.dev/go/hauler/v2/internal/flags" + "hauler.dev/go/hauler/v2/internal/server" + "hauler.dev/go/hauler/v2/pkg/log" + "hauler.dev/go/hauler/v2/pkg/store" ) func validateStoreExists(s *store.Layout) error { diff --git a/cmd/hauler/cli/store/serve_test.go b/cmd/hauler/cli/store/serve_test.go index 4af1ecd..d44e8e4 100644 --- a/cmd/hauler/cli/store/serve_test.go +++ b/cmd/hauler/cli/store/serve_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - "hauler.dev/go/hauler/internal/flags" - "hauler.dev/go/hauler/pkg/consts" + "hauler.dev/go/hauler/v2/internal/flags" + "hauler.dev/go/hauler/v2/pkg/consts" ) // writeIndexJSON writes a minimal valid OCI index.json to dir so that diff --git a/cmd/hauler/cli/store/sync.go b/cmd/hauler/cli/store/sync.go index 44e3f06..f70845b 100644 --- a/cmd/hauler/cli/store/sync.go +++ b/cmd/hauler/cli/store/sync.go @@ -19,15 +19,15 @@ import ( "helm.sh/helm/v3/pkg/action" "k8s.io/apimachinery/pkg/util/yaml" - "hauler.dev/go/hauler/internal/flags" - v1 "hauler.dev/go/hauler/pkg/apis/hauler.cattle.io/v1" - "hauler.dev/go/hauler/pkg/consts" - "hauler.dev/go/hauler/pkg/content" - "hauler.dev/go/hauler/pkg/cosign" - "hauler.dev/go/hauler/pkg/getter" - "hauler.dev/go/hauler/pkg/log" - "hauler.dev/go/hauler/pkg/reference" - "hauler.dev/go/hauler/pkg/store" + "hauler.dev/go/hauler/v2/internal/flags" + v1 "hauler.dev/go/hauler/v2/pkg/apis/hauler.cattle.io/v1" + "hauler.dev/go/hauler/v2/pkg/consts" + "hauler.dev/go/hauler/v2/pkg/content" + "hauler.dev/go/hauler/v2/pkg/cosign" + "hauler.dev/go/hauler/v2/pkg/getter" + "hauler.dev/go/hauler/v2/pkg/log" + "hauler.dev/go/hauler/v2/pkg/reference" + "hauler.dev/go/hauler/v2/pkg/store" ) func SyncCmd(ctx context.Context, o *flags.SyncOpts, s *store.Layout, rso *flags.StoreRootOpts, ro *flags.CliRootOpts) error { diff --git a/cmd/hauler/cli/store/sync_test.go b/cmd/hauler/cli/store/sync_test.go index 2a0e598..2f7ad3a 100644 --- a/cmd/hauler/cli/store/sync_test.go +++ b/cmd/hauler/cli/store/sync_test.go @@ -19,8 +19,8 @@ import ( ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/rs/zerolog" - "hauler.dev/go/hauler/internal/flags" - "hauler.dev/go/hauler/pkg/consts" + "hauler.dev/go/hauler/v2/internal/flags" + "hauler.dev/go/hauler/v2/pkg/consts" ) // writeManifestFile writes yamlContent to a temp file, seeks back to the diff --git a/cmd/hauler/cli/store/testhelpers_test.go b/cmd/hauler/cli/store/testhelpers_test.go index 27cbd60..fb78795 100644 --- a/cmd/hauler/cli/store/testhelpers_test.go +++ b/cmd/hauler/cli/store/testhelpers_test.go @@ -27,9 +27,9 @@ import ( "github.com/rs/zerolog" "helm.sh/helm/v3/pkg/action" - "hauler.dev/go/hauler/internal/flags" - "hauler.dev/go/hauler/pkg/consts" - "hauler.dev/go/hauler/pkg/store" + "hauler.dev/go/hauler/v2/internal/flags" + "hauler.dev/go/hauler/v2/pkg/consts" + "hauler.dev/go/hauler/v2/pkg/store" ) // newTestStore creates a fresh store in a temp directory. Fatal on error. diff --git a/cmd/hauler/cli/version.go b/cmd/hauler/cli/version.go index b693aa1..f6563e3 100644 --- a/cmd/hauler/cli/version.go +++ b/cmd/hauler/cli/version.go @@ -5,8 +5,8 @@ import ( "github.com/spf13/cobra" - "hauler.dev/go/hauler/internal/flags" - "hauler.dev/go/hauler/internal/version" + "hauler.dev/go/hauler/v2/internal/flags" + "hauler.dev/go/hauler/v2/internal/version" ) func addVersion(parent *cobra.Command, ro *flags.CliRootOpts) { diff --git a/cmd/hauler/main.go b/cmd/hauler/main.go index 1348465..3754cc7 100644 --- a/cmd/hauler/main.go +++ b/cmd/hauler/main.go @@ -4,9 +4,9 @@ import ( "context" "os" - "hauler.dev/go/hauler/cmd/hauler/cli" - "hauler.dev/go/hauler/internal/flags" - "hauler.dev/go/hauler/pkg/log" + "hauler.dev/go/hauler/v2/cmd/hauler/cli" + "hauler.dev/go/hauler/v2/internal/flags" + "hauler.dev/go/hauler/v2/pkg/log" ) func main() { diff --git a/go.mod b/go.mod index 6078b22..5ec63ce 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module hauler.dev/go/hauler +module hauler.dev/go/hauler/v2 go 1.26.0 diff --git a/internal/flags/load.go b/internal/flags/load.go index 9719c62..1ffe007 100644 --- a/internal/flags/load.go +++ b/internal/flags/load.go @@ -2,7 +2,7 @@ package flags import ( "github.com/spf13/cobra" - "hauler.dev/go/hauler/pkg/consts" + "hauler.dev/go/hauler/v2/pkg/consts" ) type LoadOpts struct { diff --git a/internal/flags/save.go b/internal/flags/save.go index 92ea88a..ee27f95 100644 --- a/internal/flags/save.go +++ b/internal/flags/save.go @@ -2,7 +2,7 @@ package flags import ( "github.com/spf13/cobra" - "hauler.dev/go/hauler/pkg/consts" + "hauler.dev/go/hauler/v2/pkg/consts" ) type SaveOpts struct { diff --git a/internal/flags/serve.go b/internal/flags/serve.go index 59d95d0..78ace27 100644 --- a/internal/flags/serve.go +++ b/internal/flags/serve.go @@ -2,7 +2,7 @@ package flags import ( "github.com/spf13/cobra" - "hauler.dev/go/hauler/pkg/consts" + "hauler.dev/go/hauler/v2/pkg/consts" ) type ServeRegistryOpts struct { diff --git a/internal/flags/store.go b/internal/flags/store.go index ddcf3e0..2ef89bf 100644 --- a/internal/flags/store.go +++ b/internal/flags/store.go @@ -7,9 +7,9 @@ import ( "path/filepath" "github.com/spf13/cobra" - "hauler.dev/go/hauler/pkg/consts" - "hauler.dev/go/hauler/pkg/log" - "hauler.dev/go/hauler/pkg/store" + "hauler.dev/go/hauler/v2/pkg/consts" + "hauler.dev/go/hauler/v2/pkg/log" + "hauler.dev/go/hauler/v2/pkg/store" ) type StoreRootOpts struct { diff --git a/internal/mapper/filestore.go b/internal/mapper/filestore.go index 2122d44..a24950d 100644 --- a/internal/mapper/filestore.go +++ b/internal/mapper/filestore.go @@ -12,7 +12,7 @@ import ( "github.com/containerd/containerd/remotes" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" - "hauler.dev/go/hauler/pkg/content" + "hauler.dev/go/hauler/v2/pkg/content" ) // NewMapperFileStore creates a new file store that uses mapper functions for each detected descriptor. diff --git a/internal/mapper/mapper_test.go b/internal/mapper/mapper_test.go index 3ef61cd..0c2b15b 100644 --- a/internal/mapper/mapper_test.go +++ b/internal/mapper/mapper_test.go @@ -7,7 +7,7 @@ import ( digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" - "hauler.dev/go/hauler/pkg/consts" + "hauler.dev/go/hauler/v2/pkg/consts" ) func TestFromManifest_DockerImage(t *testing.T) { diff --git a/internal/mapper/mappers.go b/internal/mapper/mappers.go index 2d6cf6a..a334320 100644 --- a/internal/mapper/mappers.go +++ b/internal/mapper/mappers.go @@ -5,8 +5,8 @@ import ( ocispec "github.com/opencontainers/image-spec/specs-go/v1" - "hauler.dev/go/hauler/pkg/consts" - "hauler.dev/go/hauler/pkg/content" + "hauler.dev/go/hauler/v2/pkg/consts" + "hauler.dev/go/hauler/v2/pkg/content" ) type Fn func(desc ocispec.Descriptor) (string, error) diff --git a/internal/server/file.go b/internal/server/file.go index 8cade10..7c39e6c 100644 --- a/internal/server/file.go +++ b/internal/server/file.go @@ -9,8 +9,8 @@ import ( "github.com/gorilla/handlers" "github.com/gorilla/mux" - "hauler.dev/go/hauler/internal/flags" - "hauler.dev/go/hauler/pkg/consts" + "hauler.dev/go/hauler/v2/internal/flags" + "hauler.dev/go/hauler/v2/pkg/consts" ) // NewFile returns a fileserver diff --git a/internal/server/server_test.go b/internal/server/server_test.go index 6229881..4bfceda 100644 --- a/internal/server/server_test.go +++ b/internal/server/server_test.go @@ -9,7 +9,7 @@ import ( // Register the filesystem storage driver for the distribution registry. _ "github.com/distribution/distribution/v3/registry/storage/driver/filesystem" - "hauler.dev/go/hauler/internal/flags" + "hauler.dev/go/hauler/v2/internal/flags" ) func TestNewTempRegistry_StartStop(t *testing.T) { diff --git a/internal/version/version.go b/internal/version/version.go index 53d4dc3..e11e9af 100644 --- a/internal/version/version.go +++ b/internal/version/version.go @@ -28,7 +28,7 @@ import ( "time" "github.com/common-nighthawk/go-figure" - "hauler.dev/go/hauler/pkg/consts" + "hauler.dev/go/hauler/v2/pkg/consts" ) // Base version information. diff --git a/pkg/apis/hauler.cattle.io/v1/groupversion_info.go b/pkg/apis/hauler.cattle.io/v1/groupversion_info.go index 1fa9339..3ad27ae 100644 --- a/pkg/apis/hauler.cattle.io/v1/groupversion_info.go +++ b/pkg/apis/hauler.cattle.io/v1/groupversion_info.go @@ -3,7 +3,7 @@ package v1 import ( "k8s.io/apimachinery/pkg/runtime/schema" - "hauler.dev/go/hauler/pkg/consts" + "hauler.dev/go/hauler/v2/pkg/consts" ) var ( diff --git a/pkg/archives/archiver.go b/pkg/archives/archiver.go index 367dad3..18b57d1 100644 --- a/pkg/archives/archiver.go +++ b/pkg/archives/archiver.go @@ -9,7 +9,7 @@ import ( "strings" "github.com/mholt/archives" - "hauler.dev/go/hauler/pkg/log" + "hauler.dev/go/hauler/v2/pkg/log" ) // maps to handle compression types diff --git a/pkg/archives/unarchiver.go b/pkg/archives/unarchiver.go index 7678f26..180a71c 100644 --- a/pkg/archives/unarchiver.go +++ b/pkg/archives/unarchiver.go @@ -12,7 +12,7 @@ import ( "strings" "github.com/mholt/archives" - "hauler.dev/go/hauler/pkg/log" + "hauler.dev/go/hauler/v2/pkg/log" ) const ( diff --git a/pkg/artifacts/config.go b/pkg/artifacts/config.go index a4bf018..55a8ecb 100644 --- a/pkg/artifacts/config.go +++ b/pkg/artifacts/config.go @@ -8,7 +8,7 @@ import ( "github.com/google/go-containerregistry/pkg/v1/partial" "github.com/google/go-containerregistry/pkg/v1/types" - "hauler.dev/go/hauler/pkg/consts" + "hauler.dev/go/hauler/v2/pkg/consts" ) var _ partial.Describable = (*marshallableConfig)(nil) diff --git a/pkg/artifacts/file/file.go b/pkg/artifacts/file/file.go index 0adafa0..fdeea68 100644 --- a/pkg/artifacts/file/file.go +++ b/pkg/artifacts/file/file.go @@ -8,9 +8,9 @@ import ( gtypes "github.com/google/go-containerregistry/pkg/v1/types" ocispec "github.com/opencontainers/image-spec/specs-go/v1" - "hauler.dev/go/hauler/pkg/artifacts" - "hauler.dev/go/hauler/pkg/consts" - "hauler.dev/go/hauler/pkg/getter" + "hauler.dev/go/hauler/v2/pkg/artifacts" + "hauler.dev/go/hauler/v2/pkg/consts" + "hauler.dev/go/hauler/v2/pkg/getter" ) // interface guard diff --git a/pkg/artifacts/file/file_test.go b/pkg/artifacts/file/file_test.go index 062b80b..b40e4f6 100644 --- a/pkg/artifacts/file/file_test.go +++ b/pkg/artifacts/file/file_test.go @@ -13,9 +13,9 @@ import ( "github.com/spf13/afero" - "hauler.dev/go/hauler/pkg/artifacts/file" - "hauler.dev/go/hauler/pkg/consts" - "hauler.dev/go/hauler/pkg/getter" + "hauler.dev/go/hauler/v2/pkg/artifacts/file" + "hauler.dev/go/hauler/v2/pkg/consts" + "hauler.dev/go/hauler/v2/pkg/getter" ) var ( diff --git a/pkg/artifacts/file/options.go b/pkg/artifacts/file/options.go index 4bc7770..fea2812 100644 --- a/pkg/artifacts/file/options.go +++ b/pkg/artifacts/file/options.go @@ -1,8 +1,8 @@ package file import ( - "hauler.dev/go/hauler/pkg/artifacts" - "hauler.dev/go/hauler/pkg/getter" + "hauler.dev/go/hauler/v2/pkg/artifacts" + "hauler.dev/go/hauler/v2/pkg/getter" ) type Option func(*File) diff --git a/pkg/artifacts/image/image.go b/pkg/artifacts/image/image.go index 993ca8e..f354c41 100644 --- a/pkg/artifacts/image/image.go +++ b/pkg/artifacts/image/image.go @@ -7,7 +7,7 @@ import ( gv1 "github.com/google/go-containerregistry/pkg/v1" "github.com/google/go-containerregistry/pkg/v1/remote" - "hauler.dev/go/hauler/pkg/artifacts" + "hauler.dev/go/hauler/v2/pkg/artifacts" ) var _ artifacts.OCI = (*Image)(nil) diff --git a/pkg/artifacts/memory/memory.go b/pkg/artifacts/memory/memory.go index e314698..3876c6b 100644 --- a/pkg/artifacts/memory/memory.go +++ b/pkg/artifacts/memory/memory.go @@ -6,8 +6,8 @@ import ( "github.com/google/go-containerregistry/pkg/v1/static" "github.com/google/go-containerregistry/pkg/v1/types" - "hauler.dev/go/hauler/pkg/artifacts" - "hauler.dev/go/hauler/pkg/consts" + "hauler.dev/go/hauler/v2/pkg/artifacts" + "hauler.dev/go/hauler/v2/pkg/consts" ) var _ artifacts.OCI = (*Memory)(nil) diff --git a/pkg/artifacts/memory/memory_test.go b/pkg/artifacts/memory/memory_test.go index b56f0f3..a42b7f9 100644 --- a/pkg/artifacts/memory/memory_test.go +++ b/pkg/artifacts/memory/memory_test.go @@ -7,7 +7,7 @@ import ( v1 "github.com/google/go-containerregistry/pkg/v1" "github.com/opencontainers/go-digest" - "hauler.dev/go/hauler/pkg/artifacts/memory" + "hauler.dev/go/hauler/v2/pkg/artifacts/memory" ) func TestMemory_Layers(t *testing.T) { diff --git a/pkg/artifacts/memory/options.go b/pkg/artifacts/memory/options.go index 6f8f572..9b703c6 100644 --- a/pkg/artifacts/memory/options.go +++ b/pkg/artifacts/memory/options.go @@ -1,6 +1,6 @@ package memory -import "hauler.dev/go/hauler/pkg/artifacts" +import "hauler.dev/go/hauler/v2/pkg/artifacts" type Option func(*Memory) diff --git a/pkg/content/chart/chart.go b/pkg/content/chart/chart.go index 5f86b12..b83741c 100644 --- a/pkg/content/chart/chart.go +++ b/pkg/content/chart/chart.go @@ -16,16 +16,16 @@ import ( "github.com/google/go-containerregistry/pkg/v1/partial" gtypes "github.com/google/go-containerregistry/pkg/v1/types" ocispec "github.com/opencontainers/image-spec/specs-go/v1" - "hauler.dev/go/hauler/pkg/artifacts" - "hauler.dev/go/hauler/pkg/log" + "hauler.dev/go/hauler/v2/pkg/artifacts" + "hauler.dev/go/hauler/v2/pkg/log" "helm.sh/helm/v3/pkg/action" "helm.sh/helm/v3/pkg/chart" "helm.sh/helm/v3/pkg/chart/loader" "helm.sh/helm/v3/pkg/cli" "helm.sh/helm/v3/pkg/registry" - "hauler.dev/go/hauler/pkg/consts" - "hauler.dev/go/hauler/pkg/layer" + "hauler.dev/go/hauler/v2/pkg/consts" + "hauler.dev/go/hauler/v2/pkg/layer" ) var ( diff --git a/pkg/content/chart/chart_test.go b/pkg/content/chart/chart_test.go index 94133e9..b6a65bc 100644 --- a/pkg/content/chart/chart_test.go +++ b/pkg/content/chart/chart_test.go @@ -9,8 +9,8 @@ import ( ocispec "github.com/opencontainers/image-spec/specs-go/v1" "helm.sh/helm/v3/pkg/action" - "hauler.dev/go/hauler/pkg/consts" - "hauler.dev/go/hauler/pkg/content/chart" + "hauler.dev/go/hauler/v2/pkg/consts" + "hauler.dev/go/hauler/v2/pkg/content/chart" ) func TestNewChart(t *testing.T) { diff --git a/pkg/content/content.go b/pkg/content/content.go index 4355a24..699bc21 100644 --- a/pkg/content/content.go +++ b/pkg/content/content.go @@ -7,7 +7,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/yaml" - v1 "hauler.dev/go/hauler/pkg/apis/hauler.cattle.io/v1" + v1 "hauler.dev/go/hauler/v2/pkg/apis/hauler.cattle.io/v1" ) func Load(data []byte) (schema.ObjectKind, error) { diff --git a/pkg/content/oci.go b/pkg/content/oci.go index 39bc3c6..4bb68a2 100644 --- a/pkg/content/oci.go +++ b/pkg/content/oci.go @@ -19,8 +19,8 @@ import ( "github.com/opencontainers/image-spec/specs-go" ocispec "github.com/opencontainers/image-spec/specs-go/v1" - "hauler.dev/go/hauler/pkg/consts" - "hauler.dev/go/hauler/pkg/reference" + "hauler.dev/go/hauler/v2/pkg/consts" + "hauler.dev/go/hauler/v2/pkg/reference" ) var _ Target = (*OCI)(nil) diff --git a/pkg/content/oci_test.go b/pkg/content/oci_test.go index 4bf650a..442dd11 100644 --- a/pkg/content/oci_test.go +++ b/pkg/content/oci_test.go @@ -17,7 +17,7 @@ import ( "github.com/opencontainers/image-spec/specs-go" ocispec "github.com/opencontainers/image-spec/specs-go/v1" - "hauler.dev/go/hauler/pkg/consts" + "hauler.dev/go/hauler/v2/pkg/consts" ) // buildMinimalOCILayout writes the smallest valid OCI layout (oci-layout marker diff --git a/pkg/cosign/cosign.go b/pkg/cosign/cosign.go index 56fd3a5..1490e19 100644 --- a/pkg/cosign/cosign.go +++ b/pkg/cosign/cosign.go @@ -5,9 +5,9 @@ import ( "github.com/sigstore/cosign/v3/cmd/cosign/cli/options" "github.com/sigstore/cosign/v3/cmd/cosign/cli/verify" - "hauler.dev/go/hauler/internal/flags" - "hauler.dev/go/hauler/pkg/log" - "hauler.dev/go/hauler/pkg/retry" + "hauler.dev/go/hauler/v2/internal/flags" + "hauler.dev/go/hauler/v2/pkg/log" + "hauler.dev/go/hauler/v2/pkg/retry" ) // VerifySignature verifies the digital signature of an image using Sigstore/Cosign. diff --git a/pkg/getter/directory.go b/pkg/getter/directory.go index 88ec04c..14dc3f8 100644 --- a/pkg/getter/directory.go +++ b/pkg/getter/directory.go @@ -13,8 +13,8 @@ import ( "github.com/opencontainers/go-digest" "github.com/pkg/errors" - "hauler.dev/go/hauler/pkg/artifacts" - "hauler.dev/go/hauler/pkg/consts" + "hauler.dev/go/hauler/v2/pkg/artifacts" + "hauler.dev/go/hauler/v2/pkg/consts" ) type directory struct { diff --git a/pkg/getter/file.go b/pkg/getter/file.go index 2017b71..d664cf0 100644 --- a/pkg/getter/file.go +++ b/pkg/getter/file.go @@ -7,8 +7,8 @@ import ( "os" "path/filepath" - "hauler.dev/go/hauler/pkg/artifacts" - "hauler.dev/go/hauler/pkg/consts" + "hauler.dev/go/hauler/v2/pkg/artifacts" + "hauler.dev/go/hauler/v2/pkg/consts" ) type File struct{} diff --git a/pkg/getter/getter.go b/pkg/getter/getter.go index c022c21..fcad862 100644 --- a/pkg/getter/getter.go +++ b/pkg/getter/getter.go @@ -10,10 +10,10 @@ import ( ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" - content2 "hauler.dev/go/hauler/pkg/artifacts" - "hauler.dev/go/hauler/pkg/consts" - "hauler.dev/go/hauler/pkg/content" - "hauler.dev/go/hauler/pkg/layer" + content2 "hauler.dev/go/hauler/v2/pkg/artifacts" + "hauler.dev/go/hauler/v2/pkg/consts" + "hauler.dev/go/hauler/v2/pkg/content" + "hauler.dev/go/hauler/v2/pkg/layer" ) type Client struct { diff --git a/pkg/getter/getter_test.go b/pkg/getter/getter_test.go index 7c69576..94e451e 100644 --- a/pkg/getter/getter_test.go +++ b/pkg/getter/getter_test.go @@ -6,7 +6,7 @@ import ( "path/filepath" "testing" - "hauler.dev/go/hauler/pkg/getter" + "hauler.dev/go/hauler/v2/pkg/getter" ) func TestClient_Detect(t *testing.T) { diff --git a/pkg/getter/https.go b/pkg/getter/https.go index 4bd4d23..19f54e5 100644 --- a/pkg/getter/https.go +++ b/pkg/getter/https.go @@ -10,8 +10,8 @@ import ( "path/filepath" "strings" - "hauler.dev/go/hauler/pkg/artifacts" - "hauler.dev/go/hauler/pkg/consts" + "hauler.dev/go/hauler/v2/pkg/artifacts" + "hauler.dev/go/hauler/v2/pkg/consts" ) type Http struct{} diff --git a/pkg/layer/cache.go b/pkg/layer/cache.go index 76afae1..8bb3a7e 100644 --- a/pkg/layer/cache.go +++ b/pkg/layer/cache.go @@ -7,7 +7,7 @@ import ( v1 "github.com/google/go-containerregistry/pkg/v1" "github.com/google/go-containerregistry/pkg/v1/types" - "hauler.dev/go/hauler/pkg/artifacts" + "hauler.dev/go/hauler/v2/pkg/artifacts" ) /* diff --git a/pkg/layer/layer.go b/pkg/layer/layer.go index 4e8b0d2..76fb927 100644 --- a/pkg/layer/layer.go +++ b/pkg/layer/layer.go @@ -6,7 +6,7 @@ import ( v1 "github.com/google/go-containerregistry/pkg/v1" gtypes "github.com/google/go-containerregistry/pkg/v1/types" - "hauler.dev/go/hauler/pkg/consts" + "hauler.dev/go/hauler/v2/pkg/consts" ) type Opener func() (io.ReadCloser, error) diff --git a/pkg/log/log.go b/pkg/log/log.go index 89e5013..2d634cf 100644 --- a/pkg/log/log.go +++ b/pkg/log/log.go @@ -8,7 +8,7 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "hauler.dev/go/hauler/pkg/consts" + "hauler.dev/go/hauler/v2/pkg/consts" ) // Logger provides an interface for all used logger features regardless of logging backend diff --git a/pkg/reference/reference.go b/pkg/reference/reference.go index 23735d2..ed903a8 100644 --- a/pkg/reference/reference.go +++ b/pkg/reference/reference.go @@ -9,7 +9,7 @@ import ( gname "github.com/google/go-containerregistry/pkg/name" - "hauler.dev/go/hauler/pkg/consts" + "hauler.dev/go/hauler/v2/pkg/consts" ) type Reference interface { diff --git a/pkg/reference/reference_test.go b/pkg/reference/reference_test.go index 60cee74..7d100d0 100644 --- a/pkg/reference/reference_test.go +++ b/pkg/reference/reference_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "hauler.dev/go/hauler/pkg/reference" + "hauler.dev/go/hauler/v2/pkg/reference" ) func TestParse(t *testing.T) { diff --git a/pkg/retry/retry.go b/pkg/retry/retry.go index 4e93e46..520b9bb 100644 --- a/pkg/retry/retry.go +++ b/pkg/retry/retry.go @@ -7,9 +7,9 @@ import ( "strings" "time" - "hauler.dev/go/hauler/internal/flags" - "hauler.dev/go/hauler/pkg/consts" - "hauler.dev/go/hauler/pkg/log" + "hauler.dev/go/hauler/v2/internal/flags" + "hauler.dev/go/hauler/v2/pkg/consts" + "hauler.dev/go/hauler/v2/pkg/log" ) // Operation retries the given operation according to the retry settings in rso/ro. diff --git a/pkg/retry/retry_test.go b/pkg/retry/retry_test.go index 5588b93..4ac3b3d 100644 --- a/pkg/retry/retry_test.go +++ b/pkg/retry/retry_test.go @@ -8,8 +8,8 @@ import ( "github.com/rs/zerolog" - "hauler.dev/go/hauler/internal/flags" - "hauler.dev/go/hauler/pkg/consts" + "hauler.dev/go/hauler/v2/internal/flags" + "hauler.dev/go/hauler/v2/pkg/consts" ) func testContext() context.Context { diff --git a/pkg/store/store.go b/pkg/store/store.go index ada5a71..10d6a8e 100644 --- a/pkg/store/store.go +++ b/pkg/store/store.go @@ -23,10 +23,10 @@ import ( "github.com/rs/zerolog" "golang.org/x/sync/errgroup" - "hauler.dev/go/hauler/pkg/artifacts" - "hauler.dev/go/hauler/pkg/consts" - "hauler.dev/go/hauler/pkg/content" - "hauler.dev/go/hauler/pkg/layer" + "hauler.dev/go/hauler/v2/pkg/artifacts" + "hauler.dev/go/hauler/v2/pkg/consts" + "hauler.dev/go/hauler/v2/pkg/content" + "hauler.dev/go/hauler/v2/pkg/layer" ) type Layout struct { diff --git a/pkg/store/store_test.go b/pkg/store/store_test.go index eb0ec32..a37e963 100644 --- a/pkg/store/store_test.go +++ b/pkg/store/store_test.go @@ -25,9 +25,9 @@ import ( "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" - "hauler.dev/go/hauler/pkg/artifacts" - "hauler.dev/go/hauler/pkg/consts" - "hauler.dev/go/hauler/pkg/store" + "hauler.dev/go/hauler/v2/pkg/artifacts" + "hauler.dev/go/hauler/v2/pkg/consts" + "hauler.dev/go/hauler/v2/pkg/store" ) var (