From c6b457e7fe845bf9b1dc31f5c3e8b43238b9f2d5 Mon Sep 17 00:00:00 2001
From: Michael Brewer <michael.brewer@gyft.com>
Date: Tue, 28 May 2024 11:00:58 -0700
Subject: [PATCH] fix(git-config): add support for coder 0.22 (#254)

---
 git-config/main.test.ts | 39 +++++++++++++++++++++++++++++++--------
 git-config/main.tf      |  2 +-
 2 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/git-config/main.test.ts b/git-config/main.test.ts
index fe410aa..fe1fc39 100644
--- a/git-config/main.test.ts
+++ b/git-config/main.test.ts
@@ -20,10 +20,12 @@ describe("git-config", async () => {
     });
 
     const resources = state.resources;
-    expect(resources).toHaveLength(3);
+    expect(resources).toHaveLength(5);
     expect(resources).toMatchObject([
       { type: "coder_workspace", name: "me" },
+      { type: "coder_env", name: "git_author_email" },
       { type: "coder_env", name: "git_author_name" },
+      { type: "coder_env", name: "git_commmiter_email" },
       { type: "coder_env", name: "git_commmiter_name" },
     ]);
   });
@@ -35,12 +37,14 @@ describe("git-config", async () => {
     });
 
     const resources = state.resources;
-    expect(resources).toHaveLength(5);
+    expect(resources).toHaveLength(7);
     expect(resources).toMatchObject([
       { type: "coder_parameter", name: "user_email" },
       { type: "coder_parameter", name: "username" },
       { type: "coder_workspace", name: "me" },
+      { type: "coder_env", name: "git_author_email" },
       { type: "coder_env", name: "git_author_name" },
+      { type: "coder_env", name: "git_commmiter_email" },
       { type: "coder_env", name: "git_commmiter_name" },
     ]);
   });
@@ -53,7 +57,7 @@ describe("git-config", async () => {
         allow_username_change: "false",
         allow_email_change: "false",
       },
-      { CODER_WORKSPACE_OWNER_EMAIL: "foo@emai.com" },
+      { CODER_WORKSPACE_OWNER_EMAIL: "foo@email.com" },
     );
 
     const resources = state.resources;
@@ -75,12 +79,22 @@ describe("git-config", async () => {
       allow_email_change: "true",
       coder_parameter_order: order.toString(),
     });
-    expect(state.resources).toHaveLength(5);
+    const resources = state.resources;
+    expect(resources).toHaveLength(7);
+    expect(resources).toMatchObject([
+      { type: "coder_parameter", name: "user_email" },
+      { type: "coder_parameter", name: "username" },
+      { type: "coder_workspace", name: "me" },
+      { type: "coder_env", name: "git_author_email" },
+      { type: "coder_env", name: "git_author_name" },
+      { type: "coder_env", name: "git_commmiter_email" },
+      { type: "coder_env", name: "git_commmiter_name" },
+    ]);
     // user_email order is the same as the order
-    expect(state.resources[0].instances[0].attributes.order).toBe(order);
+    expect(resources[0].instances[0].attributes.order).toBe(order);
     // username order is incremented by 1
     // @ts-ignore: Object is possibly 'null'.
-    expect(state.resources[1].instances[0]?.attributes.order).toBe(order + 1);
+    expect(resources[1].instances[0]?.attributes.order).toBe(order + 1);
   });
 
   it("set custom order for coder_parameter for just username", async () => {
@@ -91,9 +105,18 @@ describe("git-config", async () => {
       allow_username_change: "true",
       coder_parameter_order: order.toString(),
     });
-    expect(state.resources).toHaveLength(4);
+    const resources = state.resources;
+    expect(resources).toHaveLength(6);
+    expect(resources).toMatchObject([
+      { type: "coder_parameter", name: "username" },
+      { type: "coder_workspace", name: "me" },
+      { type: "coder_env", name: "git_author_email" },
+      { type: "coder_env", name: "git_author_name" },
+      { type: "coder_env", name: "git_commmiter_email" },
+      { type: "coder_env", name: "git_commmiter_name" },
+    ]);
     // user_email was not created
     // username order is incremented by 1
-    expect(state.resources[0].instances[0].attributes.order).toBe(order + 1);
+    expect(resources[0].instances[0].attributes.order).toBe(order + 1);
   });
 });
diff --git a/git-config/main.tf b/git-config/main.tf
index fe19288..b876625 100644
--- a/git-config/main.tf
+++ b/git-config/main.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = ">= 0.13"
+      version = ">= 0.22"
     }
   }
 }