Implement webspace exec and webspace login

Author: devplayer0

cmd/netsoc/main.go

@@ -1,9 +1,16 @@
 package main
 
 import (
+	"os"
+
 	"github.com/netsoc/cli/pkg/cmd"
+	"github.com/netsoc/cli/pkg/util"
 )
 
 func main() {
-	cmd.NewCmdRoot().Execute()
+	if err := cmd.NewCmdRoot().Execute(); err != nil {
+		os.Exit(1)
+	}
+
+	os.Exit(util.ExitCode)
 }

go.mod

@@ -16,7 +16,7 @@ require (
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/mitchellh/mapstructure v1.3.3
 	github.com/netsoc/iam/client v1.0.9
-	github.com/netsoc/webspaced/client v1.1.0
+	github.com/netsoc/webspaced/client v1.1.2
 	github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
 	github.com/spf13/cobra v1.0.0
 	github.com/spf13/pflag v1.0.5

go.sum

@@ -173,8 +173,8 @@ github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3Rllmb
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/netsoc/iam/client v1.0.9 h1:hrOXe0cVYzsvIlkFNUsq98mE7lyZnS7wBnriiUAGAzc=
 github.com/netsoc/iam/client v1.0.9/go.mod h1:CA6PtAeTRVAx6AXb+DAjav7d754hNWcwEVFij9Nzsxg=
-github.com/netsoc/webspaced/client v1.1.0 h1:WmUS4C3ZirHeOvDbLoNIZsAziiR4NnAzCwDZXXWuxXU=
-github.com/netsoc/webspaced/client v1.1.0/go.mod h1:GFCOmONSPqvqD2LoglRBFrqr0GdUbN/7huvbsyXMRkU=
+github.com/netsoc/webspaced/client v1.1.2 h1:j+Sux/iqecUV+Ee/325o28dazWL0a114J3KY3loXkXY=
+github.com/netsoc/webspaced/client v1.1.2/go.mod h1:GFCOmONSPqvqD2LoglRBFrqr0GdUbN/7huvbsyXMRkU=
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc=

pkg/cmd/webspace/console.go

@@ -8,25 +8,23 @@ import (
 	"os"
 
 	"github.com/containerd/console"
+	"github.com/gorilla/websocket"
 	"github.com/spf13/cobra"
 
 	"github.com/netsoc/cli/pkg/config"
 	"github.com/netsoc/cli/pkg/util"
-	webspaced "github.com/netsoc/webspaced/client"
 )
 
 type consoleOptions struct {
-	Config          func() (*config.Config, error)
-	WebspacedClient func() (*webspaced.APIClient, error)
+	Config func() (*config.Config, error)
 
 	User string
 }
 
 // NewCmdConsole creates a new webspace console command
 func NewCmdConsole(f *util.CmdFactory) *cobra.Command {
 	opts := consoleOptions{
-		Config:          f.Config,
-		WebspacedClient: f.WebspacedClient,
+		Config: f.Config,
 	}
 	cmd := &cobra.Command{
 		Use:   "console",
@@ -118,6 +116,12 @@ func consoleRun(opts consoleOptions) error {
 		fmt.Print("\r\n")
 		return nil
 	case err := <-errChan:
+		var ce *websocket.CloseError
+		if errors.As(err, &ce) && ce.Code == websocket.CloseNormalClosure {
+			fmt.Print("\r\n")
+			return nil
+		}
+
 		return err
 	}
 }