[gp-cli] refactor cmd tasks and ports supervisor related func

Author: mustard-mh

components/gitpod-cli/pkg/supervisor/ports.go renamed to components/gitpod-cli/pkg/supervisor-helper/ports.go

@@ -2,15 +2,21 @@
 // Licensed under the GNU Affero General Public License (AGPL).
 // See License-AGPL.txt in the project root for license information.
 
-package supervisor
+package supervisor_helper
 
 import (
 	"context"
-	"github.com/gitpod-io/gitpod/supervisor/api"
+
+	supervisor "github.com/gitpod-io/gitpod/supervisor/api"
 )
 
-func GetPortsList(ctx context.Context, client api.StatusServiceClient) ([]*api.PortsStatus, error) {
-	portsStatusClient, portsStatusClientError := client.PortsStatus(ctx, &api.PortsStatusRequest{Observe: false})
+func GetPortsList(ctx context.Context) ([]*supervisor.PortsStatus, error) {
+	conn, err := Dial(ctx)
+	if err != nil {
+		return nil, err
+	}
+	client := supervisor.NewStatusServiceClient(conn)
+	portsStatusClient, portsStatusClientError := client.PortsStatus(ctx, &supervisor.PortsStatusRequest{Observe: false})
 
 	if portsStatusClientError != nil {
 		return nil, portsStatusClientError

components/gitpod-cli/pkg/supervisor-helper/status-tasks.go

@@ -0,0 +1,43 @@
+// Copyright (c) 2022 Gitpod GmbH. All rights reserved.
+// Licensed under the GNU Affero General Public License (AGPL).
+// See License-AGPL.txt in the project root for license information.
+
+package supervisor_helper
+
+import (
+	"context"
+
+	supervisor "github.com/gitpod-io/gitpod/supervisor/api"
+	"golang.org/x/xerrors"
+)
+
+func GetTasksList(ctx context.Context) ([]*supervisor.TaskStatus, error) {
+	conn, err := Dial(ctx)
+	if err != nil {
+		return nil, err
+	}
+	client := supervisor.NewStatusServiceClient(conn)
+	respClient, err := client.TasksStatus(ctx, &supervisor.TasksStatusRequest{Observe: false})
+	if err != nil {
+		return nil, xerrors.Errorf("failed get tasks status client: %w", err)
+	}
+	resp, err := respClient.Recv()
+	if err != nil {
+		return nil, xerrors.Errorf("failed receive data: %w", err)
+	}
+	return resp.GetTasks(), nil
+}
+
+func GetTasksListByState(ctx context.Context, filterState supervisor.TaskState) ([]*supervisor.TaskStatus, error) {
+	tasks, err := GetTasksList(ctx)
+	if err != nil {
+		return nil, err
+	}
+	var filteredTasks []*supervisor.TaskStatus
+	for _, task := range tasks {
+		if task.State == filterState {
+			filteredTasks = append(filteredTasks, task)
+		}
+	}
+	return filteredTasks, nil
+}

components/gitpod-cli/pkg/supervisor/supervisor.go renamed to components/gitpod-cli/pkg/supervisor-helper/supervisor.go

@@ -2,24 +2,26 @@
 // Licensed under the GNU Affero General Public License (AGPL).
 // See License-AGPL.txt in the project root for license information.
 
-package supervisor
+package supervisor_helper
 
 import (
+	"context"
 	"os"
 
-	log "github.com/sirupsen/logrus"
+	"golang.org/x/xerrors"
 	"google.golang.org/grpc"
 )
 
-func Dial() *grpc.ClientConn {
+var conn *grpc.ClientConn
+
+func Dial(ctx context.Context) (*grpc.ClientConn, error) {
 	supervisorAddr := os.Getenv("SUPERVISOR_ADDR")
 	if supervisorAddr == "" {
 		supervisorAddr = "localhost:22999"
 	}
-	supervisorConn, err := grpc.Dial(supervisorAddr, grpc.WithInsecure())
+	supervisorConn, err := grpc.DialContext(ctx, supervisorAddr, grpc.WithInsecure())
 	if err != nil {
-		log.WithError(err).Fatal("cannot connect to supervisor")
+		err = xerrors.Errorf("failed connecting to supervisor: %w", err)
 	}
-
-	return supervisorConn
+	return supervisorConn, err
 }

components/gitpod-cli/pkg/supervisor/terminal-attach.go renamed to components/gitpod-cli/pkg/supervisor-helper/terminal-attach.go

@@ -2,7 +2,7 @@
 // Licensed under the GNU Affero General Public License (AGPL).
 // See License-AGPL.txt in the project root for license information.
 
-package supervisor
+package supervisor_helper
 
 import (
 	"context"
@@ -12,7 +12,7 @@ import (
 	"syscall"
 
 	"github.com/creack/pty"
-	"github.com/gitpod-io/gitpod/supervisor/api"
+	supervisor "github.com/gitpod-io/gitpod/supervisor/api"
 	log "github.com/sirupsen/logrus"
 	"golang.org/x/term"
 )
@@ -23,9 +23,9 @@ type AttachToTerminalOpts struct {
 	Token       string
 }
 
-func AttachToTerminal(ctx context.Context, client api.TerminalServiceClient, alias string, opts AttachToTerminalOpts) {
+func AttachToTerminal(ctx context.Context, client supervisor.TerminalServiceClient, alias string, opts AttachToTerminalOpts) {
 	// Copy to stdout/stderr
-	listen, err := client.Listen(ctx, &api.ListenTerminalRequest{
+	listen, err := client.Listen(ctx, &supervisor.ListenTerminalRequest{
 		Alias: alias,
 	})
 	if err != nil {
@@ -50,7 +50,7 @@ func AttachToTerminal(ctx context.Context, client api.TerminalServiceClient, ali
 	// Set stdin in raw mode.
 	oldState, err := term.MakeRaw(int(os.Stdin.Fd()))
 	if err != nil {
-		panic(err)
+		log.WithError(err).Fatal("cannot attach to terminal")
 	}
 	defer func() { _ = term.Restore(int(os.Stdin.Fd()), oldState) }() // Best effort.
 
@@ -66,9 +66,9 @@ func AttachToTerminal(ctx context.Context, client api.TerminalServiceClient, ali
 					continue
 				}
 
-				req := &api.SetTerminalSizeRequest{
+				req := &supervisor.SetTerminalSizeRequest{
 					Alias: alias,
-					Size: &api.TerminalSize{
+					Size: &supervisor.TerminalSize{
 						Cols:     uint32(size.Cols),
 						Rows:     uint32(size.Rows),
 						WidthPx:  uint32(size.X),
@@ -78,10 +78,10 @@ func AttachToTerminal(ctx context.Context, client api.TerminalServiceClient, ali
 
 				var expectResize bool
 				if opts.ForceResize {
-					req.Priority = &api.SetTerminalSizeRequest_Force{Force: true}
+					req.Priority = &supervisor.SetTerminalSizeRequest_Force{Force: true}
 					expectResize = true
 				} else if opts.Token != "" {
-					req.Priority = &api.SetTerminalSizeRequest_Token{Token: opts.Token}
+					req.Priority = &supervisor.SetTerminalSizeRequest_Token{Token: opts.Token}
 					expectResize = true
 				}
 
@@ -100,7 +100,7 @@ func AttachToTerminal(ctx context.Context, client api.TerminalServiceClient, ali
 			for {
 				n, err := os.Stdin.Read(buf)
 				if n > 0 {
-					_, serr := client.Write(ctx, &api.WriteTerminalRequest{Alias: alias, Stdin: buf[:n]})
+					_, serr := client.Write(ctx, &supervisor.WriteTerminalRequest{Alias: alias, Stdin: buf[:n]})
 					if serr != nil {
 						errchan <- err
 						return
@@ -127,3 +127,12 @@ func AttachToTerminal(ctx context.Context, client api.TerminalServiceClient, ali
 	case <-stopch:
 	}
 }
+
+func GetTerminalServiceClient(ctx context.Context) (supervisor.TerminalServiceClient, error) {
+	conn, err := Dial(ctx)
+	if err != nil {
+		return nil, err
+	}
+	terminalClient := supervisor.NewTerminalServiceClient(conn)
+	return terminalClient, nil
+}