fix scheduling hack

Author: christianalfoni

src/Sandbox.ts

@@ -183,6 +183,37 @@ export class Sandbox {
       hostToken: customSession?.hostToken,
     });
 
+    if (customSession?.git) {
+      const netrc = await session.commands.runBackground([
+        `mkdir -p ~/private`,
+        `cat > ~/private/.netrc <<EOF
+machine ${customSession.git.provider}
+login ${customSession.git.username || "x-access-token"}
+password ${customSession.git.accessToken}
+EOF`,
+        `chmod 600 ~/private/.netrc`,
+        `cd ~`,
+        `ln -sfn private/.netrc .netrc`,
+      ]);
+      netrc.onOutput(console.log);
+      console.log(await netrc.open());
+      await netrc.waitUntilComplete();
+
+      const config = await session.commands.runBackground([
+        `cat > ~/private/.gitconfig <<EOF
+[user]
+    name  = ${customSession.git.name || customSession.id}
+    email = ${customSession.git.email}
+EOF`,
+        `chmod 600 ~/private/.gitconfig`,
+        `cd "~"`,
+        `ln -sfn private/.gitconfig .gitconfig`,
+      ]);
+      config.onOutput(console.log);
+      console.log(await config.open());
+      await config.waitUntilComplete();
+    }
+
     return session;
   }
 

src/Sandboxes.ts

@@ -16,9 +16,7 @@ import {
 } from "./utils/api";
 
 import {
-  CreateSandboxGitSourceOpts,
   CreateSandboxOpts,
-  CreateSandboxTemplateSourceOpts,
   PaginationOpts,
   SandboxInfo,
   SandboxListOpts,
@@ -67,54 +65,13 @@ export class Sandboxes {
 
   constructor(private apiClient: Client) {}
 
-  private async createGitSandbox(
-    opts: CreateSandboxGitSourceOpts & StartSandboxOpts
-  ) {
-    const sandbox = await this.createTemplateSandbox({
-      ...opts,
-      source: "template",
-      id: opts.templateId || this.defaultTemplateId,
-    });
-
-    // We do not want users to pass gitAccessToken on global user, because it
-    // can be read by other users
-    const sessionCreateOptions: SessionCreateOptions = {
-      id: "clone-repo-user",
-      permission: "write",
-    };
-    if (opts.config) {
-      sessionCreateOptions.git = {
-        accessToken: opts.config.accessToken,
-        email: opts.config.email,
-        name: opts.config.name,
-      };
-    }
-
-    const session = await sandbox.connect(sessionCreateOptions);
-
-    await session.commands.run([
-      "rm -rf .git",
-      "git init",
-      `git remote add origin ${opts.url}`,
-      "git fetch origin",
-      `git checkout -b ${opts.branch}`,
-      `git reset --hard origin/${opts.branch}`,
-    ]);
-
-    await opts.setup?.(session);
-
-    session.disconnect();
-
-    return sandbox;
-  }
-
   private async createTemplateSandbox(
-    opts: CreateSandboxTemplateSourceOpts & StartSandboxOpts
+    opts?: CreateSandboxOpts & StartSandboxOpts
   ) {
-    const templateId = opts.id || this.defaultTemplateId;
-    const privacy = opts.privacy || "unlisted";
-    const tags = opts.tags || ["sdk"];
-    const path = opts.path || "/SDK";
+    const templateId = opts?.id || this.defaultTemplateId;
+    const privacy = opts?.privacy || "unlisted";
+    const tags = opts?.tags || ["sdk"];
+    const path = opts?.path || "/SDK";
 
     // Always add the "sdk" tag to the sandbox, this is used to identify sandboxes created by the SDK.
     const tagsWithSdk = tags.includes("sdk") ? tags : [...tags, "sdk"];
@@ -175,7 +132,6 @@ export class Sandboxes {
    */
   public async fork(sandboxId: string, opts?: StartSandboxOpts) {
     return this.create({
-      source: "template",
       id: sandboxId,
       ...opts,
     });
@@ -210,22 +166,10 @@ export class Sandboxes {
   }
 
   /**
-   * Create a sandbox from a template or git repository. By default we will create a sandbox from the default template.
+   * Create a sandbox from a template. By default we will create a sandbox from the default universal template.
    */
-  async create(
-    opts: CreateSandboxOpts & StartSandboxOpts = { source: "template" }
-  ): Promise<Sandbox> {
-    switch (opts.source) {
-      case "git": {
-        return this.createGitSandbox(opts);
-      }
-      case "template": {
-        return this.createTemplateSandbox(opts);
-      }
-      default: {
-        throw new Error("Invalid source");
-      }
-    }
+  async create(opts?: CreateSandboxOpts & StartSandboxOpts): Promise<Sandbox> {
+    return this.createTemplateSandbox(opts);
   }
 
   /**

src/Session/git.ts

@@ -60,6 +60,17 @@ export class Git {
    * Push all changes to git
    */
   async push() {
-    await this.commands.run(["git push"]);
+    await this.commands.run(["git push -u origin HEAD"]);
+  }
+
+  async clone(opts: { url: string; branch: string }) {
+    await this.commands.run([
+      "rm -rf .git",
+      "git init",
+      `git remote add origin ${opts.url}`,
+      "git fetch origin",
+      `git checkout -b ${opts.branch}`,
+      `git reset --hard origin/${opts.branch}`,
+    ]);
   }
 }

src/bin/commands/build.ts

@@ -148,6 +148,16 @@ export const buildCommand: yargs.CommandModule<
               updateSpinnerMessage(index, "Starting sandbox...", sandboxId)
             );
 
+            // This is a hack, we need to tell the global scheduler that the VM is running
+            // in a different cluster than the one it'd like to default to.
+            const baseUrl = apiClient
+              .getConfig()
+              .baseUrl?.replace("api", "global-scheduler");
+
+            await fetch(
+              `${baseUrl}/api/v1/cluster/${sandboxId}?preferredManager=${cluster}`
+            ).then((res) => res.json());
+
             const startResponse = await startVm(clusterApiClient, sandboxId, {
               vmTier: VMTier.fromName("Micro"),
             });

src/types.ts

@@ -185,6 +185,8 @@ export interface SessionCreateOptions {
   id: string;
   permission?: "read" | "write";
   git?: {
+    provider: string;
+    username?: string;
     accessToken?: string;
     email: string;
     name?: string;
@@ -201,32 +203,14 @@ export type SandboxSession = {
   env?: Record<string, string>;
 };
 
-export type CreateSandboxTemplateSourceOpts = CreateSandboxBaseOpts & {
-  source: "template";
+export type CreateSandboxOpts = CreateSandboxBaseOpts & {
   /**
    * What template to fork from, this is the id of another sandbox. Defaults to our
    * [universal template](https://codesandbox.io/s/github/codesandbox/sandbox-templates/tree/main/universal).
    */
   id?: string;
 };
 
-export type CreateSandboxGitSourceOpts = CreateSandboxBaseOpts & {
-  source: "git";
-  url: string;
-  branch: string;
-  templateId?: string;
-  config?: {
-    accessToken: string;
-    email: string;
-    name?: string;
-  };
-  setup?: (session: Session) => Promise<void>;
-};
-
-export type CreateSandboxOpts =
-  | CreateSandboxTemplateSourceOpts
-  | CreateSandboxGitSourceOpts;
-
 export type SandboxOpts = {
   id: string;
   bootupType: PitcherManagerResponse["bootupType"];

src/utils/api.ts

@@ -56,7 +56,7 @@ export function getDefaultTemplateId(apiClient: Client): string {
     return "7ngcrf";
   }
 
-  return "pt_CW2BcBSPRoGb3AS6Fv7oXs";
+  return "pt_TRkPA6ypYZ7cRLQYgCmRHs";
 }
 
 export function handleResponse<D, E>(