diff --git a/jetbrains-gateway/README.md b/jetbrains-gateway/README.md index 0d967a99..a3269a4c 100644 --- a/jetbrains-gateway/README.md +++ b/jetbrains-gateway/README.md @@ -15,9 +15,8 @@ This module adds a JetBrains Gateway Button to open any workspace with a single module "jetbrains_gateway" { count = data.coder_workspace.me.start_count source = "registry.coder.com/modules/jetbrains-gateway/coder" - version = "1.0.27" + version = "1.0.28" agent_id = coder_agent.example.id - agent_name = "example" folder = "/home/coder/example" jetbrains_ides = ["CL", "GO", "IU", "PY", "WS"] default = "GO" @@ -34,9 +33,8 @@ module "jetbrains_gateway" { module "jetbrains_gateway" { count = data.coder_workspace.me.start_count source = "registry.coder.com/modules/jetbrains-gateway/coder" - version = "1.0.27" + version = "1.0.28" agent_id = coder_agent.example.id - agent_name = "example" folder = "/home/coder/example" jetbrains_ides = ["GO", "WS"] default = "GO" @@ -49,9 +47,8 @@ module "jetbrains_gateway" { module "jetbrains_gateway" { count = data.coder_workspace.me.start_count source = "registry.coder.com/modules/jetbrains-gateway/coder" - version = "1.0.27" + version = "1.0.28" agent_id = coder_agent.example.id - agent_name = "example" folder = "/home/coder/example" jetbrains_ides = ["IU", "PY"] default = "IU" @@ -65,9 +62,8 @@ module "jetbrains_gateway" { module "jetbrains_gateway" { count = data.coder_workspace.me.start_count source = "registry.coder.com/modules/jetbrains-gateway/coder" - version = "1.0.27" + version = "1.0.28" agent_id = coder_agent.example.id - agent_name = "example" folder = "/home/coder/example" jetbrains_ides = ["IU", "PY"] default = "IU" @@ -91,9 +87,8 @@ module "jetbrains_gateway" { module "jetbrains_gateway" { count = data.coder_workspace.me.start_count source = "registry.coder.com/modules/jetbrains-gateway/coder" - version = "1.0.27" + version = "1.0.28" agent_id = coder_agent.example.id - agent_name = "example" folder = "/home/coder/example" jetbrains_ides = ["GO", "WS"] default = "GO" @@ -110,9 +105,8 @@ Due to the highest priority of the `ide_download_link` parameter in the `(jetbra module "jetbrains_gateway" { count = data.coder_workspace.me.start_count source = "registry.coder.com/modules/jetbrains-gateway/coder" - version = "1.0.27" + version = "1.0.28" agent_id = coder_agent.example.id - agent_name = "example" folder = "/home/coder/example" jetbrains_ides = ["GO", "WS"] releases_base_link = "https://releases.internal.site/" diff --git a/jetbrains-gateway/main.test.ts b/jetbrains-gateway/main.test.ts index a532e9bd..ea04a77d 100644 --- a/jetbrains-gateway/main.test.ts +++ b/jetbrains-gateway/main.test.ts @@ -10,7 +10,6 @@ describe("jetbrains-gateway", async () => { await testRequiredVariables(import.meta.dir, { agent_id: "foo", - agent_name: "foo", folder: "/home/foo", }); @@ -18,11 +17,10 @@ describe("jetbrains-gateway", async () => { const state = await runTerraformApply(import.meta.dir, { // These are all required. agent_id: "foo", - agent_name: "foo", folder: "/home/coder", }); expect(state.outputs.url.value).toBe( - "jetbrains-gateway://connect#type=coder&workspace=default&owner=default&agent=foo&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", + "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( @@ -37,7 +35,6 @@ describe("jetbrains-gateway", async () => { it("default to first ide", async () => { const state = await runTerraformApply(import.meta.dir, { agent_id: "foo", - agent_name: "foo", folder: "/home/foo", jetbrains_ides: '["IU", "GO", "PY"]', }); diff --git a/jetbrains-gateway/main.tf b/jetbrains-gateway/main.tf index 6daf48b9..d197399d 100644 --- a/jetbrains-gateway/main.tf +++ b/jetbrains-gateway/main.tf @@ -26,7 +26,9 @@ variable "slug" { variable "agent_name" { type = string - description = "Agent name." + description = "Agent name. (unused). Will be removed in a future version" + + default = "" } variable "folder" { @@ -295,8 +297,6 @@ resource "coder_app" "gateway" { data.coder_workspace.me.name, "&owner=", data.coder_workspace_owner.me.name, - "&agent=", - var.agent_name, "&folder=", var.folder, "&url=",