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

- use Println to print newline instead of custom format
- use dockerCLI with Go's standard camelCase casing.
- suppress some errors to make my IDE and linters happier

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Author: thaJeztah

cli/command/manifest/create_list.go

@@ -35,7 +35,7 @@ func newCreateListCommand(dockerCli command.Cli) *cobra.Command {
 	return cmd
 }
 
-func createManifestList(ctx context.Context, dockerCli command.Cli, args []string, opts createOpts) error {
+func createManifestList(ctx context.Context, dockerCLI command.Cli, args []string, opts createOpts) error {
 	newRef := args[0]
 	targetRef, err := normalizeReference(newRef)
 	if err != nil {
@@ -47,7 +47,7 @@ func createManifestList(ctx context.Context, dockerCli command.Cli, args []strin
 		return errors.Wrapf(err, "error parsing repository name for manifest list %s", newRef)
 	}
 
-	manifestStore := dockerCli.ManifestStore()
+	manifestStore := dockerCLI.ManifestStore()
 	_, err = manifestStore.GetList(targetRef)
 	switch {
 	case store.IsNotFound(err):
@@ -68,14 +68,14 @@ func createManifestList(ctx context.Context, dockerCli command.Cli, args []strin
 			return err
 		}
 
-		manifest, err := getManifest(ctx, dockerCli, targetRef, namedRef, opts.insecure)
+		manifest, err := getManifest(ctx, dockerCLI, targetRef, namedRef, opts.insecure)
 		if err != nil {
 			return err
 		}
 		if err := manifestStore.Save(targetRef, namedRef, manifest); err != nil {
 			return err
 		}
 	}
-	fmt.Fprintf(dockerCli.Out(), "Created manifest list %s\n", targetRef.String())
+	_, _ = fmt.Fprintln(dockerCLI.Out(), "Created manifest list", targetRef.String())
 	return nil
 }

cli/command/manifest/push.go

@@ -268,21 +268,21 @@ func buildPutManifestRequest(imageManifest types.ImageManifest, targetRef refere
 	return mountRequest{ref: mountRef, manifest: imageManifest}, err
 }
 
-func pushList(ctx context.Context, dockerCli command.Cli, req pushRequest) error {
-	rclient := dockerCli.RegistryClient(req.insecure)
+func pushList(ctx context.Context, dockerCLI command.Cli, req pushRequest) error {
+	rclient := dockerCLI.RegistryClient(req.insecure)
 
 	if err := mountBlobs(ctx, rclient, req.targetRef, req.manifestBlobs); err != nil {
 		return err
 	}
-	if err := pushReferences(ctx, dockerCli.Out(), rclient, req.mountRequests); err != nil {
+	if err := pushReferences(ctx, dockerCLI.Out(), rclient, req.mountRequests); err != nil {
 		return err
 	}
 	dgst, err := rclient.PutManifest(ctx, req.targetRef, req.list)
 	if err != nil {
 		return err
 	}
 
-	fmt.Fprintln(dockerCli.Out(), dgst.String())
+	_, _ = fmt.Fprintln(dockerCLI.Out(), dgst.String())
 	return nil
 }
 
@@ -292,7 +292,7 @@ func pushReferences(ctx context.Context, out io.Writer, client registryclient.Re
 		if err != nil {
 			return err
 		}
-		fmt.Fprintf(out, "Pushed ref %s with digest: %s\n", mount.ref, newDigest)
+		_, _ = fmt.Fprintf(out, "Pushed ref %s with digest: %s\n", mount.ref, newDigest)
 	}
 	return nil
 }