From 16fa03fec88133f1c95c8495bc23b07b190f9d77 Mon Sep 17 00:00:00 2001 From: Jacob Blain Christen Date: Mon, 26 Aug 2024 13:54:06 -0700 Subject: [PATCH] github.com/rancherfederal/hauler => hauler.dev/go/hauler (#311) --- .github/workflows/pages.yaml | 4 +++- .goreleaser.yaml | 2 +- cmd/hauler/cli/cli.go | 4 ++-- cmd/hauler/cli/login.go | 4 ++-- cmd/hauler/cli/store.go | 4 ++-- cmd/hauler/cli/store/add.go | 18 +++++++++--------- cmd/hauler/cli/store/copy.go | 8 ++++---- cmd/hauler/cli/store/extract.go | 10 +++++----- cmd/hauler/cli/store/info.go | 8 ++++---- cmd/hauler/cli/store/load.go | 8 ++++---- cmd/hauler/cli/store/save.go | 4 ++-- cmd/hauler/cli/store/serve.go | 8 ++++---- cmd/hauler/cli/store/sync.go | 22 +++++++++++----------- cmd/hauler/cli/version.go | 2 +- cmd/hauler/main.go | 6 +++--- go.mod | 2 +- internal/flags/store.go | 6 +++--- internal/mapper/mappers.go | 2 +- internal/server/file.go | 2 +- pkg/artifacts/config.go | 2 +- pkg/artifacts/file/file.go | 6 +++--- pkg/artifacts/file/file_test.go | 6 +++--- pkg/artifacts/file/getter/directory.go | 4 ++-- pkg/artifacts/file/getter/file.go | 4 ++-- pkg/artifacts/file/getter/getter.go | 6 +++--- pkg/artifacts/file/getter/getter_test.go | 2 +- pkg/artifacts/file/getter/https.go | 4 ++-- pkg/artifacts/file/options.go | 4 ++-- pkg/artifacts/image/image.go | 2 +- pkg/artifacts/memory/memory.go | 4 ++-- pkg/artifacts/memory/memory_test.go | 2 +- pkg/artifacts/memory/options.go | 2 +- pkg/collection/chart/chart.go | 10 +++++----- pkg/collection/chart/dependents.go | 2 +- pkg/collection/imagetxt/imagetxt.go | 8 ++++---- pkg/collection/imagetxt/imagetxt_test.go | 4 ++-- pkg/collection/k3s/k3s.go | 10 +++++----- pkg/content/chart/chart.go | 8 ++++---- pkg/content/chart/chart_test.go | 4 ++-- pkg/content/content.go | 2 +- pkg/content/oci.go | 4 ++-- pkg/cosign/cosign.go | 6 +++--- pkg/layer/cache.go | 2 +- pkg/layer/layer.go | 2 +- pkg/reference/reference_test.go | 2 +- pkg/store/store.go | 8 ++++---- pkg/store/store_test.go | 4 ++-- static/go/hauler/index.html | 4 ++-- 48 files changed, 127 insertions(+), 125 deletions(-) diff --git a/.github/workflows/pages.yaml b/.github/workflows/pages.yaml index 1408a9a2..2eb4caa6 100644 --- a/.github/workflows/pages.yaml +++ b/.github/workflows/pages.yaml @@ -2,7 +2,9 @@ name: 📋 on: - # Allows you to run this workflow manually from the Actions tab + push: + branches: + - main workflow_dispatch: # Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 5d7e48bb..59cc6122 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -12,7 +12,7 @@ release: make_latest: false env: - - vpkg=github.com/rancherfederal/hauler/internal/version + - vpkg=hauler.dev/go/hauler/internal/version - cosign_version=v2.2.3+carbide.2 builds: diff --git a/cmd/hauler/cli/cli.go b/cmd/hauler/cli/cli.go index 5cc4a77f..7ebc1361 100644 --- a/cmd/hauler/cli/cli.go +++ b/cmd/hauler/cli/cli.go @@ -3,8 +3,8 @@ package cli import ( "github.com/spf13/cobra" - "github.com/rancherfederal/hauler/internal/flags" - "github.com/rancherfederal/hauler/pkg/log" + "hauler.dev/go/hauler/internal/flags" + "hauler.dev/go/hauler/pkg/log" ) var ro = &flags.CliRootOpts{} diff --git a/cmd/hauler/cli/login.go b/cmd/hauler/cli/login.go index 70e09170..65025e2a 100644 --- a/cmd/hauler/cli/login.go +++ b/cmd/hauler/cli/login.go @@ -10,8 +10,8 @@ import ( "github.com/spf13/cobra" "oras.land/oras-go/pkg/content" - "github.com/rancherfederal/hauler/internal/flags" - "github.com/rancherfederal/hauler/pkg/cosign" + "hauler.dev/go/hauler/internal/flags" + "hauler.dev/go/hauler/pkg/cosign" ) func addLogin(parent *cobra.Command) { diff --git a/cmd/hauler/cli/store.go b/cmd/hauler/cli/store.go index dd3d0b7a..044d0749 100644 --- a/cmd/hauler/cli/store.go +++ b/cmd/hauler/cli/store.go @@ -6,8 +6,8 @@ import ( "github.com/spf13/cobra" "helm.sh/helm/v3/pkg/action" - "github.com/rancherfederal/hauler/cmd/hauler/cli/store" - "github.com/rancherfederal/hauler/internal/flags" + "hauler.dev/go/hauler/cmd/hauler/cli/store" + "hauler.dev/go/hauler/internal/flags" ) var rootStoreOpts = &flags.StoreRootOpts{} diff --git a/cmd/hauler/cli/store/add.go b/cmd/hauler/cli/store/add.go index 8029b4e5..8209ce42 100644 --- a/cmd/hauler/cli/store/add.go +++ b/cmd/hauler/cli/store/add.go @@ -4,17 +4,17 @@ import ( "context" "github.com/google/go-containerregistry/pkg/name" - "github.com/rancherfederal/hauler/pkg/artifacts/file/getter" + "hauler.dev/go/hauler/pkg/artifacts/file/getter" "helm.sh/helm/v3/pkg/action" - "github.com/rancherfederal/hauler/internal/flags" - "github.com/rancherfederal/hauler/pkg/apis/hauler.cattle.io/v1alpha1" - "github.com/rancherfederal/hauler/pkg/artifacts/file" - "github.com/rancherfederal/hauler/pkg/content/chart" - "github.com/rancherfederal/hauler/pkg/cosign" - "github.com/rancherfederal/hauler/pkg/log" - "github.com/rancherfederal/hauler/pkg/reference" - "github.com/rancherfederal/hauler/pkg/store" + "hauler.dev/go/hauler/internal/flags" + "hauler.dev/go/hauler/pkg/apis/hauler.cattle.io/v1alpha1" + "hauler.dev/go/hauler/pkg/artifacts/file" + "hauler.dev/go/hauler/pkg/content/chart" + "hauler.dev/go/hauler/pkg/cosign" + "hauler.dev/go/hauler/pkg/log" + "hauler.dev/go/hauler/pkg/reference" + "hauler.dev/go/hauler/pkg/store" ) func AddFileCmd(ctx context.Context, o *flags.AddFileOpts, s *store.Layout, reference string) error { diff --git a/cmd/hauler/cli/store/copy.go b/cmd/hauler/cli/store/copy.go index ee72ed64..4cc6845b 100644 --- a/cmd/hauler/cli/store/copy.go +++ b/cmd/hauler/cli/store/copy.go @@ -7,10 +7,10 @@ import ( "oras.land/oras-go/pkg/content" - "github.com/rancherfederal/hauler/internal/flags" - "github.com/rancherfederal/hauler/pkg/cosign" - "github.com/rancherfederal/hauler/pkg/log" - "github.com/rancherfederal/hauler/pkg/store" + "hauler.dev/go/hauler/internal/flags" + "hauler.dev/go/hauler/pkg/cosign" + "hauler.dev/go/hauler/pkg/log" + "hauler.dev/go/hauler/pkg/store" ) func CopyCmd(ctx context.Context, o *flags.CopyOpts, s *store.Layout, targetRef string) error { diff --git a/cmd/hauler/cli/store/extract.go b/cmd/hauler/cli/store/extract.go index 298609b1..73da37d2 100644 --- a/cmd/hauler/cli/store/extract.go +++ b/cmd/hauler/cli/store/extract.go @@ -8,11 +8,11 @@ import ( ocispec "github.com/opencontainers/image-spec/specs-go/v1" - "github.com/rancherfederal/hauler/internal/flags" - "github.com/rancherfederal/hauler/internal/mapper" - "github.com/rancherfederal/hauler/pkg/log" - "github.com/rancherfederal/hauler/pkg/reference" - "github.com/rancherfederal/hauler/pkg/store" + "hauler.dev/go/hauler/internal/flags" + "hauler.dev/go/hauler/internal/mapper" + "hauler.dev/go/hauler/pkg/log" + "hauler.dev/go/hauler/pkg/reference" + "hauler.dev/go/hauler/pkg/store" ) func ExtractCmd(ctx context.Context, o *flags.ExtractOpts, s *store.Layout, ref string) error { diff --git a/cmd/hauler/cli/store/info.go b/cmd/hauler/cli/store/info.go index b5c38830..2f6612ec 100644 --- a/cmd/hauler/cli/store/info.go +++ b/cmd/hauler/cli/store/info.go @@ -10,10 +10,10 @@ import ( "github.com/olekukonko/tablewriter" ocispec "github.com/opencontainers/image-spec/specs-go/v1" - "github.com/rancherfederal/hauler/internal/flags" - "github.com/rancherfederal/hauler/pkg/consts" - "github.com/rancherfederal/hauler/pkg/reference" - "github.com/rancherfederal/hauler/pkg/store" + "hauler.dev/go/hauler/internal/flags" + "hauler.dev/go/hauler/pkg/consts" + "hauler.dev/go/hauler/pkg/reference" + "hauler.dev/go/hauler/pkg/store" ) func InfoCmd(ctx context.Context, o *flags.InfoOpts, s *store.Layout) error { diff --git a/cmd/hauler/cli/store/load.go b/cmd/hauler/cli/store/load.go index 0dd1fe3b..4e00a7b6 100644 --- a/cmd/hauler/cli/store/load.go +++ b/cmd/hauler/cli/store/load.go @@ -6,10 +6,10 @@ import ( "github.com/mholt/archiver/v3" - "github.com/rancherfederal/hauler/internal/flags" - "github.com/rancherfederal/hauler/pkg/content" - "github.com/rancherfederal/hauler/pkg/log" - "github.com/rancherfederal/hauler/pkg/store" + "hauler.dev/go/hauler/internal/flags" + "hauler.dev/go/hauler/pkg/content" + "hauler.dev/go/hauler/pkg/log" + "hauler.dev/go/hauler/pkg/store" ) // LoadCmd diff --git a/cmd/hauler/cli/store/save.go b/cmd/hauler/cli/store/save.go index 0882d86d..0d6d082e 100644 --- a/cmd/hauler/cli/store/save.go +++ b/cmd/hauler/cli/store/save.go @@ -7,8 +7,8 @@ import ( "github.com/mholt/archiver/v3" - "github.com/rancherfederal/hauler/internal/flags" - "github.com/rancherfederal/hauler/pkg/log" + "hauler.dev/go/hauler/internal/flags" + "hauler.dev/go/hauler/pkg/log" ) // SaveCmd diff --git a/cmd/hauler/cli/store/serve.go b/cmd/hauler/cli/store/serve.go index e77624be..0fa900b7 100644 --- a/cmd/hauler/cli/store/serve.go +++ b/cmd/hauler/cli/store/serve.go @@ -11,10 +11,10 @@ import ( _ "github.com/distribution/distribution/v3/registry/storage/driver/inmemory" "github.com/distribution/distribution/v3/version" - "github.com/rancherfederal/hauler/internal/flags" - "github.com/rancherfederal/hauler/internal/server" - "github.com/rancherfederal/hauler/pkg/log" - "github.com/rancherfederal/hauler/pkg/store" + "hauler.dev/go/hauler/internal/flags" + "hauler.dev/go/hauler/internal/server" + "hauler.dev/go/hauler/pkg/log" + "hauler.dev/go/hauler/pkg/store" ) func ServeRegistryCmd(ctx context.Context, o *flags.ServeRegistryOpts, s *store.Layout) error { diff --git a/cmd/hauler/cli/store/sync.go b/cmd/hauler/cli/store/sync.go index 2763e6c6..7d5834dc 100644 --- a/cmd/hauler/cli/store/sync.go +++ b/cmd/hauler/cli/store/sync.go @@ -12,17 +12,17 @@ import ( "helm.sh/helm/v3/pkg/action" "k8s.io/apimachinery/pkg/util/yaml" - "github.com/rancherfederal/hauler/internal/flags" - "github.com/rancherfederal/hauler/pkg/apis/hauler.cattle.io/v1alpha1" - tchart "github.com/rancherfederal/hauler/pkg/collection/chart" - "github.com/rancherfederal/hauler/pkg/collection/imagetxt" - "github.com/rancherfederal/hauler/pkg/collection/k3s" - "github.com/rancherfederal/hauler/pkg/consts" - "github.com/rancherfederal/hauler/pkg/content" - "github.com/rancherfederal/hauler/pkg/cosign" - "github.com/rancherfederal/hauler/pkg/log" - "github.com/rancherfederal/hauler/pkg/reference" - "github.com/rancherfederal/hauler/pkg/store" + "hauler.dev/go/hauler/internal/flags" + "hauler.dev/go/hauler/pkg/apis/hauler.cattle.io/v1alpha1" + tchart "hauler.dev/go/hauler/pkg/collection/chart" + "hauler.dev/go/hauler/pkg/collection/imagetxt" + "hauler.dev/go/hauler/pkg/collection/k3s" + "hauler.dev/go/hauler/pkg/consts" + "hauler.dev/go/hauler/pkg/content" + "hauler.dev/go/hauler/pkg/cosign" + "hauler.dev/go/hauler/pkg/log" + "hauler.dev/go/hauler/pkg/reference" + "hauler.dev/go/hauler/pkg/store" ) func SyncCmd(ctx context.Context, o *flags.SyncOpts, s *store.Layout) error { diff --git a/cmd/hauler/cli/version.go b/cmd/hauler/cli/version.go index 3edd4b61..c455da7b 100644 --- a/cmd/hauler/cli/version.go +++ b/cmd/hauler/cli/version.go @@ -5,7 +5,7 @@ import ( "github.com/spf13/cobra" - "github.com/rancherfederal/hauler/internal/version" + "hauler.dev/go/hauler/internal/version" ) func addVersion(parent *cobra.Command) { diff --git a/cmd/hauler/main.go b/cmd/hauler/main.go index 88f77f16..e4f2b4a3 100644 --- a/cmd/hauler/main.go +++ b/cmd/hauler/main.go @@ -5,9 +5,9 @@ import ( "embed" "os" - "github.com/rancherfederal/hauler/cmd/hauler/cli" - "github.com/rancherfederal/hauler/pkg/cosign" - "github.com/rancherfederal/hauler/pkg/log" + "hauler.dev/go/hauler/cmd/hauler/cli" + "hauler.dev/go/hauler/pkg/cosign" + "hauler.dev/go/hauler/pkg/log" ) //go:embed binaries/* diff --git a/go.mod b/go.mod index e9c900de..abdaa672 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/rancherfederal/hauler +module hauler.dev/go/hauler go 1.21 diff --git a/internal/flags/store.go b/internal/flags/store.go index 0cdacde1..cf22c733 100644 --- a/internal/flags/store.go +++ b/internal/flags/store.go @@ -6,10 +6,10 @@ import ( "os" "path/filepath" - "github.com/rancherfederal/hauler/pkg/consts" - "github.com/rancherfederal/hauler/pkg/log" - "github.com/rancherfederal/hauler/pkg/store" "github.com/spf13/cobra" + "hauler.dev/go/hauler/pkg/consts" + "hauler.dev/go/hauler/pkg/log" + "hauler.dev/go/hauler/pkg/store" ) type StoreRootOpts struct { diff --git a/internal/mapper/mappers.go b/internal/mapper/mappers.go index 7942f886..c4e65d34 100644 --- a/internal/mapper/mappers.go +++ b/internal/mapper/mappers.go @@ -6,7 +6,7 @@ import ( ocispec "github.com/opencontainers/image-spec/specs-go/v1" "oras.land/oras-go/pkg/target" - "github.com/rancherfederal/hauler/pkg/consts" + "hauler.dev/go/hauler/pkg/consts" ) type Fn func(desc ocispec.Descriptor) (string, error) diff --git a/internal/server/file.go b/internal/server/file.go index cc037327..ac6b8d19 100644 --- a/internal/server/file.go +++ b/internal/server/file.go @@ -9,7 +9,7 @@ import ( "github.com/gorilla/handlers" "github.com/gorilla/mux" - "github.com/rancherfederal/hauler/internal/flags" + "hauler.dev/go/hauler/internal/flags" ) // NewFile returns a fileserver diff --git a/pkg/artifacts/config.go b/pkg/artifacts/config.go index b25bb441..a4bf0183 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" - "github.com/rancherfederal/hauler/pkg/consts" + "hauler.dev/go/hauler/pkg/consts" ) var _ partial.Describable = (*marshallableConfig)(nil) diff --git a/pkg/artifacts/file/file.go b/pkg/artifacts/file/file.go index 3be515ef..5fca2ba6 100644 --- a/pkg/artifacts/file/file.go +++ b/pkg/artifacts/file/file.go @@ -7,9 +7,9 @@ import ( "github.com/google/go-containerregistry/pkg/v1/partial" gtypes "github.com/google/go-containerregistry/pkg/v1/types" - "github.com/rancherfederal/hauler/pkg/artifacts" - "github.com/rancherfederal/hauler/pkg/artifacts/file/getter" - "github.com/rancherfederal/hauler/pkg/consts" + "hauler.dev/go/hauler/pkg/artifacts" + "hauler.dev/go/hauler/pkg/artifacts/file/getter" + "hauler.dev/go/hauler/pkg/consts" ) // interface guard diff --git a/pkg/artifacts/file/file_test.go b/pkg/artifacts/file/file_test.go index 729b5c4f..c471639e 100644 --- a/pkg/artifacts/file/file_test.go +++ b/pkg/artifacts/file/file_test.go @@ -13,9 +13,9 @@ import ( "github.com/spf13/afero" - "github.com/rancherfederal/hauler/pkg/artifacts/file" - "github.com/rancherfederal/hauler/pkg/artifacts/file/getter" - "github.com/rancherfederal/hauler/pkg/consts" + "hauler.dev/go/hauler/pkg/artifacts/file" + "hauler.dev/go/hauler/pkg/artifacts/file/getter" + "hauler.dev/go/hauler/pkg/consts" ) var ( diff --git a/pkg/artifacts/file/getter/directory.go b/pkg/artifacts/file/getter/directory.go index ab640d89..2399393e 100644 --- a/pkg/artifacts/file/getter/directory.go +++ b/pkg/artifacts/file/getter/directory.go @@ -13,8 +13,8 @@ import ( "github.com/opencontainers/go-digest" "github.com/pkg/errors" - "github.com/rancherfederal/hauler/pkg/artifacts" - "github.com/rancherfederal/hauler/pkg/consts" + "hauler.dev/go/hauler/pkg/artifacts" + "hauler.dev/go/hauler/pkg/consts" ) type directory struct { diff --git a/pkg/artifacts/file/getter/file.go b/pkg/artifacts/file/getter/file.go index 222a80cf..2017b71c 100644 --- a/pkg/artifacts/file/getter/file.go +++ b/pkg/artifacts/file/getter/file.go @@ -7,8 +7,8 @@ import ( "os" "path/filepath" - "github.com/rancherfederal/hauler/pkg/artifacts" - "github.com/rancherfederal/hauler/pkg/consts" + "hauler.dev/go/hauler/pkg/artifacts" + "hauler.dev/go/hauler/pkg/consts" ) type File struct{} diff --git a/pkg/artifacts/file/getter/getter.go b/pkg/artifacts/file/getter/getter.go index ff2e0cf4..63274df3 100644 --- a/pkg/artifacts/file/getter/getter.go +++ b/pkg/artifacts/file/getter/getter.go @@ -11,9 +11,9 @@ import ( "github.com/pkg/errors" "oras.land/oras-go/pkg/content" - content2 "github.com/rancherfederal/hauler/pkg/artifacts" - "github.com/rancherfederal/hauler/pkg/consts" - "github.com/rancherfederal/hauler/pkg/layer" + content2 "hauler.dev/go/hauler/pkg/artifacts" + "hauler.dev/go/hauler/pkg/consts" + "hauler.dev/go/hauler/pkg/layer" ) type Client struct { diff --git a/pkg/artifacts/file/getter/getter_test.go b/pkg/artifacts/file/getter/getter_test.go index e67e7482..ce74ce60 100644 --- a/pkg/artifacts/file/getter/getter_test.go +++ b/pkg/artifacts/file/getter/getter_test.go @@ -6,7 +6,7 @@ import ( "path/filepath" "testing" - "github.com/rancherfederal/hauler/pkg/artifacts/file/getter" + "hauler.dev/go/hauler/pkg/artifacts/file/getter" ) func TestClient_Detect(t *testing.T) { diff --git a/pkg/artifacts/file/getter/https.go b/pkg/artifacts/file/getter/https.go index 2df29d19..ee2ae735 100644 --- a/pkg/artifacts/file/getter/https.go +++ b/pkg/artifacts/file/getter/https.go @@ -9,8 +9,8 @@ import ( "path/filepath" "strings" - "github.com/rancherfederal/hauler/pkg/artifacts" - "github.com/rancherfederal/hauler/pkg/consts" + "hauler.dev/go/hauler/pkg/artifacts" + "hauler.dev/go/hauler/pkg/consts" ) type Http struct{} diff --git a/pkg/artifacts/file/options.go b/pkg/artifacts/file/options.go index 3efdd63b..ebbcdef0 100644 --- a/pkg/artifacts/file/options.go +++ b/pkg/artifacts/file/options.go @@ -1,8 +1,8 @@ package file import ( - "github.com/rancherfederal/hauler/pkg/artifacts" - "github.com/rancherfederal/hauler/pkg/artifacts/file/getter" + "hauler.dev/go/hauler/pkg/artifacts" + "hauler.dev/go/hauler/pkg/artifacts/file/getter" ) type Option func(*File) diff --git a/pkg/artifacts/image/image.go b/pkg/artifacts/image/image.go index 5cd87e2b..6c278496 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" - "github.com/rancherfederal/hauler/pkg/artifacts" + "hauler.dev/go/hauler/pkg/artifacts" ) var _ artifacts.OCI = (*Image)(nil) diff --git a/pkg/artifacts/memory/memory.go b/pkg/artifacts/memory/memory.go index 05bb7529..e3146988 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" - "github.com/rancherfederal/hauler/pkg/artifacts" - "github.com/rancherfederal/hauler/pkg/consts" + "hauler.dev/go/hauler/pkg/artifacts" + "hauler.dev/go/hauler/pkg/consts" ) var _ artifacts.OCI = (*Memory)(nil) diff --git a/pkg/artifacts/memory/memory_test.go b/pkg/artifacts/memory/memory_test.go index 529ce9d0..b56f0f3e 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" - "github.com/rancherfederal/hauler/pkg/artifacts/memory" + "hauler.dev/go/hauler/pkg/artifacts/memory" ) func TestMemory_Layers(t *testing.T) { diff --git a/pkg/artifacts/memory/options.go b/pkg/artifacts/memory/options.go index 032aa3cc..6f8f572e 100644 --- a/pkg/artifacts/memory/options.go +++ b/pkg/artifacts/memory/options.go @@ -1,6 +1,6 @@ package memory -import "github.com/rancherfederal/hauler/pkg/artifacts" +import "hauler.dev/go/hauler/pkg/artifacts" type Option func(*Memory) diff --git a/pkg/collection/chart/chart.go b/pkg/collection/chart/chart.go index 71103cc8..991591fc 100644 --- a/pkg/collection/chart/chart.go +++ b/pkg/collection/chart/chart.go @@ -3,11 +3,11 @@ package chart import ( "helm.sh/helm/v3/pkg/action" - "github.com/rancherfederal/hauler/pkg/apis/hauler.cattle.io/v1alpha1" - "github.com/rancherfederal/hauler/pkg/artifacts" - "github.com/rancherfederal/hauler/pkg/artifacts/image" - "github.com/rancherfederal/hauler/pkg/content/chart" - "github.com/rancherfederal/hauler/pkg/reference" + "hauler.dev/go/hauler/pkg/apis/hauler.cattle.io/v1alpha1" + "hauler.dev/go/hauler/pkg/artifacts" + "hauler.dev/go/hauler/pkg/artifacts/image" + "hauler.dev/go/hauler/pkg/content/chart" + "hauler.dev/go/hauler/pkg/reference" ) var _ artifacts.OCICollection = (*tchart)(nil) diff --git a/pkg/collection/chart/dependents.go b/pkg/collection/chart/dependents.go index d74f6f38..7fd1ca7e 100644 --- a/pkg/collection/chart/dependents.go +++ b/pkg/collection/chart/dependents.go @@ -15,7 +15,7 @@ import ( "k8s.io/apimachinery/pkg/util/yaml" "k8s.io/client-go/util/jsonpath" - "github.com/rancherfederal/hauler/pkg/apis/hauler.cattle.io/v1alpha1" + "hauler.dev/go/hauler/pkg/apis/hauler.cattle.io/v1alpha1" ) var defaultKnownImagePaths = []string{ diff --git a/pkg/collection/imagetxt/imagetxt.go b/pkg/collection/imagetxt/imagetxt.go index b13c1b1e..1f297c77 100644 --- a/pkg/collection/imagetxt/imagetxt.go +++ b/pkg/collection/imagetxt/imagetxt.go @@ -11,10 +11,10 @@ import ( "github.com/google/go-containerregistry/pkg/name" - artifact "github.com/rancherfederal/hauler/pkg/artifacts" - "github.com/rancherfederal/hauler/pkg/artifacts/file/getter" - "github.com/rancherfederal/hauler/pkg/artifacts/image" - "github.com/rancherfederal/hauler/pkg/log" + artifact "hauler.dev/go/hauler/pkg/artifacts" + "hauler.dev/go/hauler/pkg/artifacts/file/getter" + "hauler.dev/go/hauler/pkg/artifacts/image" + "hauler.dev/go/hauler/pkg/log" ) type ImageTxt struct { diff --git a/pkg/collection/imagetxt/imagetxt_test.go b/pkg/collection/imagetxt/imagetxt_test.go index 8dcee138..04264c46 100644 --- a/pkg/collection/imagetxt/imagetxt_test.go +++ b/pkg/collection/imagetxt/imagetxt_test.go @@ -8,8 +8,8 @@ import ( "os" "testing" - "github.com/rancherfederal/hauler/pkg/artifacts" - "github.com/rancherfederal/hauler/pkg/artifacts/image" + "hauler.dev/go/hauler/pkg/artifacts" + "hauler.dev/go/hauler/pkg/artifacts/image" ) var ( diff --git a/pkg/collection/k3s/k3s.go b/pkg/collection/k3s/k3s.go index 624dad18..79ab4b5f 100644 --- a/pkg/collection/k3s/k3s.go +++ b/pkg/collection/k3s/k3s.go @@ -10,11 +10,11 @@ import ( "path" "strings" - "github.com/rancherfederal/hauler/pkg/artifacts" - "github.com/rancherfederal/hauler/pkg/artifacts/file" - "github.com/rancherfederal/hauler/pkg/artifacts/file/getter" - "github.com/rancherfederal/hauler/pkg/artifacts/image" - "github.com/rancherfederal/hauler/pkg/reference" + "hauler.dev/go/hauler/pkg/artifacts" + "hauler.dev/go/hauler/pkg/artifacts/file" + "hauler.dev/go/hauler/pkg/artifacts/file/getter" + "hauler.dev/go/hauler/pkg/artifacts/image" + "hauler.dev/go/hauler/pkg/reference" ) var _ artifacts.OCICollection = (*k3s)(nil) diff --git a/pkg/content/chart/chart.go b/pkg/content/chart/chart.go index 718f3dda..c6e6060c 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" - "github.com/rancherfederal/hauler/pkg/artifacts" - "github.com/rancherfederal/hauler/pkg/log" + "hauler.dev/go/hauler/pkg/artifacts" + "hauler.dev/go/hauler/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" - "github.com/rancherfederal/hauler/pkg/consts" - "github.com/rancherfederal/hauler/pkg/layer" + "hauler.dev/go/hauler/pkg/consts" + "hauler.dev/go/hauler/pkg/layer" ) var ( diff --git a/pkg/content/chart/chart_test.go b/pkg/content/chart/chart_test.go index 5fa5dbad..fda3f76d 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" - "github.com/rancherfederal/hauler/pkg/consts" - "github.com/rancherfederal/hauler/pkg/content/chart" + "hauler.dev/go/hauler/pkg/consts" + "hauler.dev/go/hauler/pkg/content/chart" ) func TestNewChart(t *testing.T) { diff --git a/pkg/content/content.go b/pkg/content/content.go index 16337d64..c42de162 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" - "github.com/rancherfederal/hauler/pkg/apis/hauler.cattle.io/v1alpha1" + "hauler.dev/go/hauler/pkg/apis/hauler.cattle.io/v1alpha1" ) func Load(data []byte) (schema.ObjectKind, error) { diff --git a/pkg/content/oci.go b/pkg/content/oci.go index 5aa1396b..99ae5862 100644 --- a/pkg/content/oci.go +++ b/pkg/content/oci.go @@ -19,8 +19,8 @@ import ( "oras.land/oras-go/pkg/content" "oras.land/oras-go/pkg/target" - "github.com/rancherfederal/hauler/pkg/consts" - "github.com/rancherfederal/hauler/pkg/reference" + "hauler.dev/go/hauler/pkg/consts" + "hauler.dev/go/hauler/pkg/reference" ) var _ target.Target = (*OCI)(nil) diff --git a/pkg/cosign/cosign.go b/pkg/cosign/cosign.go index a1b57cb8..10a20506 100644 --- a/pkg/cosign/cosign.go +++ b/pkg/cosign/cosign.go @@ -15,9 +15,9 @@ import ( "oras.land/oras-go/pkg/content" - "github.com/rancherfederal/hauler/pkg/artifacts/image" - "github.com/rancherfederal/hauler/pkg/log" - "github.com/rancherfederal/hauler/pkg/store" + "hauler.dev/go/hauler/pkg/artifacts/image" + "hauler.dev/go/hauler/pkg/log" + "hauler.dev/go/hauler/pkg/store" ) const maxRetries = 3 diff --git a/pkg/layer/cache.go b/pkg/layer/cache.go index 45d27f7b..76afae1b 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" - "github.com/rancherfederal/hauler/pkg/artifacts" + "hauler.dev/go/hauler/pkg/artifacts" ) /* diff --git a/pkg/layer/layer.go b/pkg/layer/layer.go index fdfbf6a8..4e8b0d24 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" - "github.com/rancherfederal/hauler/pkg/consts" + "hauler.dev/go/hauler/pkg/consts" ) type Opener func() (io.ReadCloser, error) diff --git a/pkg/reference/reference_test.go b/pkg/reference/reference_test.go index d0af24e4..60cee749 100644 --- a/pkg/reference/reference_test.go +++ b/pkg/reference/reference_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/rancherfederal/hauler/pkg/reference" + "hauler.dev/go/hauler/pkg/reference" ) func TestParse(t *testing.T) { diff --git a/pkg/store/store.go b/pkg/store/store.go index ef4b2d54..d1b5dcc2 100644 --- a/pkg/store/store.go +++ b/pkg/store/store.go @@ -15,10 +15,10 @@ import ( "oras.land/oras-go/pkg/oras" "oras.land/oras-go/pkg/target" - "github.com/rancherfederal/hauler/pkg/artifacts" - "github.com/rancherfederal/hauler/pkg/consts" - "github.com/rancherfederal/hauler/pkg/content" - "github.com/rancherfederal/hauler/pkg/layer" + "hauler.dev/go/hauler/pkg/artifacts" + "hauler.dev/go/hauler/pkg/consts" + "hauler.dev/go/hauler/pkg/content" + "hauler.dev/go/hauler/pkg/layer" ) type Layout struct { diff --git a/pkg/store/store_test.go b/pkg/store/store_test.go index 54b4319a..5c4bd590 100644 --- a/pkg/store/store_test.go +++ b/pkg/store/store_test.go @@ -8,8 +8,8 @@ import ( v1 "github.com/google/go-containerregistry/pkg/v1" "github.com/google/go-containerregistry/pkg/v1/random" - "github.com/rancherfederal/hauler/pkg/artifacts" - "github.com/rancherfederal/hauler/pkg/store" + "hauler.dev/go/hauler/pkg/artifacts" + "hauler.dev/go/hauler/pkg/store" ) var ( diff --git a/static/go/hauler/index.html b/static/go/hauler/index.html index ade2449c..f2a17bcf 100644 --- a/static/go/hauler/index.html +++ b/static/go/hauler/index.html @@ -1,9 +1,9 @@ - + -Redirecting you to the hauler docs +Redirecting to the hauler source.