Skip to content

Commit 3bea223

Browse files
fix: update fleet URL generation in jetbrains-fleet module
1 parent 47a830b commit 3bea223

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ describe("fleet-ide", async () => {
1717
agent_id: "foo",
1818
});
1919
expect(state.outputs.fleet_url.value).toBe(
20-
"fleet://fleet.ssh/https://mydeployment.coder.com?workspace=default&owner=default",
20+
"fleet://fleet.ssh/default.default.coder",
2121
);
2222

2323
const coder_app = state.resources.find(
@@ -35,7 +35,7 @@ describe("fleet-ide", async () => {
3535
folder: "/foo/bar",
3636
});
3737
expect(state.outputs.fleet_url.value).toBe(
38-
"fleet://fleet.ssh/https://mydeployment.coder.com?workspace=default&owner=default&pwd=/foo/bar",
38+
"fleet://fleet.ssh/default.default.coder?pwd=/foo/bar",
3939
);
4040
});
4141

@@ -46,7 +46,7 @@ describe("fleet-ide", async () => {
4646
slug: "my-fleet",
4747
});
4848
expect(state.outputs.fleet_url.value).toBe(
49-
"fleet://fleet.ssh/https://mydeployment.coder.com?workspace=default&owner=default",
49+
"fleet://fleet.ssh/default.default.coder",
5050
);
5151

5252
const coder_app = state.resources.find(

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,12 @@ variable "display_name" {
4747
data "coder_workspace" "me" {}
4848
data "coder_workspace_owner" "me" {}
4949

50+
locals {
51+
workspace_name = lower(data.coder_workspace.me.name)
52+
owner_name = lower(data.coder_workspace_owner.me.name)
53+
hostname = "${local.workspace_name}.${local.owner_name}.coder"
54+
}
55+
5056
resource "coder_app" "fleet" {
5157
agent_id = var.agent_id
5258
external = true
@@ -57,12 +63,8 @@ resource "coder_app" "fleet" {
5763
group = var.group
5864
url = join("", [
5965
"fleet://fleet.ssh/",
60-
data.coder_workspace.me.access_url,
61-
"?workspace=",
62-
data.coder_workspace.me.name,
63-
"&owner=",
64-
data.coder_workspace_owner.me.name,
65-
var.folder != "" ? join("", ["&pwd=", var.folder]) : ""
66+
local.hostname,
67+
var.folder != "" ? join("", ["?pwd=", var.folder]) : ""
6668
])
6769
}
6870

0 commit comments

Comments
 (0)