diff --git a/go.mod b/go.mod index f30bfa4e..d3b33d27 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/alecthomas/jsonschema v0.0.0-20220216202328-9eeeec9d044b github.com/defenseunicorns/maru-runner v0.2.0 github.com/defenseunicorns/pkg/exec v0.0.1 - github.com/defenseunicorns/pkg/helpers v1.1.2 + github.com/defenseunicorns/pkg/helpers/v2 v2.0.1 github.com/defenseunicorns/pkg/oci v0.0.2 github.com/defenseunicorns/zarf v0.34.0 github.com/fsnotify/fsnotify v1.7.0 @@ -174,7 +174,7 @@ require ( github.com/cyphar/filepath-securejoin v0.2.4 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/daviddengcn/go-colortext v1.0.0 // indirect - github.com/defenseunicorns/pkg/helpers/v2 v2.0.1 // indirect + github.com/defenseunicorns/pkg/helpers v1.1.1 // indirect github.com/deitch/magic v0.0.0-20230404182410-1ff89d7342da // indirect github.com/derailed/k9s v0.31.7 // indirect github.com/derailed/popeye v0.11.2 // indirect diff --git a/go.sum b/go.sum index ae593154..4a194859 100644 --- a/go.sum +++ b/go.sum @@ -609,8 +609,8 @@ github.com/defenseunicorns/maru-runner v0.2.0 h1:y49cPZSydBVlTwcH+JaSuBtW0BxL19s github.com/defenseunicorns/maru-runner v0.2.0/go.mod h1:MOVxUUSTNINepwiqkq8jrqVSASK47Pk2+ziZKPR8Uxw= github.com/defenseunicorns/pkg/exec v0.0.1 h1:mZtkZvwvOgInZOi+hvEjT0JAtjOgbeIo4RkpqMzU85g= github.com/defenseunicorns/pkg/exec v0.0.1/go.mod h1:F/OPhrZuoXM6e2RgeDUlaSYFFW8I3rsErJnytLSkLFo= -github.com/defenseunicorns/pkg/helpers v1.1.2 h1:2t8ntF2Lijc8GqigAe6ZpYfC2BZd5Kk6rAUqrKNASt4= -github.com/defenseunicorns/pkg/helpers v1.1.2/go.mod h1:F4S5VZLDrlNWQKklzv4v9tFWjjZNhxJ1gT79j4XiLwk= +github.com/defenseunicorns/pkg/helpers v1.1.1 h1:p3pKeK5SeFaoZUJZIX9sEsJqX1CGGMS8OpQMPgJtSqM= +github.com/defenseunicorns/pkg/helpers v1.1.1/go.mod h1:F4S5VZLDrlNWQKklzv4v9tFWjjZNhxJ1gT79j4XiLwk= github.com/defenseunicorns/pkg/helpers/v2 v2.0.1 h1:j08rz9vhyD9Bs+yKiyQMY2tSSejXRMxTqEObZ5M1Wbk= github.com/defenseunicorns/pkg/helpers/v2 v2.0.1/go.mod h1:u1PAqOICZyiGIVA2v28g55bQH1GiAt0Bc4U9/rnWQvQ= github.com/defenseunicorns/pkg/oci v0.0.2 h1:Lewwtl/D1Z55npRCkK1DS4Sd7pdrwyUs4+1RGpYajSQ= diff --git a/src/cmd/common.go b/src/cmd/common.go index fc35d86f..e95f566a 100644 --- a/src/cmd/common.go +++ b/src/cmd/common.go @@ -9,7 +9,7 @@ import ( "path/filepath" "strings" - "github.com/defenseunicorns/pkg/helpers" + "github.com/defenseunicorns/pkg/helpers/v2" "github.com/defenseunicorns/uds-cli/src/config" "github.com/defenseunicorns/uds-cli/src/config/lang" "github.com/defenseunicorns/uds-cli/src/pkg/bundle" diff --git a/src/cmd/dev.go b/src/cmd/dev.go index 5b7fc8e5..4425791d 100644 --- a/src/cmd/dev.go +++ b/src/cmd/dev.go @@ -5,7 +5,7 @@ package cmd import ( - "github.com/defenseunicorns/pkg/helpers" + "github.com/defenseunicorns/pkg/helpers/v2" "github.com/defenseunicorns/uds-cli/src/config" "github.com/defenseunicorns/uds-cli/src/config/lang" "github.com/defenseunicorns/zarf/src/pkg/message" diff --git a/src/pkg/bundle/common.go b/src/pkg/bundle/common.go index 2c0a793e..c1f31791 100644 --- a/src/pkg/bundle/common.go +++ b/src/pkg/bundle/common.go @@ -13,7 +13,7 @@ import ( "strings" "time" - "github.com/defenseunicorns/pkg/helpers" + "github.com/defenseunicorns/pkg/helpers/v2" "github.com/defenseunicorns/pkg/oci" "github.com/defenseunicorns/uds-cli/src/config" "github.com/defenseunicorns/uds-cli/src/pkg/bundler/fetcher" diff --git a/src/pkg/bundle/deploy.go b/src/pkg/bundle/deploy.go index 95bb9c14..b7e4f79a 100644 --- a/src/pkg/bundle/deploy.go +++ b/src/pkg/bundle/deploy.go @@ -14,7 +14,7 @@ import ( "strings" "github.com/AlecAivazis/survey/v2" - "github.com/defenseunicorns/pkg/helpers" + "github.com/defenseunicorns/pkg/helpers/v2" "github.com/defenseunicorns/uds-cli/src/config" "github.com/defenseunicorns/uds-cli/src/pkg/sources" "github.com/defenseunicorns/uds-cli/src/types" diff --git a/src/pkg/bundle/provider.go b/src/pkg/bundle/provider.go index dc15558f..1abcdea4 100644 --- a/src/pkg/bundle/provider.go +++ b/src/pkg/bundle/provider.go @@ -8,7 +8,7 @@ import ( "context" "fmt" - "github.com/defenseunicorns/pkg/helpers" + "github.com/defenseunicorns/pkg/helpers/v2" "github.com/defenseunicorns/pkg/oci" "github.com/defenseunicorns/uds-cli/src/config" "github.com/defenseunicorns/uds-cli/src/pkg/utils" diff --git a/src/pkg/bundle/pull.go b/src/pkg/bundle/pull.go index 84dc2c70..61174073 100644 --- a/src/pkg/bundle/pull.go +++ b/src/pkg/bundle/pull.go @@ -11,7 +11,7 @@ import ( "os" "path/filepath" - "github.com/defenseunicorns/pkg/helpers" + "github.com/defenseunicorns/pkg/helpers/v2" "github.com/defenseunicorns/pkg/oci" "github.com/defenseunicorns/uds-cli/src/config" "github.com/defenseunicorns/uds-cli/src/types" diff --git a/src/pkg/bundle/remote.go b/src/pkg/bundle/remote.go index 4d7017f7..f663645d 100644 --- a/src/pkg/bundle/remote.go +++ b/src/pkg/bundle/remote.go @@ -13,7 +13,7 @@ import ( "path/filepath" "slices" - "github.com/defenseunicorns/pkg/helpers" + "github.com/defenseunicorns/pkg/helpers/v2" "github.com/defenseunicorns/pkg/oci" "github.com/defenseunicorns/uds-cli/src/config" "github.com/defenseunicorns/uds-cli/src/pkg/utils" diff --git a/src/pkg/bundle/tarball.go b/src/pkg/bundle/tarball.go index 6af34783..da6f56b7 100644 --- a/src/pkg/bundle/tarball.go +++ b/src/pkg/bundle/tarball.go @@ -12,7 +12,7 @@ import ( "os" "path/filepath" - "github.com/defenseunicorns/pkg/helpers" + "github.com/defenseunicorns/pkg/helpers/v2" "github.com/defenseunicorns/pkg/oci" "github.com/defenseunicorns/uds-cli/src/config" "github.com/defenseunicorns/uds-cli/src/pkg/utils" diff --git a/src/pkg/bundler/common.go b/src/pkg/bundler/common.go index b6a36dbd..0d9fd8c2 100644 --- a/src/pkg/bundler/common.go +++ b/src/pkg/bundler/common.go @@ -9,7 +9,7 @@ import ( "fmt" "strings" - "github.com/defenseunicorns/pkg/helpers" + "github.com/defenseunicorns/pkg/helpers/v2" "github.com/defenseunicorns/pkg/oci" "github.com/defenseunicorns/uds-cli/src/pkg/utils/boci" "github.com/defenseunicorns/uds-cli/src/types" diff --git a/src/pkg/bundler/fetcher/common.go b/src/pkg/bundler/fetcher/common.go index 023d3dc5..11c804ec 100644 --- a/src/pkg/bundler/fetcher/common.go +++ b/src/pkg/bundler/fetcher/common.go @@ -9,7 +9,7 @@ import ( "path/filepath" "strings" - "github.com/defenseunicorns/pkg/helpers" + "github.com/defenseunicorns/pkg/helpers/v2" "github.com/defenseunicorns/uds-cli/src/config" "github.com/defenseunicorns/uds-cli/src/pkg/utils" "github.com/defenseunicorns/zarf/src/pkg/layout" diff --git a/src/pkg/bundler/fetcher/remote.go b/src/pkg/bundler/fetcher/remote.go index f8ac65c1..28a7f708 100644 --- a/src/pkg/bundler/fetcher/remote.go +++ b/src/pkg/bundler/fetcher/remote.go @@ -10,7 +10,7 @@ import ( "path/filepath" "strings" - "github.com/defenseunicorns/pkg/helpers" + "github.com/defenseunicorns/pkg/helpers/v2" "github.com/defenseunicorns/pkg/oci" "github.com/defenseunicorns/uds-cli/src/config" "github.com/defenseunicorns/uds-cli/src/pkg/cache" diff --git a/src/pkg/bundler/localbundle.go b/src/pkg/bundler/localbundle.go index 05b4091d..711f55a5 100644 --- a/src/pkg/bundler/localbundle.go +++ b/src/pkg/bundler/localbundle.go @@ -12,7 +12,7 @@ import ( "os" "path/filepath" - "github.com/defenseunicorns/pkg/helpers" + "github.com/defenseunicorns/pkg/helpers/v2" "github.com/defenseunicorns/pkg/oci" "github.com/defenseunicorns/uds-cli/src/config" "github.com/defenseunicorns/uds-cli/src/pkg/bundler/fetcher" diff --git a/src/pkg/sources/tarball.go b/src/pkg/sources/tarball.go index 051c3256..3a835b76 100644 --- a/src/pkg/sources/tarball.go +++ b/src/pkg/sources/tarball.go @@ -12,7 +12,7 @@ import ( "path/filepath" "strings" - "github.com/defenseunicorns/pkg/helpers" + "github.com/defenseunicorns/pkg/helpers/v2" "github.com/defenseunicorns/pkg/oci" "github.com/defenseunicorns/uds-cli/src/types" "github.com/defenseunicorns/zarf/src/pkg/layout" diff --git a/src/pkg/utils/utils.go b/src/pkg/utils/utils.go index 05b12b25..019a2ef6 100644 --- a/src/pkg/utils/utils.go +++ b/src/pkg/utils/utils.go @@ -19,7 +19,7 @@ import ( zarfTypes "github.com/defenseunicorns/zarf/src/types" goyaml "github.com/goccy/go-yaml" - "github.com/defenseunicorns/pkg/helpers" + "github.com/defenseunicorns/pkg/helpers/v2" "github.com/defenseunicorns/uds-cli/src/config" "github.com/defenseunicorns/uds-cli/src/types" "github.com/defenseunicorns/zarf/src/pkg/message" diff --git a/src/test/common.go b/src/test/common.go index b6e5475e..cf527278 100644 --- a/src/test/common.go +++ b/src/test/common.go @@ -17,7 +17,7 @@ import ( "testing" "time" - "github.com/defenseunicorns/pkg/helpers" + "github.com/defenseunicorns/pkg/helpers/v2" "github.com/defenseunicorns/zarf/src/pkg/message" "github.com/defenseunicorns/zarf/src/pkg/utils/exec" "github.com/stretchr/testify/require" diff --git a/src/test/e2e/commands_test.go b/src/test/e2e/commands_test.go index 86e6a72c..cda25a57 100644 --- a/src/test/e2e/commands_test.go +++ b/src/test/e2e/commands_test.go @@ -15,7 +15,7 @@ import ( "strings" "testing" - "github.com/defenseunicorns/pkg/helpers" + "github.com/defenseunicorns/pkg/helpers/v2" "github.com/defenseunicorns/uds-cli/src/config" "github.com/defenseunicorns/zarf/src/pkg/message" ocispec "github.com/opencontainers/image-spec/specs-go/v1"