Merge pull request #420 from QuentinPerez/logger

login: reenable logging

Author: Quentin Perez

pkg/cli/main.go

@@ -15,10 +15,10 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	flag "github.com/docker/docker/pkg/mflag"
-	"github.com/moul/http2curl"
 
 	version "github.com/hashicorp/go-version"
 	"github.com/scaleway/scaleway-cli/pkg/api"
+	"github.com/scaleway/scaleway-cli/pkg/clilogger"
 	"github.com/scaleway/scaleway-cli/pkg/commands"
 	"github.com/scaleway/scaleway-cli/pkg/config"
 	"github.com/scaleway/scaleway-cli/pkg/scwversion"
@@ -146,34 +146,7 @@ func getScalewayAPI(region string) (*api.ScalewayAPI, error) {
 	if err != nil {
 		return nil, err
 	}
-	return api.NewScalewayAPI(config.Organization, config.Token, scwversion.UserAgent(), region, func(s *api.ScalewayAPI) {
-		s.Logger = newCliLogger(s)
-	})
-}
-
-type cliLogger struct {
-	*logrus.Logger
-	s *api.ScalewayAPI
-}
-
-func (l *cliLogger) LogHTTP(req *http.Request) {
-	curl, err := http2curl.GetCurlCommand(req)
-	if err != nil {
-		l.Fatalf("Failed to convert to curl request: %q", err)
-	}
-
-	if os.Getenv("SCW_SENSITIVE") != "1" {
-		l.Debug(l.s.HideAPICredentials(curl.String()))
-	} else {
-		l.Debug(curl.String())
-	}
-}
-
-func newCliLogger(s *api.ScalewayAPI) api.Logger {
-	return &cliLogger{
-		Logger: logrus.StandardLogger(),
-		s:      s,
-	}
+	return api.NewScalewayAPI(config.Organization, config.Token, scwversion.UserAgent(), region, clilogger.SetupLogger)
 }
 
 func initLogging(debug bool, verbose bool, streams *commands.Streams) {

pkg/clilogger/clilogger.go

@@ -0,0 +1,39 @@
+package clilogger
+
+import (
+	"net/http"
+	"os"
+
+	"github.com/Sirupsen/logrus"
+	"github.com/moul/http2curl"
+	"github.com/scaleway/scaleway-cli/pkg/api"
+)
+
+type cliLogger struct {
+	*logrus.Logger
+	s *api.ScalewayAPI
+}
+
+func (l *cliLogger) LogHTTP(req *http.Request) {
+	curl, err := http2curl.GetCurlCommand(req)
+	if err != nil {
+		l.Fatalf("Failed to convert to curl request: %q", err)
+	}
+
+	if os.Getenv("SCW_SENSITIVE") != "1" {
+		l.Debug(l.s.HideAPICredentials(curl.String()))
+	} else {
+		l.Debug(curl.String())
+	}
+}
+
+func NewCliLogger(s *api.ScalewayAPI) api.Logger {
+	return &cliLogger{
+		Logger: logrus.StandardLogger(),
+		s:      s,
+	}
+}
+
+func SetupLogger(s *api.ScalewayAPI) {
+	s.Logger = NewCliLogger(s)
+}

pkg/commands/login.go

@@ -18,6 +18,7 @@ import (
 	"golang.org/x/crypto/ssh/terminal"
 
 	"github.com/scaleway/scaleway-cli/pkg/api"
+	"github.com/scaleway/scaleway-cli/pkg/clilogger"
 	"github.com/scaleway/scaleway-cli/pkg/config"
 	"github.com/scaleway/scaleway-cli/pkg/scwversion"
 )
@@ -83,12 +84,8 @@ func selectKey(args *LoginArgs) error {
 	return nil
 }
 
-func disableLogger(s *api.ScalewayAPI) {
-	s.Logger = api.NewDisableLogger()
-}
-
 func getToken(connect api.ScalewayConnect) (string, error) {
-	FakeConnection, err := api.NewScalewayAPI("", "", scwversion.UserAgent(), "", disableLogger)
+	FakeConnection, err := api.NewScalewayAPI("", "", scwversion.UserAgent(), "", clilogger.SetupLogger)
 	if err != nil {
 		return "", fmt.Errorf("Unable to create a fake ScalewayAPI: %s", err)
 	}
@@ -117,7 +114,7 @@ func getToken(connect api.ScalewayConnect) (string, error) {
 }
 
 func getOrganization(token string, email string) (string, error) {
-	FakeConnection, err := api.NewScalewayAPI("", token, scwversion.UserAgent(), "", disableLogger)
+	FakeConnection, err := api.NewScalewayAPI("", token, scwversion.UserAgent(), "", clilogger.SetupLogger)
 	if err != nil {
 		return "", fmt.Errorf("Unable to create a fake ScalewayAPI: %s", err)
 	}
@@ -209,7 +206,7 @@ func uploadSSHKeys(apiConnection *api.ScalewayAPI, newKey string) {
 // RunLogin is the handler for 'scw login'
 func RunLogin(ctx CommandContext, args LoginArgs) error {
 	if config, cfgErr := config.GetConfig(); cfgErr == nil {
-		if TestConnection, err := api.NewScalewayAPI(config.Organization, config.Token, scwversion.UserAgent(), "", disableLogger); err == nil {
+		if TestConnection, err := api.NewScalewayAPI(config.Organization, config.Token, scwversion.UserAgent(), "", clilogger.SetupLogger); err == nil {
 			if user, err := TestConnection.GetUser(); err == nil {
 				fmt.Println("You are already logged as", user.Fullname)
 			}
@@ -230,7 +227,7 @@ func RunLogin(ctx CommandContext, args LoginArgs) error {
 		Token:        strings.Trim(args.Token, "\n"),
 	}
 
-	apiConnection, err := api.NewScalewayAPI(cfg.Organization, cfg.Token, scwversion.UserAgent(), "", disableLogger)
+	apiConnection, err := api.NewScalewayAPI(cfg.Organization, cfg.Token, scwversion.UserAgent(), "", clilogger.SetupLogger)
 	if err != nil {
 		return fmt.Errorf("Unable to create ScalewayAPI: %s", err)
 	}