Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update to proper pkg/helpers/v2 #92

Merged
merged 3 commits into from
May 23, 2024
Merged

chore: update to proper pkg/helpers/v2 #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d53ea9b
chore: update to proper pkg/helpers/v2
Racer159 May 22, 2024
fab85d2
update gomod
Racer159 May 23, 2024
41c647f
Merge branch 'main' into update-to-to-fixed-pkg
Racer159 May 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
6 changes: 4 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
2 changes: 1 addition & 1 deletion src/cmd/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/message/progress.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"fmt"
"os"

"github.com/defenseunicorns/pkg/helpers"
"github.com/defenseunicorns/pkg/helpers/v2"
"github.com/pterm/pterm"
)

Expand Down
2 changes: 1 addition & 1 deletion src/message/spinner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"fmt"
"strings"

"github.com/defenseunicorns/pkg/helpers"
"github.com/defenseunicorns/pkg/helpers/v2"
"github.com/pterm/pterm"
)

Expand Down
2 changes: 1 addition & 1 deletion src/pkg/runner/actions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/pkg/runner/runner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/pkg/utils/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion src/test/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
Loading