make ephemeral accounts get an ephemeral project

Author: williamstein

src/packages/server/accounts/account-creation-actions.ts

@@ -16,12 +16,14 @@ export default async function accountCreationActions({
   account_id,
   tags,
   noFirstProject,
+  ephemeral,
 }: {
   email_address?: string;
   account_id: string;
   tags?: string[];
   // if set, don't do any initial project actions (i.e., creating or starting projects)
   noFirstProject?: boolean;
+  ephemeral?: number;
 }): Promise<void> {
   log.debug({ account_id, email_address, tags });
 
@@ -56,7 +58,7 @@ export default async function accountCreationActions({
           const projects = await getProjects({ account_id, limit: 1 });
           if (projects.length == 0) {
             // you really have no projects at all.
-            await firstProject({ account_id, tags });
+            await firstProject({ account_id, tags, ephemeral });
           }
         } catch (err) {
           // non-fatal; they can make their own project

src/packages/server/accounts/create-account.ts

@@ -81,6 +81,7 @@ export default async function createAccount({
       account_id,
       tags,
       noFirstProject,
+      ephemeral,
     });
     await creationActionsDone(account_id);
   } catch (error) {

src/packages/server/accounts/first-project.ts

@@ -22,9 +22,11 @@ const log = getLogger("server:accounts:first-project");
 export default async function firstProject({
   account_id,
   tags,
+  ephemeral,
 }: {
   account_id: string;
   tags?: string[];
+  ephemeral?: number;
 }): Promise<string> {
   log.debug(account_id, tags);
   if (!isValidUUID(account_id)) {
@@ -33,6 +35,7 @@ export default async function firstProject({
   const project_id = await createProject({
     account_id,
     title: "My First Project",
+    ephemeral,
   });
   log.debug("created new project", project_id);
   const project = getProject(project_id);
@@ -57,7 +60,7 @@ export default async function firstProject({
             account_id,
             project_id,
             language,
-            welcome + jupyterExtra
+            welcome + jupyterExtra,
           );
         }
       }
@@ -78,7 +81,7 @@ async function createJupyterNotebookIfAvailable(
   account_id: string,
   project_id: string,
   language: string,
-  welcome: string
+  welcome: string,
 ): Promise<string> {
   // find the highest priority kernel with the given language
   let kernelspec: any = null;
@@ -129,7 +132,7 @@ async function createWelcome(
   account_id: string,
   project_id: string,
   ext: string,
-  welcome: string
+  welcome: string,
 ): Promise<string> {
   const path = `welcome/welcome.${ext}`;
   const { torun } = TAGS_MAP[ext] ?? {};

src/packages/server/projects/create.ts

@@ -34,6 +34,7 @@ export default async function createProject(opts: CreateProjectOptions) {
     public_path_id,
     noPool,
     start,
+    ephemeral,
   } = opts;
   let license = opts.license;
   if (public_path_id) {
@@ -70,7 +71,7 @@ export default async function createProject(opts: CreateProjectOptions) {
 
     project_id = v4();
   }
-  
+
   const pool = getPool();
   const users =
     account_id == null ? null : { [account_id]: { group: "owner" } };
@@ -87,14 +88,15 @@ export default async function createProject(opts: CreateProjectOptions) {
   const envs = await getSoftwareEnvironments("server");
 
   await pool.query(
-    "INSERT INTO projects (project_id, title, description, users, site_license, compute_image, created, last_edited) VALUES($1, $2, $3, $4, $5, $6, NOW(), NOW())",
+    "INSERT INTO projects (project_id, title, description, users, site_license, compute_image, created, last_edited, ephemeral) VALUES($1, $2, $3, $4, $5, $6, NOW(), NOW(), $7::BIGINT)",
     [
       project_id,
       title ?? "No Title",
       description ?? "",
       users != null ? JSON.stringify(users) : users,
       site_license != null ? JSON.stringify(site_license) : undefined,
       image ?? envs?.default ?? DEFAULT_COMPUTE_IMAGE,
+      ephemeral ?? null,
     ],
   );
 

src/packages/util/db-schema/projects.ts

@@ -743,6 +743,8 @@ export interface CreateProjectOptions {
 
   // admins can specify the project_id - nobody else can -- useful for debugging.
   project_id?: string;
+  // if set, project should be treated as expiring after this many milliseconds since creation
+  ephemeral?: number;
 }
 
 interface BaseCopyOptions {