Correct passing client args correctly

client/cmd/connect.go

@@ -24,11 +24,10 @@ var (
 		Short:        "Connect to a remote resource",
 		SilenceUsage: false,
 		PreRun: func(cmd *cobra.Command, args []string) {
-			if len(args) != 1 {
+			if len(args) < 1 {
 				cmd.Usage()
 				os.Exit(1)
 			}
-
 		},
 		Run: func(cmd *cobra.Command, args []string) {
 			runConnect(args)
@@ -67,7 +66,7 @@ func runConnect(args []string) {
 	c := &connect{
 		proxyPort:      connectFlags.proxyPort,
 		connStore:      memory.New(),
-		clientArgs:     args,
+		clientArgs:     args[1:],
 		connectionName: args[0],
 		loader:         loader,
 	}
@@ -81,9 +80,18 @@ func runConnect(args []string) {
 		c.printErrorAndExit(err.Error())
 	}
 	loader.Suffix = " validating connection..."
+	spec := map[string][]byte{}
+	if len(c.clientArgs) > 0 {
+		encArgs, err := pb.GobEncode(c.clientArgs)
+		if err != nil {
+			log.Fatalf("failed encoding args, err=%v", err)
+		}
+		spec[string(pb.SpecClientExecArgsKey)] = encArgs
+	}
 	c.client = client
 	if err := client.Send(&pb.Packet{
 		Type: pb.PacketGatewayConnectType.String(),
+		Spec: spec,
 	}); err != nil {
 		_, _ = client.Close()
 		c.printErrorAndExit("failed connecting to gateway, err=%v", err)
@@ -169,17 +177,9 @@ func (c *connect) processAgentConnectPhase(pkt *pb.Packet) {
 			c.loader.Stop()
 			c.client.StartKeepAlive()
 			term := proxyexec.New(c.client)
-			spec := map[string][]byte{}
-			if len(c.clientArgs) > 0 {
-				encArgs, err := pb.GobEncode(c.clientArgs)
-				if err != nil {
-					log.Fatalf("failed encoding args, err=%v", err)
-				}
-				spec[string(pb.SpecClientExecArgsKey)] = encArgs
-			}
 			c.printHeader(string(sessionID))
 			c.connStore.Set(string(sessionID), term)
-			if err := term.ConnecWithTTY(spec); err != nil {
+			if err := term.ConnecWithTTY(); err != nil {
 				c.processGracefulExit(err)
 			}
 		default:

client/proxyexec/proxyexec.go

@@ -26,7 +26,7 @@ func New(client pb.ClientTransport) *Terminal {
 }
 
 // Connect control the current terminal connecting with the remote one
-func (t *Terminal) ConnecWithTTY(spec map[string][]byte) error {
+func (t *Terminal) ConnecWithTTY() error {
 	info, err := os.Stdin.Stat()
 	if err != nil {
 		return fmt.Errorf("failed obtaining stdin file description, err=%v", err)
@@ -61,7 +61,7 @@ func (t *Terminal) ConnecWithTTY(spec map[string][]byte) error {
 	sig <- pbexec.SIGWINCH
 
 	go func() {
-		sw := pb.NewStreamWriter(t.client, pb.PacketExecWriteAgentStdinType, spec)
+		sw := pb.NewStreamWriter(t.client, pb.PacketExecWriteAgentStdinType, nil)
 		_, _ = sw.Write(pbexec.TermEnterKeyStrokeType)
 		// TODO: check errors
 		_, _ = io.Copy(sw, os.Stdin)

rootfs/app/entrypoint.sh

@@ -1,5 +1,9 @@
 #!/bin/bash
 
+if [[ "$DEBUG_ENTRYPOINT" == "true" ]]; then
+    set -x
+fi
+
 export GIN_MODE=release
 if [[ "$PROFILE" == "dev" ]]; then
     /app/start-dev.sh
@@ -11,4 +15,4 @@ if [[ "$API_URL" != "" ]]; then
     sed "s|http://localhost:8009|$API_URL|g" -i app/ui/public/js/app.js
 fi
 
-"${@}"
+tini -- "${@}"

scripts/run-client-dev.sh

@@ -2,4 +2,5 @@
 
 #go clean --cache
 go build -o /tmp/hoop-client github.com/runopsio/hoop/client
+
 /tmp/hoop-client "$@"