[local-app] Make part of the regular build

Author: csweichel

components/BUILD.yaml

@@ -19,15 +19,16 @@ packages:
       - components/ide/code:docker
       - components/ide/theia:docker
       - components/image-builder:docker
+      - components/local-app:docker
       - components/proxy:docker
       - components/registry-facade:docker
       - components/server:docker
       - components/service-waiter:docker
       - components/supervisor-api/typescript-grpc:publish
       - components/supervisor:docker
+      - components/ws-daemon:docker
       - components/ws-daemon/seccomp-profile-installer:docker
       - components/ws-daemon/shiftfs-module-loader:docker
-      - components/ws-daemon:docker
       - components/ws-manager-bridge:docker
       - components/ws-manager:docker
       - components/ws-proxy:docker

components/local-app/BUILD.yaml

@@ -1,5 +1,27 @@
 packages:
     - name: app
+      type: generic
+      config:
+        commands: [["echo"]]
+      deps:
+        - :app-linux
+        - :app-darwin
+        - :app-windows
+    - name: app-linux
+      type: go
+      srcs:
+        - go.mod
+        - go.sum
+        - "**/*.go"
+      deps:
+        - components/supervisor-api/go:lib
+        - components/gitpod-protocol/go:lib
+      env:
+        - CGO_ENABLED=0
+        - GOOS=linux
+      config:
+        packaging: app
+    - name: app-darwin
       type: go
       srcs:
         - go.mod
@@ -8,5 +30,32 @@ packages:
       deps:
         - components/supervisor-api/go:lib
         - components/gitpod-protocol/go:lib
+      env:
+        - CGO_ENABLED=0
+        - GOOS=darwin
       config:
         packaging: app
+    - name: app-windows
+      type: go
+      srcs:
+        - go.mod
+        - go.sum
+        - "**/*.go"
+      deps:
+        - components/supervisor-api/go:lib
+        - components/gitpod-protocol/go:lib
+      env:
+        - CGO_ENABLED=0
+        - GOOS=windows
+      config:
+        packaging: app
+    - name: docker
+      type: docker
+      deps:
+        - :app
+      argdeps:
+        - imageRepoBase
+      config:
+        dockerfile: leeway.Dockerfile
+        image:
+          - ${imageRepoBase}/local-app:${version}

components/local-app/README.md

@@ -0,0 +1,19 @@
+# local-app
+
+**Beware**: this is very much work in progress and will likely break things.
+
+## How to install
+```
+docker run --rm -it -v /tmp/dest:/out eu.gcr.io/gitpod-core-dev/build/local-app:<version>
+```
+
+## How to run
+```
+./local-app
+```
+
+## How to run in Gitpod against a dev-staging environment
+```
+cd components/local-app
+BROWSER= GITPOD_HOST=<URL-of-your-preview-env> go run main.go --mock-keyring run
+```

components/local-app/leeway.Dockerfile

@@ -0,0 +1,12 @@
+# Copyright (c) 2021 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.
+
+FROM alpine:3.13
+
+WORKDIR /app
+COPY components-local-app--app/components-local-app--app-linux/local-app local-app-linux
+COPY components-local-app--app/components-local-app--app-darwin/local-app local-app-darwin
+COPY components-local-app--app/components-local-app--app-windows/local-app.exe local-app-windows.exe
+
+CMD ["/bin/sh", "-c", "cp /app/* /out"]

components/local-app/cmd/debug/main.go renamed to components/local-app/main.go

@@ -7,7 +7,6 @@ package main
 import (
 	"context"
 	"errors"
-	"fmt"
 	"log"
 	"os"
 	"strings"
@@ -22,56 +21,36 @@ import (
 
 func main() {
 	app := cli.App{
-		Name: "local-app-debug",
-		Commands: []*cli.Command{
-			{
-				Name: "login",
-				Action: func(c *cli.Context) error {
-					keyring.MockInit()
-					_, err := auth.Login(context.Background(), auth.LoginOpts{
-						GitpodURL: c.String("gitpod-host"),
-					})
-					if err != nil {
-						return err
-					}
-					fmt.Println("login successful")
-					return nil
-				},
-				Flags: []cli.Flag{
-					&cli.StringFlag{
-						EnvVars: []string{
-							"GITPOD_HOST",
-						},
-						Name: "gitpod-host",
-					},
+		Name:                 "gitpod",
+		Action:               DefaultCommand("run"),
+		EnableBashCompletion: true,
+		Flags: []cli.Flag{
+			&cli.StringFlag{
+				Name:  "gitpod-host",
+				Usage: "URL of the Gitpod installation to connect to",
+				EnvVars: []string{
+					"GITPOD_HOST",
 				},
 			},
+			&cli.BoolFlag{
+				Name:  "mock-keyring",
+				Usage: "Don't use system native keyring, but store Gitpod token in memory",
+			},
+		},
+		Commands: []*cli.Command{
 			{
 				Name: "run",
 				Action: func(c *cli.Context) error {
 					if c.Bool("mock-keyring") {
 						keyring.MockInit()
 					}
-					return run(c.String("gitpod-host"), c.String("token"), c.String("ssh_config"))
+					return run(c.String("gitpod-host"), c.String("ssh_config"))
 				},
 				Flags: []cli.Flag{
-					&cli.StringFlag{
-						EnvVars: []string{
-							"GITPOD_HOST",
-						},
-						Name: "gitpod-host",
-					},
-					&cli.StringFlag{
-						Name: "token",
-						EnvVars: []string{
-							"GITPOD_TOKEN",
-						},
-					},
 					&cli.PathFlag{
-						Name: "ssh_config",
-					},
-					&cli.BoolFlag{
-						Name: "mock-keyring",
+						Name:  "ssh_config",
+						Usage: "produce and update an OpenSSH compatible ssh_config file",
+						Value: "/tmp/gitpod_ssh_config",
 					},
 				},
 			},
@@ -83,11 +62,13 @@ func main() {
 	}
 }
 
-func run(host, token, sshConfig string) error {
-	if token != "" {
-		auth.SetToken(host, token)
+func DefaultCommand(name string) cli.ActionFunc {
+	return func(ctx *cli.Context) error {
+		return ctx.App.Command(name).Run(ctx)
 	}
+}
 
+func run(host, sshConfig string) error {
 	tkn, err := auth.GetToken(host)
 	if errors.Is(err, keyring.ErrNotFound) {
 		tkn, err = auth.Login(context.Background(), auth.LoginOpts{GitpodURL: host})