Clean up some theia references

Fix condition

remove `printVarFromTheia`

Unused theia lib

Author: filiptronicek

components/gitpod-cli/cmd/credential-helper.go

@@ -7,7 +7,6 @@ package cmd
 import (
 	"bufio"
 	"context"
-	"errors"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -22,7 +21,6 @@ import (
 	"github.com/spf13/cobra"
 	"google.golang.org/grpc"
 
-	"github.com/gitpod-io/gitpod/gitpod-cli/pkg/theialib"
 	supervisor "github.com/gitpod-io/gitpod/supervisor/api"
 )
 
@@ -75,27 +73,6 @@ var credentialHelper = &cobra.Command{
 			log.Println("'host' is missing")
 		}
 
-		if isTheiaIDE() {
-			service, err := theialib.NewServiceFromEnv()
-			if err != nil {
-				log.WithError(err).Print("cannot connect to Theia")
-				return
-			}
-			if action == "get" {
-				resp, err := service.GetGitToken(theialib.GetGitTokenRequest{
-					Command: gitCommand,
-					Host:    host,
-					RepoURL: repoURL,
-				})
-				if err != nil {
-					log.WithError(err).Print("cannot get token")
-					return
-				}
-				user = resp.User
-				token = resp.Token
-			}
-			return
-		}
 		ctx, cancel := context.WithTimeout(context.Background(), 1*time.Minute)
 		defer cancel()
 		supervisorAddr := os.Getenv("SUPERVISOR_ADDR")
@@ -134,11 +111,6 @@ var credentialHelper = &cobra.Command{
 	},
 }
 
-func isTheiaIDE() bool {
-	stat, err := os.Stat("/theia")
-	return !errors.Is(os.ErrNotExist, err) && stat != nil && stat.IsDir()
-}
-
 func parseHostFromStdin() string {
 	host := ""
 	scanner := bufio.NewScanner(os.Stdin)

components/gitpod-cli/cmd/env.go

@@ -18,7 +18,6 @@ import (
 	"golang.org/x/xerrors"
 	"google.golang.org/grpc"
 
-	"github.com/gitpod-io/gitpod/gitpod-cli/pkg/theialib"
 	serverapi "github.com/gitpod-io/gitpod/gitpod-protocol"
 	supervisor "github.com/gitpod-io/gitpod/supervisor/api"
 )
@@ -124,148 +123,78 @@ func connectToServer(ctx context.Context) (*connectToServerResult, error) {
 }
 
 func getEnvs() {
-	if !isTheiaIDE() {
-		ctx, cancel := context.WithTimeout(context.Background(), 1*time.Minute)
-		defer cancel()
-		result, err := connectToServer(ctx)
-		if err != nil {
-			fail(err.Error())
-		}
-
-		vars, err := result.client.GetEnvVars(ctx)
-		if err != nil {
-			fail("failed to fetch env vars from server: " + err.Error())
-		}
-
-		for _, v := range vars {
-			printVar(v, exportEnvs)
-		}
-		return
-	}
-
-	service, err := theialib.NewServiceFromEnv()
+	ctx, cancel := context.WithTimeout(context.Background(), 1*time.Minute)
+	defer cancel()
+	result, err := connectToServer(ctx)
 	if err != nil {
 		fail(err.Error())
 	}
 
-	vars, err := service.GetEnvVars(theialib.GetEnvvarsRequest{})
+	vars, err := result.client.GetEnvVars(ctx)
 	if err != nil {
-		fail(fmt.Sprintf("cannot get environment variables: %v", err))
+		fail("failed to fetch env vars from server: " + err.Error())
 	}
 
-	for _, v := range vars.Variables {
-		printVarFromTheia(v, exportEnvs)
+	for _, v := range vars {
+		printVar(v, exportEnvs)
 	}
 }
 
 func setEnvs(args []string) {
-	if !isTheiaIDE() {
-		ctx, cancel := context.WithTimeout(context.Background(), 1*time.Minute)
-		defer cancel()
-		result, err := connectToServer(ctx)
-		if err != nil {
-			fail(err.Error())
-		}
-
-		vars, err := parseArgs(args, result.repositoryPattern)
-		if err != nil {
-			fail(err.Error())
-		}
-
-		var exitCode int
-		var wg sync.WaitGroup
-		wg.Add(len(vars))
-		for _, v := range vars {
-			go func(v *serverapi.UserEnvVarValue) {
-				err = result.client.SetEnvVar(ctx, v)
-				if err != nil {
-					fmt.Fprintf(os.Stderr, "cannot set %s: %v\n", v.Name, err)
-					exitCode = -1
-				} else {
-					printVar(v, exportEnvs)
-				}
-				wg.Done()
-			}(v)
-		}
-		wg.Wait()
-		os.Exit(exitCode)
-	}
-
-	service, err := theialib.NewServiceFromEnv()
+	ctx, cancel := context.WithTimeout(context.Background(), 1*time.Minute)
+	defer cancel()
+	result, err := connectToServer(ctx)
 	if err != nil {
 		fail(err.Error())
 	}
 
-	vars := make([]theialib.EnvironmentVariable, len(args))
-	for i, arg := range args {
-		kv := strings.Split(arg, "=")
-		if len(kv) != 2 {
-			fail(fmt.Sprintf("%s has no value (correct format is %s=some_value)", arg, arg))
-		}
-
-		key := strings.TrimSpace(kv[0])
-		if key == "" {
-			fail("variable must have a name")
-		}
-		// Do not trim value - the user might want whitespace here
-		// Also do not check if the value is empty, as an empty value means we want to delete the variable
-		val := kv[1]
-		if val == "" {
-			fail("variable must have a value; use -u to unset a variable")
-		}
-
-		vars[i] = theialib.EnvironmentVariable{Name: key, Value: val}
-	}
-
-	_, err = service.SetEnvVar(theialib.SetEnvvarRequest{Variables: vars})
+	vars, err := parseArgs(args, result.repositoryPattern)
 	if err != nil {
-		fail(fmt.Sprintf("cannot set environment variables: %v", err))
+		fail(err.Error())
 	}
 
+	var exitCode int
+	var wg sync.WaitGroup
+	wg.Add(len(vars))
 	for _, v := range vars {
-		printVarFromTheia(v, exportEnvs)
+		go func(v *serverapi.UserEnvVarValue) {
+			err = result.client.SetEnvVar(ctx, v)
+			if err != nil {
+				fmt.Fprintf(os.Stderr, "cannot set %s: %v\n", v.Name, err)
+				exitCode = -1
+			} else {
+				printVar(v, exportEnvs)
+			}
+			wg.Done()
+		}(v)
 	}
+	wg.Wait()
+	os.Exit(exitCode)
 }
 
 func deleteEnvs(args []string) {
-	if !isTheiaIDE() {
-		ctx, cancel := context.WithTimeout(context.Background(), 1*time.Minute)
-		defer cancel()
-		result, err := connectToServer(ctx)
-		if err != nil {
-			fail(err.Error())
-		}
-
-		var exitCode int
-		var wg sync.WaitGroup
-		wg.Add(len(args))
-		for _, name := range args {
-			go func(name string) {
-				err = result.client.DeleteEnvVar(ctx, &serverapi.UserEnvVarValue{Name: name, RepositoryPattern: result.repositoryPattern})
-				if err != nil {
-					fmt.Fprintf(os.Stderr, "cannot unset %s: %v\n", name, err)
-					exitCode = -1
-				}
-				wg.Done()
-			}(name)
-		}
-		wg.Wait()
-		os.Exit(exitCode)
-	}
-
-	service, err := theialib.NewServiceFromEnv()
+	ctx, cancel := context.WithTimeout(context.Background(), 1*time.Minute)
+	defer cancel()
+	result, err := connectToServer(ctx)
 	if err != nil {
 		fail(err.Error())
 	}
 
-	resp, err := service.DeleteEnvVar(theialib.DeleteEnvvarRequest{Variables: args})
-	if err != nil {
-		fail(fmt.Sprintf("cannot unset environment variables: %v", err))
-	}
-
-	if len(resp.NotDeleted) != 0 {
-		fail(fmt.Sprintf("cannot unset environment variables: %s", strings.Join(resp.NotDeleted, ", ")))
+	var exitCode int
+	var wg sync.WaitGroup
+	wg.Add(len(args))
+	for _, name := range args {
+		go func(name string) {
+			err = result.client.DeleteEnvVar(ctx, &serverapi.UserEnvVarValue{Name: name, RepositoryPattern: result.repositoryPattern})
+			if err != nil {
+				fmt.Fprintf(os.Stderr, "cannot unset %s: %v\n", name, err)
+				exitCode = -1
+			}
+			wg.Done()
+		}(name)
 	}
+	wg.Wait()
+	os.Exit(exitCode)
 }
 
 func fail(msg string) {
@@ -282,15 +211,6 @@ func printVar(v *serverapi.UserEnvVarValue, export bool) {
 	}
 }
 
-func printVarFromTheia(v theialib.EnvironmentVariable, export bool) {
-	val := strings.Replace(v.Value, "\"", "\\\"", -1)
-	if export {
-		fmt.Printf("export %s=\"%s\"\n", v.Name, val)
-	} else {
-		fmt.Printf("%s=%s\n", v.Name, val)
-	}
-}
-
 func parseArgs(args []string, pattern string) ([]*serverapi.UserEnvVarValue, error) {
 	vars := make([]*serverapi.UserEnvVarValue, len(args))
 	for i, arg := range args {

components/gitpod-cli/cmd/preview.go

@@ -15,8 +15,6 @@ import (
 	"github.com/google/shlex"
 	"github.com/spf13/cobra"
 	"golang.org/x/sys/unix"
-
-	"github.com/gitpod-io/gitpod/gitpod-cli/pkg/theialib"
 )
 
 var regexLocalhost = regexp.MustCompile(`((^(localhost|127\.0\.0\.1))|(https?://(localhost|127\.0\.0\.1)))(:[0-9]+)?`)
@@ -39,15 +37,6 @@ var previewCmd = &cobra.Command{
 			openPreview("GP_EXTERNAL_BROWSER", url)
 			return
 		}
-		if isTheiaIDE() {
-			if service, err := theialib.NewServiceFromEnv(); err == nil {
-				_, err = service.OpenPreview(theialib.OpenPreviewRequest{URL: url})
-				if err == nil {
-					// we've opened the preview. All is well.
-					return
-				}
-			}
-		}
 		openPreview("GP_PREVIEW_BROWSER", url)
 	},
 }