diff --git a/go.mod b/go.mod index d52c3f6..88ae35a 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.21.8 require ( github.com/alecthomas/jsonschema v0.0.0-20220216202328-9eeeec9d044b github.com/defenseunicorns/pkg/exec v0.0.1 - github.com/defenseunicorns/pkg/helpers v1.1.4-0.20240515202339-7d8cf08f6cf7 + github.com/defenseunicorns/pkg/helpers/v2 v2.0.1 github.com/goccy/go-yaml v1.11.3 github.com/pterm/pterm v0.12.79 github.com/spf13/cobra v1.8.0 @@ -19,6 +19,7 @@ require ( atomicgo.dev/schedule v0.1.0 // indirect github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect + github.com/defenseunicorns/pkg/helpers v1.1.1 // indirect github.com/fatih/color v1.16.0 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect github.com/go-playground/validator/v10 v10.18.0 // indirect diff --git a/go.sum b/go.sum index f42f353..119df2d 100644 --- a/go.sum +++ b/go.sum @@ -28,8 +28,10 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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.4-0.20240515202339-7d8cf08f6cf7 h1:WuwzgN4EdakTnr2mXzZmVjGNA+MkiiGoo7wglkVS86g= -github.com/defenseunicorns/pkg/helpers v1.1.4-0.20240515202339-7d8cf08f6cf7/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/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= diff --git a/src/cmd/run.go b/src/cmd/run.go index 751e621..746ec1e 100644 --- a/src/cmd/run.go +++ b/src/cmd/run.go @@ -19,7 +19,7 @@ import ( "github.com/defenseunicorns/maru-runner/src/pkg/runner" "github.com/defenseunicorns/maru-runner/src/pkg/utils" "github.com/defenseunicorns/maru-runner/src/types" - "github.com/defenseunicorns/pkg/helpers" + "github.com/defenseunicorns/pkg/helpers/v2" goyaml "github.com/goccy/go-yaml" "github.com/pterm/pterm" "github.com/spf13/cobra" diff --git a/src/message/progress.go b/src/message/progress.go index 44fa64c..10e5139 100644 --- a/src/message/progress.go +++ b/src/message/progress.go @@ -8,7 +8,7 @@ import ( "fmt" "os" - "github.com/defenseunicorns/pkg/helpers" + "github.com/defenseunicorns/pkg/helpers/v2" "github.com/pterm/pterm" ) diff --git a/src/message/spinner.go b/src/message/spinner.go index 0218df8..3e98735 100644 --- a/src/message/spinner.go +++ b/src/message/spinner.go @@ -10,7 +10,7 @@ import ( "fmt" "strings" - "github.com/defenseunicorns/pkg/helpers" + "github.com/defenseunicorns/pkg/helpers/v2" "github.com/pterm/pterm" ) diff --git a/src/pkg/runner/actions.go b/src/pkg/runner/actions.go index 6740d8c..0afd801 100644 --- a/src/pkg/runner/actions.go +++ b/src/pkg/runner/actions.go @@ -14,7 +14,7 @@ import ( "github.com/defenseunicorns/maru-runner/src/pkg/variables" "github.com/defenseunicorns/pkg/exec" - "github.com/defenseunicorns/pkg/helpers" + "github.com/defenseunicorns/pkg/helpers/v2" "github.com/defenseunicorns/maru-runner/src/config" "github.com/defenseunicorns/maru-runner/src/message" diff --git a/src/pkg/runner/runner.go b/src/pkg/runner/runner.go index 4deb1a4..99d7a50 100644 --- a/src/pkg/runner/runner.go +++ b/src/pkg/runner/runner.go @@ -17,7 +17,7 @@ import ( "github.com/defenseunicorns/maru-runner/src/pkg/utils" "github.com/defenseunicorns/maru-runner/src/pkg/variables" "github.com/defenseunicorns/maru-runner/src/types" - "github.com/defenseunicorns/pkg/helpers" + "github.com/defenseunicorns/pkg/helpers/v2" ) // Runner holds the necessary data to run tasks from a tasks file diff --git a/src/pkg/utils/utils.go b/src/pkg/utils/utils.go index eb60fe7..ade971d 100644 --- a/src/pkg/utils/utils.go +++ b/src/pkg/utils/utils.go @@ -16,7 +16,7 @@ import ( "github.com/defenseunicorns/maru-runner/src/config/lang" "github.com/defenseunicorns/maru-runner/src/message" - "github.com/defenseunicorns/pkg/helpers" + "github.com/defenseunicorns/pkg/helpers/v2" goyaml "github.com/goccy/go-yaml" "github.com/pterm/pterm" ) diff --git a/src/test/common.go b/src/test/common.go index 2e40aa9..142ad5e 100644 --- a/src/test/common.go +++ b/src/test/common.go @@ -13,7 +13,7 @@ import ( "testing" "github.com/defenseunicorns/pkg/exec" - "github.com/defenseunicorns/pkg/helpers" + "github.com/defenseunicorns/pkg/helpers/v2" "github.com/stretchr/testify/require" )