From be2f37d7ac3a75e7657a68c5bdd9652d349a7c8d Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Tue, 3 Dec 2024 07:24:18 -0500 Subject: [PATCH 1/2] go.mod: Replace `carolynvs/magex` with `uwu-tools/magex` v0.10.0 Signed-off-by: Stephen Augustus --- go.mod | 3 ++- go.sum | 2 ++ mage/docs/docs.go | 4 ++-- mage/docs/docs_test.go | 2 +- mage/setup/tools.go | 8 ++++---- magefile.go | 14 +++++++------- pkg/agent/agent_test.go | 2 +- pkg/storage/migrations/testhelpers/helpers.go | 6 +++--- tests/integration/build_test.go | 2 +- tests/integration/driver_test.go | 2 +- tests/integration/lint_test.go | 2 +- tests/integration/plugin_log_level_test.go | 2 +- tests/integration/signing_test.go | 2 +- tests/integration/telemetry_test.go | 2 +- tests/smoke/airgap_test.go | 2 +- tests/smoke/desiredstate_test.go | 4 ++-- tests/smoke/hello_test.go | 2 +- tests/tester/helpers.go | 2 +- tests/tester/main.go | 2 +- tests/tester/test_registry.go | 2 +- 20 files changed, 35 insertions(+), 32 deletions(-) diff --git a/go.mod b/go.mod index 945cef304..20313c40a 100644 --- a/go.mod +++ b/go.mod @@ -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 @@ -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 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 @@ -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 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 diff --git a/go.sum b/go.sum index 54bc336a9..0dd0c9d3a 100644 --- a/go.sum +++ b/go.sum @@ -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= diff --git a/mage/docs/docs.go b/mage/docs/docs.go index fa3baaa69..d86ecb52f 100644 --- a/mage/docs/docs.go +++ b/mage/docs/docs.go @@ -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} diff --git a/mage/docs/docs_test.go b/mage/docs/docs_test.go index d341a6185..f00caec9a 100644 --- a/mage/docs/docs_test.go +++ b/mage/docs/docs_test.go @@ -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) { diff --git a/mage/setup/tools.go b/mage/setup/tools.go index f28289959..0524a7519 100644 --- a/mage/setup/tools.go +++ b/mage/setup/tools.go @@ -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() { diff --git a/magefile.go b/magefile.go index 1b323c975..83e000988 100644 --- a/magefile.go +++ b/magefile.go @@ -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 diff --git a/pkg/agent/agent_test.go b/pkg/agent/agent_test.go index a2d28cea7..ec7b7f169 100644 --- a/pkg/agent/agent_test.go +++ b/pkg/agent/agent_test.go @@ -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) { diff --git a/pkg/storage/migrations/testhelpers/helpers.go b/pkg/storage/migrations/testhelpers/helpers.go index 5330faa1a..593c40284 100644 --- a/pkg/storage/migrations/testhelpers/helpers.go +++ b/pkg/storage/migrations/testhelpers/helpers.go @@ -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 diff --git a/tests/integration/build_test.go b/tests/integration/build_test.go index 91e43ec4b..f2d393edb 100644 --- a/tests/integration/build_test.go +++ b/tests/integration/build_test.go @@ -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) { diff --git a/tests/integration/driver_test.go b/tests/integration/driver_test.go index e69895408..9edede25d 100644 --- a/tests/integration/driver_test.go +++ b/tests/integration/driver_test.go @@ -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 diff --git a/tests/integration/lint_test.go b/tests/integration/lint_test.go index b06888298..1a1014b1c 100644 --- a/tests/integration/lint_test.go +++ b/tests/integration/lint_test.go @@ -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) { diff --git a/tests/integration/plugin_log_level_test.go b/tests/integration/plugin_log_level_test.go index 36c5cd514..bfc943b8f 100644 --- a/tests/integration/plugin_log_level_test.go +++ b/tests/integration/plugin_log_level_test.go @@ -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) { diff --git a/tests/integration/signing_test.go b/tests/integration/signing_test.go index 75a916731..d121f7ca1 100644 --- a/tests/integration/signing_test.go +++ b/tests/integration/signing_test.go @@ -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) { diff --git a/tests/integration/telemetry_test.go b/tests/integration/telemetry_test.go index cfc5d4675..4327f84ef 100644 --- a/tests/integration/telemetry_test.go +++ b/tests/integration/telemetry_test.go @@ -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 diff --git a/tests/smoke/airgap_test.go b/tests/smoke/airgap_test.go index c3a6f2528..6b4df5739 100644 --- a/tests/smoke/airgap_test.go +++ b/tests/smoke/airgap_test.go @@ -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 diff --git a/tests/smoke/desiredstate_test.go b/tests/smoke/desiredstate_test.go index 675c5ebd3..fc46f0dcf 100644 --- a/tests/smoke/desiredstate_test.go +++ b/tests/smoke/desiredstate_test.go @@ -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 diff --git a/tests/smoke/hello_test.go b/tests/smoke/hello_test.go index 8ffe81faf..e0fb14453 100644 --- a/tests/smoke/hello_test.go +++ b/tests/smoke/hello_test.go @@ -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 diff --git a/tests/tester/helpers.go b/tests/tester/helpers.go index 10d3fb92c..3d4d5c9f2 100644 --- a/tests/tester/helpers.go +++ b/tests/tester/helpers.go @@ -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. diff --git a/tests/tester/main.go b/tests/tester/main.go index b23c83183..e87096e11 100644 --- a/tests/tester/main.go +++ b/tests/tester/main.go @@ -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 { diff --git a/tests/tester/test_registry.go b/tests/tester/test_registry.go index 169d49de6..747e8273f 100644 --- a/tests/tester/test_registry.go +++ b/tests/tester/test_registry.go @@ -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 From 2fbec2b520c95e4a68f9459a07d0249cbb4d72bb Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Tue, 3 Dec 2024 07:35:11 -0500 Subject: [PATCH 2/2] CONTRIBUTORS: Add Stephen Augustus Signed-off-by: Stephen Augustus --- CONTRIBUTORS.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 6a2cfdd1e..8d182713c 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -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)