lay out cli command a bit more

pkg/abstractions/shell/shell.go

@@ -23,7 +23,7 @@ import (
 )
 
 const (
-	shellContainerPrefix   string = "shell-"
+	shellContainerPrefix   string = "shell"
 	defaultContainerCpu    int64  = 100
 	defaultContainerMemory int64  = 128
 )
@@ -111,7 +111,7 @@ func (ss *SSHShellService) CreateShell(ctx context.Context, in *pb.CreateShellRe
 		}, nil
 	}
 
-	containerId := fmt.Sprintf("%s%s", shellContainerPrefix, uuid.New().String())
+	containerId := ss.genContainerId(stub.ExternalId)
 
 	go ss.keyEventManager.ListenForPattern(ctx, common.RedisKeys.SchedulerContainerExitCode(containerId), keyEventChan)
 
@@ -175,7 +175,7 @@ func (ss *SSHShellService) CreateShell(ctx context.Context, in *pb.CreateShellRe
 		StubId:      stub.ExternalId,
 		WorkspaceId: authInfo.Workspace.ExternalId,
 		Workspace:   *authInfo.Workspace,
-		EntryPoint:  []string{"/usr/sbin/sshd", "-D"},
+		EntryPoint:  []string{"tail", "-f", "/dev/null"},
 		Mounts:      mounts,
 		Stub:        *stub,
 	})
@@ -202,6 +202,11 @@ func (ss *SSHShellService) CreateShell(ctx context.Context, in *pb.CreateShellRe
 	log.Println("Connected to shell: ", conn)
 
 	return &pb.CreateShellResponse{
-		Ok: true,
+		Ok:          true,
+		ContainerId: containerId,
 	}, nil
 }
+
+func (ss *SSHShellService) genContainerId(stubId string) string {
+	return fmt.Sprintf("%s-%s-%s", shellContainerPrefix, stubId, uuid.New().String()[:8])
+}

pkg/abstractions/shell/shell.proto

@@ -13,4 +13,7 @@ message CreateShellRequest {
   int32 timeout = 2;
 }
 
-message CreateShellResponse { bool ok = 1; }
+message CreateShellResponse {
+  bool ok = 1;
+  string container_id = 2;
+}

pkg/repository/backend_postgres_migrations/020_add_shell_stub_type.go

@@ -0,0 +1,45 @@
+package backend_postgres_migrations
+
+import (
+	"context"
+	"database/sql"
+	"fmt"
+
+	"github.com/pressly/goose/v3"
+)
+
+func init() {
+	goose.AddMigrationContext(upAddShellStubType, downRemoveShellStubType)
+}
+
+func upAddShellStubType(ctx context.Context, tx *sql.Tx) error {
+	newStubTypes := []string{"schedule/shell", "asgi/shell", "endpoint/shell", "taskqueue/shell", "function/shell"}
+
+	for _, stubType := range newStubTypes {
+		addEnumSQL := fmt.Sprintf(`
+DO $$
+BEGIN
+   IF NOT EXISTS (
+      SELECT 1 FROM pg_type t
+      JOIN pg_enum e ON t.oid = e.enumtypid
+      JOIN pg_catalog.pg_namespace n ON n.oid = t.typnamespace
+      WHERE n.nspname = 'public' AND t.typname = 'stub_type' AND e.enumlabel = '%s'
+   ) THEN
+      EXECUTE 'ALTER TYPE stub_type ADD VALUE ' || quote_literal('%s');
+   END IF;
+END
+$$;`, stubType, stubType)
+
+		if _, err := tx.Exec(addEnumSQL); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func downRemoveShellStubType(ctx context.Context, tx *sql.Tx) error {
+	// PostgreSQL doesn't support removing values from an ENUM directly
+	// hi
+	return nil
+}

pkg/types/backend.go

@@ -207,25 +207,34 @@ const (
 	StubTypeFunction               string = "function"
 	StubTypeFunctionDeployment     string = "function/deployment"
 	StubTypeFunctionServe          string = "function/serve"
+	StubTypeFunctionShell          string = "function/shell"
 	StubTypeContainer              string = "container"
 	StubTypeTaskQueue              string = "taskqueue"
 	StubTypeTaskQueueDeployment    string = "taskqueue/deployment"
 	StubTypeTaskQueueServe         string = "taskqueue/serve"
+	StubTypeTaskQueueShell         string = "taskqueue/shell"
 	StubTypeEndpoint               string = "endpoint"
 	StubTypeEndpointDeployment     string = "endpoint/deployment"
 	StubTypeEndpointServe          string = "endpoint/serve"
+	StubTypeEndpointShell          string = "endpoint/shell"
 	StubTypeASGI                   string = "asgi"
 	StubTypeASGIDeployment         string = "asgi/deployment"
 	StubTypeASGIServe              string = "asgi/serve"
+	StubTypeASGIShell              string = "asgi/shell"
 	StubTypeScheduledJob           string = "schedule"
 	StubTypeScheduledJobDeployment string = "schedule/deployment"
+	StubTypeScheduledJobShell      string = "schedule/shell"
 	StubTypeBot                    string = "bot"
 	StubTypeBotDeployment          string = "bot/deployment"
 	StubTypeBotServe               string = "bot/serve"
 )
 
 type StubType string
 
+func (t StubType) IsShell() bool {
+	return strings.HasSuffix(string(t), "/shell")
+}
+
 func (t StubType) IsServe() bool {
 	return strings.HasSuffix(string(t), "/serve")
 }