Skip to content

Commit 5d95d2d

Browse files
committed
fix non-constant format string error
1 parent ca938ec commit 5d95d2d

File tree

7 files changed

+12
-16
lines changed

7 files changed

+12
-16
lines changed

api/filters/replacement/replacement.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,14 +192,14 @@ func copyValueToTarget(target *yaml.RNode, value *yaml.RNode, selector *types.Ta
192192
Path: kyaml_utils.SmarterPathSplitter(fp, "."),
193193
Create: createKind})
194194
if err != nil {
195-
return errors.WrapPrefixf(err, fieldRetrievalError(fp, createKind != 0)) //nolint:govet
195+
return errors.WrapPrefixf(err, "%s", fieldRetrievalError(fp, createKind != 0))
196196
}
197197
targetFields, err := targetFieldList.Elements()
198198
if err != nil {
199-
return errors.WrapPrefixf(err, fieldRetrievalError(fp, createKind != 0)) //nolint:govet
199+
return errors.WrapPrefixf(err, "%s", fieldRetrievalError(fp, createKind != 0))
200200
}
201201
if len(targetFields) == 0 {
202-
return errors.Errorf(fieldRetrievalError(fp, createKind != 0)) //nolint:govet
202+
return errors.Errorf("%s", fieldRetrievalError(fp, createKind != 0))
203203
}
204204

205205
for _, t := range targetFields {

api/internal/builtins/HelmChartInflationGenerator.go

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/internal/loader/fileloader.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ func (fl *FileLoader) New(path string) (ifc.Loader, error) {
169169
}
170170
root, err := filesys.ConfirmDir(fl.fSys, fl.root.Join(path))
171171
if err != nil {
172-
return nil, errors.WrapPrefixf(err, ErrRtNotDir.Error()) //nolint:govet
172+
return nil, errors.WrapPrefixf(err, "%s", ErrRtNotDir.Error())
173173
}
174174
if err = fl.errIfGitContainmentViolation(root); err != nil {
175175
return nil, err

api/internal/loader/loader.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ func NewLoader(
2828
}
2929
root, err := filesys.ConfirmDir(fSys, target)
3030
if err != nil {
31-
return nil, errors.WrapPrefixf(err, ErrRtNotDir.Error()) //nolint:govet
31+
return nil, errors.WrapPrefixf(err, "%s", ErrRtNotDir.Error())
3232
}
3333
return newLoaderAtConfirmedDir(
3434
lr, root, fSys, nil, git.ClonerUsingGitExec), nil

api/internal/plugins/execplugin/execplugin.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -161,12 +161,12 @@ func (p *ExecPlugin) invokePlugin(input []byte) ([]byte, error) {
161161
_, err = f.Write(p.cfg)
162162
if err != nil {
163163
return nil, errors.WrapPrefixf(
164-
err, "writing plugin config to "+f.Name())
164+
err, "%s", "writing plugin config to "+f.Name())
165165
}
166166
err = f.Close()
167167
if err != nil {
168168
return nil, errors.WrapPrefixf(
169-
err, "closing plugin config file "+f.Name())
169+
err, "%s", "closing plugin config file "+f.Name())
170170
}
171171
//nolint:gosec
172172
cmd := exec.Command(
@@ -180,10 +180,9 @@ func (p *ExecPlugin) invokePlugin(input []byte) ([]byte, error) {
180180
}
181181
result, err := cmd.Output()
182182
if err != nil {
183-
//nolint:govet
184183
return nil, errors.WrapPrefixf(
185-
fmt.Errorf("failure in plugin configured via %s; %w",
186-
f.Name(), err), stdErr.String())
184+
fmt.Errorf("failure in plugin configured via %s; %w", f.Name(), err),
185+
"%s", stdErr.String())
187186
}
188187
return result, os.Remove(f.Name())
189188
}

kyaml/filesys/filesystem.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,7 @@ func ConfirmDir(fSys FileSystem, path string) (ConfirmedDir, error) {
7878
return "", errors.WrapPrefixf(err, "not a valid directory")
7979
}
8080
if f != "" {
81-
//nolint:govet
82-
return "", errors.WrapPrefixf(errors.Errorf("file is not directory"), fmt.Sprintf("'%s'", path))
81+
return "", errors.WrapPrefixf(errors.Errorf("file is not directory"), "%s", fmt.Sprintf("'%s'", path))
8382
}
8483
return d, nil
8584
}

plugin/builtin/helmchartinflationgenerator/HelmChartInflationGenerator.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,12 +184,11 @@ func (p *plugin) runHelmCommand(
184184
}
185185
if err != nil {
186186
helm := p.h.GeneralConfig().HelmConfig.Command
187-
//nolint:govet
188187
err = errors.WrapPrefixf(
189188
fmt.Errorf(
190189
"unable to run: '%s %s' with env=%s (is '%s' installed?): %w",
191190
helm, strings.Join(args, " "), env, helm, err),
192-
errorOutput,
191+
"%s", errorOutput,
193192
)
194193
}
195194
return stdout.Bytes(), err

0 commit comments

Comments
 (0)