Refactored code to prevent passing command as argument

Author: moul

api.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"net/http"
 	"net/url"
+	"os"
 	"strings"
 
 	log "github.com/Sirupsen/logrus"
@@ -1076,3 +1077,87 @@ func (s *ScalewayAPI) CheckCredentials() error {
 	}
 	return nil
 }
+
+// GetServerID returns exactly one server matching or dies
+func (s *ScalewayAPI) GetServerID(needle string) string {
+	servers, err := s.ResolveServer(needle)
+	if err != nil {
+		log.Fatalf("Unable to resolve server %s: %s", needle, err)
+	}
+	if len(servers) == 1 {
+		return servers[0]
+	}
+	if len(servers) == 0 {
+		log.Fatalf("No such server: %s", needle)
+	}
+	log.Errorf("Too many candidates for %s (%d)", needle, len(servers))
+	for _, identifier := range servers {
+		// FIXME: also print the name
+		log.Infof("- %s", identifier)
+	}
+	os.Exit(1)
+	return ""
+}
+
+// GetSnapshotID returns exactly one snapshot matching or dies
+func (s *ScalewayAPI) GetSnapshotID(needle string) string {
+	snapshots, err := s.ResolveSnapshot(needle)
+	if err != nil {
+		log.Fatalf("Unable to resolve snapshot %s: %s", needle, err)
+	}
+	if len(snapshots) == 1 {
+		return snapshots[0]
+	}
+	if len(snapshots) == 0 {
+		log.Fatalf("No such snapshot: %s", needle)
+	}
+	log.Errorf("Too many candidates for %s (%d)", needle, len(snapshots))
+	for _, identifier := range snapshots {
+		// FIXME: also print the name
+		log.Infof("- %s", identifier)
+	}
+	os.Exit(1)
+	return ""
+}
+
+// GetImageID returns exactly one image matching or dies
+func (s *ScalewayAPI) GetImageID(needle string) string {
+	images, err := s.ResolveImage(needle)
+	if err != nil {
+		log.Fatalf("Unable to resolve image %s: %s", needle, err)
+	}
+	if len(images) == 1 {
+		return images[0]
+	}
+	if len(images) == 0 {
+		log.Fatalf("No such image: %s", needle)
+	}
+	log.Errorf("Too many candidates for %s (%d)", needle, len(images))
+	for _, identifier := range images {
+		// FIXME: also print the name
+		log.Infof("- %s", identifier)
+	}
+	os.Exit(1)
+	return ""
+}
+
+// GetBootscriptID returns exactly one bootscript matching or dies
+func (s *ScalewayAPI) GetBootscriptID(needle string) string {
+	bootscripts, err := s.ResolveBootscript(needle)
+	if err != nil {
+		log.Fatalf("Unable to resolve bootscript %s: %s", needle, err)
+	}
+	if len(bootscripts) == 1 {
+		return bootscripts[0]
+	}
+	if len(bootscripts) == 0 {
+		log.Fatalf("No such bootscript: %s", needle)
+	}
+	log.Errorf("Too many candidates for %s (%d)", needle, len(bootscripts))
+	for _, identifier := range bootscripts {
+		// FIXME: also print the name
+		log.Infof("- %s", identifier)
+	}
+	os.Exit(1)
+	return ""
+}

attach.go

@@ -37,7 +37,7 @@ func runAttach(cmd *Command, args []string) {
 		cmd.PrintShortUsage()
 	}
 
-	serverID := cmd.GetServer(args[0])
+	serverID := cmd.API.GetServerID(args[0])
 
 	termjsURL := fmt.Sprintf("https://tty.cloud.online.net?server_id=%s&type=serial&auth_token=%s", serverID, cmd.API.Token)
 

cli.go

@@ -149,90 +149,6 @@ func (c *Command) ExamplesHelp() string {
 	return fmt.Sprintf("Examples:\n\n%s", strings.Trim(c.Examples, "\n"))
 }
 
-// GetServer returns exactly one server matching or dies
-func (c *Command) GetServer(needle string) string {
-	servers, err := c.API.ResolveServer(needle)
-	if err != nil {
-		log.Fatalf("Unable to resolve server %s: %s", needle, err)
-	}
-	if len(servers) == 1 {
-		return servers[0]
-	}
-	if len(servers) == 0 {
-		log.Fatalf("No such server: %s", needle)
-	}
-	log.Errorf("Too many candidates for %s (%d)", needle, len(servers))
-	for _, identifier := range servers {
-		// FIXME: also print the name
-		log.Infof("- %s", identifier)
-	}
-	os.Exit(1)
-	return ""
-}
-
-// GetSnapshot returns exactly one snapshot matching or dies
-func (c *Command) GetSnapshot(needle string) string {
-	snapshots, err := c.API.ResolveSnapshot(needle)
-	if err != nil {
-		log.Fatalf("Unable to resolve snapshot %s: %s", needle, err)
-	}
-	if len(snapshots) == 1 {
-		return snapshots[0]
-	}
-	if len(snapshots) == 0 {
-		log.Fatalf("No such snapshot: %s", needle)
-	}
-	log.Errorf("Too many candidates for %s (%d)", needle, len(snapshots))
-	for _, identifier := range snapshots {
-		// FIXME: also print the name
-		log.Infof("- %s", identifier)
-	}
-	os.Exit(1)
-	return ""
-}
-
-// GetImage returns exactly one image matching or dies
-func (c *Command) GetImage(needle string) string {
-	images, err := c.API.ResolveImage(needle)
-	if err != nil {
-		log.Fatalf("Unable to resolve image %s: %s", needle, err)
-	}
-	if len(images) == 1 {
-		return images[0]
-	}
-	if len(images) == 0 {
-		log.Fatalf("No such image: %s", needle)
-	}
-	log.Errorf("Too many candidates for %s (%d)", needle, len(images))
-	for _, identifier := range images {
-		// FIXME: also print the name
-		log.Infof("- %s", identifier)
-	}
-	os.Exit(1)
-	return ""
-}
-
-// GetBootscript returns exactly one bootscript matching or dies
-func (c *Command) GetBootscript(needle string) string {
-	bootscripts, err := c.API.ResolveBootscript(needle)
-	if err != nil {
-		log.Fatalf("Unable to resolve bootscript %s: %s", needle, err)
-	}
-	if len(bootscripts) == 1 {
-		return bootscripts[0]
-	}
-	if len(bootscripts) == 0 {
-		log.Fatalf("No such bootscript: %s", needle)
-	}
-	log.Errorf("Too many candidates for %s (%d)", needle, len(bootscripts))
-	for _, identifier := range bootscripts {
-		// FIXME: also print the name
-		log.Infof("- %s", identifier)
-	}
-	os.Exit(1)
-	return ""
-}
-
 var commands = []*Command{
 	cmdAttach,
 	cmdCommit,

commit.go

@@ -34,7 +34,7 @@ func runCommit(cmd *Command, args []string) {
 		cmd.PrintShortUsage()
 	}
 
-	serverID := cmd.GetServer(args[0])
+	serverID := cmd.API.GetServerID(args[0])
 	server, err := cmd.API.GetServer(serverID)
 	if err != nil {
 		log.Fatalf("Cannot fetch server: %v", err)

cp.go

@@ -40,7 +40,7 @@ func runCp(cmd *Command, args []string) {
 		log.Fatalf("usage: scw %s", cmd.UsageLine)
 	}
 
-	serverID := cmd.GetServer(serverParts[0])
+	serverID := cmd.API.GetServerID(serverParts[0])
 
 	server, err := cmd.API.GetServer(serverID)
 	if err != nil {

create.go

@@ -38,8 +38,7 @@ var createEnv string        // -e, --env flag
 var createVolume string     // -v, --volume flag
 var createHelp bool         // -h, --help flag
 
-// CreateVolumeFromHumanSize create a new volume using the API from a human-readable size
-func CreateVolumeFromHumanSize(cmd *Command, size string) (*string, error) {
+func CreateVolumeFromHumanSize(api *ScalewayAPI, size string) (*string, error) {
 	bytes, err := humanize.ParseBytes(size)
 	if err != nil {
 		return nil, err
@@ -50,15 +49,15 @@ func CreateVolumeFromHumanSize(cmd *Command, size string) (*string, error) {
 	newVolume.Size = bytes
 	newVolume.Type = "l_ssd"
 
-	volumeID, err := cmd.API.PostVolume(newVolume)
+	volumeID, err := api.PostVolume(newVolume)
 	if err != nil {
 		return nil, err
 	}
 
 	return &volumeID, nil
 }
 
-func createServer(cmd *Command, imageName string, name string, bootscript string, env string, additionalVolumes string) (string, error) {
+func createServer(api *ScalewayAPI, imageName string, name string, bootscript string, env string, additionalVolumes string) (string, error) {
 	if name == "" {
 		name = strings.Replace(namesgenerator.GetRandomName(0), "_", "-", -1)
 	}
@@ -73,7 +72,7 @@ func createServer(cmd *Command, imageName string, name string, bootscript string
 	if additionalVolumes != "" {
 		volumes := strings.Split(additionalVolumes, " ")
 		for i := range volumes {
-			volumeID, err := CreateVolumeFromHumanSize(cmd, volumes[i])
+			volumeID, err := CreateVolumeFromHumanSize(api, volumes[i])
 			if err != nil {
 				return "", err
 			}
@@ -84,26 +83,26 @@ func createServer(cmd *Command, imageName string, name string, bootscript string
 	}
 	server.Name = name
 	if bootscript != "" {
-		bootscript := cmd.GetBootscript(bootscript)
+		bootscript := api.GetBootscriptID(bootscript)
 		server.Bootscript = &bootscript
 	}
 
 	_, err := humanize.ParseBytes(imageName)
 	if err == nil {
 		// Create a new root volume
-		volumeID, err := CreateVolumeFromHumanSize(cmd, imageName)
+		volumeID, err := CreateVolumeFromHumanSize(api, imageName)
 		if err != nil {
 			return "", err
 		}
 		server.Volumes["0"] = *volumeID
 	} else {
 		// Use an existing image
 		// FIXME: handle snapshots
-		image := cmd.GetImage(imageName)
+		image := api.GetImageID(imageName)
 		server.Image = &image
 	}
 
-	serverID, err := cmd.API.PostServer(server)
+	serverID, err := api.PostServer(server)
 	if err != nil {
 		return "", nil
 	}
@@ -120,7 +119,7 @@ func runCreate(cmd *Command, args []string) {
 		cmd.PrintShortUsage()
 	}
 
-	serverID, err := createServer(cmd, args[0], createName, createBootscript, createEnv, createVolume)
+	serverID, err := createServer(cmd.API, args[0], createName, createBootscript, createEnv, createVolume)
 
 	if err != nil {
 		log.Fatalf("Failed to create server: %v", err)

exec.go

@@ -157,7 +157,7 @@ func runExec(cmd *Command, args []string) {
 		cmd.PrintShortUsage()
 	}
 
-	serverID := cmd.GetServer(args[0])
+	serverID := cmd.API.GetServerID(args[0])
 
 	var server *ScalewayServer
 	var err error

history.go

@@ -36,7 +36,7 @@ func runHistory(cmd *Command, args []string) {
 		cmd.PrintShortUsage()
 	}
 
-	imageID := cmd.GetImage(args[0])
+	imageID := cmd.API.GetImageID(args[0])
 	image, err := cmd.API.GetImage(imageID)
 	if err != nil {
 		log.Fatalf("Cannot get image %s: %v", imageID, err)