Refactored 'login' command (scaleway#80)

Author: moul

pkg/commands/login.go

@@ -20,7 +20,7 @@ import (
 )
 
 var cmdLogin = &types.Command{
-	Exec:        runLogin,
+	Exec:        cmdExecLogin,
 	UsageLine:   "login [OPTIONS]",
 	Description: "Log in to Scaleway API",
 	Help: `Generates a configuration file in '/home/$USER/.scwrc'
@@ -32,6 +32,7 @@ You can get your credentials on https://cloud.scaleway.com/#/credentials
 }
 
 func promptUser(prompt string, output *string, echo bool) {
+	// FIXME: should use stdin/stdout from command context
 	fmt.Fprintf(os.Stdout, prompt)
 	os.Stdout.Sync()
 
@@ -59,50 +60,69 @@ var organization string // -o flag
 var token string        // -t flag
 var loginHelp bool      // -h, --help flag
 
-func runLogin(cmd *types.Command, args []string) {
+type LoginArgs struct {
+	Organization string
+	Token        string
+}
+
+func cmdExecLogin(cmd *types.Command, rawArgs []string) {
 	if loginHelp {
 		cmd.PrintUsage()
 	}
-	if len(args) != 0 {
+	if len(rawArgs) != 0 {
 		cmd.PrintShortUsage()
 	}
 
+	args := LoginArgs{
+		Organization: organization,
+		Token:        token,
+	}
+	ctx := cmd.GetContext(rawArgs)
+	err := RunLogin(ctx, args)
+	if err != nil {
+		log.Fatalf("Cannot execute 'login': %v", err)
+	}
+}
+
+// RunLogin is the handler for 'scw login'
+func RunLogin(ctx types.CommandContext, args LoginArgs) error {
 	if len(organization) == 0 {
 		fmt.Println("You can get your credentials on https://cloud.scaleway.com/#/credentials")
-		promptUser("Organization (access key): ", &organization, true)
+		promptUser("Organization (access key): ", &args.Organization, true)
 	}
-	if len(token) == 0 {
-		promptUser("Token: ", &token, false)
+	if args.Token == "" {
+		promptUser("Token: ", &args.Token, false)
 	}
 
 	cfg := &api.Config{
 		APIEndPoint:  "https://account.scaleway.com/",
-		Organization: strings.Trim(organization, "\n"),
-		Token:        strings.Trim(token, "\n"),
+		Organization: strings.Trim(args.Organization, "\n"),
+		Token:        strings.Trim(args.Token, "\n"),
 	}
 
 	api, err := api.NewScalewayAPI(cfg.APIEndPoint, cfg.Organization, cfg.Token)
 	if err != nil {
-		log.Fatalf("Unable to create ScalewayAPI: %s", err)
+		return fmt.Errorf("Unable to create ScalewayAPI: %s", err)
 	}
 	err = api.CheckCredentials()
 	if err != nil {
-		log.Fatalf("Unable to contact ScalewayAPI: %s", err)
+		return fmt.Errorf("Unable to contact ScalewayAPI: %s", err)
 	}
 
 	scwrcPath, err := utils.GetConfigFilePath()
 	if err != nil {
-		log.Fatalf("Unable to get scwrc config file path: %s", err)
+		return fmt.Errorf("Unable to get scwrc config file path: %s", err)
 	}
 	scwrc, err := os.OpenFile(scwrcPath, os.O_CREATE|os.O_TRUNC|os.O_RDWR, 0600)
 	if err != nil {
-		log.Fatalf("Unable to create scwrc config file: %s", err)
+		return fmt.Errorf("Unable to create scwrc config file: %s", err)
 	}
 	defer scwrc.Close()
 	encoder := json.NewEncoder(scwrc)
 	cfg.APIEndPoint = "https://api.scaleway.com/"
 	err = encoder.Encode(cfg)
 	if err != nil {
-		log.Fatalf("Unable to encode scw config file: %s", err)
+		return fmt.Errorf("Unable to encode scw config file: %s", err)
 	}
+	return nil
 }