Move Logout functionality to cmd package to match new Login structure

2 files changed, 11 insertions, 20 deletions

diff --git a/client/go/auth/auth0/auth0.go b/client/go/auth/auth0/auth0.go
index 593489600d1..9b24066fa04 100644
--- a/client/go/auth/auth0/auth0.go
+++ b/client/go/auth/auth0/auth0.go
@@ -252,7 +252,7 @@ func (a *Auth0) AddSystem(s *System) error {
 	return nil
 }
 
-func (a *Auth0) removeSystem(s string) error {
+func (a *Auth0) RemoveSystem(s string) error {
 	_ = a.init()
 
 	// If we're dealing with an empty file, we'll need to initialize this map.
@@ -345,20 +345,3 @@ func (a *Auth0) initContext() (err error) {
 	a.config = *cfg
 	return nil
 }
-
-func RunLogout(a *Auth0) error {
-	s, err := a.getSystem()
-	if err != nil {
-		return err
-	}
-
-	if err := a.removeSystem(s.Name); err != nil {
-		return err
-	}
-
-	fmt.Print("\n")
-	fmt.Println("Successfully logged out.")
-	fmt.Print("\n")
-
-	return nil
-}
diff --git a/client/go/cmd/logout.go b/client/go/cmd/logout.go
index 6cef5ee371c..c0a6b60ab2e 100644
--- a/client/go/cmd/logout.go
+++ b/client/go/cmd/logout.go
@@ -1,6 +1,8 @@
 package cmd
 
 import (
+	"log"
+
 	"github.com/spf13/cobra"
 	"github.com/vespa-engine/vespa/client/go/auth/auth0"
 )
@@ -26,8 +28,14 @@ func newLogoutCmd(cli *CLI) *cobra.Command {
 			if err != nil {
 				return err
 			}
-			err = auth0.RunLogout(a)
-			return err
+			if err := a.RemoveSystem(system.Name); err != nil {
+				return err
+			}
+
+			log.Print("\n")
+			log.Println("Successfully logged out.")
+			log.Print("\n")
+			return nil
 		},
 	}
 }