Skip to content

Commit

Permalink
Add owner to Gateway link
Browse files Browse the repository at this point in the history
Without this, it is not possible to reliably connect to another user's
workspace (for admins, mainly).
  • Loading branch information
code-asher committed Oct 4, 2024
1 parent 438c904 commit 7395a35
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 0 deletions.
20 changes: 20 additions & 0 deletions jetbrains-gateway/main.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,26 @@ describe("jetbrains-gateway", async () => {
folder: "/home/foo",
});

it("should create a link with the default values", 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=241.14494.240&ide_download_link=https://download.jetbrains.com/idea/ideaIU-2024.1.tar.gz",
);

const coder_app = state.resources.find(
(res) => res.type === "coder_app" && res.name === "gateway",
);

expect(coder_app).not.toBeNull();
expect(coder_app?.instances.length).toBe(1);
expect(coder_app?.instances[0].attributes.order).toBeNull();
});

it("default to first ide", async () => {
const state = await runTerraformApply(import.meta.dir, {
agent_id: "foo",
Expand Down
3 changes: 3 additions & 0 deletions jetbrains-gateway/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,7 @@ data "coder_parameter" "jetbrains_ide" {
}

data "coder_workspace" "me" {}
data "coder_workspace_owner" "me" {}

resource "coder_app" "gateway" {
agent_id = var.agent_id
Expand All @@ -254,6 +255,8 @@ resource "coder_app" "gateway" {
url = join("", [
"jetbrains-gateway://connect#type=coder&workspace=",
data.coder_workspace.me.name,
"&owner=",
data.coder_workspace_owner.me.name,
"&agent=",
var.agent_name,
"&folder=",
Expand Down

0 comments on commit 7395a35

Please sign in to comment.