unity subscriptions

Author: akosyakov

components/gitpod-cli/cmd/open.go

@@ -45,18 +45,24 @@ var openCmd = &cobra.Command{
 				paths = append(paths, path)
 			}
 
-			_, err := client.Notification.NotifyActive(ctx, &api.NotifyActiveRequest{
-				ActionData: &api.NotifyActiveRequest_Open{
-					Open: &api.NotifyActiveRequest_OpenData{
-						Paths: paths,
-						Await: wait,
-					},
+			resp, err := client.Notification.Notify(ctx, &api.NotifyRequest{
+				Open: &api.NotifyRequest_Open{
+					Paths: paths,
+					Await: wait,
 				},
+				Active: true,
 			})
-			if err != nil && ctx.Err() == nil {
-				return xerrors.Errorf("failed to open: %w", err)
+			if err != nil {
+				return err
 			}
-			return nil
+			if resp.Command == nil {
+				return nil
+			}
+			c := exec.CommandContext(cmd.Context(), resp.Command.Cmd, resp.Command.Args...)
+			c.Stdin = os.Stdin
+			c.Stdout = os.Stdout
+			c.Stderr = os.Stderr
+			return c.Run()
 		}
 		// TODO: backward compatibilty, remove when all IDEs are updated
 		pargs, err := shlex.Split(pcmd)

components/gitpod-cli/cmd/preview.go

@@ -53,15 +53,24 @@ func openPreview(ctx context.Context, url string, external bool) error {
 	}
 	pcmd := os.Getenv(gpBrowserEnvVar)
 	if pcmd == "" {
-		_, err := client.Notification.NotifyActive(ctx, &api.NotifyActiveRequest{
-			ActionData: &api.NotifyActiveRequest_Preview{
-				Preview: &api.NotifyActiveRequest_PreviewData{
-					Url:      url,
-					External: external,
-				},
+		resp, err := client.Notification.Notify(ctx, &api.NotifyRequest{
+			Preview: &api.NotifyRequest_Preview{
+				Url:      url,
+				External: external,
 			},
+			Active: true,
 		})
-		return err
+		if err != nil {
+			return err
+		}
+		if resp.Command == nil {
+			return nil
+		}
+		c := exec.CommandContext(ctx, resp.Command.Cmd, resp.Command.Args...)
+		c.Stdin = os.Stdin
+		c.Stdout = os.Stdout
+		c.Stderr = os.Stderr
+		return c.Run()
 	}
 	// TODO: backward compatibilty, remove when all IDEs are updated
 	if pcmd == "" {

components/gitpod-cli/hot-swap.sh

@@ -6,26 +6,45 @@
 set -Eeuo pipefail
 
 component=${PWD##*/}
-workspaceUrl=$(echo "${1}" |sed -e "s/\/$//")
-echo "URL: $workspaceUrl"
+workspaceURL=$(echo "${1}" |sed -e "s/\/$//")
+echo "Workspace URL: $workspaceURL"
 
-workspaceDesc=$(gpctl workspaces describe "$workspaceUrl" -o=json)
+workspaceHost=${workspaceURL//https:\/\//}
+echo "Workspace Host: $workspaceHost"
 
-podName=$(echo "$workspaceDesc" | jq .runtime.pod_name -r)
-echo "Pod: $podName"
+workspaceID=$(echo "${workspaceHost}" | cut -d. -f1)
+echo "Workspace ID: $workspaceID"
 
-workspaceId=$(echo "$workspaceDesc" | jq .metadata.meta_id -r)
-echo "ID: $workspaceId"
-
-clusterHost=$(kubectl exec -it "$podName" -- printenv GITPOD_WORKSPACE_CLUSTER_HOST |sed -e "s/\s//g")
+clusterHost=${workspaceHost//$workspaceID./}
 echo "Cluster Host: $clusterHost"
 
-# prepare ssh
-ownerToken=$(kubectl get pod "$podName" -o=json | jq ".metadata.annotations.\"gitpod\/ownerToken\"" -r)
+devClusterHost=$(gp info --json |jq .cluster_host -r)
+echo "Dev Cluster Host: $devClusterHost"
+
+preview=true
+if [[ $clusterHost = "$devClusterHost" ]]
+then
+    preview=false
+fi
+echo "Preview Env: $preview"
+
+# prepare ssh config
 sshConfig=$(mktemp)
-echo "Host $workspaceId" > "$sshConfig"
-echo "    Hostname \"$workspaceId.ssh.$clusterHost\"" >> "$sshConfig"
-echo "    User \"$workspaceId#$ownerToken\"" >> "$sshConfig"
+echo "Host $workspaceID" > "$sshConfig"
+echo "    Hostname \"$workspaceID.ssh.$clusterHost\"" >> "$sshConfig"
+if [ $preview = "true" ]
+then
+    workspaceDesc=$(gpctl workspaces describe "$workspaceURL" -o=json)
+
+    podName=$(echo "$workspaceDesc" | jq .runtime.pod_name -r)
+    echo "Workspace Pod: $podName"
+
+    ownerToken=$(kubectl get pod "$podName" -o=json | jq ".metadata.annotations.\"gitpod\/ownerToken\"" -r)
+    echo "    User \"$workspaceID#$ownerToken\"" >> "$sshConfig"
+else
+    # assume SSH keys configured via .dotfiles
+    echo "    User \"$workspaceID\"" >> "$sshConfig"
+fi
 
 # build
 go build .
@@ -34,7 +53,7 @@ echo "$component built"
 # upload
 uploadDest="/.supervisor/$component"
 echo "Upload Dest: $uploadDest"
-ssh -F "$sshConfig" "$workspaceId" "sudo chown -R gitpod:gitpod /.supervisor && rm $uploadDest 2> /dev/null"
+ssh -F "$sshConfig" "$workspaceID" "sudo chown -R gitpod:gitpod /.supervisor && rm $uploadDest 2> /dev/null"
 echo "Permissions granted"
-scp -F "$sshConfig" -r "./$component" "$workspaceId":"$uploadDest"
+scp -F "$sshConfig" -r "./$component" "$workspaceID":"$uploadDest"
 echo "Swap complete"