Refactored 'rmi' command (scaleway#80)

Author: moul

pkg/cli/rmi.go

@@ -5,10 +5,8 @@
 package cli
 
 import (
-	"fmt"
-	"os"
-
-	log "github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
+	"github.com/scaleway/scaleway-cli/pkg/commands"
+	"github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
 )
 
 var cmdRmi = &Command{
@@ -29,29 +27,20 @@ func init() {
 // Flags
 var rmiHelp bool // -h, --help flag
 
-func runRmi(cmd *Command, args []string) {
+func runRmi(cmd *Command, rawArgs []string) {
 	if rmiHelp {
 		cmd.PrintUsage()
 	}
-	if len(args) < 1 {
+	if len(rawArgs) < 1 {
 		cmd.PrintShortUsage()
 	}
 
-	if len(args) == 0 {
-		log.Fatalf("usage: scw %s", cmd.UsageLine)
-	}
-	hasError := false
-	for _, needle := range args {
-		image := cmd.API.GetImageID(needle, true)
-		err := cmd.API.DeleteImage(image)
-		if err != nil {
-			log.Errorf("failed to delete image %s: %s", image, err)
-			hasError = true
-		} else {
-			fmt.Println(needle)
-		}
+	args := commands.RmiArgs{
+		Images: rawArgs,
 	}
-	if hasError {
-		os.Exit(1)
+	ctx := cmd.GetContext(rawArgs)
+	err := commands.RunRmi(ctx, args)
+	if err != nil {
+		logrus.Fatalf("Cannot execute 'rmi': %v", err)
 	}
 }

pkg/commands/rmi.go

@@ -0,0 +1,35 @@
+// Copyright (C) 2015 Scaleway. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE.md file.
+
+package commands
+
+import (
+	"fmt"
+
+	"github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
+)
+
+// RmiArgs are flags for the `RunRmi` function
+type RmiArgs struct {
+	Images []string
+}
+
+// RunRmi is the handler for 'scw rmi'
+func RunRmi(ctx CommandContext, args RmiArgs) error {
+	hasError := false
+	for _, needle := range args.Images {
+		image := ctx.API.GetImageID(needle, true)
+		err := ctx.API.DeleteImage(image)
+		if err != nil {
+			logrus.Errorf("failed to delete image %s: %s", image, err)
+			hasError = true
+		} else {
+			fmt.Fprintln(ctx.Stdout, needle)
+		}
+	}
+	if hasError {
+		return fmt.Errorf("at least 1 image failed to be removed")
+	}
+	return nil
+}