fix of pr167 & zd4391

Author: rowansmithau

registry/coder/modules/jetbrains-gateway/main.test.ts

@@ -20,7 +20,7 @@ describe("jetbrains-gateway", async () => {
       folder: "/home/coder",
     });
     expect(state.outputs.url.value).toBe(
-      "jetbrains-gateway://connect#type=coder&workspace=default&owner=default&folder=/home/coder&url=https://mydeployment.coder.com&token=$SESSION_TOKEN&ide_product_code=IU&ide_build_number=243.21565.193&ide_download_link=https://download.jetbrains.com/idea/ideaIU-2024.3.tar.gz&agent_id=foo",
+      "jetbrains-gateway://connect#type=coder&workspace=default&owner=default&folder=/home/coder&url=https://mydeployment.coder.com&token=$SESSION_TOKEN&ide_product_code=IU&ide_build_number=243.21565.193&ide_download_link=https://download.jetbrains.com/idea/ideaIU-2024.3.tar.gz",
     );
 
     const coder_app = state.resources.find(
@@ -41,3 +41,14 @@ describe("jetbrains-gateway", async () => {
     expect(state.outputs.identifier.value).toBe("IU");
   });
 });
+it("optionally includes agent_id when embed_agent_id is true", async () => {
+  const state = await runTerraformApply(import.meta.dir, {
+    agent_id: "foo",
+    folder: "/home/coder",
+    embed_agent_id: true,
+  });
+
+  expect(state.outputs.url.value).toBe(
+    "jetbrains-gateway://connect#type=coder&workspace=default&owner=default&folder=/home/coder&url=https://mydeployment.coder.com&token=$SESSION_TOKEN&ide_product_code=IU&ide_build_number=243.21565.193&ide_download_link=https://download.jetbrains.com/idea/ideaIU-2024.3.tar.gz&agent_id=foo",
+  );
+});

registry/coder/modules/jetbrains-gateway/main.tf

@@ -68,6 +68,12 @@ variable "group" {
   default     = null
 }
 
+variable "embed_agent_id" {
+  type        = bool
+  description = "Append the agent_id to the JetBrains Gateway URL for when support for multiple agents is required."
+  default     = false
+}
+
 variable "coder_parameter_order" {
   type        = number
   description = "The order determines the position of a template parameter in the UI/CLI presentation. The lowest order is shown first and parameters with equal order are sorted by name (ascending order)."
@@ -331,7 +337,7 @@ resource "coder_app" "gateway" {
   external     = true
   order        = var.order
   group        = var.group
-  url = join("", [
+  url = join("", concat([
     "jetbrains-gateway://connect#type=coder&workspace=",
     data.coder_workspace.me.name,
     "&owner=",
@@ -348,9 +354,7 @@ resource "coder_app" "gateway" {
     local.build_number,
     "&ide_download_link=",
     local.download_link,
-    "&agent_id=",
-    var.agent_id,
-  ])
+  ], var.embed_agent_id && trimspace(var.agent_id) != "" ? ["&agent_id=", var.agent_id] : []))
 }
 
 output "identifier" {