cli/command/service: minor cleanups: use Println, rename vars

thaJeztah · thaJeztah · commit aa74f931d385 · 2025-02-03T12:18:12.000+01:00
- use Println to print newline instead of custom format
- use apiClient instead of client for the API client to
  prevent shadowing imports.
- use dockerCLI with Go's standard camelCase casing.
- suppress some errors to make my IDE and linters happier

Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
diff --git a/cli/command/service/create.go b/cli/command/service/create.go
@@ -78,16 +78,16 @@ func newCreateCommand(dockerCli command.Cli) *cobra.Command {
 	return cmd
 }
 
-func runCreate(ctx context.Context, dockerCli command.Cli, flags *pflag.FlagSet, opts *serviceOptions) error {
-	apiClient := dockerCli.Client()
+func runCreate(ctx context.Context, dockerCLI command.Cli, flags *pflag.FlagSet, opts *serviceOptions) error {
+	apiClient := dockerCLI.Client()
 	createOpts := types.ServiceCreateOptions{}
 
 	service, err := opts.ToService(ctx, apiClient, flags)
 	if err != nil {
 		return err
 	}
 
-	if err = validateAPIVersion(service, dockerCli.Client().ClientVersion()); err != nil {
+	if err = validateAPIVersion(service, dockerCLI.Client().ClientVersion()); err != nil {
 		return err
 	}
 
@@ -105,14 +105,14 @@ func runCreate(ctx context.Context, dockerCli command.Cli, flags *pflag.FlagSet,
 		return err
 	}
 
-	if err := resolveServiceImageDigestContentTrust(dockerCli, &service); err != nil {
+	if err := resolveServiceImageDigestContentTrust(dockerCLI, &service); err != nil {
 		return err
 	}
 
 	// only send auth if flag was set
 	if opts.registryAuth {
 		// Retrieve encoded auth token from the image reference
-		encodedAuth, err := command.RetrieveAuthTokenFromImage(dockerCli.ConfigFile(), opts.image)
+		encodedAuth, err := command.RetrieveAuthTokenFromImage(dockerCLI.ConfigFile(), opts.image)
 		if err != nil {
 			return err
 		}
@@ -130,16 +130,16 @@ func runCreate(ctx context.Context, dockerCli command.Cli, flags *pflag.FlagSet,
 	}
 
 	for _, warning := range response.Warnings {
-		fmt.Fprintln(dockerCli.Err(), warning)
+		_, _ = fmt.Fprintln(dockerCLI.Err(), warning)
 	}
 
-	fmt.Fprintf(dockerCli.Out(), "%s\n", response.ID)
+	_, _ = fmt.Fprintln(dockerCLI.Out(), response.ID)
 
 	if opts.detach || versions.LessThan(apiClient.ClientVersion(), "1.29") {
 		return nil
 	}
 
-	return WaitOnService(ctx, dockerCli, response.ID, opts.quiet)
+	return WaitOnService(ctx, dockerCLI, response.ID, opts.quiet)
 }
 
 // setConfigs does double duty: it both sets the ConfigReferences of the
diff --git a/cli/command/service/remove.go b/cli/command/service/remove.go
@@ -29,17 +29,17 @@ func newRemoveCommand(dockerCli command.Cli) *cobra.Command {
 	return cmd
 }
 
-func runRemove(ctx context.Context, dockerCli command.Cli, sids []string) error {
-	client := dockerCli.Client()
+func runRemove(ctx context.Context, dockerCLI command.Cli, serviceIDs []string) error {
+	apiClient := dockerCLI.Client()
 
 	var errs []string
-	for _, sid := range sids {
-		err := client.ServiceRemove(ctx, sid)
+	for _, id := range serviceIDs {
+		err := apiClient.ServiceRemove(ctx, id)
 		if err != nil {
 			errs = append(errs, err.Error())
 			continue
 		}
-		_, _ = fmt.Fprintf(dockerCli.Out(), "%s\n", sid)
+		_, _ = fmt.Fprintln(dockerCLI.Out(), id)
 	}
 	if len(errs) > 0 {
 		return errors.New(strings.Join(errs, "\n"))
diff --git a/cli/command/service/rollback.go b/cli/command/service/rollback.go
@@ -34,8 +34,8 @@ func newRollbackCommand(dockerCli command.Cli) *cobra.Command {
 	return cmd
 }
 
-func runRollback(ctx context.Context, dockerCli command.Cli, options *serviceOptions, serviceID string) error {
-	apiClient := dockerCli.Client()
+func runRollback(ctx context.Context, dockerCLI command.Cli, options *serviceOptions, serviceID string) error {
+	apiClient := dockerCLI.Client()
 
 	service, _, err := apiClient.ServiceInspectWithRaw(ctx, serviceID, types.ServiceInspectOptions{})
 	if err != nil {
@@ -53,14 +53,14 @@ func runRollback(ctx context.Context, dockerCli command.Cli, options *serviceOpt
 	}
 
 	for _, warning := range response.Warnings {
-		fmt.Fprintln(dockerCli.Err(), warning)
+		_, _ = fmt.Fprintln(dockerCLI.Err(), warning)
 	}
 
-	fmt.Fprintf(dockerCli.Out(), "%s\n", serviceID)
+	_, _ = fmt.Fprintln(dockerCLI.Out(), serviceID)
 
 	if options.detach || versions.LessThan(apiClient.ClientVersion(), "1.29") {
 		return nil
 	}
 
-	return WaitOnService(ctx, dockerCli, serviceID, options.quiet)
+	return WaitOnService(ctx, dockerCLI, serviceID, options.quiet)
 }
diff --git a/cli/command/service/scale.go b/cli/command/service/scale.go
@@ -117,9 +117,9 @@ func runServiceScale(ctx context.Context, dockerCli command.Cli, serviceID strin
 	}
 
 	for _, warning := range response.Warnings {
-		fmt.Fprintln(dockerCli.Err(), warning)
+		_, _ = fmt.Fprintln(dockerCli.Err(), warning)
 	}
 
-	fmt.Fprintf(dockerCli.Out(), "%s scaled to %d\n", serviceID, scale)
+	_, _ = fmt.Fprintf(dockerCli.Out(), "%s scaled to %d\n", serviceID, scale)
 	return nil
 }
diff --git a/cli/command/service/trust.go b/cli/command/service/trust.go
@@ -73,7 +73,7 @@ func trustedResolveDigest(cli command.Cli, ref reference.NamedTagged) (reference
 		return nil, trust.NotaryError(repoInfo.Name.Name(), errors.Errorf("No trust data for %s", reference.FamiliarString(ref)))
 	}
 
-	logrus.Debugf("retrieving target for %s role\n", t.Role)
+	logrus.Debugf("retrieving target for %s role", t.Role)
 	h, ok := t.Hashes["sha256"]
 	if !ok {
 		return nil, errors.New("no valid hash, expecting sha256")
diff --git a/cli/command/service/update.go b/cli/command/service/update.go
@@ -129,8 +129,8 @@ func newListOptsVarWithValidator(validator opts.ValidatorFctType) *opts.ListOpts
 }
 
 //nolint:gocyclo
-func runUpdate(ctx context.Context, dockerCli command.Cli, flags *pflag.FlagSet, options *serviceOptions, serviceID string) error {
-	apiClient := dockerCli.Client()
+func runUpdate(ctx context.Context, dockerCLI command.Cli, flags *pflag.FlagSet, options *serviceOptions, serviceID string) error {
+	apiClient := dockerCLI.Client()
 
 	service, _, err := apiClient.ServiceInspectWithRaw(ctx, serviceID, types.ServiceInspectOptions{})
 	if err != nil {
@@ -188,7 +188,7 @@ func runUpdate(ctx context.Context, dockerCli command.Cli, flags *pflag.FlagSet,
 	}
 
 	if flags.Changed("image") {
-		if err := resolveServiceImageDigestContentTrust(dockerCli, spec); err != nil {
+		if err := resolveServiceImageDigestContentTrust(dockerCLI, spec); err != nil {
 			return err
 		}
 		if !options.noResolveImage && versions.GreaterThanOrEqualTo(apiClient.ClientVersion(), "1.30") {
@@ -225,7 +225,7 @@ func runUpdate(ctx context.Context, dockerCli command.Cli, flags *pflag.FlagSet,
 		// Retrieve encoded auth token from the image reference
 		// This would be the old image if it didn't change in this update
 		image := spec.TaskTemplate.ContainerSpec.Image
-		encodedAuth, err := command.RetrieveAuthTokenFromImage(dockerCli.ConfigFile(), image)
+		encodedAuth, err := command.RetrieveAuthTokenFromImage(dockerCLI.ConfigFile(), image)
 		if err != nil {
 			return err
 		}
@@ -242,16 +242,16 @@ func runUpdate(ctx context.Context, dockerCli command.Cli, flags *pflag.FlagSet,
 	}
 
 	for _, warning := range response.Warnings {
-		fmt.Fprintln(dockerCli.Err(), warning)
+		_, _ = fmt.Fprintln(dockerCLI.Err(), warning)
 	}
 
-	fmt.Fprintf(dockerCli.Out(), "%s\n", serviceID)
+	_, _ = fmt.Fprintln(dockerCLI.Out(), serviceID)
 
 	if options.detach || versions.LessThan(apiClient.ClientVersion(), "1.29") {
 		return nil
 	}
 
-	return WaitOnService(ctx, dockerCli, serviceID, options.quiet)
+	return WaitOnService(ctx, dockerCLI, serviceID, options.quiet)
 }
 
 //nolint:gocyclo

Original file line number	Diff line number	Diff line change
`@@ -78,16 +78,16 @@ func newCreateCommand(dockerCli command.Cli) *cobra.Command {`
`78`	`78`	`return cmd`
`79`	`79`	`}`
`80`	`80`
`81`		`-func runCreate(ctx context.Context, dockerCli command.Cli, flags pflag.FlagSet, opts serviceOptions) error {`
`82`		`- apiClient := dockerCli.Client()`
	`81`	`+func runCreate(ctx context.Context, dockerCLI command.Cli, flags pflag.FlagSet, opts serviceOptions) error {`
	`82`	`+ apiClient := dockerCLI.Client()`
`83`	`83`	`createOpts := types.ServiceCreateOptions{}`
`84`	`84`
`85`	`85`	`service, err := opts.ToService(ctx, apiClient, flags)`
`86`	`86`	`if err != nil {`
`87`	`87`	`return err`
`88`	`88`	`}`
`89`	`89`
`90`		`- if err = validateAPIVersion(service, dockerCli.Client().ClientVersion()); err != nil {`
	`90`	`+ if err = validateAPIVersion(service, dockerCLI.Client().ClientVersion()); err != nil {`
`91`	`91`	`return err`
`92`	`92`	`}`
`93`	`93`
`@@ -105,14 +105,14 @@ func runCreate(ctx context.Context, dockerCli command.Cli, flags *pflag.FlagSet,`
`105`	`105`	`return err`
`106`	`106`	`}`
`107`	`107`
`108`		`- if err := resolveServiceImageDigestContentTrust(dockerCli, &service); err != nil {`
	`108`	`+ if err := resolveServiceImageDigestContentTrust(dockerCLI, &service); err != nil {`
`109`	`109`	`return err`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`// only send auth if flag was set`
`113`	`113`	`if opts.registryAuth {`
`114`	`114`	`// Retrieve encoded auth token from the image reference`
`115`		`- encodedAuth, err := command.RetrieveAuthTokenFromImage(dockerCli.ConfigFile(), opts.image)`
	`115`	`+ encodedAuth, err := command.RetrieveAuthTokenFromImage(dockerCLI.ConfigFile(), opts.image)`
`116`	`116`	`if err != nil {`
`117`	`117`	`return err`
`118`	`118`	`}`
`@@ -130,16 +130,16 @@ func runCreate(ctx context.Context, dockerCli command.Cli, flags *pflag.FlagSet,`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`for _, warning := range response.Warnings {`
`133`		`- fmt.Fprintln(dockerCli.Err(), warning)`
	`133`	`+ _, _ = fmt.Fprintln(dockerCLI.Err(), warning)`
`134`	`134`	`}`
`135`	`135`
`136`		`- fmt.Fprintf(dockerCli.Out(), "%s\n", response.ID)`
	`136`	`+ _, _ = fmt.Fprintln(dockerCLI.Out(), response.ID)`
`137`	`137`
`138`	`138`	`if opts.detach \|\| versions.LessThan(apiClient.ClientVersion(), "1.29") {`
`139`	`139`	`return nil`
`140`	`140`	`}`
`141`	`141`
`142`		`- return WaitOnService(ctx, dockerCli, response.ID, opts.quiet)`
	`142`	`+ return WaitOnService(ctx, dockerCLI, response.ID, opts.quiet)`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`// setConfigs does double duty: it both sets the ConfigReferences of the`
Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,8 @@ func newRollbackCommand(dockerCli command.Cli) *cobra.Command {`
`34`	`34`	`return cmd`
`35`	`35`	`}`
`36`	`36`
`37`		`-func runRollback(ctx context.Context, dockerCli command.Cli, options *serviceOptions, serviceID string) error {`
`38`		`- apiClient := dockerCli.Client()`
	`37`	`+func runRollback(ctx context.Context, dockerCLI command.Cli, options *serviceOptions, serviceID string) error {`
	`38`	`+ apiClient := dockerCLI.Client()`
`39`	`39`
`40`	`40`	`service, _, err := apiClient.ServiceInspectWithRaw(ctx, serviceID, types.ServiceInspectOptions{})`
`41`	`41`	`if err != nil {`
`@@ -53,14 +53,14 @@ func runRollback(ctx context.Context, dockerCli command.Cli, options *serviceOpt`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`for _, warning := range response.Warnings {`
`56`		`- fmt.Fprintln(dockerCli.Err(), warning)`
	`56`	`+ _, _ = fmt.Fprintln(dockerCLI.Err(), warning)`
`57`	`57`	`}`
`58`	`58`
`59`		`- fmt.Fprintf(dockerCli.Out(), "%s\n", serviceID)`
	`59`	`+ _, _ = fmt.Fprintln(dockerCLI.Out(), serviceID)`
`60`	`60`
`61`	`61`	`if options.detach \|\| versions.LessThan(apiClient.ClientVersion(), "1.29") {`
`62`	`62`	`return nil`
`63`	`63`	`}`
`64`	`64`
`65`		`- return WaitOnService(ctx, dockerCli, serviceID, options.quiet)`
	`65`	`+ return WaitOnService(ctx, dockerCLI, serviceID, options.quiet)`
`66`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -117,9 +117,9 @@ func runServiceScale(ctx context.Context, dockerCli command.Cli, serviceID strin`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`for _, warning := range response.Warnings {`
`120`		`- fmt.Fprintln(dockerCli.Err(), warning)`
	`120`	`+ _, _ = fmt.Fprintln(dockerCli.Err(), warning)`
`121`	`121`	`}`
`122`	`122`
`123`		`- fmt.Fprintf(dockerCli.Out(), "%s scaled to %d\n", serviceID, scale)`
	`123`	`+ _, _ = fmt.Fprintf(dockerCli.Out(), "%s scaled to %d\n", serviceID, scale)`
`124`	`124`	`return nil`
`125`	`125`	`}`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ func trustedResolveDigest(cli command.Cli, ref reference.NamedTagged) (reference`
`73`	`73`	`return nil, trust.NotaryError(repoInfo.Name.Name(), errors.Errorf("No trust data for %s", reference.FamiliarString(ref)))`
`74`	`74`	`}`
`75`	`75`
`76`		`- logrus.Debugf("retrieving target for %s role\n", t.Role)`
	`76`	`+ logrus.Debugf("retrieving target for %s role", t.Role)`
`77`	`77`	`h, ok := t.Hashes["sha256"]`
`78`	`78`	`if !ok {`
`79`	`79`	`return nil, errors.New("no valid hash, expecting sha256")`
Original file line number	Diff line number	Diff line change
`@@ -129,8 +129,8 @@ func newListOptsVarWithValidator(validator opts.ValidatorFctType) *opts.ListOpts`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`//nolint:gocyclo`
`132`		`-func runUpdate(ctx context.Context, dockerCli command.Cli, flags pflag.FlagSet, options serviceOptions, serviceID string) error {`
`133`		`- apiClient := dockerCli.Client()`
	`132`	`+func runUpdate(ctx context.Context, dockerCLI command.Cli, flags pflag.FlagSet, options serviceOptions, serviceID string) error {`
	`133`	`+ apiClient := dockerCLI.Client()`
`134`	`134`
`135`	`135`	`service, _, err := apiClient.ServiceInspectWithRaw(ctx, serviceID, types.ServiceInspectOptions{})`
`136`	`136`	`if err != nil {`
`@@ -188,7 +188,7 @@ func runUpdate(ctx context.Context, dockerCli command.Cli, flags *pflag.FlagSet,`
`188`	`188`	`}`
`189`	`189`
`190`	`190`	`if flags.Changed("image") {`
`191`		`- if err := resolveServiceImageDigestContentTrust(dockerCli, spec); err != nil {`
	`191`	`+ if err := resolveServiceImageDigestContentTrust(dockerCLI, spec); err != nil {`
`192`	`192`	`return err`
`193`	`193`	`}`
`194`	`194`	`if !options.noResolveImage && versions.GreaterThanOrEqualTo(apiClient.ClientVersion(), "1.30") {`
`@@ -225,7 +225,7 @@ func runUpdate(ctx context.Context, dockerCli command.Cli, flags *pflag.FlagSet,`
`225`	`225`	`// Retrieve encoded auth token from the image reference`
`226`	`226`	`// This would be the old image if it didn't change in this update`
`227`	`227`	`image := spec.TaskTemplate.ContainerSpec.Image`
`228`		`- encodedAuth, err := command.RetrieveAuthTokenFromImage(dockerCli.ConfigFile(), image)`
	`228`	`+ encodedAuth, err := command.RetrieveAuthTokenFromImage(dockerCLI.ConfigFile(), image)`
`229`	`229`	`if err != nil {`
`230`	`230`	`return err`
`231`	`231`	`}`
`@@ -242,16 +242,16 @@ func runUpdate(ctx context.Context, dockerCli command.Cli, flags *pflag.FlagSet,`
`242`	`242`	`}`
`243`	`243`
`244`	`244`	`for _, warning := range response.Warnings {`
`245`		`- fmt.Fprintln(dockerCli.Err(), warning)`
	`245`	`+ _, _ = fmt.Fprintln(dockerCLI.Err(), warning)`
`246`	`246`	`}`
`247`	`247`
`248`		`- fmt.Fprintf(dockerCli.Out(), "%s\n", serviceID)`
	`248`	`+ _, _ = fmt.Fprintln(dockerCLI.Out(), serviceID)`
`249`	`249`
`250`	`250`	`if options.detach \|\| versions.LessThan(apiClient.ClientVersion(), "1.29") {`
`251`	`251`	`return nil`
`252`	`252`	`}`
`253`	`253`
`254`		`- return WaitOnService(ctx, dockerCli, serviceID, options.quiet)`
	`254`	`+ return WaitOnService(ctx, dockerCLI, serviceID, options.quiet)`
`255`	`255`	`}`
`256`	`256`
`257`	`257`	`//nolint:gocyclo`