Skip to content

chore: fix for jetbrains gateway agent_id issue #437

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Oct 5, 2025
Merged

chore: fix for jetbrains gateway agent_id issue #437

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
0945873
fix of pr167 & zd4391
rowansmithau Sep 29, 2025
0926bdf
version bump script
rowansmithau Sep 29, 2025
fc7cc77
rework to use agent name
rowansmithau Sep 30, 2025
612e94e
update var name, remove deprecation note
rowansmithau Sep 30, 2025
1656b33
format
rowansmithau Sep 30, 2025
7e52b80
simplification
rowansmithau Oct 2, 2025
7dc5cc3
Merge branch 'main' into rowansmithau/chore/jetbrains_gateway_multi_a…
rowansmithau Oct 2, 2025
1c68179
fix when no value is provided
rowansmithau Oct 2, 2025
38e0887
format
rowansmithau Oct 2, 2025
7597456
simplification
rowansmithau Oct 2, 2025
1a78ce3
format
rowansmithau Oct 3, 2025
dfe7fc6
format
rowansmithau Oct 3, 2025
667c991
updated test
rowansmithau Oct 3, 2025
0acf51c
version bump script
rowansmithau Oct 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion registry/coder/modules/jetbrains-gateway/main.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -40,4 +40,16 @@ describe("jetbrains-gateway", async () => {
});
expect(state.outputs.identifier.value).toBe("IU");
});

it("optionally includes agent when an agent name is provided", async () => {
const state = await runTerraformApply(import.meta.dir, {
agent_id: "foo",
agent_name: "main",
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=main",
);
});
});
13 changes: 6 additions & 7 deletions registry/coder/modules/jetbrains-gateway/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,8 @@ variable "slug" {

variable "agent_name" {
type = string
description = "Agent name. (unused). Will be removed in a future version"

default = ""
description = "Agent name."
default = ""
}

variable "folder" {
Expand Down Expand Up @@ -331,7 +330,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=",
Expand All @@ -348,9 +347,9 @@ resource "coder_app" "gateway" {
local.build_number,
"&ide_download_link=",
local.download_link,
"&agent_id=",
var.agent_id,
])
], trimspace(var.agent_name) != ""
? ["&agent=", var.agent_name]
: []))
}

output "identifier" {
Expand Down