polished run.sh, updated tests

git-config/main.test.ts

@@ -11,31 +11,35 @@ describe("git-config", async () => {
 
   testRequiredVariables(import.meta.dir, {
     agent_id: "foo",
-    allow_username_change: true,
-    allow_email_change: false,
   });
 
   it("fails without git", async () => {
     const state = await runTerraformApply(import.meta.dir, {
       agent_id: "foo",
-      allow_username_change: true,
+      allow_username_change: false,
       allow_email_change: false,
     });
     const output = await executeScriptInContainer(state, "alpine");
     expect(output.exitCode).toBe(1);
-    expect(output.stdout).toEqual(["\u001B[0;1mChecking git-config!", "Git is not installed!"]);
+    expect(output.stdout).toEqual([
+      "\u001B[0;1mChecking git-config!",
+      "Git is not installed!",
+    ]);
   });
 
-//   it("runs with git", async () => {
+  it("runs with git", async () => {
-//     const state = await runTerraformApply(import.meta.dir, {
+    const state = await runTerraformApply(import.meta.dir, {
-//       agent_id: "foo",
+      agent_id: "foo",
-//       url: "fake-url",
+    });
-//     });
+    const output = await executeScriptInContainer(state, "alpine/git");
-//     const output = await executeScriptInContainer(state, "alpine/git");
+    expect(output.exitCode).toBe(0);
-//     expect(output.exitCode).toBe(128);
+    expect(output.stdout).toEqual([
-//     expect(output.stdout).toEqual([
+      "\u001B[0;1mChecking git-config!",
-//       "Creating directory ~/fake-url...",
+      "git-config: No user.email found, setting to ",
-//       "Cloning fake-url to ~/fake-url...",
+      "git-config: No user.name found, setting to default",
-//     ]);
+      "\u001B[0;1mgit-config: using email: ",
-//   });
+      "",
+      "\u001B[0;1mgit-config: using username: default",
+    ]);
+  });
 });

git-config/run.sh

@@ -20,5 +20,5 @@ if [ -z $(git config --get user.name) ]; then
     git config --global user.name "${CODER_USERNAME}"
 fi
 
-printf "\n$${BOLD}git-config: using username: $(git config --get user.name)\n"
+printf "$${BOLD}git-config: using email: $(git config --get user.email)\n"
-printf "$${BOLD}git-config: using email: $(git config --get user.email)\n\n"
+printf "\n$${BOLD}git-config: using username: $(git config --get user.name)\n\n"