Refactored pkg/cli and cmd/scw to allow cli testing

Author: moul

.travis.yml

@@ -37,4 +37,3 @@ script:
   - make travis_run
   - make cover
   - goveralls -service=travis-ci -v -coverprofile=profile.out
-  - make integration-cli

Makefile

@@ -152,14 +152,3 @@ party:
 convey:
 	go get github.com/smartystreets/goconvey
 	goconvey -cover -port=9042 -workDir="$(realpath .)/pkg" -depth=-1
-
-
-.PHONY: integration-cli
-integration-cli:
-	go test -v ./integration-cli
-
-
-.PHONY: integration-cli
-convey-integration-cli:
-	go get github.com/smartystreets/goconvey
-	goconvey -cover -port=9043 -workDir="$(realpath .)/integration-cli" -depth=-1

cmd/scw/main.go

@@ -6,196 +6,16 @@
 package main
 
 import (
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
 	"os"
 
-	log "github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
-	flag "github.com/scaleway/scaleway-cli/vendor/github.com/docker/docker/pkg/mflag"
-
-	"github.com/scaleway/scaleway-cli/pkg/api"
-	cmds "github.com/scaleway/scaleway-cli/pkg/cli"
-	"github.com/scaleway/scaleway-cli/pkg/scwversion"
-	"github.com/scaleway/scaleway-cli/pkg/utils"
-)
-
-// CommandListOpts holds a list of parameters
-type CommandListOpts struct {
-	Values *[]string
-}
-
-// NewListOpts create an empty CommandListOpts
-func NewListOpts() CommandListOpts {
-	var values []string
-	return CommandListOpts{
-		Values: &values,
-	}
-}
-
-// String returns a string representation of a CommandListOpts object
-func (opts *CommandListOpts) String() string {
-	return fmt.Sprintf("%v", []string((*opts.Values)))
-}
-
-// Set appends a new value to a CommandListOpts
-func (opts *CommandListOpts) Set(value string) error {
-	(*opts.Values) = append((*opts.Values), value)
-	return nil
-}
-
-func commandUsage(name string) {
-}
-
-var (
-	flAPIEndPoint *string
-	flDebug       = flag.Bool([]string{"D", "-debug"}, false, "Enable debug mode")
-	flVerbose     = flag.Bool([]string{"V", "-verbose"}, false, "Enable verbose mode")
-	flVersion     = flag.Bool([]string{"v", "-version"}, false, "Print version information and quit")
-	flQuiet       = flag.Bool([]string{"q", "-quiet"}, false, "Enable quiet mode")
-	flSensitive   = flag.Bool([]string{"-sensitive"}, false, "Show sensitive data in outputs, i.e. API Token/Organization")
+	"github.com/scaleway/scaleway-cli/pkg/cli"
+	"github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
 )
 
 func main() {
-	config, cfgErr := getConfig()
-	if cfgErr != nil && !os.IsNotExist(cfgErr) {
-		log.Fatalf("Unable to open .scwrc config file: %v", cfgErr)
-	}
-
-	if config != nil {
-		defaultComputeAPI := os.Getenv("scaleway_api_endpoint")
-		if defaultComputeAPI == "" {
-			defaultComputeAPI = config.ComputeAPI
-		}
-		flAPIEndPoint = flag.String([]string{"-api-endpoint"}, defaultComputeAPI, "Set the API endpoint")
-	}
-	flag.Parse()
-
-	if *flVersion {
-		showVersion()
-		return
-	}
-
-	if flAPIEndPoint != nil {
-		os.Setenv("scaleway_api_endpoint", *flAPIEndPoint)
-	}
-
-	if *flSensitive {
-		os.Setenv("SCW_SENSITIVE", "1")
-	}
-
-	if *flDebug {
-		os.Setenv("DEBUG", "1")
-	}
-
-	utils.Quiet(*flQuiet)
-	initLogging(os.Getenv("DEBUG") != "", *flVerbose)
-
-	args := flag.Args()
-	if len(args) < 1 {
-		usage()
-	}
-	name := args[0]
-
-	args = args[1:]
-
-	for _, cmd := range cmds.Commands {
-		if cmd.Name() == name {
-			cmd.Flag.SetOutput(ioutil.Discard)
-			err := cmd.Flag.Parse(args)
-			if err != nil {
-				log.Fatalf("usage: scw %s", cmd.UsageLine)
-			}
-			if cmd.Name() != "login" && cmd.Name() != "help" && cmd.Name() != "version" {
-				if cfgErr != nil {
-					if name != "login" && config == nil {
-						log.Debugf("cfgErr: %v", cfgErr)
-						fmt.Fprintf(os.Stderr, "You need to login first: 'scw login'\n")
-						os.Exit(1)
-					}
-				}
-				api, err := getScalewayAPI()
-				if err != nil {
-					log.Fatalf("unable to initialize scw api: %s", err)
-				}
-				cmd.API = api
-			}
-			err = cmd.Exec(cmd, cmd.Flag.Args())
-			if err != nil {
-				log.Fatalf("Cannot execute '%s': %v", cmd.Name(), err)
-			}
-			if cmd.API != nil {
-				cmd.API.Sync()
-			}
-			os.Exit(0)
-		}
-	}
-
-	log.Fatalf("scw: unknown subcommand %s\nRun 'scw help' for usage.", name)
-}
-
-func usage() {
-	cmds.CmdHelp.Exec(cmds.CmdHelp, []string{})
-	os.Exit(1)
-}
-
-// getConfig returns the Scaleway CLI config file for the current user
-func getConfig() (*api.Config, error) {
-	scwrcPath, err := utils.GetConfigFilePath()
-	if err != nil {
-		return nil, err
-	}
-
-	stat, err := os.Stat(scwrcPath)
-	// we don't care if it fails, the user just won't see the warning
-	if err == nil {
-		mode := stat.Mode()
-		if mode&0066 != 0 {
-			log.Fatalf("Permissions %#o for .scwrc are too open.", mode)
-		}
-	}
-
-	file, err := ioutil.ReadFile(scwrcPath)
+	ec, err := cli.Start(os.Args[1:], nil)
 	if err != nil {
-		return nil, err
-	}
-	var config api.Config
-	err = json.Unmarshal(file, &config)
-	if err != nil {
-		return nil, err
-	}
-	// check if he has an old scwrc version
-	if config.AccountAPI == "" {
-		config.AccountAPI = "https://account.scaleway.com"
-		config.Save()
-	}
-	if os.Getenv("scaleway_api_endpoint") == "" {
-		os.Setenv("scaleway_api_endpoint", config.ComputeAPI)
-	}
-	return &config, nil
-}
-
-// getScalewayAPI returns a ScalewayAPI using the user config file
-func getScalewayAPI() (*api.ScalewayAPI, error) {
-	// We already get config globally, but whis way we can get explicit error when trying to create a ScalewayAPI object
-	config, err := getConfig()
-	if err != nil {
-		return nil, err
-	}
-	return api.NewScalewayAPI(os.Getenv("scaleway_api_endpoint"), config.AccountAPI, config.Organization, config.Token)
-}
-
-func showVersion() {
-	fmt.Printf("scw version %s, build %s\n", scwversion.VERSION, scwversion.GITCOMMIT)
-}
-
-func initLogging(debug bool, verbose bool) {
-	log.SetOutput(os.Stderr)
-	if debug {
-		log.SetLevel(log.DebugLevel)
-	} else if verbose {
-		log.SetLevel(log.InfoLevel)
-	} else {
-		log.SetLevel(log.WarnLevel)
+		logrus.Fatalf("%s", err)
 	}
+	os.Exit(ec)
 }