Skip to content

Commit 7e53098

Browse files
blink-so[bot]matifali
blink-so[bot]
and
matifali
authored
Update jetbrains-gateway module references to coder/jetbrains (#396)
Co-authored-by: blink-so[bot] <211532188+blink-so[bot]@users.noreply.github.com> Co-authored-by: Atif Ali <[email protected]>
1 parent 901043b commit 7e53098

File tree

16 files changed

+158
-240
lines changed

16 files changed

+158
-240
lines changed

‎registry/coder-labs/templates/tasks-docker/main.tf

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ module "claude-code" {
2424
source = "registry.coder.com/coder/claude-code/coder"
2525
version = "2.0.0"
2626
agent_id = coder_agent.main.id
27+
agent_name = "main"
2728
folder = "/home/coder/projects"
2829
install_claude_code = true
2930
claude_code_version = "latest"
@@ -44,9 +45,10 @@ variable "anthropic_api_key" {
4445
sensitive = true
4546
}
4647
resource "coder_env" "anthropic_api_key" {
47-
agent_id = coder_agent.main.id
48-
name = "CODER_MCP_CLAUDE_API_KEY"
49-
value = var.anthropic_api_key
48+
agent_id = coder_agent.main.id
49+
agent_name = "main"
50+
name = "CODER_MCP_CLAUDE_API_KEY"
51+
value = var.anthropic_api_key
5052
}
5153

5254
# We are using presets to set the prompts, image, and set up instructions
@@ -174,19 +176,22 @@ data "coder_parameter" "preview_port" {
174176

175177
# Other variables for Claude Code
176178
resource "coder_env" "claude_task_prompt" {
177-
agent_id = coder_agent.main.id
178-
name = "CODER_MCP_CLAUDE_TASK_PROMPT"
179-
value = data.coder_parameter.ai_prompt.value
179+
agent_id = coder_agent.main.id
180+
agent_name = "main"
181+
name = "CODER_MCP_CLAUDE_TASK_PROMPT"
182+
value = data.coder_parameter.ai_prompt.value
180183
}
181184
resource "coder_env" "app_status_slug" {
182-
agent_id = coder_agent.main.id
183-
name = "CODER_MCP_APP_STATUS_SLUG"
184-
value = "ccw"
185+
agent_id = coder_agent.main.id
186+
agent_name = "main"
187+
name = "CODER_MCP_APP_STATUS_SLUG"
188+
value = "ccw"
185189
}
186190
resource "coder_env" "claude_system_prompt" {
187-
agent_id = coder_agent.main.id
188-
name = "CODER_MCP_CLAUDE_SYSTEM_PROMPT"
189-
value = data.coder_parameter.system_prompt.value
191+
agent_id = coder_agent.main.id
192+
agent_name = "main"
193+
name = "CODER_MCP_CLAUDE_SYSTEM_PROMPT"
194+
value = data.coder_parameter.system_prompt.value
190195
}
191196

192197
data "coder_provisioner" "me" {}
@@ -296,48 +301,42 @@ module "code-server" {
296301
# This ensures that the latest non-breaking version of the module gets downloaded, you can also pin the module version to prevent breaking changes in production.
297302
version = "~> 1.0"
298303

299-
agent_id = coder_agent.main.id
300-
order = 1
304+
agent_id = coder_agent.main.id
305+
agent_name = "main"
306+
order = 1
301307
}
302308

303309
module "vscode" {
304-
count = data.coder_workspace.me.start_count
305-
source = "registry.coder.com/coder/vscode-desktop/coder"
306-
version = "1.1.0"
307-
agent_id = coder_agent.main.id
310+
count = data.coder_workspace.me.start_count
311+
source = "registry.coder.com/coder/vscode-desktop/coder"
312+
version = "1.1.0"
313+
agent_id = coder_agent.main.id
314+
agent_name = "main"
308315
}
309316

310317
module "windsurf" {
311-
count = data.coder_workspace.me.start_count
312-
source = "registry.coder.com/coder/windsurf/coder"
313-
version = "1.1.0"
314-
agent_id = coder_agent.main.id
318+
count = data.coder_workspace.me.start_count
319+
source = "registry.coder.com/coder/windsurf/coder"
320+
version = "1.1.0"
321+
agent_id = coder_agent.main.id
322+
agent_name = "main"
315323
}
316324

317325
module "cursor" {
318-
count = data.coder_workspace.me.start_count
319-
source = "registry.coder.com/coder/cursor/coder"
320-
version = "1.2.0"
321-
agent_id = coder_agent.main.id
326+
count = data.coder_workspace.me.start_count
327+
source = "registry.coder.com/coder/cursor/coder"
328+
version = "1.2.0"
329+
agent_id = coder_agent.main.id
330+
agent_name = "main"
322331
}
323332

324-
module "jetbrains_gateway" {
325-
count = data.coder_workspace.me.start_count
326-
source = "registry.coder.com/coder/jetbrains-gateway/coder"
327-
328-
# JetBrains IDEs to make available for the user to select
329-
jetbrains_ides = ["IU", "PS", "WS", "PY", "CL", "GO", "RM", "RD", "RR"]
330-
default = "IU"
331-
332-
# Default folder to open when starting a JetBrains IDE
333-
folder = "/home/coder/projects"
334-
335-
# This ensures that the latest non-breaking version of the module gets downloaded, you can also pin the module version to prevent breaking changes in production.
336-
version = "~> 1.0"
337-
333+
module "jetbrains" {
334+
count = data.coder_workspace.me.start_count
335+
source = "registry.coder.com/modules/coder/jetbrains/coder"
336+
version = "~> 1.0"
338337
agent_id = coder_agent.main.id
339338
agent_name = "main"
340-
order = 2
339+
folder = "/home/coder/projects"
341340
}
342341

343342
resource "docker_volume" "home_volume" {
@@ -369,6 +368,7 @@ resource "docker_volume" "home_volume" {
369368

370369
resource "coder_app" "preview" {
371370
agent_id = coder_agent.main.id
371+
agent_name = "main"
372372
slug = "preview"
373373
display_name = "Preview your app"
374374
icon = "${data.coder_workspace.me.access_url}/emojis/1f50e.png"
@@ -422,4 +422,4 @@ resource "docker_container" "workspace" {
422422
label = "coder.workspace_name"
423423
value = data.coder_workspace.me.name
424424
}
425-
}
425+
}

‎registry/coder/templates/aws-devcontainer/main.tf

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,7 @@ module "code-server" {
326326
count = data.coder_workspace.me.start_count
327327
source = "registry.coder.com/coder/code-server/coder"
328328
# This ensures that the latest non-breaking version of the module gets downloaded, you can also pin the module version to prevent breaking changes in production.
329-
version = "~> 1.0"
330-
agent_id = coder_agent.dev[0].id
329+
version = "~> 1.0"
330+
agent_id = coder_agent.dev[0].id
331+
agent_name = "dev"
331332
}

‎registry/coder/templates/aws-linux/main.tf

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -201,28 +201,19 @@ module "code-server" {
201201
# This ensures that the latest non-breaking version of the module gets downloaded, you can also pin the module version to prevent breaking changes in production.
202202
version = "~> 1.0"
203203

204-
agent_id = coder_agent.dev[0].id
205-
order = 1
204+
agent_id = coder_agent.dev[0].id
205+
agent_name = "dev"
206+
order = 1
206207
}
207208

208-
# See https://registry.coder.com/modules/jetbrains-gateway
209-
module "jetbrains_gateway" {
210-
count = data.coder_workspace.me.start_count
211-
source = "registry.coder.com/modules/jetbrains-gateway/coder"
212-
213-
# JetBrains IDEs to make available for the user to select
214-
jetbrains_ides = ["IU", "PY", "WS", "PS", "RD", "CL", "GO", "RM"]
215-
default = "IU"
216-
217-
# Default folder to open when starting a JetBrains IDE
218-
folder = "/home/coder"
219-
220-
# This ensures that the latest non-breaking version of the module gets downloaded, you can also pin the module version to prevent breaking changes in production.
221-
version = "~> 1.0"
222-
209+
# See https://registry.coder.com/modules/coder/jetbrains
210+
module "jetbrains" {
211+
count = data.coder_workspace.me.start_count
212+
source = "registry.coder.com/modules/coder/jetbrains/coder"
213+
version = "~> 1.0"
223214
agent_id = coder_agent.dev[0].id
224215
agent_name = "dev"
225-
order = 2
216+
folder = "/home/coder"
226217
}
227218

228219
locals {
@@ -293,4 +284,4 @@ resource "coder_metadata" "workspace_info" {
293284
resource "aws_ec2_instance_state" "dev" {
294285
instance_id = aws_instance.dev.id
295286
state = data.coder_workspace.me.transition == "start" ? "running" : "stopped"
296-
}
287+
}

‎registry/coder/templates/azure-linux/main.tf

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -144,28 +144,19 @@ module "code-server" {
144144
# This ensures that the latest non-breaking version of the module gets downloaded, you can also pin the module version to prevent breaking changes in production.
145145
version = "~> 1.0"
146146

147-
agent_id = coder_agent.main.id
148-
order = 1
147+
agent_id = coder_agent.main.id
148+
agent_name = "main"
149+
order = 1
149150
}
150151

151-
# See https://registry.coder.com/modules/coder/jetbrains-gateway
152-
module "jetbrains_gateway" {
153-
count = data.coder_workspace.me.start_count
154-
source = "registry.coder.com/coder/jetbrains-gateway/coder"
155-
156-
# JetBrains IDEs to make available for the user to select
157-
jetbrains_ides = ["IU", "PY", "WS", "PS", "RD", "CL", "GO", "RM"]
158-
default = "IU"
159-
160-
# Default folder to open when starting a JetBrains IDE
161-
folder = "/home/coder"
162-
163-
# This ensures that the latest non-breaking version of the module gets downloaded, you can also pin the module version to prevent breaking changes in production.
164-
version = "~> 1.0"
165-
152+
# See https://registry.coder.com/modules/coder/jetbrains
153+
module "jetbrains" {
154+
count = data.coder_workspace.me.start_count
155+
source = "registry.coder.com/modules/coder/jetbrains/coder"
156+
version = "~> 1.0"
166157
agent_id = coder_agent.main.id
167158
agent_name = "main"
168-
order = 2
159+
folder = "/home/coder"
169160
}
170161

171162
locals {
@@ -322,4 +313,4 @@ resource "coder_metadata" "home_info" {
322313
key = "size"
323314
value = "${data.coder_parameter.home_size.value} GiB"
324315
}
325-
}
316+
}

‎registry/coder/templates/azure-windows/main.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ module "windows_rdp" {
3737
admin_password = random_password.admin_password.result
3838

3939
agent_id = resource.coder_agent.main.id
40+
agent_name = "main"
4041
resource_id = null # Unused, to be removed in a future version
4142
}
4243

‎registry/coder/templates/digitalocean-linux/main.tf

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -272,28 +272,19 @@ module "code-server" {
272272
# This ensures that the latest non-breaking version of the module gets downloaded, you can also pin the module version to prevent breaking changes in production.
273273
version = "~> 1.0"
274274

275-
agent_id = coder_agent.main.id
276-
order = 1
275+
agent_id = coder_agent.main.id
276+
agent_name = "main"
277+
order = 1
277278
}
278279

279-
# See https://registry.coder.com/modules/coder/jetbrains-gateway
280-
module "jetbrains_gateway" {
281-
count = data.coder_workspace.me.start_count
282-
source = "registry.coder.com/coder/jetbrains-gateway/coder"
283-
284-
# JetBrains IDEs to make available for the user to select
285-
jetbrains_ides = ["IU", "PY", "WS", "PS", "RD", "CL", "GO", "RM"]
286-
default = "IU"
287-
288-
# Default folder to open when starting a JetBrains IDE
289-
folder = "/home/coder"
290-
291-
# This ensures that the latest non-breaking version of the module gets downloaded, you can also pin the module version to prevent breaking changes in production.
292-
version = "~> 1.0"
293-
280+
# See https://registry.coder.com/modules/coder/jetbrains
281+
module "jetbrains" {
282+
count = data.coder_workspace.me.start_count
283+
source = "registry.coder.com/modules/coder/jetbrains/coder"
284+
version = "~> 1.0"
294285
agent_id = coder_agent.main.id
295286
agent_name = "main"
296-
order = 2
287+
folder = "/home/coder"
297288
}
298289

299290
resource "digitalocean_volume" "home_volume" {
@@ -358,4 +349,4 @@ resource "coder_metadata" "volume-info" {
358349
key = "size"
359350
value = "${digitalocean_volume.home_volume.size} GiB"
360351
}
361-
}
352+
}

‎registry/coder/templates/docker-devcontainer/main.tf

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -330,28 +330,19 @@ module "code-server" {
330330
# This ensures that the latest non-breaking version of the module gets downloaded, you can also pin the module version to prevent breaking changes in production.
331331
version = "~> 1.0"
332332

333-
agent_id = coder_agent.main.id
334-
order = 1
333+
agent_id = coder_agent.main.id
334+
agent_name = "main"
335+
order = 1
335336
}
336337

337-
# See https://registry.coder.com/modules/coder/jetbrains-gateway
338-
module "jetbrains_gateway" {
339-
count = data.coder_workspace.me.start_count
340-
source = "registry.coder.com/coder/jetbrains-gateway/coder"
341-
342-
# JetBrains IDEs to make available for the user to select
343-
jetbrains_ides = ["IU", "PS", "WS", "PY", "CL", "GO", "RM", "RD", "RR"]
344-
default = "IU"
345-
346-
# Default folder to open when starting a JetBrains IDE
347-
folder = "/workspaces"
348-
349-
# This ensures that the latest non-breaking version of the module gets downloaded, you can also pin the module version to prevent breaking changes in production.
350-
version = "~> 1.0"
351-
338+
# See https://registry.coder.com/modules/coder/jetbrains
339+
module "jetbrains" {
340+
count = data.coder_workspace.me.start_count
341+
source = "registry.coder.com/modules/coder/jetbrains/coder"
342+
version = "~> 1.0"
352343
agent_id = coder_agent.main.id
353344
agent_name = "main"
354-
order = 2
345+
folder = "/workspaces"
355346
}
356347

357348
resource "coder_metadata" "container_info" {
@@ -369,4 +360,4 @@ resource "coder_metadata" "container_info" {
369360
key = "cache repo"
370361
value = var.cache_repo == "" ? "not enabled" : var.cache_repo
371362
}
372-
}
363+
}

‎registry/coder/templates/docker/main.tf

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -129,28 +129,19 @@ module "code-server" {
129129
# This ensures that the latest non-breaking version of the module gets downloaded, you can also pin the module version to prevent breaking changes in production.
130130
version = "~> 1.0"
131131

132-
agent_id = coder_agent.main.id
133-
order = 1
132+
agent_id = coder_agent.main.id
133+
agent_name = "main"
134+
order = 1
134135
}
135136

136-
# See https://registry.coder.com/modules/coder/jetbrains-gateway
137-
module "jetbrains_gateway" {
138-
count = data.coder_workspace.me.start_count
139-
source = "registry.coder.com/coder/jetbrains-gateway/coder"
140-
141-
# JetBrains IDEs to make available for the user to select
142-
jetbrains_ides = ["IU", "PS", "WS", "PY", "CL", "GO", "RM", "RD", "RR"]
143-
default = "IU"
144-
145-
# Default folder to open when starting a JetBrains IDE
146-
folder = "/home/coder"
147-
148-
# This ensures that the latest non-breaking version of the module gets downloaded, you can also pin the module version to prevent breaking changes in production.
149-
version = "~> 1.0"
150-
137+
# See https://registry.coder.com/modules/coder/jetbrains
138+
module "jetbrains" {
139+
count = data.coder_workspace.me.start_count
140+
source = "registry.coder.com/modules/coder/jetbrains/coder"
141+
version = "~> 1.0"
151142
agent_id = coder_agent.main.id
152143
agent_name = "main"
153-
order = 2
144+
folder = "/home/coder"
154145
}
155146

156147
resource "docker_volume" "home_volume" {
@@ -217,4 +208,4 @@ resource "docker_container" "workspace" {
217208
label = "coder.workspace_name"
218209
value = data.coder_workspace.me.name
219210
}
220-
}
211+
}

0 commit comments

Comments
 (0)