Skip to content

Commit 002cfcd

Browse files
committed
cli/command: fix n-constant format string in call (govet)
cli/command/utils.go:225:29: printf: non-constant format string in call to github.com/pkg/errors.Wrapf (govet) return errors.Wrapf(err, fmt.Sprintf("invalid output path: %q must be a directory or a regular file", path)) ^ cli/command/manifest/cmd.go:21:33: printf: non-constant format string in call to fmt.Fprintf (govet) fmt.Fprintf(dockerCli.Err(), "\n"+cmd.UsageString()) ^ cli/command/service/remove.go:45:24: printf: non-constant format string in call to github.com/pkg/errors.Errorf (govet) return errors.Errorf(strings.Join(errs, "\n")) ^ cli/command/service/scale.go:93:23: printf: non-constant format string in call to github.com/pkg/errors.Errorf (govet) return errors.Errorf(strings.Join(errs, "\n")) ^ cli/command/stack/swarm/remove.go:74:24: printf: non-constant format string in call to github.com/pkg/errors.Errorf (govet) return errors.Errorf(strings.Join(errs, "\n")) ^ Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit f101f07) Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent d8af781 commit 002cfcd

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

cli/command/manifest/cmd.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ func NewManifestCommand(dockerCli command.Cli) *cobra.Command {
1818
Long: manifestDescription,
1919
Args: cli.NoArgs,
2020
Run: func(cmd *cobra.Command, args []string) {
21-
fmt.Fprintf(dockerCli.Err(), "\n"+cmd.UsageString())
21+
_, _ = fmt.Fprint(dockerCli.Err(), "\n"+cmd.UsageString())
2222
},
2323
Annotations: map[string]string{"experimentalCLI": ""},
2424
}

cli/command/service/remove.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ func runRemove(ctx context.Context, dockerCli command.Cli, sids []string) error
3939
errs = append(errs, err.Error())
4040
continue
4141
}
42-
fmt.Fprintf(dockerCli.Out(), "%s\n", sid)
42+
_, _ = fmt.Fprintf(dockerCli.Out(), "%s\n", sid)
4343
}
4444
if len(errs) > 0 {
45-
return errors.Errorf(strings.Join(errs, "\n"))
45+
return errors.New(strings.Join(errs, "\n"))
4646
}
4747
return nil
4848
}

cli/command/service/scale.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ func runScale(ctx context.Context, dockerCli command.Cli, options *scaleOptions,
9090
if len(errs) == 0 {
9191
return nil
9292
}
93-
return errors.Errorf(strings.Join(errs, "\n"))
93+
return errors.New(strings.Join(errs, "\n"))
9494
}
9595

9696
func runServiceScale(ctx context.Context, dockerCli command.Cli, serviceID string, scale uint64) error {

cli/command/stack/swarm/remove.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func RunRemove(ctx context.Context, dockerCli command.Cli, opts options.Remove)
4848
}
4949

5050
if len(services)+len(networks)+len(secrets)+len(configs) == 0 {
51-
fmt.Fprintf(dockerCli.Err(), "Nothing found in stack: %s\n", namespace)
51+
_, _ = fmt.Fprintf(dockerCli.Err(), "Nothing found in stack: %s\n", namespace)
5252
continue
5353
}
5454

@@ -71,7 +71,7 @@ func RunRemove(ctx context.Context, dockerCli command.Cli, opts options.Remove)
7171
}
7272

7373
if len(errs) > 0 {
74-
return errors.Errorf(strings.Join(errs, "\n"))
74+
return errors.New(strings.Join(errs, "\n"))
7575
}
7676
return nil
7777
}

cli/command/utils.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ func ValidateOutputPath(path string) error {
222222
}
223223

224224
if err := ValidateOutputPathFileMode(fileInfo.Mode()); err != nil {
225-
return errors.Wrapf(err, fmt.Sprintf("invalid output path: %q must be a directory or a regular file", path))
225+
return errors.Wrapf(err, "invalid output path: %q must be a directory or a regular file", path)
226226
}
227227
}
228228
return nil

0 commit comments

Comments
 (0)