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.

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

go.mod: Replace carolynvs/magex with uwu-tools/magex v0.10.0 #3270

Merged
merged 2 commits into from
Dec 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 2 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,5 +105,4 @@ and we will add you. **All** contributors belong here. 💯
- [John Cudd](https://github.com/jmcudd)
- [Robin Brämer](https://github.com/robinbraemer)
- [Geeta Chavan](https://github.com/geetachavan1)


- [Stephen Augustus](https://github.com/justaugustus)
3 changes: 2 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ require (
github.com/PaesslerAG/jsonpath v0.1.1
github.com/carolynvs/aferox v0.3.0
github.com/carolynvs/datetime-printer v0.2.0
github.com/carolynvs/magex v0.9.0
github.com/cbroglie/mustache v1.4.0
github.com/cnabio/cnab-go v0.25.2
github.com/cnabio/cnab-to-oci v0.4.1
Expand Down Expand Up @@ -66,6 +65,7 @@ require (
github.com/stretchr/testify v1.10.0
github.com/tidwall/gjson v1.18.0
github.com/tidwall/sjson v1.2.5
github.com/uwu-tools/magex v0.10.0
troy0820 marked this conversation as resolved.
Show resolved Hide resolved
github.com/xeipuuv/gojsonschema v1.2.0
go.mongodb.org/mongo-driver v1.17.1
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.57.0
Expand Down Expand Up @@ -112,6 +112,7 @@ require (
github.com/aws/aws-sdk-go-v2/service/sts v1.32.4 // indirect
github.com/aws/smithy-go v1.22.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/carolynvs/magex v0.9.0 // indirect
troy0820 marked this conversation as resolved.
Show resolved Hide resolved
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/containerd/console v1.0.4 // indirect
Expand Down
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -869,6 +869,8 @@ github.com/ulikunitz/xz v0.5.12 h1:37Nm15o69RwBkXM0J6A5OlE67RZTfzUxTj8fB3dfcsc=
github.com/ulikunitz/xz v0.5.12/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
github.com/uwu-tools/magex v0.10.0 h1:eDDHw9izUPXEKXejY26VCtTK4LjuDoGkyWpgGscFO80=
github.com/uwu-tools/magex v0.10.0/go.mod h1:TrSEhrL1xHfJVy6n05AUwFdcQndgwrbgL5ybPNKWmVY=
github.com/vbatts/tar-split v0.11.6 h1:4SjTW5+PU11n6fZenf2IPoV8/tz3AaYHMWjf23envGs=
github.com/vbatts/tar-split v0.11.6/go.mod h1:dqKNtesIOr2j2Qv3W/cHjnvk9I8+G7oAkFDFN6TCBEI=
github.com/weppos/publicsuffix-go v0.4.0/go.mod h1:z3LCPQ38eedDQSwmsSRW4Y7t2L8Ln16JPQ02lHAdn5k=
Expand Down
4 changes: 2 additions & 2 deletions mage/docs/docs.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"time"

"get.porter.sh/magefiles/docker"
"github.com/carolynvs/magex/mgx"
"github.com/carolynvs/magex/shx"
"github.com/magefile/mage/mg"
"github.com/uwu-tools/magex/mgx"
"github.com/uwu-tools/magex/shx"
)

var must = shx.CommandBuilder{StopOnError: true}
Expand Down
2 changes: 1 addition & 1 deletion mage/docs/docs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"path/filepath"
"testing"

"github.com/carolynvs/magex/shx"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/uwu-tools/magex/shx"
)

func TestEnsureOperatorRepository(t *testing.T) {
Expand Down
8 changes: 4 additions & 4 deletions mage/setup/tools.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import (
"os/exec"
"runtime"

"github.com/carolynvs/magex/mgx"
"github.com/carolynvs/magex/pkg"
"github.com/carolynvs/magex/pkg/archive"
"github.com/carolynvs/magex/pkg/downloads"
"github.com/magefile/mage/mg"
"github.com/uwu-tools/magex/mgx"
"github.com/uwu-tools/magex/pkg"
"github.com/uwu-tools/magex/pkg/archive"
"github.com/uwu-tools/magex/pkg/downloads"
)

func EnsureProtobufTools() {
Expand Down
14 changes: 7 additions & 7 deletions magefile.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ import (
"get.porter.sh/porter/mage/setup"
"get.porter.sh/porter/pkg"
"get.porter.sh/porter/tests/tester"
mageci "github.com/carolynvs/magex/ci"
"github.com/carolynvs/magex/mgx"
magepkg "github.com/carolynvs/magex/pkg"
"github.com/carolynvs/magex/pkg/archive"
"github.com/carolynvs/magex/pkg/downloads"
"github.com/carolynvs/magex/shx"
"github.com/carolynvs/magex/xplat"
"github.com/magefile/mage/mg"
"github.com/magefile/mage/sh"
mageci "github.com/uwu-tools/magex/ci"
"github.com/uwu-tools/magex/mgx"
magepkg "github.com/uwu-tools/magex/pkg"
"github.com/uwu-tools/magex/pkg/archive"
"github.com/uwu-tools/magex/pkg/downloads"
"github.com/uwu-tools/magex/shx"
"github.com/uwu-tools/magex/xplat"
"golang.org/x/sync/errgroup"

// mage:import
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/agent_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"runtime"
"testing"

"github.com/carolynvs/magex/shx"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/uwu-tools/magex/shx"
)

func TestExecute(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions pkg/storage/migrations/testhelpers/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"testing"

"get.porter.sh/porter/pkg/config"
"github.com/carolynvs/magex/pkg/downloads"
"github.com/carolynvs/magex/shx"
"github.com/carolynvs/magex/xplat"
"github.com/stretchr/testify/require"
"github.com/uwu-tools/magex/pkg/downloads"
"github.com/uwu-tools/magex/shx"
"github.com/uwu-tools/magex/xplat"
)

// CreateLegacyPorterHome creates a porter v0.38 PORTER_HOME with legacy data
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/build_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import (
"get.porter.sh/porter/tests"
"get.porter.sh/porter/tests/tester"
"github.com/Masterminds/semver/v3"
"github.com/carolynvs/magex/shx"
"github.com/stretchr/testify/require"
"github.com/uwu-tools/magex/shx"
)

func TestBuild(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/driver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"get.porter.sh/porter/tests"
"get.porter.sh/porter/tests/testdata"
"get.porter.sh/porter/tests/tester"
"github.com/carolynvs/magex/shx"
"github.com/stretchr/testify/require"
"github.com/uwu-tools/magex/shx"
)

// Validate that we can use PORTER_RUNTIME_DRIVER with
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/lint_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"testing"

"get.porter.sh/porter/tests/tester"
"github.com/carolynvs/magex/shx"
"github.com/stretchr/testify/require"
"github.com/uwu-tools/magex/shx"
)

func TestLint(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/plugin_log_level_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"testing"

"get.porter.sh/porter/tests/tester"
"github.com/carolynvs/magex/shx"
"github.com/stretchr/testify/require"
"github.com/uwu-tools/magex/shx"
)

func TestPluginDebugLogsVerbosityArgument(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/signing_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ import (

"get.porter.sh/porter/pkg/cnab"
"get.porter.sh/porter/tests/tester"
"github.com/carolynvs/magex/shx"
"github.com/docker/distribution/reference"
"github.com/google/go-containerregistry/pkg/crane"
"github.com/opencontainers/go-digest"
"github.com/stretchr/testify/require"
"github.com/uwu-tools/magex/shx"
)

func TestCosign(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/telemetry_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import (
"get.porter.sh/porter/pkg/porter"
"get.porter.sh/porter/tests"
"get.porter.sh/porter/tests/tester"
"github.com/carolynvs/magex/shx"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/uwu-tools/magex/shx"
)

// Validate that we can configure a live connection to a telemetry endpoint
Expand Down
2 changes: 1 addition & 1 deletion tests/smoke/airgap_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ import (
"get.porter.sh/porter/pkg/yaml"
"get.porter.sh/porter/tests/testdata"
"get.porter.sh/porter/tests/tester"
"github.com/carolynvs/magex/shx"
"github.com/cnabio/cnab-go/bundle/loader"
"github.com/cnabio/cnab-go/packager"
"github.com/cnabio/cnab-to-oci/relocation"
"github.com/stretchr/testify/require"
"github.com/uwu-tools/magex/shx"
)

// Validate that we can move a bundle into an aigraped environment
Expand Down
4 changes: 2 additions & 2 deletions tests/smoke/desiredstate_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"get.porter.sh/porter/pkg/yaml"
"get.porter.sh/porter/tests"
"get.porter.sh/porter/tests/tester"
"github.com/carolynvs/magex/mgx"
"github.com/carolynvs/magex/shx"
"github.com/stretchr/testify/require"
"github.com/uwu-tools/magex/mgx"
"github.com/uwu-tools/magex/shx"
)

// Test desired state workflows used by the porter operator
Expand Down
2 changes: 1 addition & 1 deletion tests/smoke/hello_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"get.porter.sh/porter/tests"
"get.porter.sh/porter/tests/testdata"
"get.porter.sh/porter/tests/tester"
"github.com/carolynvs/magex/shx"
"github.com/stretchr/testify/require"
"github.com/uwu-tools/magex/shx"
)

// Test general flows in porter
Expand Down
2 changes: 1 addition & 1 deletion tests/tester/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"get.porter.sh/porter/pkg/yaml"
"get.porter.sh/porter/tests"
"get.porter.sh/porter/tests/testdata"
"github.com/carolynvs/magex/shx"
"github.com/stretchr/testify/require"
"github.com/uwu-tools/magex/shx"
)

// PrepareTestBundle ensures that the mybuns test bundle is ready to use.
Expand Down
2 changes: 1 addition & 1 deletion tests/tester/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"get.porter.sh/porter/pkg/portercontext"
"get.porter.sh/porter/pkg/storage/plugins/mongodb_docker"
"get.porter.sh/porter/tests"
"github.com/carolynvs/magex/shx"
"github.com/stretchr/testify/require"
"github.com/uwu-tools/magex/shx"
)

type Tester struct {
Expand Down
2 changes: 1 addition & 1 deletion tests/tester/test_registry.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"path/filepath"
"testing"

"github.com/carolynvs/magex/shx"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/uwu-tools/magex/shx"
)

// TestRegistryAlias is the environment variable that contains a pre-configured
Expand Down
Loading