Refactored 'tag' command (scaleway#80)

Author: moul

pkg/cli/tag.go

@@ -5,9 +5,8 @@
 package cli
 
 import (
-	"fmt"
-
-	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 cmdTag = &Command{
@@ -24,23 +23,21 @@ func init() {
 // Flags
 var tagHelp bool // -h, --help flag
 
-func runTag(cmd *Command, args []string) {
+func runTag(cmd *Command, rawArgs []string) {
 	if tagHelp {
 		cmd.PrintUsage()
 	}
-	if len(args) != 2 {
+	if len(rawArgs) != 2 {
 		cmd.PrintShortUsage()
 	}
 
-	snapshotID := cmd.API.GetSnapshotID(args[0])
-	snapshot, err := cmd.API.GetSnapshot(snapshotID)
-	if err != nil {
-		log.Fatalf("Cannot fetch snapshot: %v", err)
+	args := commands.TagArgs{
+		Snapshot: rawArgs[0],
+		Name:     rawArgs[1],
 	}
-
-	image, err := cmd.API.PostImage(snapshot.Identifier, args[1])
+	ctx := cmd.GetContext(rawArgs)
+	err := commands.RunTag(ctx, args)
 	if err != nil {
-		log.Fatalf("Cannot create image: %v", err)
+		logrus.Fatalf("Cannot execute 'tag': %v", err)
 	}
-	fmt.Println(image)
 }

pkg/commands/tag.go

@@ -0,0 +1,29 @@
+// 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"
+
+// TagArgs are flags for the `RunTag` function
+type TagArgs struct {
+	Snapshot string
+	Name     string
+}
+
+// RunTag is the handler for 'scw tag'
+func RunTag(ctx CommandContext, args TagArgs) error {
+	snapshotID := ctx.API.GetSnapshotID(args.Snapshot)
+	snapshot, err := ctx.API.GetSnapshot(snapshotID)
+	if err != nil {
+		return fmt.Errorf("cannot fetch snapshot: %v", err)
+	}
+
+	image, err := ctx.API.PostImage(snapshot.Identifier, args.Name)
+	if err != nil {
+		return fmt.Errorf("cannot create image: %v", err)
+	}
+	fmt.Fprintln(ctx.Stdout, image)
+	return nil
+}