Skip to content
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
4 changes: 2 additions & 2 deletions api/internal/plugins/execplugin/execplugin.go
Original file line number Diff line number Diff line change
Expand Up @@ -161,12 +161,12 @@ func (p *ExecPlugin) invokePlugin(input []byte) ([]byte, error) {
_, err = f.Write(p.cfg)
if err != nil {
return nil, errors.WrapPrefixf(
err, "%s", "writing plugin config to "+f.Name())
err, "writing plugin config to %s", f.Name())
}
err = f.Close()
if err != nil {
return nil, errors.WrapPrefixf(
err, "%s", "closing plugin config file "+f.Name())
err, "closing plugin config file %s", f.Name())
}
cmd := exec.Command(
p.path, append([]string{f.Name()}, p.args...)...)
Expand Down
4 changes: 2 additions & 2 deletions kustomize/commands/openapi/fetch/fetch.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ Installation and setup instructions: https://kubernetes.io/docs/tasks/tools/inst
command.Stderr = &stderr
err := command.Run()
if err != nil {
return fmt.Errorf("%w\n%s", err, stderr.String()+errMsg)
return fmt.Errorf("%w\n%s%s", err, stderr.String(), errMsg)
} else if stdout.String() == "" {
return fmt.Errorf("%s", stderr.String()+errMsg)
return fmt.Errorf("%s%s", stderr.String(), errMsg)
}

// format and output
Expand Down
3 changes: 1 addition & 2 deletions kyaml/filesys/filesystem.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
package filesys

import (
"fmt"
"path/filepath"

"sigs.k8s.io/kustomize/kyaml/errors"
Expand Down Expand Up @@ -78,7 +77,7 @@ func ConfirmDir(fSys FileSystem, path string) (ConfirmedDir, error) {
return "", errors.WrapPrefixf(err, "not a valid directory")
}
if f != "" {
return "", errors.WrapPrefixf(errors.Errorf("file is not directory"), "%s", fmt.Sprintf("'%s'", path))
return "", errors.WrapPrefixf(errors.Errorf("file is not directory"), "'%s'", path)
}
return d, nil
}
Expand Down
Loading