Skip to content

Commit b61a5d7

Browse files
blink-so[bot]matifali
blink-so[bot]
and
matifali
authored
feat: replace the jetbrains-gateway module with the jetbrains toolbox (coder#19583)
Co-authored-by: blink-so[bot] <211532188+blink-so[bot]@users.noreply.github.com> Co-authored-by: Atif Ali <atif@coder.com>
1 parent abc946c commit b61a5d7

File tree

13 files changed

+79
-181
lines changed

13 files changed

+79
-181
lines changed

‎docs/about/contributing/modules.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ Use the version bump script to update versions:
369369

370370
## Get help
371371

372-
- **Examples**: Review existing modules like [`code-server`](https://registry.coder.com/modules/coder/code-server), [`git-clone`](https://registry.coder.com/modules/coder/git-clone), and [`jetbrains-gateway`](https://registry.coder.com/modules/coder/jetbrains-gateway)
372+
- **Examples**: Review existing modules like [`code-server`](https://registry.coder.com/modules/coder/code-server), [`git-clone`](https://registry.coder.com/modules/coder/git-clone), and [`jetbrains`](https://registry.coder.com/modules/coder/jetbrains)
373373
- **Issues**: Open an issue at [github.com/coder/registry](https://github.com/coder/registry/issues)
374374
- **Community**: Join the [Coder Discord](https://discord.gg/coder) for questions
375375
- **Documentation**: Check the [Coder docs](https://coder.com/docs) for help on Coder.

‎docs/admin/templates/extending-templates/modules.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ across templates. Some of the modules we publish are,
4444
[`vscode-web`](https://registry.coder.com/modules/coder/vscode-web)
4545
2. [`git-clone`](https://registry.coder.com/modules/coder/git-clone)
4646
3. [`dotfiles`](https://registry.coder.com/modules/coder/dotfiles)
47-
4. [`jetbrains-gateway`](https://registry.coder.com/modules/coder/jetbrains-gateway)
47+
4. [`jetbrains`](https://registry.coder.com/modules/coder/jetbrains)
4848
5. [`jfrog-oauth`](https://registry.coder.com/modules/coder/jfrog-oauth) and
4949
[`jfrog-token`](https://registry.coder.com/modules/coder/jfrog-token)
5050
6. [`vault-github`](https://registry.coder.com/modules/coder/vault-github)

‎dogfood/coder-envbuilder/main.tf

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -135,15 +135,13 @@ module "code-server" {
135135
auto_install_extensions = true
136136
}
137137

138-
module "jetbrains_gateway" {
139-
source = "dev.registry.coder.com/coder/jetbrains-gateway/coder"
140-
version = "1.1.1"
141-
agent_id = coder_agent.dev.id
142-
agent_name = "dev"
143-
folder = local.repo_dir
144-
jetbrains_ides = ["GO", "WS"]
145-
default = "GO"
146-
latest = true
138+
module "jetbrains" {
139+
count = data.coder_workspace.me.start_count
140+
source = "dev.registry.coder.com/coder/jetbrains/coder"
141+
version = "~> 1.0"
142+
agent_id = coder_agent.dev.id
143+
agent_name = "dev"
144+
folder = local.repo_dir
147145
}
148146

149147
module "filebrowser" {
@@ -448,4 +446,4 @@ resource "coder_metadata" "container_info" {
448446
key = "region"
449447
value = data.coder_parameter.region.option[index(data.coder_parameter.region.option.*.value, data.coder_parameter.region.value)].name
450448
}
451-
}
449+
}

‎examples/templates/aws-linux/main.tf

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -205,24 +205,14 @@ module "code-server" {
205205
order = 1
206206
}
207207

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-
208+
# See https://registry.coder.com/modules/coder/jetbrains
209+
module "jetbrains" {
210+
count = data.coder_workspace.me.start_count
211+
source = "registry.coder.com/coder/jetbrains/coder"
212+
version = "~> 1.0"
223213
agent_id = coder_agent.dev[0].id
224214
agent_name = "dev"
225-
order = 2
215+
folder = "/home/coder"
226216
}
227217

228218
locals {
@@ -293,4 +283,4 @@ resource "coder_metadata" "workspace_info" {
293283
resource "aws_ec2_instance_state" "dev" {
294284
instance_id = aws_instance.dev.id
295285
state = data.coder_workspace.me.transition == "start" ? "running" : "stopped"
296-
}
286+
}

‎examples/templates/azure-linux/main.tf

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -148,24 +148,14 @@ module "code-server" {
148148
order = 1
149149
}
150150

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-
151+
# See https://registry.coder.com/modules/coder/jetbrains
152+
module "jetbrains" {
153+
count = data.coder_workspace.me.start_count
154+
source = "registry.coder.com/coder/jetbrains/coder"
155+
version = "~> 1.0"
166156
agent_id = coder_agent.main.id
167157
agent_name = "main"
168-
order = 2
158+
folder = "/home/coder"
169159
}
170160

171161
locals {
@@ -322,4 +312,4 @@ resource "coder_metadata" "home_info" {
322312
key = "size"
323313
value = "${data.coder_parameter.home_size.value} GiB"
324314
}
325-
}
315+
}

‎examples/templates/digitalocean-linux/main.tf

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -276,24 +276,14 @@ module "code-server" {
276276
order = 1
277277
}
278278

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-
279+
# See https://registry.coder.com/modules/coder/jetbrains
280+
module "jetbrains" {
281+
count = data.coder_workspace.me.start_count
282+
source = "registry.coder.com/coder/jetbrains/coder"
283+
version = "~> 1.0"
294284
agent_id = coder_agent.main.id
295285
agent_name = "main"
296-
order = 2
286+
folder = "/home/coder"
297287
}
298288

299289
resource "digitalocean_volume" "home_volume" {
@@ -358,4 +348,4 @@ resource "coder_metadata" "volume-info" {
358348
key = "size"
359349
value = "${digitalocean_volume.home_volume.size} GiB"
360350
}
361-
}
351+
}

‎examples/templates/docker-envbuilder/main.tf

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -334,24 +334,14 @@ module "code-server" {
334334
order = 1
335335
}
336336

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-
337+
# See https://registry.coder.com/modules/coder/jetbrains
338+
module "jetbrains" {
339+
count = data.coder_workspace.me.start_count
340+
source = "registry.coder.com/coder/jetbrains/coder"
341+
version = "~> 1.0"
352342
agent_id = coder_agent.main.id
353343
agent_name = "main"
354-
order = 2
344+
folder = "/workspaces"
355345
}
356346

357347
resource "coder_metadata" "container_info" {

‎examples/templates/docker/main.tf

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -133,24 +133,14 @@ module "code-server" {
133133
order = 1
134134
}
135135

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-
136+
# See https://registry.coder.com/modules/coder/jetbrains
137+
module "jetbrains" {
138+
count = data.coder_workspace.me.start_count
139+
source = "registry.coder.com/coder/jetbrains/coder"
140+
version = "~> 1.0"
151141
agent_id = coder_agent.main.id
152142
agent_name = "main"
153-
order = 2
143+
folder = "/home/coder"
154144
}
155145

156146
resource "docker_volume" "home_volume" {
@@ -217,4 +207,4 @@ resource "docker_container" "workspace" {
217207
label = "coder.workspace_name"
218208
value = data.coder_workspace.me.name
219209
}
220-
}
210+
}

‎examples/templates/gcp-devcontainer/main.tf

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -295,24 +295,14 @@ module "code-server" {
295295
order = 1
296296
}
297297

298-
# See https://registry.coder.com/modules/coder/jetbrains-gateway
299-
module "jetbrains_gateway" {
300-
count = data.coder_workspace.me.start_count
301-
source = "registry.coder.com/coder/jetbrains-gateway/coder"
302-
303-
# JetBrains IDEs to make available for the user to select
304-
jetbrains_ides = ["IU", "PY", "WS", "PS", "RD", "CL", "GO", "RM"]
305-
default = "IU"
306-
307-
# Default folder to open when starting a JetBrains IDE
308-
folder = "/workspaces"
309-
310-
# 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.
311-
version = "~> 1.0"
312-
298+
# See https://registry.coder.com/modules/coder/jetbrains
299+
module "jetbrains" {
300+
count = data.coder_workspace.me.start_count
301+
source = "registry.coder.com/coder/jetbrains/coder"
302+
version = "~> 1.0"
313303
agent_id = coder_agent.main.id
314304
agent_name = "main"
315-
order = 2
305+
folder = "/workspaces"
316306
}
317307

318308
# Create metadata for the workspace and home disk.
@@ -338,4 +328,4 @@ resource "coder_metadata" "home_info" {
338328
key = "size"
339329
value = "${google_compute_disk.root.size} GiB"
340330
}
341-
}
331+
}

‎examples/templates/gcp-linux/main.tf

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -103,24 +103,14 @@ module "code-server" {
103103
order = 1
104104
}
105105

106-
# See https://registry.coder.com/modules/coder/jetbrains-gateway
107-
module "jetbrains_gateway" {
108-
count = data.coder_workspace.me.start_count
109-
source = "registry.coder.com/coder/jetbrains-gateway/coder"
110-
111-
# JetBrains IDEs to make available for the user to select
112-
jetbrains_ides = ["IU", "PY", "WS", "PS", "RD", "CL", "GO", "RM"]
113-
default = "IU"
114-
115-
# Default folder to open when starting a JetBrains IDE
116-
folder = "/home/coder"
117-
118-
# 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.
119-
version = "~> 1.0"
120-
106+
# See https://registry.coder.com/modules/coder/jetbrains
107+
module "jetbrains" {
108+
count = data.coder_workspace.me.start_count
109+
source = "registry.coder.com/coder/jetbrains/coder"
110+
version = "~> 1.0"
121111
agent_id = coder_agent.main.id
122112
agent_name = "main"
123-
order = 2
113+
folder = "/home/coder"
124114
}
125115

126116
resource "google_compute_instance" "dev" {
@@ -181,4 +171,4 @@ resource "coder_metadata" "home_info" {
181171
key = "size"
182172
value = "${google_compute_disk.root.size} GiB"
183173
}
184-
}
174+
}

0 commit comments

Comments
 (0)