Skip to content

Commit

Permalink
Bump get.porter.sh/magefiles from 0.6.8 to 0.6.9 (#3256)
Browse files Browse the repository at this point in the history
* 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] <[email protected]>

* Fix linting errors

Signed-off-by: Kim Christensen <[email protected]>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: Kim Christensen <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Kim Christensen <[email protected]>
  • Loading branch information
dependabot[bot] and kichristensen authored Nov 15, 2024
1 parent c2e24f1 commit 45c17c1
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
2 changes: 1 addition & 1 deletion pkg/plugins/pluggable/connection.go
Original file line number Diff line number Diff line change
Expand Up @@ -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":
Expand Down
10 changes: 5 additions & 5 deletions pkg/storage/plugins/mongodb_docker/store.go
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}
Expand All @@ -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))
}
Expand All @@ -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))
}
Expand All @@ -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))
}
Expand Down

0 comments on commit 45c17c1

Please sign in to comment.