[gp-cli] remove unused code

Author: akosyakov

components/gitpod-cli/cmd/open.go

@@ -5,17 +5,16 @@
 package cmd
 
 import (
+	"context"
 	"log"
 	"os"
 	"os/exec"
-	"sync"
-	"time"
+
+	supervisorClient "github.com/gitpod-io/gitpod/gitpod-cli/pkg/supervisor-helper"
 
 	"github.com/google/shlex"
 	"github.com/spf13/cobra"
 	"golang.org/x/sys/unix"
-
-	"github.com/gitpod-io/gitpod/gitpod-cli/pkg/theialib"
 )
 
 // initCmd represents the init command
@@ -24,14 +23,16 @@ var openCmd = &cobra.Command{
 	Short: "Opens a file in Gitpod",
 	Args:  cobra.MinimumNArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
-		wait, _ := cmd.Flags().GetBool("wait")
+		// TODO(ak) use NotificationService.NotifyActive supervisor API instead
 
-		err := tryOpenInTheia(args, wait)
-		if err == nil {
-			// opening in Theia worked - we're good
-			return
+		ctx := context.Background()
+		err := supervisorClient.WaitForIDEReady(ctx)
+		if err != nil {
+			log.Fatal(err)
 		}
 
+		wait, _ := cmd.Flags().GetBool("wait")
+
 		pcmd := os.Getenv("GP_OPEN_EDITOR")
 		if pcmd == "" {
 			log.Fatal("GP_OPEN_EDITOR is not set")
@@ -65,46 +66,3 @@ func init() {
 	rootCmd.AddCommand(openCmd)
 	openCmd.Flags().BoolP("wait", "w", false, "wait until all opened files are closed again")
 }
-
-func tryOpenInTheia(args []string, wait bool) error {
-	service, err := theialib.NewServiceFromEnv()
-	if err != nil {
-		return err
-	}
-
-	var wg sync.WaitGroup
-	for _, fn := range args {
-		if fn == "--wait" {
-			continue
-		}
-
-		_, err := service.OpenFile(theialib.OpenFileRequest{Path: fn})
-		if err != nil {
-			return err
-		}
-		if !wait {
-			continue
-		}
-
-		wg.Add(1)
-		go func(fn string) {
-			defer wg.Done()
-
-			for {
-				resp, err := service.IsFileOpen(theialib.IsFileOpenRequest{Path: fn})
-				if err != nil {
-					log.Fatal(err)
-					return
-				}
-				if !resp.IsOpen {
-					return
-				}
-
-				time.Sleep(1 * time.Second)
-			}
-		}(fn)
-	}
-
-	wg.Wait()
-	return nil
-}

components/gitpod-cli/cmd/preview.go

@@ -5,13 +5,15 @@
 package cmd
 
 import (
+	"context"
 	"log"
 	"os"
 	"os/exec"
 	"regexp"
 	"strconv"
 	"strings"
 
+	supervisorClient "github.com/gitpod-io/gitpod/gitpod-cli/pkg/supervisor-helper"
 	"github.com/google/shlex"
 	"github.com/spf13/cobra"
 	"golang.org/x/sys/unix"
@@ -29,6 +31,13 @@ var previewCmd = &cobra.Command{
 	Short: "Opens a URL in the IDE's preview",
 	Args:  cobra.ExactArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
+		// TODO(ak) use NotificationService.NotifyActive supervisor API instead
+
+		ctx := context.Background()
+		err := supervisorClient.WaitForIDEReady(ctx)
+		if err != nil {
+			log.Fatal(err)
+		}
 		url := replaceLocalhostInURL(args[0])
 		if previewCmdOpts.External {
 			if !strings.HasPrefix(url, "http://") && !strings.HasPrefix(url, "https://") {

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

@@ -6,18 +6,43 @@ package supervisor_helper
 
 import (
 	"context"
+	"time"
 
 	"golang.org/x/xerrors"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 
 	"github.com/gitpod-io/gitpod/common-go/util"
+	supervisor "github.com/gitpod-io/gitpod/supervisor/api"
 )
 
+// TODO(ak) introduce proper abstraction, like SupervisorClient
+
 func Dial(ctx context.Context) (*grpc.ClientConn, error) {
 	supervisorConn, err := grpc.DialContext(ctx, util.GetSupervisorAddress(), grpc.WithTransportCredentials(insecure.NewCredentials()))
 	if err != nil {
 		err = xerrors.Errorf("failed connecting to supervisor: %w", err)
 	}
 	return supervisorConn, err
 }
+
+func WaitForIDEReady(ctx context.Context) error {
+	conn, err := Dial(ctx)
+	if err != nil {
+		return err
+	}
+	defer conn.Close()
+	client := supervisor.NewStatusServiceClient(conn)
+
+	var ideReady bool
+	for !ideReady {
+		resp, _ := client.IDEStatus(ctx, &supervisor.IDEStatusRequest{Wait: true})
+		if resp != nil {
+			ideReady = resp.Ok
+		}
+		if !ideReady {
+			time.Sleep(1 * time.Second)
+		}
+	}
+	return nil
+}