Bump get.porter.sh/magefiles from 0.6.8 to 0.6.9 (#3256)

dependabot[bot] · kichristensen · web-flow · commit 45c17c15b0ac · 2024-11-15T22:44:50.000+01:00
* Bump get.porter.sh/magefiles from 0.6.8 to 0.6.9 Bumps [get.porter.sh/magefiles](https://github.com/getporter/magefiles) from 0.6.8 to 0.6.9. - [Release notes](https://github.com/getporter/magefiles/releases) - [Commits](getporter/magefiles@v0.6.8...v0.6.9) --- updated-dependencies: - dependency-name: get.porter.sh/magefiles dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Fix linting errors Signed-off-by: Kim Christensen <kimworking@gmail.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Kim Christensen <kimworking@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Kim Christensen <kimworking@gmail.com>
diff --git a/go.mod b/go.mod
@@ -19,7 +19,7 @@ replace (
 )
 
 require (
-	get.porter.sh/magefiles v0.6.8
+	get.porter.sh/magefiles v0.6.9
 	github.com/Masterminds/semver/v3 v3.3.0
 	github.com/PaesslerAG/jsonpath v0.1.1
 	github.com/carolynvs/aferox v0.3.0
diff --git a/go.sum b/go.sum
@@ -12,8 +12,8 @@ cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqCl
 cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
 cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-get.porter.sh/magefiles v0.6.8 h1:1q0CmKgOtlP8IBXtRNLv2+r9tLiC96tpIPhTHX+HlUw=
-get.porter.sh/magefiles v0.6.8/go.mod h1:w37oTKICvvaEKR5KVB9UfN2EX30uYO9Qk0oRoz80DOU=
+get.porter.sh/magefiles v0.6.9 h1:fDrWzuuUgptBgbuc18IRDTUib+AGQtgn+TnXT3wAVJ0=
+get.porter.sh/magefiles v0.6.9/go.mod h1:w37oTKICvvaEKR5KVB9UfN2EX30uYO9Qk0oRoz80DOU=
 github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 h1:He8afgbRMd7mFxO99hRNu+6tazq8nFF9lIwo9JFroBk=
 github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8=
 github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20231105174938-2b5cbb29f3e2 h1:dIScnXFlF784X79oi7MzVT6GWqr/W1uUt0pB5CsDs9M=
diff --git a/pkg/plugins/pluggable/connection.go b/pkg/plugins/pluggable/connection.go
@@ -339,7 +339,7 @@ func (c *PluginConnection) collectPluginLogs(ctx context.Context) {
 
 			switch pluginLog["@level"] {
 			case "error":
-				_ = span.Error(fmt.Errorf(msg))
+				_ = span.Error(fmt.Errorf("%s", msg))
 			case "warn":
 				span.Warn(msg)
 			case "info":
diff --git a/pkg/storage/plugins/mongodb_docker/store.go b/pkg/storage/plugins/mongodb_docker/store.go
@@ -155,7 +155,7 @@ func EnsureMongoIsRunning(ctx context.Context, c *portercontext.Context, contain
 			err = exec.Command("docker", "volume", "create", dataVol).Run()
 			if err != nil {
 				if exitErr, ok := err.(*exec.ExitError); ok {
-					err = fmt.Errorf(string(exitErr.Stderr))
+					err = fmt.Errorf("%s", string(exitErr.Stderr))
 				}
 				return nil, span.Error(fmt.Errorf("error creating %s docker volume: %w", dataVol, err))
 			}
@@ -170,7 +170,7 @@ func EnsureMongoIsRunning(ctx context.Context, c *portercontext.Context, contain
 		err := exec.Command("docker", "pull", mongoImg).Run()
 		if err != nil {
 			if exitErr, ok := err.(*exec.ExitError); ok {
-				err = fmt.Errorf(string(exitErr.Stderr))
+				err = fmt.Errorf("%s", string(exitErr.Stderr))
 			}
 			return span.Error(fmt.Errorf("error pulling %s: %w", mongoImg, err))
 		}
@@ -186,7 +186,7 @@ func EnsureMongoIsRunning(ctx context.Context, c *portercontext.Context, contain
 		err = mongoC.Start()
 		if err != nil {
 			if exitErr, ok := err.(*exec.ExitError); ok {
-				err = fmt.Errorf(string(exitErr.Stderr))
+				err = fmt.Errorf("%s", string(exitErr.Stderr))
 			}
 			return span.Error(fmt.Errorf("error running a mongo container for the mongodb-docker plugin: %w", err))
 		}
@@ -200,15 +200,15 @@ func EnsureMongoIsRunning(ctx context.Context, c *portercontext.Context, contain
 			}
 		} else {
 			if exitErr, ok := err.(*exec.ExitError); ok {
-				err = fmt.Errorf(string(exitErr.Stderr))
+				err = fmt.Errorf("%s", string(exitErr.Stderr))
 			}
 			return nil, span.Error(fmt.Errorf("error inspecting container %s: %w", container, err))
 		}
 	} else if !strings.Contains(string(containerStatus), `"Status": "running"`) { // Container is stopped
 		err = exec.Command("docker", "rm", "-f", container).Run()
 		if err != nil {
 			if exitErr, ok := err.(*exec.ExitError); ok {
-				err = fmt.Errorf(string(exitErr.Stderr))
+				err = fmt.Errorf("%s", string(exitErr.Stderr))
 			}
 			return nil, span.Error(fmt.Errorf("error cleaning up stopped container %s: %w", container, err))
 		}

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ replace (`
`19`	`19`	`)`
`20`	`20`
`21`	`21`	`require (`
`22`		`- get.porter.sh/magefiles v0.6.8`
	`22`	`+ get.porter.sh/magefiles v0.6.9`
`23`	`23`	`github.com/Masterminds/semver/v3 v3.3.0`
`24`	`24`	`github.com/PaesslerAG/jsonpath v0.1.1`
`25`	`25`	`github.com/carolynvs/aferox v0.3.0`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ func EnsureMongoIsRunning(ctx context.Context, c *portercontext.Context, contain`
`155`	`155`	`err = exec.Command("docker", "volume", "create", dataVol).Run()`
`156`	`156`	`if err != nil {`
`157`	`157`	`if exitErr, ok := err.(*exec.ExitError); ok {`
`158`		`- err = fmt.Errorf(string(exitErr.Stderr))`
	`158`	`+ err = fmt.Errorf("%s", string(exitErr.Stderr))`
`159`	`159`	`}`
`160`	`160`	`return nil, span.Error(fmt.Errorf("error creating %s docker volume: %w", dataVol, err))`
`161`	`161`	`}`
`@@ -170,7 +170,7 @@ func EnsureMongoIsRunning(ctx context.Context, c *portercontext.Context, contain`
`170`	`170`	`err := exec.Command("docker", "pull", mongoImg).Run()`
`171`	`171`	`if err != nil {`
`172`	`172`	`if exitErr, ok := err.(*exec.ExitError); ok {`
`173`		`- err = fmt.Errorf(string(exitErr.Stderr))`
	`173`	`+ err = fmt.Errorf("%s", string(exitErr.Stderr))`
`174`	`174`	`}`
`175`	`175`	`return span.Error(fmt.Errorf("error pulling %s: %w", mongoImg, err))`
`176`	`176`	`}`
`@@ -186,7 +186,7 @@ func EnsureMongoIsRunning(ctx context.Context, c *portercontext.Context, contain`
`186`	`186`	`err = mongoC.Start()`
`187`	`187`	`if err != nil {`
`188`	`188`	`if exitErr, ok := err.(*exec.ExitError); ok {`
`189`		`- err = fmt.Errorf(string(exitErr.Stderr))`
	`189`	`+ err = fmt.Errorf("%s", string(exitErr.Stderr))`
`190`	`190`	`}`
`191`	`191`	`return span.Error(fmt.Errorf("error running a mongo container for the mongodb-docker plugin: %w", err))`
`192`	`192`	`}`
`@@ -200,15 +200,15 @@ func EnsureMongoIsRunning(ctx context.Context, c *portercontext.Context, contain`
`200`	`200`	`}`
`201`	`201`	`} else {`
`202`	`202`	`if exitErr, ok := err.(*exec.ExitError); ok {`
`203`		`- err = fmt.Errorf(string(exitErr.Stderr))`
	`203`	`+ err = fmt.Errorf("%s", string(exitErr.Stderr))`
`204`	`204`	`}`
`205`	`205`	`return nil, span.Error(fmt.Errorf("error inspecting container %s: %w", container, err))`
`206`	`206`	`}`
`207`	`207`	} else if !strings.Contains(string(containerStatus), `"Status": "running"`) { // Container is stopped
`208`	`208`	`err = exec.Command("docker", "rm", "-f", container).Run()`
`209`	`209`	`if err != nil {`
`210`	`210`	`if exitErr, ok := err.(*exec.ExitError); ok {`
`211`		`- err = fmt.Errorf(string(exitErr.Stderr))`
	`211`	`+ err = fmt.Errorf("%s", string(exitErr.Stderr))`
`212`	`212`	`}`
`213`	`213`	`return nil, span.Error(fmt.Errorf("error cleaning up stopped container %s: %w", container, err))`
`214`	`214`	`}`