diff --git a/docs/about/contributing/modules.md b/docs/about/contributing/modules.md index b824fa209e..05d06e9299 100644 --- a/docs/about/contributing/modules.md +++ b/docs/about/contributing/modules.md @@ -369,7 +369,7 @@ Use the version bump script to update versions: ## Get help -- **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) +- **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) - **Issues**: Open an issue at [github.com/coder/registry](https://github.com/coder/registry/issues) - **Community**: Join the [Coder Discord](https://discord.gg/coder) for questions - **Documentation**: Check the [Coder docs](https://coder.com/docs) for help on Coder. diff --git a/docs/admin/templates/extending-templates/modules.md b/docs/admin/templates/extending-templates/modules.md index 1495dfce1f..887704f098 100644 --- a/docs/admin/templates/extending-templates/modules.md +++ b/docs/admin/templates/extending-templates/modules.md @@ -44,7 +44,7 @@ across templates. Some of the modules we publish are, [`vscode-web`](https://registry.coder.com/modules/coder/vscode-web) 2. [`git-clone`](https://registry.coder.com/modules/coder/git-clone) 3. [`dotfiles`](https://registry.coder.com/modules/coder/dotfiles) -4. [`jetbrains-gateway`](https://registry.coder.com/modules/coder/jetbrains-gateway) +4. [`jetbrains`](https://registry.coder.com/modules/coder/jetbrains) 5. [`jfrog-oauth`](https://registry.coder.com/modules/coder/jfrog-oauth) and [`jfrog-token`](https://registry.coder.com/modules/coder/jfrog-token) 6. [`vault-github`](https://registry.coder.com/modules/coder/vault-github) diff --git a/dogfood/coder-envbuilder/main.tf b/dogfood/coder-envbuilder/main.tf index f5dfbb3259..cd316100fe 100644 --- a/dogfood/coder-envbuilder/main.tf +++ b/dogfood/coder-envbuilder/main.tf @@ -135,15 +135,13 @@ module "code-server" { auto_install_extensions = true } -module "jetbrains_gateway" { - source = "dev.registry.coder.com/coder/jetbrains-gateway/coder" - version = "1.1.1" - agent_id = coder_agent.dev.id - agent_name = "dev" - folder = local.repo_dir - jetbrains_ides = ["GO", "WS"] - default = "GO" - latest = true +module "jetbrains" { + count = data.coder_workspace.me.start_count + source = "dev.registry.coder.com/coder/jetbrains/coder" + version = "~> 1.0" + agent_id = coder_agent.dev.id + agent_name = "dev" + folder = local.repo_dir } module "filebrowser" { @@ -448,4 +446,4 @@ resource "coder_metadata" "container_info" { key = "region" value = data.coder_parameter.region.option[index(data.coder_parameter.region.option.*.value, data.coder_parameter.region.value)].name } -} +} \ No newline at end of file diff --git a/examples/templates/aws-linux/main.tf b/examples/templates/aws-linux/main.tf index bf59dadc67..ba22558432 100644 --- a/examples/templates/aws-linux/main.tf +++ b/examples/templates/aws-linux/main.tf @@ -205,24 +205,14 @@ module "code-server" { order = 1 } -# See https://registry.coder.com/modules/jetbrains-gateway -module "jetbrains_gateway" { - count = data.coder_workspace.me.start_count - source = "registry.coder.com/modules/jetbrains-gateway/coder" - - # JetBrains IDEs to make available for the user to select - jetbrains_ides = ["IU", "PY", "WS", "PS", "RD", "CL", "GO", "RM"] - default = "IU" - - # Default folder to open when starting a JetBrains IDE - folder = "/home/coder" - - # 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. - version = "~> 1.0" - +# See https://registry.coder.com/modules/coder/jetbrains +module "jetbrains" { + count = data.coder_workspace.me.start_count + source = "registry.coder.com/coder/jetbrains/coder" + version = "~> 1.0" agent_id = coder_agent.dev[0].id agent_name = "dev" - order = 2 + folder = "/home/coder" } locals { @@ -293,4 +283,4 @@ resource "coder_metadata" "workspace_info" { resource "aws_ec2_instance_state" "dev" { instance_id = aws_instance.dev.id state = data.coder_workspace.me.transition == "start" ? "running" : "stopped" -} +} \ No newline at end of file diff --git a/examples/templates/azure-linux/main.tf b/examples/templates/azure-linux/main.tf index 687c8cae2a..f19f468af3 100644 --- a/examples/templates/azure-linux/main.tf +++ b/examples/templates/azure-linux/main.tf @@ -148,24 +148,14 @@ module "code-server" { order = 1 } -# See https://registry.coder.com/modules/coder/jetbrains-gateway -module "jetbrains_gateway" { - count = data.coder_workspace.me.start_count - source = "registry.coder.com/coder/jetbrains-gateway/coder" - - # JetBrains IDEs to make available for the user to select - jetbrains_ides = ["IU", "PY", "WS", "PS", "RD", "CL", "GO", "RM"] - default = "IU" - - # Default folder to open when starting a JetBrains IDE - folder = "/home/coder" - - # 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. - version = "~> 1.0" - +# See https://registry.coder.com/modules/coder/jetbrains +module "jetbrains" { + count = data.coder_workspace.me.start_count + source = "registry.coder.com/coder/jetbrains/coder" + version = "~> 1.0" agent_id = coder_agent.main.id agent_name = "main" - order = 2 + folder = "/home/coder" } locals { @@ -322,4 +312,4 @@ resource "coder_metadata" "home_info" { key = "size" value = "${data.coder_parameter.home_size.value} GiB" } -} +} \ No newline at end of file diff --git a/examples/templates/digitalocean-linux/main.tf b/examples/templates/digitalocean-linux/main.tf index 4daf4b8b8a..e179952659 100644 --- a/examples/templates/digitalocean-linux/main.tf +++ b/examples/templates/digitalocean-linux/main.tf @@ -276,24 +276,14 @@ module "code-server" { order = 1 } -# See https://registry.coder.com/modules/coder/jetbrains-gateway -module "jetbrains_gateway" { - count = data.coder_workspace.me.start_count - source = "registry.coder.com/coder/jetbrains-gateway/coder" - - # JetBrains IDEs to make available for the user to select - jetbrains_ides = ["IU", "PY", "WS", "PS", "RD", "CL", "GO", "RM"] - default = "IU" - - # Default folder to open when starting a JetBrains IDE - folder = "/home/coder" - - # 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. - version = "~> 1.0" - +# See https://registry.coder.com/modules/coder/jetbrains +module "jetbrains" { + count = data.coder_workspace.me.start_count + source = "registry.coder.com/coder/jetbrains/coder" + version = "~> 1.0" agent_id = coder_agent.main.id agent_name = "main" - order = 2 + folder = "/home/coder" } resource "digitalocean_volume" "home_volume" { @@ -358,4 +348,4 @@ resource "coder_metadata" "volume-info" { key = "size" value = "${digitalocean_volume.home_volume.size} GiB" } -} +} \ No newline at end of file diff --git a/examples/templates/docker-envbuilder/main.tf b/examples/templates/docker-envbuilder/main.tf index 2765874f80..47e486c81b 100644 --- a/examples/templates/docker-envbuilder/main.tf +++ b/examples/templates/docker-envbuilder/main.tf @@ -334,24 +334,14 @@ module "code-server" { order = 1 } -# See https://registry.coder.com/modules/coder/jetbrains-gateway -module "jetbrains_gateway" { - count = data.coder_workspace.me.start_count - source = "registry.coder.com/coder/jetbrains-gateway/coder" - - # JetBrains IDEs to make available for the user to select - jetbrains_ides = ["IU", "PS", "WS", "PY", "CL", "GO", "RM", "RD", "RR"] - default = "IU" - - # Default folder to open when starting a JetBrains IDE - folder = "/workspaces" - - # 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. - version = "~> 1.0" - +# See https://registry.coder.com/modules/coder/jetbrains +module "jetbrains" { + count = data.coder_workspace.me.start_count + source = "registry.coder.com/coder/jetbrains/coder" + version = "~> 1.0" agent_id = coder_agent.main.id agent_name = "main" - order = 2 + folder = "/workspaces" } resource "coder_metadata" "container_info" { diff --git a/examples/templates/docker/main.tf b/examples/templates/docker/main.tf index 234c433823..d7f87b1923 100644 --- a/examples/templates/docker/main.tf +++ b/examples/templates/docker/main.tf @@ -133,24 +133,14 @@ module "code-server" { order = 1 } -# See https://registry.coder.com/modules/coder/jetbrains-gateway -module "jetbrains_gateway" { - count = data.coder_workspace.me.start_count - source = "registry.coder.com/coder/jetbrains-gateway/coder" - - # JetBrains IDEs to make available for the user to select - jetbrains_ides = ["IU", "PS", "WS", "PY", "CL", "GO", "RM", "RD", "RR"] - default = "IU" - - # Default folder to open when starting a JetBrains IDE - folder = "/home/coder" - - # 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. - version = "~> 1.0" - +# See https://registry.coder.com/modules/coder/jetbrains +module "jetbrains" { + count = data.coder_workspace.me.start_count + source = "registry.coder.com/coder/jetbrains/coder" + version = "~> 1.0" agent_id = coder_agent.main.id agent_name = "main" - order = 2 + folder = "/home/coder" } resource "docker_volume" "home_volume" { @@ -217,4 +207,4 @@ resource "docker_container" "workspace" { label = "coder.workspace_name" value = data.coder_workspace.me.name } -} +} \ No newline at end of file diff --git a/examples/templates/gcp-devcontainer/main.tf b/examples/templates/gcp-devcontainer/main.tf index 317a22fccd..015fa935c4 100644 --- a/examples/templates/gcp-devcontainer/main.tf +++ b/examples/templates/gcp-devcontainer/main.tf @@ -295,24 +295,14 @@ module "code-server" { order = 1 } -# See https://registry.coder.com/modules/coder/jetbrains-gateway -module "jetbrains_gateway" { - count = data.coder_workspace.me.start_count - source = "registry.coder.com/coder/jetbrains-gateway/coder" - - # JetBrains IDEs to make available for the user to select - jetbrains_ides = ["IU", "PY", "WS", "PS", "RD", "CL", "GO", "RM"] - default = "IU" - - # Default folder to open when starting a JetBrains IDE - folder = "/workspaces" - - # 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. - version = "~> 1.0" - +# See https://registry.coder.com/modules/coder/jetbrains +module "jetbrains" { + count = data.coder_workspace.me.start_count + source = "registry.coder.com/coder/jetbrains/coder" + version = "~> 1.0" agent_id = coder_agent.main.id agent_name = "main" - order = 2 + folder = "/workspaces" } # Create metadata for the workspace and home disk. @@ -338,4 +328,4 @@ resource "coder_metadata" "home_info" { key = "size" value = "${google_compute_disk.root.size} GiB" } -} +} \ No newline at end of file diff --git a/examples/templates/gcp-linux/main.tf b/examples/templates/gcp-linux/main.tf index 286db4e41d..da4ef2bae6 100644 --- a/examples/templates/gcp-linux/main.tf +++ b/examples/templates/gcp-linux/main.tf @@ -103,24 +103,14 @@ module "code-server" { order = 1 } -# See https://registry.coder.com/modules/coder/jetbrains-gateway -module "jetbrains_gateway" { - count = data.coder_workspace.me.start_count - source = "registry.coder.com/coder/jetbrains-gateway/coder" - - # JetBrains IDEs to make available for the user to select - jetbrains_ides = ["IU", "PY", "WS", "PS", "RD", "CL", "GO", "RM"] - default = "IU" - - # Default folder to open when starting a JetBrains IDE - folder = "/home/coder" - - # 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. - version = "~> 1.0" - +# See https://registry.coder.com/modules/coder/jetbrains +module "jetbrains" { + count = data.coder_workspace.me.start_count + source = "registry.coder.com/coder/jetbrains/coder" + version = "~> 1.0" agent_id = coder_agent.main.id agent_name = "main" - order = 2 + folder = "/home/coder" } resource "google_compute_instance" "dev" { @@ -181,4 +171,4 @@ resource "coder_metadata" "home_info" { key = "size" value = "${google_compute_disk.root.size} GiB" } -} +} \ No newline at end of file diff --git a/examples/templates/gcp-vm-container/main.tf b/examples/templates/gcp-vm-container/main.tf index 20ced76680..86023e3b7e 100644 --- a/examples/templates/gcp-vm-container/main.tf +++ b/examples/templates/gcp-vm-container/main.tf @@ -56,24 +56,14 @@ module "code-server" { order = 1 } -# See https://registry.coder.com/modules/coder/jetbrains-gateway -module "jetbrains_gateway" { - count = data.coder_workspace.me.start_count - source = "registry.coder.com/coder/jetbrains-gateway/coder" - - # JetBrains IDEs to make available for the user to select - jetbrains_ides = ["IU", "PY", "WS", "PS", "RD", "CL", "GO", "RM"] - default = "IU" - - # Default folder to open when starting a JetBrains IDE - folder = "/home/coder" - - # 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. - version = "~> 1.0" - +# See https://registry.coder.com/modules/coder/jetbrains +module "jetbrains" { + count = data.coder_workspace.me.start_count + source = "registry.coder.com/coder/jetbrains/coder" + version = "~> 1.0" agent_id = coder_agent.main.id agent_name = "main" - order = 2 + folder = "/home/coder" } # See https://registry.terraform.io/modules/terraform-google-modules/container-vm @@ -133,4 +123,4 @@ resource "coder_metadata" "workspace_info" { key = "image" value = module.gce-container.container.image } -} +} \ No newline at end of file diff --git a/examples/templates/kubernetes-devcontainer/main.tf b/examples/templates/kubernetes-devcontainer/main.tf index 8fc79fa25c..6d9dcfda0a 100644 --- a/examples/templates/kubernetes-devcontainer/main.tf +++ b/examples/templates/kubernetes-devcontainer/main.tf @@ -426,24 +426,14 @@ module "code-server" { order = 1 } -# See https://registry.coder.com/modules/coder/jetbrains-gateway -module "jetbrains_gateway" { - count = data.coder_workspace.me.start_count - source = "registry.coder.com/coder/jetbrains-gateway/coder" - - # JetBrains IDEs to make available for the user to select - jetbrains_ides = ["IU", "PY", "WS", "PS", "RD", "CL", "GO", "RM"] - default = "IU" - - # Default folder to open when starting a JetBrains IDE - folder = "/home/coder" - - # 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. - version = "~> 1.0" - +# See https://registry.coder.com/modules/coder/jetbrains +module "jetbrains" { + count = data.coder_workspace.me.start_count + source = "registry.coder.com/coder/jetbrains/coder" + version = "~> 1.0" agent_id = coder_agent.main.id agent_name = "main" - order = 2 + folder = "/home/coder" } resource "coder_metadata" "container_info" { @@ -461,4 +451,4 @@ resource "coder_metadata" "container_info" { key = "cache repo" value = var.cache_repo == "" ? "not enabled" : var.cache_repo } -} +} \ No newline at end of file diff --git a/examples/templates/kubernetes-envbox/main.tf b/examples/templates/kubernetes-envbox/main.tf index 00ae9a2f1f..09692bc840 100644 --- a/examples/templates/kubernetes-envbox/main.tf +++ b/examples/templates/kubernetes-envbox/main.tf @@ -110,24 +110,14 @@ module "code-server" { order = 1 } -# See https://registry.coder.com/modules/coder/jetbrains-gateway -module "jetbrains_gateway" { - count = data.coder_workspace.me.start_count - source = "registry.coder.com/coder/jetbrains-gateway/coder" - - # JetBrains IDEs to make available for the user to select - jetbrains_ides = ["IU", "PY", "WS", "PS", "RD", "CL", "GO", "RM"] - default = "IU" - - # Default folder to open when starting a JetBrains IDE - folder = "/home/coder" - - # 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. - version = "~> 1.0" - +# See https://registry.coder.com/modules/coder/jetbrains +module "jetbrains" { + count = data.coder_workspace.me.start_count + source = "registry.coder.com/coder/jetbrains/coder" + version = "~> 1.0" agent_id = coder_agent.main.id agent_name = "main" - order = 2 + folder = "/home/coder" } resource "kubernetes_persistent_volume_claim" "home" { @@ -319,4 +309,4 @@ resource "kubernetes_pod" "main" { } } } -} +} \ No newline at end of file