Fmt

.github/dependabot.yml

@@ -1,6 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"

.github/workflows/ci.yaml

@@ -17,41 +17,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: coder/coder/.github/actions/setup-tf@main
+      - uses: oven-sh/setup-bun@v1
-      - uses: oven-sh/setup-bun@v2
         with:
           bun-version: latest
-      - name: Setup
-        run: bun install
       - run: bun test
   pretty:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-        with:
+      - uses: oven-sh/setup-bun@v1
-          fetch-depth: 0 # Needed to get tags
-      - uses: coder/coder/.github/actions/setup-tf@main
-      - uses: oven-sh/setup-bun@v2
         with:
           bun-version: latest
-      - name: Setup
-        run: bun install
       - name: Format
         run: bun fmt:ci
-      - name: typos-action
-        uses: crate-ci/typos@v1.17.2
       - name: Lint
-        run: bun lint
+        run: bun install && bun lint
-      - name: Check version
-        shell: bash
-        run: |
-          # check for version changes
-          ./update-version.sh
-          # Check if any changes were made in README.md files
-          if [[ -n "$(git status --porcelain -- '**/README.md')" ]]; then
-            echo "Version mismatch detected. Please run ./update-version.sh and commit the updated README.md files."
-            git diff -- '**/README.md' 
-            exit 1
-          else
-            echo "No version mismatch detected. All versions are up to date."
-          fi

.icons/desktop.svg

@@ -1,5 +0,0 @@
-<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M31 6V22C31 23.65 29.65 25 28 25H4C2.35 25 1 23.65 1 22V6C1 4.35 2.35 3 4 3H28C29.65 3 31 4.35 31 6Z" fill="#2197F3"/>
-<path d="M21 27H17V24C17 23.4478 16.5522 23 16 23C15.4478 23 15 23.4478 15 24V27H11C10.4478 27 10 27.4478 10 28C10 28.5522 10.4478 29 11 29H21C21.5522 29 22 28.5522 22 28C22 27.4478 21.5522 27 21 27Z" fill="#FFC10A"/>
-<path d="M31 17V22C31 23.65 29.65 25 28 25H4C2.35 25 1 23.65 1 22V17H31Z" fill="#3F51B5"/>
-</svg>

.icons/exoscale.svg

@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 68.03 68.03"><defs><style>.cls-1{fill:#da291c;}</style></defs><title>Artboard 1</title><polygon class="cls-1" points="34.02 13.31 11.27 52.72 14.52 52.72 34.02 18.94 34.02 24.57 17.77 52.72 21.02 52.72 34.02 30.2 34.02 35.83 24.27 52.72 27.52 52.72 34.02 41.46 34.02 47.09 30.77 52.72 34.02 52.72 34.02 52.72 56.77 52.72 34.02 13.31"/></svg>

.icons/github.svg

@@ -1 +0,0 @@
-<svg width="98" height="96" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M48.854 0C21.839 0 0 22 0 49.217c0 21.756 13.993 40.172 33.405 46.69 2.427.49 3.316-1.059 3.316-2.362 0-1.141-.08-5.052-.08-9.127-13.59 2.934-16.42-5.867-16.42-5.867-2.184-5.704-5.42-7.17-5.42-7.17-4.448-3.015.324-3.015.324-3.015 4.934.326 7.523 5.052 7.523 5.052 4.367 7.496 11.404 5.378 14.235 4.074.404-3.178 1.699-5.378 3.074-6.6-10.839-1.141-22.243-5.378-22.243-24.283 0-5.378 1.94-9.778 5.014-13.2-.485-1.222-2.184-6.275.486-13.038 0 0 4.125-1.304 13.426 5.052a46.97 46.97 0 0 1 12.214-1.63c4.125 0 8.33.571 12.213 1.63 9.302-6.356 13.427-5.052 13.427-5.052 2.67 6.763.97 11.816.485 13.038 3.155 3.422 5.015 7.822 5.015 13.2 0 18.905-11.404 23.06-22.324 24.283 1.78 1.548 3.316 4.481 3.316 9.126 0 6.6-.08 11.897-.08 13.526 0 1.304.89 2.853 3.316 2.364 19.412-6.52 33.405-24.935 33.405-46.691C97.707 22 75.788 0 48.854 0z" fill="#fff"/></svg>

.icons/node.svg

@@ -1 +0,0 @@
-<svg width="2270" height="2500" viewBox="0 0 256 282" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMinYMin meet"><g fill="#8CC84B"><path d="M116.504 3.58c6.962-3.985 16.03-4.003 22.986 0 34.995 19.774 70.001 39.517 104.99 59.303 6.581 3.707 10.983 11.031 10.916 18.614v118.968c.049 7.897-4.788 15.396-11.731 19.019-34.88 19.665-69.742 39.354-104.616 59.019-7.106 4.063-16.356 3.75-23.24-.646-10.457-6.062-20.932-12.094-31.39-18.15-2.137-1.274-4.546-2.288-6.055-4.36 1.334-1.798 3.719-2.022 5.657-2.807 4.365-1.388 8.374-3.616 12.384-5.778 1.014-.694 2.252-.428 3.224.193 8.942 5.127 17.805 10.403 26.777 15.481 1.914 1.105 3.852-.362 5.488-1.274 34.228-19.345 68.498-38.617 102.72-57.968 1.268-.61 1.969-1.956 1.866-3.345.024-39.245.006-78.497.012-117.742.145-1.576-.767-3.025-2.192-3.67-34.759-19.575-69.5-39.18-104.253-58.76a3.621 3.621 0 0 0-4.094-.006C91.2 39.257 56.465 58.88 21.712 78.454c-1.42.646-2.373 2.071-2.204 3.653.006 39.245 0 78.497 0 117.748a3.329 3.329 0 0 0 1.89 3.303c9.274 5.259 18.56 10.481 27.84 15.722 5.228 2.814 11.647 4.486 17.407 2.33 5.083-1.823 8.646-7.01 8.549-12.407.048-39.016-.024-78.038.036-117.048-.127-1.732 1.516-3.163 3.2-3 4.456-.03 8.918-.06 13.374.012 1.86-.042 3.14 1.823 2.91 3.568-.018 39.263.048 78.527-.03 117.79.012 10.464-4.287 21.85-13.966 26.97-11.924 6.177-26.662 4.867-38.442-1.056-10.198-5.09-19.93-11.097-29.947-16.55C5.368 215.886.555 208.357.604 200.466V81.497c-.073-7.74 4.504-15.197 11.29-18.85C46.768 42.966 81.636 23.27 116.504 3.58z"/><path d="M146.928 85.99c15.21-.979 31.493-.58 45.18 6.913 10.597 5.742 16.472 17.793 16.659 29.566-.296 1.588-1.956 2.464-3.472 2.355-4.413-.006-8.827.06-13.24-.03-1.872.072-2.96-1.654-3.195-3.309-1.268-5.633-4.34-11.212-9.642-13.929-8.139-4.075-17.576-3.87-26.451-3.785-6.479.344-13.446.905-18.935 4.715-4.214 2.886-5.494 8.712-3.99 13.404 1.418 3.369 5.307 4.456 8.489 5.458 18.33 4.794 37.754 4.317 55.734 10.626 7.444 2.572 14.726 7.572 17.274 15.366 3.333 10.446 1.872 22.932-5.56 31.318-6.027 6.901-14.805 10.657-23.56 12.697-11.647 2.597-23.734 2.663-35.562 1.51-11.122-1.268-22.696-4.19-31.282-11.768-7.342-6.375-10.928-16.308-10.572-25.895.085-1.619 1.697-2.748 3.248-2.615 4.444-.036 8.888-.048 13.332.006 1.775-.127 3.091 1.407 3.182 3.08.82 5.367 2.837 11 7.517 14.182 9.032 5.827 20.365 5.428 30.707 5.591 8.568-.38 18.186-.495 25.178-6.158 3.689-3.23 4.782-8.634 3.785-13.283-1.08-3.925-5.186-5.754-8.712-6.95-18.095-5.724-37.736-3.647-55.656-10.12-7.275-2.571-14.31-7.432-17.105-14.906-3.9-10.578-2.113-23.662 6.098-31.765 8.006-8.06 19.563-11.164 30.551-12.275z"/></g></svg>

.icons/vault.svg

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-<svg width="800px" height="800px" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" fill="none"><path fill="#FFD814" d="M0 0l7.971 15.516L16 0H0zm6.732 6.16h-1.27V4.89h1.27v1.27zm0-1.906h-1.27V2.985h1.27v1.269zm1.904 3.81h-1.27v-1.27h1.27v1.27zm0-1.905h-1.27V4.89h1.27v1.27zm0-1.905h-1.27V2.985h1.27v1.269zm1.894 1.905H9.26V4.89h1.27v1.27zM9.26 4.254V2.985h1.27v1.269H9.26z"/></svg>

.sample/README.md

@@ -11,10 +11,9 @@ tags: [helper]
 
 <!-- Describes what this module does -->
 
-```tf
+```hcl
 module "MODULE_NAME" {
-  source  = "registry.coder.com/modules/MODULE_NAME/coder"
+    source = "https://registry.coder.com/modules/MODULE_NAME"
-  version = "1.0.2"
 }
 ```
 
@@ -26,10 +25,9 @@ module "MODULE_NAME" {
 
 Install the Dracula theme from [OpenVSX](https://open-vsx.org/):
 
-```tf
+```hcl
 module "MODULE_NAME" {
-  source     = "registry.coder.com/modules/MODULE_NAME/coder"
+    source = "https://registry.coder.com/modules/MODULE_NAME"
-  version    = "1.0.2"
     agent_id = coder_agent.example.id
     extensions = [
         "dracula-theme.theme-dracula"
@@ -43,10 +41,9 @@ Enter the `<author>.<name>` into the extensions array and code-server will autom
 
 Configure VS Code's [settings.json](https://code.visualstudio.com/docs/getstarted/settings#_settingsjson) file:
 
-```tf
+```hcl
 module "MODULE_NAME" {
-  source     = "registry.coder.com/modules/MODULE_NAME/coder"
+    source = "https://registry.coder.com/modules/MODULE_NAME"
-  version    = "1.0.2"
     agent_id = coder_agent.example.id
     extensions = [ "dracula-theme.theme-dracula" ]
     settings = {
@@ -59,10 +56,9 @@ module "MODULE_NAME" {
 
 Run code-server in the background, don't fetch it from GitHub:
 
-```tf
+```hcl
 module "MODULE_NAME" {
-  source   = "registry.coder.com/modules/MODULE_NAME/coder"
+    source = "https://registry.coder.com/modules/MODULE_NAME"
-  version  = "1.0.2"
     agent_id = coder_agent.example.id
     offline = true
 }

.sample/main.tf

@@ -4,7 +4,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = ">= 0.17"
+      version = ">= 0.12"
     }
   }
 }
@@ -50,12 +50,6 @@ variable "mutable" {
   description = "Whether the parameter is mutable."
   default     = true
 }
-
-variable "order" {
-  type        = number
-  description = "The order determines the position of app in the UI presentation. The lowest order is shown first and apps with equal order are sorted by name (ascending order)."
-  default     = null
-}
 # Add other variables here
 
 
@@ -75,10 +69,9 @@ resource "coder_app" "MODULE_NAME" {
   slug         = "MODULE_NAME"
   display_name = "MODULE_NAME"
   url          = "http://localhost:${var.port}"
-  icon         = local.icon_url
+  icon         = loocal.icon_url
   subdomain    = false
   share        = "owner"
-  order        = var.order
 
   # Remove if the app does not have a healthcheck endpoint
   healthcheck {

.sample/run.sh

@@ -1,15 +1,7 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 
-# Convert templated variables to shell variables
-# shellcheck disable=SC2269
-LOG_PATH=${LOG_PATH}
-
-# shellcheck disable=SC2034
 BOLD='\033[0;1m'
-
-# shellcheck disable=SC2059
 printf "$${BOLD}Installing MODULE_NAME ...\n\n"
-
 # Add code here
 # Use varibles from the templatefile function in main.tf
 # e.g. LOG_PATH, PORT, etc.
@@ -21,6 +13,6 @@ printf "👷 Starting MODULE_NAME in background...\n\n"
 # 1. Use & to run it in background
 # 2. redirct stdout and stderr to log files
 
-./app > "$${LOG_PATH}" 2>&1 &
+./app >${LOG_PATH} 2>&1 &
 
-printf "check logs at %s\n\n" "$${LOG_PATH}"
+printf "check logs at ${LOG_PATH} \n\n"

CONTRIBUTING.md

@@ -1,75 +1,26 @@
 # Contributing
 
-## Getting started
+To create a new module, clone this repository and run:
-
-This repo uses the [Bun runtime](https://bun.sh/) to to run all code and tests. To install Bun, you can run this command on Linux/MacOS:
 
 ```shell
-curl -fsSL https://bun.sh/install | bash
+./new.sh MOUDLE_NAME
-```
-
-Or this command on Windows:
-
-```shell
-powershell -c "irm bun.sh/install.ps1 | iex"
-```
-
-Follow the instructions to ensure that Bun is available globally. Once Bun has been installed, clone this repository. From there, run this script to create a new module:
-
-```shell
-./new.sh NAME_OF_NEW_MODULE
 ```
 
 ## Testing a Module
 
-> **Note:** It is the responsibility of the module author to implement tests for their module. The author must test the module locally before submitting a PR.
-
 A suite of test-helpers exists to run `terraform apply` on modules with variables, and test script output against containers.
 
-The testing suite must be able to run docker containers with the `--network=host` flag. This typically requires running the tests on Linux as this flag does not apply to Docker Desktop for MacOS and Windows. MacOS users can work around this by using something like [colima](https://github.com/abiosoft/colima) or [Orbstack](https://orbstack.dev/) instead of Docker Desktop.
+Reference existing `*.test.ts` files for implementation.
-
-Reference the existing `*.test.ts` files to get an idea for how to set up tests.
-
-You can run all tests in a specific file with this command:
 
 ```shell
+# Run tests for a specific module!
 $ bun test -t '<module>'
 ```
 
-Or run all tests by running this command:
-
-```shell
-$ bun test
-```
-
 You can test a module locally by updating the source as follows
 
-```tf
+```hcl
-module "example" {
 source = "git::https://github.com/<USERNAME>/<REPO>.git//<MODULE-NAME>?ref=<BRANCH-NAME>"
-  # You may need to remove the 'version' field, it is incompatible with some sources.
-}
 ```
 
-## Releases
+> **Note:** This is the responsibility of the module author to implement tests for their module. and test the module locally before submitting a PR.
-
-> [!WARNING]
-> When creating a new release, make sure that your new version number is fully accurate. If a version number is incorrect or does not exist, we may end up serving incorrect/old data for our various tools and providers.
-
-Much of our release process is automated. To cut a new release:
-
-1. Navigate to [GitHub's Releases page](https://github.com/coder/modules/releases)
-2. Click "Draft a new release"
-3. Click the "Choose a tag" button and type a new release number in the format `v<major>.<minor>.<patch>` (e.g., `v1.18.0`). Then click "Create new tag".
-4. Click the "Generate release notes" button, and clean up the resulting README. Be sure to remove any notes that would not be relevant to end-users (e.g., bumping dependencies).
-5. Once everything looks good, click the "Publish release" button.
-
-Once the release has been cut, a script will run to check whether there are any modules that will require that the new release number be published to Terraform. If there are any, a new pull request will automatically be generated. Be sure to approve this PR and merge it into the `main` branch.
-
-Following that, our automated processes will handle publishing new data for [`registry.coder.com`](https://github.com/coder/registry.coder.com/):
-
-1. Publishing new versions to Coder's [Terraform Registry](https://registry.terraform.io/providers/coder/coder/latest)
-2. Publishing new data to the [Coder Registry](https://registry.coder.com)
-
-> [!NOTE]
-> Some data in `registry.coder.com` is fetched on demand from the Module repo's main branch. This data should be updated almost immediately after a new release, but other changes will take some time to propagate.

README.md

@@ -3,21 +3,20 @@
   Modules
   </h1>
 
-[Module Registry](https://registry.coder.com) | [Coder Docs](https://coder.com/docs) | [Why Coder](https://coder.com/why) | [Coder Enterprise](https://coder.com/docs/v2/latest/enterprise)
+[Registry](https://registry.coder.com) | [Coder Docs](https://coder.com/docs) | [Why Coder](https://coder.com/why) | [Coder Enterprise](https://coder.com/docs/v2/latest/enterprise)
 
 [![discord](https://img.shields.io/discord/747933592273027093?label=discord)](https://discord.gg/coder)
 [![license](https://img.shields.io/github/license/coder/modules)](./LICENSE)
 
 </div>
 
-Modules extend Coder Templates to create reusable components for your development environment.
+Modules extend Templates to create reusable components for your development environment.
 
 e.g.
 
-```tf
+```hcl
 module "code-server" {
-  source   = "registry.coder.com/modules/code-server/coder"
+    source = "https://registry.coder.com/modules/code-server"
-  version  = "1.0.2"
     agent_id = coder_agent.main.id
 }
 ```

apache-airflow/README.md

@@ -1,23 +0,0 @@
----
-display_name: airflow
-description: A module that adds Apache Airflow in your Coder template
-icon: ../.icons/airflow.svg
-maintainer_github: coder
-partner_github: nataindata
-verified: true
-tags: [airflow, idea, web, helper]
----
-
-# airflow
-
-A module that adds Apache Airflow in your Coder template.
-
-```tf
-module "airflow" {
-  source   = "registry.coder.com/modules/apache-airflow/coder"
-  version  = "1.0.13"
-  agent_id = coder_agent.main.id
-}
-```
-
-![Airflow](../.images/airflow.png)

apache-airflow/main.tf

@@ -1,65 +0,0 @@
-terraform {
-  required_version = ">= 1.0"
-
-  required_providers {
-    coder = {
-      source  = "coder/coder"
-      version = ">= 0.17"
-    }
-  }
-}
-
-# Add required variables for your modules and remove any unneeded variables
-variable "agent_id" {
-  type        = string
-  description = "The ID of a Coder agent."
-}
-
-variable "log_path" {
-  type        = string
-  description = "The path to log airflow to."
-  default     = "/tmp/airflow.log"
-}
-
-variable "port" {
-  type        = number
-  description = "The port to run airflow on."
-  default     = 8080
-}
-
-variable "share" {
-  type    = string
-  default = "owner"
-  validation {
-    condition     = var.share == "owner" || var.share == "authenticated" || var.share == "public"
-    error_message = "Incorrect value. Please set either 'owner', 'authenticated', or 'public'."
-  }
-}
-
-variable "order" {
-  type        = number
-  description = "The order determines the position of app in the UI presentation. The lowest order is shown first and apps with equal order are sorted by name (ascending order)."
-  default     = null
-}
-
-resource "coder_script" "airflow" {
-  agent_id     = var.agent_id
-  display_name = "airflow"
-  icon         = "/icon/apache-guacamole.svg"
-  script = templatefile("${path.module}/run.sh", {
-    LOG_PATH : var.log_path,
-    PORT : var.port
-  })
-  run_on_start = true
-}
-
-resource "coder_app" "airflow" {
-  agent_id     = var.agent_id
-  slug         = "airflow"
-  display_name = "airflow"
-  url          = "http://localhost:${var.port}"
-  icon         = "/icon/apache-guacamole.svg"
-  subdomain    = true
-  share        = var.share
-  order        = var.order
-}

apache-airflow/run.sh

@@ -1,19 +0,0 @@
-#!/usr/bin/env sh
-
-BOLD='\033[0;1m'
-
-PATH=$PATH:~/.local/bin
-pip install --upgrade apache-airflow
-
-filename=~/airflow/airflow.db
-if ! [ -f $filename ] || ! [ -s $filename ]; then
-  airflow db init
-fi
-
-export AIRFLOW__CORE__LOAD_EXAMPLES=false
-
-airflow webserver > ${LOG_PATH} 2>&1 &
-
-airflow scheduler >> /tmp/airflow_scheduler.log 2>&1 &
-
-airflow users create -u admin -p admin -r Admin -e admin@admin.com -f Coder -l User

aws-region/README.md

@@ -14,10 +14,9 @@ the region closest to them.
 
 Customize the preselected parameter value:
 
-```tf
+```hcl
 module "aws-region" {
-  source  = "registry.coder.com/modules/aws-region/coder"
+    source = "https://registry.coder.com/modules/aws-region"
-  version = "1.0.12"
     default = "us-east-1"
 }
 
@@ -34,16 +33,13 @@ provider "aws" {
 
 Change the display name and icon for a region using the corresponding maps:
 
-```tf
+```hcl
 module "aws-region" {
-  source  = "registry.coder.com/modules/aws-region/coder"
+    source = "https://registry.coder.com/modules/aws-region"
-  version = "1.0.12"
     default = "ap-south-1"
-
     custom_names = {
         "ap-south-1": "Awesome Mumbai!"
     }
-
     custom_icons = {
         "ap-south-1": "/emojis/1f33a.png"
     }
@@ -60,10 +56,9 @@ provider "aws" {
 
 Hide the Asia Pacific regions Seoul and Osaka:
 
-```tf
+```hcl
 module "aws-region" {
-  source  = "registry.coder.com/modules/aws-region/coder"
+    source = "https://registry.coder.com/modules/aws-region"
-  version = "1.0.12"
     exclude = [ "ap-northeast-2", "ap-northeast-3" ]
 }
 

aws-region/main.test.ts

@@ -1,5 +1,6 @@
 import { describe, expect, it } from "bun:test";
 import {
+  executeScriptInContainer,
   runTerraformApply,
   runTerraformInit,
   testRequiredVariables,
@@ -21,13 +22,4 @@ describe("aws-region", async () => {
     });
     expect(state.outputs.value.value).toBe("us-west-2");
   });
-
-  it("set custom order for coder_parameter", async () => {
-    const order = 99;
-    const state = await runTerraformApply(import.meta.dir, {
-      coder_parameter_order: order.toString(),
-    });
-    expect(state.resources).toHaveLength(1);
-    expect(state.resources[0].instances[0].attributes.order).toBe(order);
-  });
 });

aws-region/main.tf

@@ -51,25 +51,11 @@ variable "exclude" {
   type        = list(string)
 }
 
-variable "coder_parameter_order" {
-  type        = number
-  description = "The order determines the position of a template parameter in the UI/CLI presentation. The lowest order is shown first and parameters with equal order are sorted by name (ascending order)."
-  default     = null
-}
-
 locals {
   # This is a static list because the regions don't change _that_
   # frequently and including the `aws_regions` data source requires
   # the provider, which requires a region.
   regions = {
-    "af-south-1" = {
-      name = "Africa (Cape Town)"
-      icon = "/emojis/1f1ff-1f1e6.png"
-    }
-    "ap-east-1" = {
-      name = "Asia Pacific (Hong Kong)"
-      icon = "/emojis/1f1ed-1f1f0.png"
-    }
     "ap-northeast-1" = {
       name = "Asia Pacific (Tokyo)"
       icon = "/emojis/1f1ef-1f1f5.png"
@@ -86,10 +72,6 @@ locals {
       name = "Asia Pacific (Mumbai)"
       icon = "/emojis/1f1ee-1f1f3.png"
     }
-    "ap-south-2" = {
-      name = "Asia Pacific (Hyderabad)"
-      icon = "/emojis/1f1ee-1f1f3.png"
-    }
     "ap-southeast-1" = {
       name = "Asia Pacific (Singapore)"
       icon = "/emojis/1f1f8-1f1ec.png"
@@ -98,42 +80,18 @@ locals {
       name = "Asia Pacific (Sydney)"
       icon = "/emojis/1f1e6-1f1fa.png"
     }
-    "ap-southeast-3" = {
-      name = "Asia Pacific (Jakarta)"
-      icon = "/emojis/1f1ee-1f1e9.png"
-    }
-    "ap-southeast-4" = {
-      name = "Asia Pacific (Melbourne)"
-      icon = "/emojis/1f1e6-1f1fa.png"
-    }
     "ca-central-1" = {
       name = "Canada (Central)"
       icon = "/emojis/1f1e8-1f1e6.png"
     }
-    "ca-west-1" = {
-      name = "Canada West (Calgary)"
-      icon = "/emojis/1f1e8-1f1e6.png"
-    }
     "eu-central-1" = {
       name = "EU (Frankfurt)"
       icon = "/emojis/1f1ea-1f1fa.png"
     }
-    "eu-central-2" = {
-      name = "Europe (Zurich)"
-      icon = "/emojis/1f1ea-1f1fa.png"
-    }
     "eu-north-1" = {
       name = "EU (Stockholm)"
       icon = "/emojis/1f1ea-1f1fa.png"
     }
-    "eu-south-1" = {
-      name = "Europe (Milan)"
-      icon = "/emojis/1f1ea-1f1fa.png"
-    }
-    "eu-south-2" = {
-      name = "Europe (Spain)"
-      icon = "/emojis/1f1ea-1f1fa.png"
-    }
     "eu-west-1" = {
       name = "EU (Ireland)"
       icon = "/emojis/1f1ea-1f1fa.png"
@@ -146,14 +104,6 @@ locals {
       name = "EU (Paris)"
       icon = "/emojis/1f1ea-1f1fa.png"
     }
-    "il-central-1" = {
-      name = "Israel (Tel Aviv)"
-      icon = "/emojis/1f1ee-1f1f1.png"
-    }
-    "me-south-1" = {
-      name = "Middle East (Bahrain)"
-      icon = "/emojis/1f1e7-1f1ed.png"
-    }
     "sa-east-1" = {
       name = "South America (São Paulo)"
       icon = "/emojis/1f1e7-1f1f7.png"
@@ -182,7 +132,6 @@ data "coder_parameter" "region" {
   display_name = var.display_name
   description  = var.description
   default      = var.default == "" ? null : var.default
-  order        = var.coder_parameter_order
   mutable      = var.mutable
   dynamic "option" {
     for_each = { for k, v in local.regions : k => v if !(contains(var.exclude, k)) }

azure-region/README.md

@@ -11,10 +11,9 @@ tags: [helper, parameter, azure, regions]
 
 This module adds a parameter with all Azure regions, allowing developers to select the region closest to them.
 
-```tf
+```hcl
 module "azure_region" {
-  source  = "registry.coder.com/modules/azure-region/coder"
+    source = "https://registry.coder.com/modules/azure-region"
-  version = "1.0.12"
     default = "eastus"
 }
 
@@ -31,10 +30,9 @@ resource "azurem_resource_group" "example" {
 
 Change the display name and icon for a region using the corresponding maps:
 
-```tf
+```hcl
 module "azure-region" {
-  source  = "registry.coder.com/modules/azure-region/coder"
+    source = "https://registry.coder.com/modules/azure-region"
-  version = "1.0.12"
     custom_names = {
         "australia": "Go Australia!"
     }
@@ -54,10 +52,9 @@ resource "azurerm_resource_group" "example" {
 
 Hide all regions in Australia except australiacentral:
 
-```tf
+```hcl
 module "azure-region" {
-  source  = "registry.coder.com/modules/azure-region/coder"
+    source = "https://registry.coder.com/modules/azure-region"
-  version = "1.0.12"
     exclude = [
         "australia",
         "australiacentral2",

azure-region/main.test.ts

@@ -1,5 +1,6 @@
 import { describe, expect, it } from "bun:test";
 import {
+  executeScriptInContainer,
   runTerraformApply,
   runTerraformInit,
   testRequiredVariables,
@@ -21,13 +22,4 @@ describe("azure-region", async () => {
     });
     expect(state.outputs.value.value).toBe("westus");
   });
-
-  it("set custom order for coder_parameter", async () => {
-    const order = 99;
-    const state = await runTerraformApply(import.meta.dir, {
-      coder_parameter_order: order.toString(),
-    });
-    expect(state.resources).toHaveLength(1);
-    expect(state.resources[0].instances[0].attributes.order).toBe(order);
-  });
 });

azure-region/main.tf

@@ -50,12 +50,6 @@ variable "exclude" {
   type        = list(string)
 }
 
-variable "coder_parameter_order" {
-  type        = number
-  description = "The order determines the position of a template parameter in the UI/CLI presentation. The lowest order is shown first and parameters with equal order are sorted by name (ascending order)."
-  default     = null
-}
-
 locals {
   # Note: Options are limited to 64 regions, some redundant regions have been removed.
   all_regions = {
@@ -315,7 +309,6 @@ data "coder_parameter" "region" {
   display_name = var.display_name
   description  = var.description
   default      = var.default == "" ? null : var.default
-  order        = var.coder_parameter_order
   mutable      = var.mutable
   icon         = "/icon/azure.png"
   dynamic "option" {

code-server/README.md

@@ -11,10 +11,9 @@ tags: [helper, ide, web]
 
 Automatically install [code-server](https://github.com/coder/code-server) in a workspace, create an app to access it via the dashboard, install extensions, and pre-configure editor settings.
 
-```tf
+```hcl
 module "code-server" {
-  source   = "registry.coder.com/modules/code-server/coder"
+    source = "https://registry.coder.com/modules/code-server"
-  version  = "1.0.18"
     agent_id = coder_agent.example.id
 }
 ```
@@ -25,10 +24,9 @@ module "code-server" {
 
 ### Pin Versions
 
-```tf
+```hcl
 module "code-server" {
-  source          = "registry.coder.com/modules/code-server/coder"
+  source          = "https://registry.coder.com/modules/code-server"
-  version         = "1.0.18"
   agent_id        = coder_agent.example.id
   install_version = "4.8.3"
 }
@@ -38,10 +36,9 @@ module "code-server" {
 
 Install the Dracula theme from [OpenVSX](https://open-vsx.org/):
 
-```tf
+```hcl
 module "code-server" {
-  source   = "registry.coder.com/modules/code-server/coder"
+    source = "https://registry.coder.com/modules/code-server"
-  version  = "1.0.18"
     agent_id = coder_agent.example.id
     extensions = [
         "dracula-theme.theme-dracula"
@@ -55,10 +52,9 @@ Enter the `<author>.<name>` into the extensions array and code-server will autom
 
 Configure VS Code's [settings.json](https://code.visualstudio.com/docs/getstarted/settings#_settingsjson) file:
 
-```tf
+```hcl
-module "code-server" {
+module "settings" {
-  source     = "registry.coder.com/modules/code-server/coder"
+    source = "https://registry.coder.com/modules/code-server"
-  version    = "1.0.18"
     agent_id = coder_agent.example.id
     extensions = [ "dracula-theme.theme-dracula" ]
     settings = {
@@ -67,41 +63,13 @@ module "code-server" {
 }
 ```
 
-### Install multiple extensions
+### Offline Mode
 
 Just run code-server in the background, don't fetch it from GitHub:
 
-```tf
+```hcl
-module "code-server" {
+module "settings" {
-  source     = "registry.coder.com/modules/code-server/coder"
+    source = "https://registry.coder.com/modules/code-server"
-  version    = "1.0.18"
-  agent_id   = coder_agent.example.id
-  extensions = ["dracula-theme.theme-dracula", "ms-azuretools.vscode-docker"]
-}
-```
-
-### Offline and Use Cached Modes
-
-By default the module looks for code-server at `/tmp/code-server` but this can be changed with `install_prefix`.
-
-Run an existing copy of code-server if found, otherwise download from GitHub:
-
-```tf
-module "code-server" {
-  source     = "registry.coder.com/modules/code-server/coder"
-  version    = "1.0.18"
-  agent_id   = coder_agent.example.id
-  use_cached = true
-  extensions = ["dracula-theme.theme-dracula", "ms-azuretools.vscode-docker"]
-}
-```
-
-Just run code-server in the background, don't fetch it from GitHub:
-
-```tf
-module "code-server" {
-  source   = "registry.coder.com/modules/code-server/coder"
-  version  = "1.0.18"
     agent_id = coder_agent.example.id
     offline = true
 }

code-server/main.test.ts

@@ -1,9 +1,5 @@
 import { describe, expect, it } from "bun:test";
-import {
+import { runTerraformInit, testRequiredVariables } from "../test";
-  runTerraformApply,
-  runTerraformInit,
-  testRequiredVariables,
-} from "../test";
 
 describe("code-server", async () => {
   await runTerraformInit(import.meta.dir);
@@ -12,27 +8,5 @@ describe("code-server", async () => {
     agent_id: "foo",
   });
 
-  it("use_cached and offline can not be used together", () => {
-    const t = async () => {
-      await runTerraformApply(import.meta.dir, {
-        agent_id: "foo",
-        use_cached: "true",
-        offline: "true",
-      });
-    };
-    expect(t).toThrow("Offline and Use Cached can not be used together");
-  });
-
-  it("offline and extensions can not be used together", () => {
-    const t = async () => {
-      await runTerraformApply(import.meta.dir, {
-        agent_id: "foo",
-        offline: "true",
-        extensions: '["1", "2"]',
-      });
-    };
-    expect(t).toThrow("Offline mode does not allow extensions to be installed");
-  });
-
   // More tests depend on shebang refactors
 });

code-server/main.tf

@@ -4,7 +4,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = ">= 0.17"
+      version = ">= 0.12"
     }
   }
 }
@@ -32,12 +32,6 @@ variable "display_name" {
   default     = "code-server"
 }
 
-variable "slug" {
-  type        = string
-  description = "The slug for the code-server application."
-  default     = "code-server"
-}
-
 variable "settings" {
   type        = map(string)
   description = "A map of settings to apply to code-server."
@@ -68,60 +62,6 @@ variable "install_version" {
   default     = ""
 }
 
-variable "share" {
-  type    = string
-  default = "owner"
-  validation {
-    condition     = var.share == "owner" || var.share == "authenticated" || var.share == "public"
-    error_message = "Incorrect value. Please set either 'owner', 'authenticated', or 'public'."
-  }
-}
-
-variable "order" {
-  type        = number
-  description = "The order determines the position of app in the UI presentation. The lowest order is shown first and apps with equal order are sorted by name (ascending order)."
-  default     = null
-}
-
-variable "offline" {
-  type        = bool
-  description = "Just run code-server in the background, don't fetch it from GitHub"
-  default     = false
-}
-
-variable "use_cached" {
-  type        = bool
-  description = "Uses cached copy code-server in the background, otherwise fetched it from GitHub"
-  default     = false
-}
-
-variable "use_cached_extensions" {
-  type        = bool
-  description = "Uses cached copy of extensions, otherwise do a forced upgrade"
-  default     = false
-}
-
-variable "extensions_dir" {
-  type        = string
-  description = "Override the directory to store extensions in."
-  default     = ""
-}
-
-variable "auto_install_extensions" {
-  type        = bool
-  description = "Automatically install recommended extensions when code-server starts."
-  default     = false
-}
-
-variable "subdomain" {
-  type        = bool
-  description = <<-EOT
-    Determines whether the app will be accessed via it's own subdomain or whether it will be accessed via a path on Coder.
-    If wildcards have not been setup by the administrator then apps with "subdomain" set to true will not be accessible.
-  EOT
-  default     = false
-}
-
 resource "coder_script" "code-server" {
   agent_id     = var.agent_id
   display_name = "code-server"
@@ -129,43 +69,23 @@ resource "coder_script" "code-server" {
   script = templatefile("${path.module}/run.sh", {
     VERSION : var.install_version,
     EXTENSIONS : join(",", var.extensions),
-    APP_NAME : var.display_name,
     PORT : var.port,
     LOG_PATH : var.log_path,
     INSTALL_PREFIX : var.install_prefix,
     // This is necessary otherwise the quotes are stripped!
     SETTINGS : replace(jsonencode(var.settings), "\"", "\\\""),
-    OFFLINE : var.offline,
-    USE_CACHED : var.use_cached,
-    USE_CACHED_EXTENSIONS : var.use_cached_extensions,
-    EXTENSIONS_DIR : var.extensions_dir,
-    FOLDER : var.folder,
-    AUTO_INSTALL_EXTENSIONS : var.auto_install_extensions,
   })
   run_on_start = true
-
-  lifecycle {
-    precondition {
-      condition     = !var.offline || length(var.extensions) == 0
-      error_message = "Offline mode does not allow extensions to be installed"
-    }
-
-    precondition {
-      condition     = !var.offline || !var.use_cached
-      error_message = "Offline and Use Cached can not be used together"
-    }
-  }
 }
 
 resource "coder_app" "code-server" {
   agent_id     = var.agent_id
-  slug         = var.slug
+  slug         = "code-server"
   display_name = var.display_name
   url          = "http://localhost:${var.port}/${var.folder != "" ? "?folder=${urlencode(var.folder)}" : ""}"
   icon         = "/icon/code.svg"
-  subdomain    = var.subdomain
+  subdomain    = false
-  share        = var.share
+  share        = "owner"
-  order        = var.order
 
   healthcheck {
     url       = "http://localhost:${var.port}/healthz"

code-server/run.sh

@@ -4,42 +4,7 @@ EXTENSIONS=("${EXTENSIONS}")
 BOLD='\033[0;1m'
 CODE='\033[36;40;1m'
 RESET='\033[0m'
-CODE_SERVER="${INSTALL_PREFIX}/bin/code-server"
 
-# Set extension directory
-EXTENSION_ARG=""
-if [ -n "${EXTENSIONS_DIR}" ]; then
-  EXTENSION_ARG="--extensions-dir=${EXTENSIONS_DIR}"
-  mkdir -p "${EXTENSIONS_DIR}"
-fi
-
-function run_code_server() {
-  echo "👷 Running code-server in the background..."
-  echo "Check logs at ${LOG_PATH}!"
-  $CODE_SERVER "$EXTENSION_ARG" --auth none --port "${PORT}" --app-name "${APP_NAME}" > "${LOG_PATH}" 2>&1 &
-}
-
-# Check if the settings file exists...
-if [ ! -f ~/.local/share/code-server/User/settings.json ]; then
-  echo "⚙️ Creating settings file..."
-  mkdir -p ~/.local/share/code-server/User
-  echo "${SETTINGS}" > ~/.local/share/code-server/User/settings.json
-fi
-
-# Check if code-server is already installed for offline
-if [ "${OFFLINE}" = true ]; then
-  if [ -f "$CODE_SERVER" ]; then
-    echo "🥳 Found a copy of code-server"
-    run_code_server
-    exit 0
-  fi
-  # Offline mode always expects a copy of code-server to be present
-  echo "Failed to find a copy of code-server"
-  exit 1
-fi
-
-# If there is no cached install OR we don't want to use a cached install
-if [ ! -f "$CODE_SERVER" ] || [ "${USE_CACHED}" != true ]; then
 printf "$${BOLD}Installing code-server!\n"
 
 ARGS=(
@@ -56,62 +21,29 @@ if [ ! -f "$CODE_SERVER" ] || [ "${USE_CACHED}" != true ]; then
   exit 1
 fi
 printf "🥳 code-server has been installed in ${INSTALL_PREFIX}\n\n"
-fi
 
-# Get the list of installed extensions...
+CODE_SERVER="${INSTALL_PREFIX}/bin/code-server"
-LIST_EXTENSIONS=$($CODE_SERVER --list-extensions $EXTENSION_ARG)
-readarray -t EXTENSIONS_ARRAY <<< "$LIST_EXTENSIONS"
-function extension_installed() {
-  if [ "${USE_CACHED_EXTENSIONS}" != true ]; then
-    return 1
-  fi
-  for _extension in "$${EXTENSIONS_ARRAY[@]}"; do
-    if [ "$_extension" == "$1" ]; then
-      echo "Extension $1 was already installed."
-      return 0
-    fi
-  done
-  return 1
-}
 
 # Install each extension...
-IFS=',' read -r -a EXTENSIONLIST <<< "$${EXTENSIONS}"
+for extension in "$${EXTENSIONS[@]}"; do
-for extension in "$${EXTENSIONLIST[@]}"; do
   if [ -z "$extension" ]; then
     continue
   fi
-  if extension_installed "$extension"; then
-    continue
-  fi
   printf "🧩 Installing extension $${CODE}$extension$${RESET}...\n"
-  output=$($CODE_SERVER "$EXTENSION_ARG" --force --install-extension "$extension")
+  output=$($CODE_SERVER --install-extension "$extension")
   if [ $? -ne 0 ]; then
     echo "Failed to install extension: $extension: $output"
     exit 1
   fi
 done
 
-if [ "${AUTO_INSTALL_EXTENSIONS}" = true ]; then
+# Check if the settings file exists...
-  if ! command -v jq > /dev/null; then
+if [ ! -f ~/.local/share/code-server/Machine/settings.json ]; then
-    echo "jq is required to install extensions from a workspace file."
+  echo "⚙️ Creating settings file..."
-    exit 0
+  mkdir -p ~/.local/share/code-server/Machine
+  echo "${SETTINGS}" >~/.local/share/code-server/Machine/settings.json
 fi
 
-  WORKSPACE_DIR="$HOME"
+echo "👷 Running code-server in the background..."
-  if [ -n "${FOLDER}" ]; then
+echo "Check logs at ${LOG_PATH}!"
-    WORKSPACE_DIR="${FOLDER}"
+$CODE_SERVER --auth none --port ${PORT} >${LOG_PATH} 2>&1 &
-  fi
-
-  if [ -f "$WORKSPACE_DIR/.vscode/extensions.json" ]; then
-    printf "🧩 Installing extensions from %s/.vscode/extensions.json...\n" "$WORKSPACE_DIR"
-    extensions=$(jq -r '.recommendations[]' "$WORKSPACE_DIR"/.vscode/extensions.json)
-    for extension in $extensions; do
-      if extension_installed "$extension"; then
-        continue
-      fi
-      $CODE_SERVER "$EXTENSION_ARG" --force --install-extension "$extension"
-    done
-  fi
-fi
-
-run_code_server

coder-login/README.md

@@ -11,10 +11,9 @@ tags: [helper]
 
 Automatically logs the user into Coder when creating their workspace.
 
-```tf
+```hcl
 module "coder-login" {
-  source   = "registry.coder.com/modules/coder-login/coder"
+    source   = "https://registry.coder.com/modules/coder-login"
-  version  = "1.0.15"
     agent_id = coder_agent.example.id
 }
 ```

coder-login/main.test.ts

@@ -1,5 +1,10 @@
-import { describe } from "bun:test";
+import { describe, expect, it } from "bun:test";
-import { runTerraformInit, testRequiredVariables } from "../test";
+import {
+  executeScriptInContainer,
+  runTerraformApply,
+  runTerraformInit,
+  testRequiredVariables,
+} from "../test";
 
 describe("coder-login", async () => {
   await runTerraformInit(import.meta.dir);

coder-login/main.tf

@@ -4,7 +4,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = ">= 0.23"
+      version = ">= 0.12"
     }
   }
 }
@@ -15,12 +15,11 @@ variable "agent_id" {
 }
 
 data "coder_workspace" "me" {}
-data "coder_workspace_owner" "me" {}
 
 resource "coder_script" "coder-login" {
   agent_id = var.agent_id
   script = templatefile("${path.module}/run.sh", {
-    CODER_USER_TOKEN : data.coder_workspace_owner.me.session_token,
+    CODER_USER_TOKEN : data.coder_workspace.me.owner_session_token,
     CODER_DEPLOYMENT_URL : data.coder_workspace.me.access_url
   })
   display_name       = "Coder Login"

coder-login/run.sh

@@ -8,8 +8,7 @@ BOLD='\033[0;1m'
 printf "$${BOLD}Logging into Coder...\n\n$${RESET}"
 
 if ! coder list >/dev/null 2>&1; then
-  set +x
+  set +x; coder login --token="${CODER_USER_TOKEN}" --url="${CODER_DEPLOYMENT_URL}"
-  coder login --token="${CODER_USER_TOKEN}" --url="${CODER_DEPLOYMENT_URL}"
 else
   echo "You are already authenticated with coder."
 fi

cursor/README.md

@@ -1,35 +0,0 @@
----
-display_name: Cursor IDE
-description: Add a one-click button to launch Cursor IDE
-icon: ../.icons/cursor.svg
-maintainer_github: coder
-verified: true
-tags: [ide, cursor, helper]
----
-
-# Cursor IDE
-
-Add a button to open any workspace with a single click in Cursor IDE.
-
-Uses the [Coder Remote VS Code Extension](https://github.com/coder/cursor-coder).
-
-```tf
-module "cursor" {
-  source   = "registry.coder.com/modules/cursor/coder"
-  version  = "1.0.19"
-  agent_id = coder_agent.example.id
-}
-```
-
-## Examples
-
-### Open in a specific directory
-
-```tf
-module "cursor" {
-  source   = "registry.coder.com/modules/cursor/coder"
-  version  = "1.0.19"
-  agent_id = coder_agent.example.id
-  folder   = "/home/coder/project"
-}
-```

cursor/main.test.ts

@@ -1,88 +0,0 @@
-import { describe, expect, it } from "bun:test";
-import {
-  runTerraformApply,
-  runTerraformInit,
-  testRequiredVariables,
-} from "../test";
-
-describe("cursor", async () => {
-  await runTerraformInit(import.meta.dir);
-
-  testRequiredVariables(import.meta.dir, {
-    agent_id: "foo",
-  });
-
-  it("default output", async () => {
-    const state = await runTerraformApply(import.meta.dir, {
-      agent_id: "foo",
-    });
-    expect(state.outputs.cursor_url.value).toBe(
-      "cursor://coder.coder-remote/open?owner=default&workspace=default&url=https://mydeployment.coder.com&token=$SESSION_TOKEN",
-    );
-
-    const coder_app = state.resources.find(
-      (res) => res.type === "coder_app" && res.name === "cursor",
-    );
-
-    expect(coder_app).not.toBeNull();
-    expect(coder_app?.instances.length).toBe(1);
-    expect(coder_app?.instances[0].attributes.order).toBeNull();
-  });
-
-  it("adds folder", async () => {
-    const state = await runTerraformApply(import.meta.dir, {
-      agent_id: "foo",
-      folder: "/foo/bar",
-    });
-    expect(state.outputs.cursor_url.value).toBe(
-      "cursor://coder.coder-remote/open?owner=default&workspace=default&folder=/foo/bar&url=https://mydeployment.coder.com&token=$SESSION_TOKEN",
-    );
-  });
-
-  it("adds folder and open_recent", async () => {
-    const state = await runTerraformApply(import.meta.dir, {
-      agent_id: "foo",
-      folder: "/foo/bar",
-      open_recent: "true",
-    });
-    expect(state.outputs.cursor_url.value).toBe(
-      "cursor://coder.coder-remote/open?owner=default&workspace=default&folder=/foo/bar&openRecent&url=https://mydeployment.coder.com&token=$SESSION_TOKEN",
-    );
-  });
-
-  it("adds folder but not open_recent", async () => {
-    const state = await runTerraformApply(import.meta.dir, {
-      agent_id: "foo",
-      folder: "/foo/bar",
-      openRecent: "false",
-    });
-    expect(state.outputs.cursor_url.value).toBe(
-      "cursor://coder.coder-remote/open?owner=default&workspace=default&folder=/foo/bar&url=https://mydeployment.coder.com&token=$SESSION_TOKEN",
-    );
-  });
-
-  it("adds open_recent", async () => {
-    const state = await runTerraformApply(import.meta.dir, {
-      agent_id: "foo",
-      open_recent: "true",
-    });
-    expect(state.outputs.cursor_url.value).toBe(
-      "cursor://coder.coder-remote/open?owner=default&workspace=default&openRecent&url=https://mydeployment.coder.com&token=$SESSION_TOKEN",
-    );
-  });
-
-  it("expect order to be set", async () => {
-    const state = await runTerraformApply(import.meta.dir, {
-      agent_id: "foo",
-      order: "22",
-    });
-
-    const coder_app = state.resources.find(
-      (res) => res.type === "coder_app" && res.name === "cursor",
-    );
-
-    expect(coder_app).not.toBeNull();
-    expect(coder_app?.instances.length).toBe(1);
-    expect(coder_app?.instances[0].attributes.order).toBe(22);
-  });
-});

cursor/main.tf

@@ -1,62 +0,0 @@
-terraform {
-  required_version = ">= 1.0"
-
-  required_providers {
-    coder = {
-      source  = "coder/coder"
-      version = ">= 0.23"
-    }
-  }
-}
-
-variable "agent_id" {
-  type        = string
-  description = "The ID of a Coder agent."
-}
-
-variable "folder" {
-  type        = string
-  description = "The folder to open in Cursor IDE."
-  default     = ""
-}
-
-variable "open_recent" {
-  type        = bool
-  description = "Open the most recent workspace or folder. Falls back to the folder if there is no recent workspace or folder to open."
-  default     = false
-}
-
-variable "order" {
-  type        = number
-  description = "The order determines the position of app in the UI presentation. The lowest order is shown first and apps with equal order are sorted by name (ascending order)."
-  default     = null
-}
-
-data "coder_workspace" "me" {}
-data "coder_workspace_owner" "me" {}
-
-resource "coder_app" "cursor" {
-  agent_id     = var.agent_id
-  external     = true
-  icon         = "/icon/cursor.svg"
-  slug         = "cursor"
-  display_name = "Cursor Desktop"
-  order        = var.order
-  url = join("", [
-    "cursor://coder.coder-remote/open",
-    "?owner=",
-    data.coder_workspace_owner.me.name,
-    "&workspace=",
-    data.coder_workspace.me.name,
-    var.folder != "" ? join("", ["&folder=", var.folder]) : "",
-    var.open_recent ? "&openRecent" : "",
-    "&url=",
-    data.coder_workspace.me.access_url,
-    "&token=$SESSION_TOKEN",
-  ])
-}
-
-output "cursor_url" {
-  value       = coder_app.cursor.url
-  description = "Cursor IDE Desktop URL."
-}

dotfiles/README.md

@@ -9,70 +9,11 @@ tags: [helper]
 
 # Dotfiles
 
-Allow developers to optionally bring their own [dotfiles repository](https://dotfiles.github.io).
+Allow developers to optionally bring their own [dotfiles repository](https://dotfiles.github.io)! Under the hood, this module uses the [coder dotfiles](https://coder.com/docs/v2/latest/dotfiles) command.
 
-This will prompt the user for their dotfiles repository URL on template creation using a `coder_parameter`.
+```hcl
-
-Under the hood, this module uses the [coder dotfiles](https://coder.com/docs/v2/latest/dotfiles) command.
-
-```tf
 module "dotfiles" {
-  source   = "registry.coder.com/modules/dotfiles/coder"
+  source = "https://registry.coder.com/modules/dotfiles"
-  version  = "1.0.18"
   agent_id = coder_agent.example.id
 }
 ```
-
-## Examples
-
-### Apply dotfiles as the current user
-
-```tf
-module "dotfiles" {
-  source   = "registry.coder.com/modules/dotfiles/coder"
-  version  = "1.0.18"
-  agent_id = coder_agent.example.id
-}
-```
-
-### Apply dotfiles as another user (only works if sudo is passwordless)
-
-```tf
-module "dotfiles" {
-  source   = "registry.coder.com/modules/dotfiles/coder"
-  version  = "1.0.18"
-  agent_id = coder_agent.example.id
-  user     = "root"
-}
-```
-
-### Apply the same dotfiles as the current user and root (the root dotfiles can only be applied if sudo is passwordless)
-
-```tf
-module "dotfiles" {
-  source   = "registry.coder.com/modules/dotfiles/coder"
-  version  = "1.0.18"
-  agent_id = coder_agent.example.id
-}
-
-module "dotfiles-root" {
-  source       = "registry.coder.com/modules/dotfiles/coder"
-  version      = "1.0.18"
-  agent_id     = coder_agent.example.id
-  user         = "root"
-  dotfiles_uri = module.dotfiles.dotfiles_uri
-}
-```
-
-## Setting a default dotfiles repository
-
-You can set a default dotfiles repository for all users by setting the `default_dotfiles_uri` variable:
-
-```tf
-module "dotfiles" {
-  source               = "registry.coder.com/modules/dotfiles/coder"
-  version              = "1.0.18"
-  agent_id             = coder_agent.example.id
-  default_dotfiles_uri = "https://github.com/coder/dotfiles"
-}
-```

dotfiles/main.test.ts

@@ -18,23 +18,4 @@ describe("dotfiles", async () => {
     });
     expect(state.outputs.dotfiles_uri.value).toBe("");
   });
-
-  it("set a default dotfiles_uri", async () => {
-    const default_dotfiles_uri = "foo";
-    const state = await runTerraformApply(import.meta.dir, {
-      agent_id: "foo",
-      default_dotfiles_uri,
-    });
-    expect(state.outputs.dotfiles_uri.value).toBe(default_dotfiles_uri);
-  });
-
-  it("set custom order for coder_parameter", async () => {
-    const order = 99;
-    const state = await runTerraformApply(import.meta.dir, {
-      agent_id: "foo",
-      coder_parameter_order: order.toString(),
-    });
-    expect(state.resources).toHaveLength(2);
-    expect(state.resources[0].instances[0].attributes.order).toBe(order);
-  });
 });

dotfiles/main.tf

@@ -14,78 +14,30 @@ variable "agent_id" {
   description = "The ID of a Coder agent."
 }
 
-variable "default_dotfiles_uri" {
-  type        = string
-  description = "The default dotfiles URI if the workspace user does not provide one"
-  default     = ""
-}
-
-variable "dotfiles_uri" {
-  type        = string
-  description = "The URL to a dotfiles repository. (optional, when set, the user isn't prompted for their dotfiles)"
-
-  default = null
-}
-
-variable "user" {
-  type        = string
-  description = "The name of the user to apply the dotfiles to. (optional, applies to the current user by default)"
-  default     = null
-}
-
-variable "coder_parameter_order" {
-  type        = number
-  description = "The order determines the position of a template parameter in the UI/CLI presentation. The lowest order is shown first and parameters with equal order are sorted by name (ascending order)."
-  default     = null
-}
-
-variable "manual_update" {
-  type        = bool
-  description = "If true, this adds a button to workspace page to refresh dotfiles on demand."
-  default     = false
-}
-
 data "coder_parameter" "dotfiles_uri" {
-  count        = var.dotfiles_uri == null ? 1 : 0
   type         = "string"
   name         = "dotfiles_uri"
-  display_name = "Dotfiles URL"
+  display_name = "Dotfiles URL (optional)"
-  order        = var.coder_parameter_order
+  default      = ""
-  default      = var.default_dotfiles_uri
   description  = "Enter a URL for a [dotfiles repository](https://dotfiles.github.io) to personalize your workspace"
   mutable      = true
   icon         = "/icon/dotfiles.svg"
 }
 
-locals {
+resource "coder_script" "personalize" {
-  dotfiles_uri = var.dotfiles_uri != null ? var.dotfiles_uri : data.coder_parameter.dotfiles_uri[0].value
-  user         = var.user != null ? var.user : ""
-}
-
-resource "coder_script" "dotfiles" {
   agent_id     = var.agent_id
-  script = templatefile("${path.module}/run.sh", {
+  script       = <<-EOT
-    DOTFILES_URI : local.dotfiles_uri,
+    DOTFILES_URI="${data.coder_parameter.dotfiles_uri.value}"
-    DOTFILES_USER : local.user
+    if [ -n "$${DOTFILES_URI// }" ]; then
-  })
+    coder dotfiles "$DOTFILES_URI" -y 2>&1 | tee -a ~/.dotfiles.log
+    fi
+    EOT
   display_name = "Dotfiles"
   icon         = "/icon/dotfiles.svg"
   run_on_start = true
 }
 
-resource "coder_app" "dotfiles" {
-  count        = var.manual_update ? 1 : 0
-  agent_id     = var.agent_id
-  display_name = "Refresh Dotfiles"
-  slug         = "dotfiles"
-  icon         = "/icon/dotfiles.svg"
-  command = templatefile("${path.module}/run.sh", {
-    DOTFILES_URI : local.dotfiles_uri,
-    DOTFILES_USER : local.user
-  })
-}
-
 output "dotfiles_uri" {
   description = "Dotfiles URI"
-  value       = local.dotfiles_uri
+  value       = data.coder_parameter.dotfiles_uri.value
 }

dotfiles/run.sh

@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-DOTFILES_URI="${DOTFILES_URI}"
-DOTFILES_USER="${DOTFILES_USER}"
-
-if [ -n "$${DOTFILES_URI// }" ]; then
-  if [ -z "$DOTFILES_USER" ]; then
-    DOTFILES_USER="$USER"
-  fi
-
-  echo "✨ Applying dotfiles for user $DOTFILES_USER"
-
-  if [ "$DOTFILES_USER" = "$USER" ]; then
-    coder dotfiles "$DOTFILES_URI" -y 2>&1 | tee ~/.dotfiles.log
-  else
-    # The `eval echo ~"$DOTFILES_USER"` part is used to dynamically get the home directory of the user, see https://superuser.com/a/484280
-    # eval echo ~coder -> "/home/coder"
-    # eval echo ~root  -> "/root"
-
-    CODER_BIN=$(which coder)
-    DOTFILES_USER_HOME=$(eval echo ~"$DOTFILES_USER")
-    sudo -u "$DOTFILES_USER" sh -c "'$CODER_BIN' dotfiles '$DOTFILES_URI' -y 2>&1 | tee '$DOTFILES_USER_HOME'/.dotfiles.log"
-  fi
-fi

exoscale-instance-type/README.md

@@ -1,114 +0,0 @@
----
-display_name: exoscale-instance-type
-description: A parameter with human readable exoscale instance names
-icon: ../.icons/exoscale.svg
-maintainer_github: WhizUs
-verified: false
-tags: [helper, parameter, instances, exoscale]
----
-
-# exoscale-instance-type
-
-A parameter with all Exoscale instance types. This allows developers to select
-their desired virtual machine for the workspace.
-
-Customize the preselected parameter value:
-
-```tf
-module "exoscale-instance-type" {
-  source  = "registry.coder.com/modules/exoscale-instance-type/coder"
-  version = "1.0.12"
-  default = "standard.medium"
-}
-
-resource "exoscale_compute_instance" "instance" {
-  type = module.exoscale-instance-type.value
-  # ...
-}
-
-resource "coder_metadata" "workspace_info" {
-  item {
-    key   = "instance type"
-    value = module.exoscale-instance-type.name
-  }
-}
-```
-
-![Exoscale instance types](../.images/exoscale-instance-types.png)
-
-## Examples
-
-### Customize type
-
-Change the display name a type using the corresponding maps:
-
-```tf
-module "exoscale-instance-type" {
-  source  = "registry.coder.com/modules/exoscale-instance-type/coder"
-  version = "1.0.12"
-  default = "standard.medium"
-
-  custom_names = {
-    "standard.medium" : "Mittlere Instanz" # German translation
-  }
-
-  custom_descriptions = {
-    "standard.medium" : "4 GB Arbeitsspeicher, 2 Kerne, 10 - 400 GB Festplatte" # German translation
-  }
-}
-
-resource "exoscale_compute_instance" "instance" {
-  type = module.exoscale-instance-type.value
-  # ...
-}
-
-resource "coder_metadata" "workspace_info" {
-  item {
-    key   = "instance type"
-    value = module.exoscale-instance-type.name
-  }
-}
-```
-
-![Exoscale instance types Custom](../.images/exoscale-instance-custom.png)
-
-### Use category and exclude type
-
-Show only gpu1 types
-
-```tf
-module "exoscale-instance-type" {
-  source        = "registry.coder.com/modules/exoscale-instance-type/coder"
-  version       = "1.0.12"
-  default       = "gpu.large"
-  type_category = ["gpu"]
-  exclude = [
-    "gpu2.small",
-    "gpu2.medium",
-    "gpu2.large",
-    "gpu2.huge",
-    "gpu3.small",
-    "gpu3.medium",
-    "gpu3.large",
-    "gpu3.huge"
-  ]
-}
-
-resource "exoscale_compute_instance" "instance" {
-  type = module.exoscale-instance-type.value
-  # ...
-}
-
-resource "coder_metadata" "workspace_info" {
-  item {
-    key   = "instance type"
-    value = module.exoscale-instance-type.name
-  }
-}
-```
-
-![Exoscale instance types category and exclude](../.images/exoscale-instance-exclude.png)
-
-## Related templates
-
-A related exoscale template will be provided soon.

exoscale-instance-type/main.test.ts

@@ -1,43 +0,0 @@
-import { describe, expect, it } from "bun:test";
-import {
-  runTerraformApply,
-  runTerraformInit,
-  testRequiredVariables,
-} from "../test";
-
-describe("exoscale-instance-type", async () => {
-  await runTerraformInit(import.meta.dir);
-
-  testRequiredVariables(import.meta.dir, {});
-
-  it("default output", async () => {
-    const state = await runTerraformApply(import.meta.dir, {});
-    expect(state.outputs.value.value).toBe("");
-  });
-
-  it("customized default", async () => {
-    const state = await runTerraformApply(import.meta.dir, {
-      default: "gpu3.huge",
-      type_category: `["gpu", "cpu"]`,
-    });
-    expect(state.outputs.value.value).toBe("gpu3.huge");
-  });
-
-  it("fails because of wrong categroy definition", async () => {
-    expect(async () => {
-      await runTerraformApply(import.meta.dir, {
-        default: "gpu3.huge",
-        // type_category: ["standard"] is standard
-      });
-    }).toThrow('default value "gpu3.huge" must be defined as one of options');
-  });
-
-  it("set custom order for coder_parameter", async () => {
-    const order = 99;
-    const state = await runTerraformApply(import.meta.dir, {
-      coder_parameter_order: order.toString(),
-    });
-    expect(state.resources).toHaveLength(1);
-    expect(state.resources[0].instances[0].attributes.order).toBe(order);
-  });
-});

exoscale-instance-type/main.tf

@@ -1,286 +0,0 @@
-terraform {
-  required_version = ">= 1.0"
-
-  required_providers {
-    coder = {
-      source  = "coder/coder"
-      version = ">= 0.12"
-    }
-  }
-}
-
-variable "display_name" {
-  default     = "Exoscale instance type"
-  description = "The display name of the parameter."
-  type        = string
-}
-
-variable "description" {
-  default     = "Select the exoscale instance type to use for the workspace. Check out the pricing page for more information: https://www.exoscale.com/pricing"
-  description = "The description of the parameter."
-  type        = string
-}
-
-variable "default" {
-  default     = ""
-  description = "The default instance type to use if no type is specified. One of [\"standard.micro\", \"standard.tiny\", \"standard.small\", \"standard.medium\", \"standard.large\", \"standard.extra\", \"standard.huge\", \"standard.mega\", \"standard.titan\", \"standard.jumbo\", \"standard.colossus\", \"cpu.extra\", \"cpu.huge\", \"cpu.mega\", \"cpu.titan\", \"memory.extra\", \"memory.huge\", \"memory.mega\", \"memory.titan\", \"storage.extra\", \"storage.huge\", \"storage.mega\", \"storage.titan\", \"storage.jumbo\", \"gpu.small\", \"gpu.medium\", \"gpu.large\", \"gpu.huge\", \"gpu2.small\", \"gpu2.medium\", \"gpu2.large\", \"gpu2.huge\", \"gpu3.small\", \"gpu3.medium\", \"gpu3.large\", \"gpu3.huge\"]"
-  type        = string
-}
-
-variable "mutable" {
-  default     = false
-  description = "Whether the parameter can be changed after creation."
-  type        = bool
-}
-
-variable "custom_names" {
-  default     = {}
-  description = "A map of custom display names for instance type IDs."
-  type        = map(string)
-}
-variable "custom_descriptions" {
-  default     = {}
-  description = "A map of custom descriptions for instance type IDs."
-  type        = map(string)
-}
-
-variable "type_category" {
-  default     = ["standard"]
-  description = "A list of instance type categories the user is allowed to choose. One of [\"standard\", \"cpu\", \"memory\", \"storage\", \"gpu\"]"
-  type        = list(string)
-}
-
-variable "exclude" {
-  default     = []
-  description = "A list of instance type IDs to exclude. One of [\"standard.micro\", \"standard.tiny\", \"standard.small\", \"standard.medium\", \"standard.large\", \"standard.extra\", \"standard.huge\", \"standard.mega\", \"standard.titan\", \"standard.jumbo\", \"standard.colossus\", \"cpu.extra\", \"cpu.huge\", \"cpu.mega\", \"cpu.titan\", \"memory.extra\", \"memory.huge\", \"memory.mega\", \"memory.titan\", \"storage.extra\", \"storage.huge\", \"storage.mega\", \"storage.titan\", \"storage.jumbo\", \"gpu.small\", \"gpu.medium\", \"gpu.large\", \"gpu.huge\", \"gpu2.small\", \"gpu2.medium\", \"gpu2.large\", \"gpu2.huge\", \"gpu3.small\", \"gpu3.medium\", \"gpu3.large\", \"gpu3.huge\"]"
-  type        = list(string)
-}
-
-variable "coder_parameter_order" {
-  type        = number
-  description = "The order determines the position of a template parameter in the UI/CLI presentation. The lowest order is shown first and parameters with equal order are sorted by name (ascending order)."
-  default     = null
-}
-
-locals {
-  # https://www.exoscale.com/pricing/
-
-  standard_instances = [
-    {
-      value       = "standard.micro",
-      name        = "Standard Micro",
-      description = "512 MB RAM, 1 Core, 10 - 200 GB  Disk"
-    },
-    {
-      value       = "standard.tiny",
-      name        = "Standard Tiny",
-      description = "1 GB RAM, 1 Core, 10 - 400 GB  Disk"
-    },
-    {
-      value       = "standard.small",
-      name        = "Standard Small",
-      description = "2 GB RAM, 2 Cores, 10 - 400 GB  Disk"
-    },
-    {
-      value       = "standard.medium",
-      name        = "Standard Medium",
-      description = "4 GB RAM, 2 Cores, 10 - 400 GB  Disk"
-    },
-    {
-      value       = "standard.large",
-      name        = "Standard Large",
-      description = "8 GB RAM, 4 Cores, 10 - 400 GB  Disk"
-    },
-    {
-      value       = "standard.extra",
-      name        = "Standard Extra",
-      description = "rge",
-      description = "16 GB RAM, 4 Cores, 10 - 800 GB  Disk"
-    },
-    {
-      value       = "standard.huge",
-      name        = "Standard Huge",
-      description = "32 GB RAM, 8 Cores, 10 - 800 GB  Disk"
-    },
-    {
-      value       = "standard.mega",
-      name        = "Standard Mega",
-      description = "64 GB RAM, 12 Cores, 10 - 800 GB  Disk"
-    },
-    {
-      value       = "standard.titan",
-      name        = "Standard Titan",
-      description = "128 GB RAM, 16 Cores, 10 - 1.6 TB  Disk"
-    },
-    {
-      value       = "standard.jumbo",
-      name        = "Standard Jumbo",
-      description = "256 GB RAM, 24 Cores, 10 - 1.6 TB  Disk"
-    },
-    {
-      value       = "standard.colossus",
-      name        = "Standard Colossus",
-      description = "320 GB RAM, 40 Cores, 10 - 1.6 TB  Disk"
-    }
-  ]
-  cpu_instances = [
-    {
-      value       = "cpu.extra",
-      name        = "CPU Extra-Large",
-      description = "16 GB RAM, 8 Cores, 10 - 800 GB  Disk"
-    },
-    {
-      value       = "cpu.huge",
-      name        = "CPU Huge",
-      description = "32 GB RAM, 16 Cores, 10 - 800 GB  Disk"
-    },
-    {
-      value       = "cpu.mega",
-      name        = "CPU Mega",
-      description = "64 GB RAM, 32 Cores, 10 - 800 GB  Disk"
-    },
-    {
-      value       = "cpu.titan",
-      name        = "CPU Titan",
-      description = "128 GB RAM, 40 Cores, 0.1 - 1.6 TB  Disk"
-    }
-  ]
-  memory_instances = [
-    {
-      value       = "memory.extra",
-      name        = "Memory Extra-Large",
-      description = "16 GB RAM, 2 Cores, 10 - 800 GB  Disk"
-    },
-    {
-      value       = "memory.huge",
-      name        = "Memory Huge",
-      description = "32 GB RAM, 4 Cores, 10 - 800 GB  Disk"
-    },
-    {
-      value       = "memory.mega",
-      name        = "Memory Mega",
-      description = "64 GB RAM, 8 Cores, 10 - 800 GB  Disk"
-    },
-    {
-      value       = "memory.titan",
-      name        = "Memory Titan",
-      description = "128 GB RAM, 12 Cores, 0.1 - 1.6 TB  Disk"
-    }
-  ]
-  storage_instances = [
-    {
-      value       = "storage.extra",
-      name        = "Storage Extra-Large",
-      description = "16 GB RAM, 4 Cores, 1 - 2 TB  Disk"
-    },
-    {
-      value       = "storage.huge",
-      name        = "Storage Huge",
-      description = "32 GB RAM, 8 Cores, 2 - 3 TB  Disk"
-    },
-    {
-      value       = "storage.mega",
-      name        = "Storage Mega",
-      description = "64 GB RAM, 12 Cores, 3 - 5 TB  Disk"
-    },
-    {
-      value       = "storage.titan",
-      name        = "Storage Titan",
-      description = "128 GB RAM, 16 Cores, 5 - 10 TB  Disk"
-    },
-    {
-      value       = "storage.jumbo",
-      name        = "Storage Jumbo",
-      description = "225 GB RAM, 24 Cores, 10 - 15 TB  Disk"
-    }
-  ]
-  gpu_instances = [
-    {
-      value       = "gpu.small",
-      name        = "GPU1 Small",
-      description = "56 GB RAM, 12 Cores, 1 GPU, 100 - 800 GB  Disk"
-    },
-    {
-      value       = "gpu.medium",
-      name        = "GPU1 Medium",
-      description = "90 GB RAM, 16 Cores, 2 GPU, 0.1 - 1.2 TB Disk"
-    },
-    {
-      value       = "gpu.large",
-      name        = "GPU1 Large",
-      description = "120 GB RAM, 24 Cores, 3 GPU, 0.1 - 1.6 TB  Disk"
-    },
-    {
-      value       = "gpu.huge",
-      name        = "GPU1 Huge",
-      description = "225 GB RAM, 48 Cores, 4 GPU, 0.1 - 1.6 TB  Disk"
-    },
-    {
-      value       = "gpu2.small",
-      name        = "GPU2 Small",
-      description = "56 GB RAM, 12 Cores, 1 GPU, 100 - 800 GB  Disk"
-    },
-    {
-      value       = "gpu2.medium",
-      name        = "GPU2 Medium",
-      description = "90 GB RAM, 16 Cores, 2 GPU, 0.1 - 1.2 TB Disk"
-    },
-    {
-      value       = "gpu2.large",
-      name        = "GPU2 Large",
-      description = "120 GB RAM, 24 Cores, 3 GPU, 0.1 - 1.6 TB  Disk"
-    },
-    {
-      value       = "gpu2.huge",
-      name        = "GPU2 Huge",
-      description = "225 GB RAM, 48 Cores, 4 GPU, 0.1 - 1.6 TB  Disk"
-    },
-    {
-      value       = "gpu3.small",
-      name        = "GPU3 Small",
-      description = "56 GB RAM, 12 Cores, 1 GPU, 100 - 800 GB  Disk"
-    },
-    {
-      value       = "gpu3.medium",
-      name        = "GPU3 Medium",
-      description = "120 GB RAM, 24 Cores, 2 GPU, 0.1 - 1.2 TB Disk"
-    },
-    {
-      value       = "gpu3.large",
-      name        = "GPU3 Large",
-      description = "224 GB RAM, 48 Cores, 4 GPU, 0.1 - 1.6 TB  Disk"
-    },
-    {
-      value       = "gpu3.huge",
-      name        = "GPU3 Huge",
-      description = "448 GB RAM, 96 Cores, 8 GPU, 0.1 - 1.6 TB  Disk"
-    }
-  ]
-}
-
-data "coder_parameter" "instance_type" {
-  name         = "exoscale_instance_type"
-  display_name = var.display_name
-  description  = var.description
-  default      = var.default == "" ? null : var.default
-  order        = var.coder_parameter_order
-  mutable      = var.mutable
-  dynamic "option" {
-    for_each = [for k, v in concat(
-      contains(var.type_category, "standard") ? local.standard_instances : [],
-      contains(var.type_category, "cpu") ? local.cpu_instances : [],
-      contains(var.type_category, "memory") ? local.memory_instances : [],
-      contains(var.type_category, "storage") ? local.storage_instances : [],
-      contains(var.type_category, "gpu") ? local.gpu_instances : []
-    ) : v if !(contains(var.exclude, v.value))]
-    content {
-      name        = try(var.custom_names[option.value.value], option.value.name)
-      description = try(var.custom_descriptions[option.value.value], option.value.description)
-      value       = option.value.value
-    }
-  }
-}
-
-output "value" {
-  value = data.coder_parameter.instance_type.value
-}

exoscale-zone/README.md

@@ -1,98 +0,0 @@
----
-display_name: exoscale-zone
-description: A parameter with human zone names and icons
-icon: ../.icons/exoscale.svg
-maintainer_github: WhizUs
-verified: false
-tags: [helper, parameter, zones, regions, exoscale]
----
-
-# exoscale-zone
-
-A parameter with all Exoscale zones. This allows developers to select
-the zone closest to them.
-
-Customize the preselected parameter value:
-
-```tf
-module "exoscale-zone" {
-  source  = "registry.coder.com/modules/exoscale-zone/coder"
-  version = "1.0.12"
-  default = "ch-dk-2"
-}
-
-
-data "exoscale_compute_template" "my_template" {
-  zone = module.exoscale-zone.value
-  name = "Linux Ubuntu 22.04 LTS 64-bit"
-}
-
-resource "exoscale_compute_instance" "instance" {
-  zone = module.exoscale-zone.value
-  # ...
-}
-```
-
-![Exoscale Zones](../.images/exoscale-zones.png)
-
-## Examples
-
-### Customize zones
-
-Change the display name and icon for a zone using the corresponding maps:
-
-```tf
-module "exoscale-zone" {
-  source  = "registry.coder.com/modules/exoscale-zone/coder"
-  version = "1.0.12"
-  default = "at-vie-1"
-
-  custom_names = {
-    "at-vie-1" : "Home Vienna"
-  }
-
-  custom_icons = {
-    "at-vie-1" : "/emojis/1f3e0.png"
-  }
-}
-
-data "exoscale_compute_template" "my_template" {
-  zone = module.exoscale-zone.value
-  name = "Linux Ubuntu 22.04 LTS 64-bit"
-}
-
-resource "exoscale_compute_instance" "instance" {
-  zone = module.exoscale-zone.value
-  # ...
-}
-```
-
-![Exoscale Custom](../.images/exoscale-custom.png)
-
-### Exclude regions
-
-Hide the Switzerland zones Geneva and Zurich
-
-```tf
-module "exoscale-zone" {
-  source  = "registry.coder.com/modules/exoscale-zone/coder"
-  version = "1.0.12"
-  exclude = ["ch-gva-2", "ch-dk-2"]
-}
-
-data "exoscale_compute_template" "my_template" {
-  zone = module.exoscale-zone.value
-  name = "Linux Ubuntu 22.04 LTS 64-bit"
-}
-
-resource "exoscale_compute_instance" "instance" {
-  zone = module.exoscale-zone.value
-  # ...
-}
-```
-
-![Exoscale Exclude](../.images/exoscale-exclude.png)
-
-## Related templates
-
-An exoscale sample template will be delivered soon.

exoscale-zone/main.test.ts

@@ -1,33 +0,0 @@
-import { describe, expect, it } from "bun:test";
-import {
-  runTerraformApply,
-  runTerraformInit,
-  testRequiredVariables,
-} from "../test";
-
-describe("exoscale-zone", async () => {
-  await runTerraformInit(import.meta.dir);
-
-  testRequiredVariables(import.meta.dir, {});
-
-  it("default output", async () => {
-    const state = await runTerraformApply(import.meta.dir, {});
-    expect(state.outputs.value.value).toBe("");
-  });
-
-  it("customized default", async () => {
-    const state = await runTerraformApply(import.meta.dir, {
-      default: "at-vie-1",
-    });
-    expect(state.outputs.value.value).toBe("at-vie-1");
-  });
-
-  it("set custom order for coder_parameter", async () => {
-    const order = 99;
-    const state = await runTerraformApply(import.meta.dir, {
-      coder_parameter_order: order.toString(),
-    });
-    expect(state.resources).toHaveLength(1);
-    expect(state.resources[0].instances[0].attributes.order).toBe(order);
-  });
-});

exoscale-zone/main.tf

@@ -1,116 +0,0 @@
-terraform {
-  required_version = ">= 1.0"
-
-  required_providers {
-    coder = {
-      source  = "coder/coder"
-      version = ">= 0.12"
-    }
-  }
-}
-
-variable "display_name" {
-  default     = "Exoscale Region"
-  description = "The display name of the parameter."
-  type        = string
-}
-
-variable "description" {
-  default     = "The region to deploy workspace infrastructure."
-  description = "The description of the parameter."
-  type        = string
-}
-
-variable "default" {
-  default     = ""
-  description = "The default region to use if no region is specified."
-  type        = string
-}
-
-variable "mutable" {
-  default     = false
-  description = "Whether the parameter can be changed after creation."
-  type        = bool
-}
-
-variable "custom_names" {
-  default     = {}
-  description = "A map of custom display names for region IDs."
-  type        = map(string)
-}
-
-variable "custom_icons" {
-  default     = {}
-  description = "A map of custom icons for region IDs."
-  type        = map(string)
-}
-
-variable "exclude" {
-  default     = []
-  description = "A list of region IDs to exclude."
-  type        = list(string)
-}
-
-variable "coder_parameter_order" {
-  type        = number
-  description = "The order determines the position of a template parameter in the UI/CLI presentation. The lowest order is shown first and parameters with equal order are sorted by name (ascending order)."
-  default     = null
-}
-
-locals {
-  # This is a static list because the zones don't change _that_
-  # frequently and including the `exoscale_zones` data source requires
-  # the provider, which requires a zone.
-  # https://www.exoscale.com/datacenters/
-  zones = {
-    "de-fra-1" = {
-      name = "Frankfurt - Germany"
-      icon = "/emojis/1f1e9-1f1ea.png"
-    }
-    "at-vie-1" = {
-      name = "Vienna 1 - Austria"
-      icon = "/emojis/1f1e6-1f1f9.png"
-    }
-    "at-vie-2" = {
-      name = "Vienna 2 - Austria"
-      icon = "/emojis/1f1e6-1f1f9.png"
-    }
-    "ch-gva-2" = {
-      name = "Geneva - Switzerland"
-      icon = "/emojis/1f1e8-1f1ed.png"
-    }
-    "ch-dk-2" = {
-      name = "Zurich - Switzerland"
-      icon = "/emojis/1f1e8-1f1ed.png"
-    }
-    "bg-sof-1" = {
-      name = "Sofia - Bulgaria"
-      icon = "/emojis/1f1e7-1f1ec.png"
-    }
-    "de-muc-1" = {
-      name = "Munich - Germany"
-      icon = "/emojis/1f1e9-1f1ea.png"
-    }
-  }
-}
-
-data "coder_parameter" "zone" {
-  name         = "exoscale_zone"
-  display_name = var.display_name
-  description  = var.description
-  default      = var.default == "" ? null : var.default
-  order        = var.coder_parameter_order
-  mutable      = var.mutable
-  dynamic "option" {
-    for_each = { for k, v in local.zones : k => v if !(contains(var.exclude, k)) }
-    content {
-      name  = try(var.custom_names[option.key], option.value.name)
-      icon  = try(var.custom_icons[option.key], option.value.icon)
-      value = option.key
-    }
-  }
-}
-
-output "value" {
-  value = data.coder_parameter.zone.value
-}

filebrowser/README.md

@@ -11,10 +11,9 @@ tags: [helper, filebrowser]
 
 A file browser for your workspace.
 
-```tf
+```hcl
 module "filebrowser" {
-  source   = "registry.coder.com/modules/filebrowser/coder"
+    source = "https://registry.coder.com/modules/filebrowser"
-  version  = "1.0.22"
     agent_id = coder_agent.example.id
 }
 ```
@@ -25,10 +24,9 @@ module "filebrowser" {
 
 ### Serve a specific directory
 
-```tf
+```hcl
 module "filebrowser" {
-  source   = "registry.coder.com/modules/filebrowser/coder"
+    source = "https://registry.coder.com/modules/filebrowser"
-  version  = "1.0.22"
     agent_id = coder_agent.example.id
     folder = "/home/coder/project"
 }
@@ -36,22 +34,10 @@ module "filebrowser" {
 
 ### Specify location of `filebrowser.db`
 
-```tf
+```hcl
 module "filebrowser" {
-  source        = "registry.coder.com/modules/filebrowser/coder"
+    source = "https://registry.coder.com/modules/filebrowser"
-  version       = "1.0.22"
     agent_id = coder_agent.example.id
     database_path = ".config/filebrowser.db"
 }
 ```
-
-### Serve from the same domain (no subdomain)
-
-```tf
-module "filebrowser" {
-  source     = "registry.coder.com/modules/filebrowser/coder"
-  agent_id   = coder_agent.example.id
-  agent_name = "main"
-  subdomain  = false
-}
-```

filebrowser/main.test.ts

@@ -33,7 +33,7 @@ describe("filebrowser", async () => {
     expect(output.stdout).toEqual([
       "\u001b[0;1mInstalling filebrowser ",
       "",
-      "🥳 Installation complete! ",
+      "🥳 Installation comlete! ",
       "",
       "👷 Starting filebrowser in background... ",
       "",
@@ -55,7 +55,7 @@ describe("filebrowser", async () => {
     expect(output.stdout).toEqual([
       "\u001b[0;1mInstalling filebrowser ",
       "",
-      "🥳 Installation complete! ",
+      "🥳 Installation comlete! ",
       "",
       "👷 Starting filebrowser in background... ",
       "",
@@ -77,7 +77,7 @@ describe("filebrowser", async () => {
     expect(output.stdout).toEqual([
       "\u001B[0;1mInstalling filebrowser ",
       "",
-      "🥳 Installation complete! ",
+      "🥳 Installation comlete! ",
       "",
       "👷 Starting filebrowser in background... ",
       "",
@@ -88,27 +88,4 @@ describe("filebrowser", async () => {
       "📝 Logs at /tmp/filebrowser.log",
     ]);
   });
-
-  it("runs with subdomain=false", async () => {
-    const state = await runTerraformApply(import.meta.dir, {
-      agent_id: "foo",
-      agent_name: "main",
-      subdomain: false,
-    });
-    const output = await executeScriptInContainer(state, "alpine");
-    expect(output.exitCode).toBe(0);
-    expect(output.stdout).toEqual([
-      "\u001B[0;1mInstalling filebrowser ",
-      "",
-      "🥳 Installation complete! ",
-      "",
-      "👷 Starting filebrowser in background... ",
-      "",
-      "📂 Serving /root at http://localhost:13339 ",
-      "",
-      "Running 'filebrowser --noauth --root /root --port 13339' ",
-      "",
-      "📝 Logs at /tmp/filebrowser.log",
-    ]);
-  });
 });

filebrowser/main.tf

@@ -4,7 +4,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = ">= 0.17"
+      version = ">= 0.12"
     }
   }
 }
@@ -14,21 +14,6 @@ variable "agent_id" {
   description = "The ID of a Coder agent."
 }
 
-data "coder_workspace" "me" {}
-
-data "coder_workspace_owner" "me" {}
-
-variable "agent_name" {
-  type        = string
-  description = "The name of the main deployment. (Used to build the subpath for coder_app.)"
-  default     = ""
-  validation {
-    # If subdomain is false, then agent_name must be set.
-    condition     = var.subdomain || var.agent_name != ""
-    error_message = "The agent_name must be set."
-  }
-}
-
 variable "database_path" {
   type        = string
   description = "The path to the filebrowser database."
@@ -58,30 +43,6 @@ variable "folder" {
   default     = "~"
 }
 
-variable "share" {
-  type    = string
-  default = "owner"
-  validation {
-    condition     = var.share == "owner" || var.share == "authenticated" || var.share == "public"
-    error_message = "Incorrect value. Please set either 'owner', 'authenticated', or 'public'."
-  }
-}
-
-variable "order" {
-  type        = number
-  description = "The order determines the position of app in the UI presentation. The lowest order is shown first and apps with equal order are sorted by name (ascending order)."
-  default     = null
-}
-
-variable "subdomain" {
-  type        = bool
-  description = <<-EOT
-    Determines whether the app will be accessed via it's own subdomain or whether it will be accessed via a path on Coder.
-    If wildcards have not been setup by the administrator then apps with "subdomain" set to true will not be accessible.
-  EOT
-  default     = true
-}
-
 resource "coder_script" "filebrowser" {
   agent_id     = var.agent_id
   display_name = "File Browser"
@@ -91,9 +52,7 @@ resource "coder_script" "filebrowser" {
     PORT : var.port,
     FOLDER : var.folder,
     LOG_PATH : var.log_path,
-    DB_PATH : var.database_path,
+    DB_PATH : var.database_path
-    SUBDOMAIN : var.subdomain,
-    SERVER_BASE_PATH : var.subdomain ? "" : format("/@%s/%s.%s/apps/filebrowser", data.coder_workspace_owner.me.name, data.coder_workspace.me.name, var.agent_name),
   })
   run_on_start = true
 }
@@ -104,7 +63,6 @@ resource "coder_app" "filebrowser" {
   display_name = "File Browser"
   url          = "http://localhost:${var.port}"
   icon         = "https://raw.githubusercontent.com/filebrowser/logo/master/icon_raw.svg"
-  subdomain    = var.subdomain
+  subdomain    = true
-  share        = var.share
+  share        = "owner"
-  order        = var.order
 }

filebrowser/run.sh

@@ -5,7 +5,7 @@ printf "$${BOLD}Installing filebrowser \n\n"
 
 curl -fsSL https://raw.githubusercontent.com/filebrowser/get/master/get.sh | bash
 
-printf "🥳 Installation complete! \n\n"
+printf "🥳 Installation comlete! \n\n"
 
 printf "👷 Starting filebrowser in background... \n\n"
 
@@ -17,9 +17,6 @@ if [ "${DB_PATH}" != "filebrowser.db" ]; then
   DB_FLAG=" -d ${DB_PATH}"
 fi
 
-# set baseurl to be able to run if sudomain=false; if subdomain=true the SERVER_BASE_PATH value will be ""
-filebrowser config set --baseurl "${SERVER_BASE_PATH}"$${DB_FLAG} > ${LOG_PATH} 2>&1
-
 printf "📂 Serving $${ROOT_DIR} at http://localhost:${PORT} \n\n"
 
 printf "Running 'filebrowser --noauth --root $ROOT_DIR --port ${PORT}$${DB_FLAG}' \n\n"

fly-region/README.md

@@ -13,10 +13,9 @@ This module adds Fly.io regions to your Coder template. Regions can be whitelist
 
 We can use the simplest format here, only adding a default selection as the `atl` region.
 
-```tf
+```hcl
 module "fly-region" {
-  source  = "registry.coder.com/modules/fly-region/coder"
+    source = "https://registry.coder.com/modules/fly-region"
-  version = "1.0.2"
     default = "atl"
 }
 ```
@@ -29,10 +28,9 @@ module "fly-region" {
 
 The regions argument can be used to display only the desired regions in the Coder parameter.
 
-```tf
+```hcl
 module "fly-region" {
-  source  = "registry.coder.com/modules/fly-region/coder"
+    source = "https://registry.coder.com/modules/fly-region"
-  version = "1.0.2"
     default = "ams"
     regions = ["ams", "arn", "atl"]
 }
@@ -44,16 +42,13 @@ module "fly-region" {
 
 Set custom icons and names with their respective maps.
 
-```tf
+```hcl
 module "fly-region" {
-  source  = "registry.coder.com/modules/fly-region/coder"
+    source = "https://registry.coder.com/modules/fly-region"
-  version = "1.0.2"
     default = "ams"
-
     custom_icons = {
         "ams" = "/emojis/1f90e.png"
     }
-
     custom_names = {
         "ams" = "We love the Netherlands!"
     }

gcp-region/README.md

@@ -11,10 +11,9 @@ tags: [gcp, regions, parameter, helper]
 
 This module adds Google Cloud Platform regions to your Coder template.
 
-```tf
+```hcl
 module "gcp_region" {
-  source  = "registry.coder.com/modules/gcp-region/coder"
+    source  = "https://registry.coder.com/modules/gcp-region"
-  version = "1.0.12"
     regions = ["us", "europe"]
 }
 
@@ -31,10 +30,9 @@ resource "google_compute_instance" "example" {
 
 Note: setting `gpu_only = true` and using a default region without GPU support, the default will be set to `null`.
 
-```tf
+```hcl
 module "gcp_region" {
-  source   = "registry.coder.com/modules/gcp-region/coder"
+    source   = "https://registry.coder.com/modules/gcp-region"
-  version  = "1.0.12"
     default  = ["us-west1-a"]
     regions  = ["us-west1"]
     gpu_only = false
@@ -47,10 +45,9 @@ resource "google_compute_instance" "example" {
 
 ### Add all zones in the Europe West region
 
-```tf
+```hcl
 module "gcp_region" {
-  source                 = "registry.coder.com/modules/gcp-region/coder"
+    source                 = "https://registry.coder.com/modules/gcp-region"
-  version                = "1.0.12"
     regions                = ["europe-west"]
     single_zone_per_region = false
 }
@@ -60,12 +57,11 @@ resource "google_compute_instance" "example" {
 }
 ```
 
-### Add a single zone from each region in US and Europe that has GPUs
+### Add a single zone from each region in US and Europe that laos has GPUs
 
-```tf
+```hcl
 module "gcp_region" {
-  source                 = "registry.coder.com/modules/gcp-region/coder"
+    source                 = "https://registry.coder.com/modules/gcp-region"
-  version                = "1.0.12"
     regions                = ["us", "europe"]
     gpu_only               = true
     single_zone_per_region = true

gcp-region/main.test.ts

@@ -40,13 +40,4 @@ describe("gcp-region", async () => {
     });
     expect(state.outputs.value.value).toBe("us-west2-b");
   });
-
-  it("set custom order for coder_parameter", async () => {
-    const order = 99;
-    const state = await runTerraformApply(import.meta.dir, {
-      coder_parameter_order: order.toString(),
-    });
-    expect(state.resources).toHaveLength(1);
-    expect(state.resources[0].instances[0].attributes.order).toBe(order);
-  });
 });

gcp-region/main.tf

@@ -63,12 +63,6 @@ variable "single_zone_per_region" {
   type        = bool
 }
 
-variable "coder_parameter_order" {
-  type        = number
-  description = "The order determines the position of a template parameter in the UI/CLI presentation. The lowest order is shown first and parameters with equal order are sorted by name (ascending order)."
-  default     = null
-}
-
 locals {
   zones = {
     # US Central
@@ -721,7 +715,6 @@ data "coder_parameter" "region" {
   icon         = "/icon/gcp.png"
   mutable      = var.mutable
   default      = var.default != null && var.default != "" && (!var.gpu_only || try(local.zones[var.default].gpu, false)) ? var.default : null
-  order        = var.coder_parameter_order
   dynamic "option" {
     for_each = {
       for k, v in local.zones : k => v

git-clone/README.md

@@ -9,164 +9,33 @@ tags: [git, helper]
 
 # Git Clone
 
-This module allows you to automatically clone a repository by URL and skip if it exists in the base directory provided.
+This module allows you to automatically clone a repository by URL and skip if it exists in the path provided.
 
-```tf
+```hcl
 module "git-clone" {
-  source   = "registry.coder.com/modules/git-clone/coder"
+    source   = "https://registry.coder.com/modules/git-clone"
-  version  = "1.0.18"
     agent_id = coder_agent.example.id
     url      = "https://github.com/coder/coder"
 }
 ```
 
+To use with [Git Authentication](https://coder.com/docs/v2/latest/admin/git-providers), add the provider by ID to your template:
+
+```hcl
+data "coder_git_auth" "github" {
+    id = "github"
+}
+```
+
 ## Examples
 
 ### Custom Path
 
-```tf
+```hcl
 module "git-clone" {
-  source   = "registry.coder.com/modules/git-clone/coder"
+    source   = "https://registry.coder.com/modules/git-clone"
-  version  = "1.0.18"
     agent_id = coder_agent.example.id
     url      = "https://github.com/coder/coder"
-  base_dir = "~/projects/coder"
+    path     = "~/projects/coder/coder"
-}
-```
-
-### Git Authentication
-
-To use with [Git Authentication](https://coder.com/docs/v2/latest/admin/git-providers), add the provider by ID to your template:
-
-```tf
-module "git-clone" {
-  source   = "registry.coder.com/modules/git-clone/coder"
-  version  = "1.0.18"
-  agent_id = coder_agent.example.id
-  url      = "https://github.com/coder/coder"
-}
-
-data "coder_git_auth" "github" {
-  id = "github"
-}
-```
-
-## GitHub clone with branch name
-
-To GitHub clone with a specific branch like `feat/example`
-
-```tf
-# Prompt the user for the git repo URL
-data "coder_parameter" "git_repo" {
-  name         = "git_repo"
-  display_name = "Git repository"
-  default      = "https://github.com/coder/coder/tree/feat/example"
-}
-
-# Clone the repository for branch `feat/example`
-module "git_clone" {
-  source   = "registry.coder.com/modules/git-clone/coder"
-  version  = "1.0.18"
-  agent_id = coder_agent.example.id
-  url      = data.coder_parameter.git_repo.value
-}
-
-# Create a code-server instance for the cloned repository
-module "code-server" {
-  source   = "registry.coder.com/modules/code-server/coder"
-  version  = "1.0.18"
-  agent_id = coder_agent.example.id
-  order    = 1
-  folder   = "/home/${local.username}/${module.git_clone.folder_name}"
-}
-
-# Create a Coder app for the website
-resource "coder_app" "website" {
-  agent_id     = coder_agent.example.id
-  order        = 2
-  slug         = "website"
-  external     = true
-  display_name = module.git_clone.folder_name
-  url          = module.git_clone.web_url
-  icon         = module.git_clone.git_provider != "" ? "/icon/${module.git_clone.git_provider}.svg" : "/icon/git.svg"
-  count        = module.git_clone.web_url != "" ? 1 : 0
-}
-```
-
-Configuring `git-clone` for a self-hosted GitHub Enterprise Server running at `github.example.com`
-
-```tf
-module "git-clone" {
-  source   = "registry.coder.com/modules/git-clone/coder"
-  version  = "1.0.18"
-  agent_id = coder_agent.example.id
-  url      = "https://github.example.com/coder/coder/tree/feat/example"
-  git_providers = {
-    "https://github.example.com/" = {
-      provider = "github"
-    }
-  }
-}
-```
-
-## GitLab clone with branch name
-
-To GitLab clone with a specific branch like `feat/example`
-
-```tf
-module "git-clone" {
-  source   = "registry.coder.com/modules/git-clone/coder"
-  version  = "1.0.18"
-  agent_id = coder_agent.example.id
-  url      = "https://gitlab.com/coder/coder/-/tree/feat/example"
-}
-```
-
-Configuring `git-clone` for a self-hosted GitLab running at `gitlab.example.com`
-
-```tf
-module "git-clone" {
-  source   = "registry.coder.com/modules/git-clone/coder"
-  version  = "1.0.18"
-  agent_id = coder_agent.example.id
-  url      = "https://gitlab.example.com/coder/coder/-/tree/feat/example"
-  git_providers = {
-    "https://gitlab.example.com/" = {
-      provider = "gitlab"
-    }
-  }
-}
-```
-
-## Git clone with branch_name set
-
-Alternatively, you can set the `branch_name` attribute to clone a specific branch.
-
-For example, to clone the `feat/example` branch:
-
-```tf
-module "git-clone" {
-  source      = "registry.coder.com/modules/git-clone/coder"
-  version     = "1.0.18"
-  agent_id    = coder_agent.example.id
-  url         = "https://github.com/coder/coder"
-  branch_name = "feat/example"
-}
-```
-
-## Git clone with different destination folder
-
-By default, the repository will be cloned into a folder matching the repository name. You can use the `folder_name` attribute to change the name of the destination folder to something else.
-
-For example, this will clone into the `~/projects/coder/coder-dev` folder:
-
-```tf
-module "git-clone" {
-  source      = "registry.coder.com/modules/git-clone/coder"
-  version     = "1.0.18"
-  agent_id    = coder_agent.example.id
-  url         = "https://github.com/coder/coder"
-  folder_name = "coder-dev"
-  base_dir    = "~/projects/coder"
 }
 ```

git-clone/main.test.ts

@@ -36,212 +36,4 @@ describe("git-clone", async () => {
       "Cloning fake-url to ~/fake-url...",
     ]);
   });
-
-  it("repo_dir should match repo name for https", async () => {
-    const url = "https://github.com/coder/coder.git";
-    const state = await runTerraformApply(import.meta.dir, {
-      agent_id: "foo",
-      base_dir: "/tmp",
-      url,
-    });
-    expect(state.outputs.repo_dir.value).toEqual("/tmp/coder");
-    expect(state.outputs.folder_name.value).toEqual("coder");
-    expect(state.outputs.clone_url.value).toEqual(url);
-    expect(state.outputs.web_url.value).toEqual(url);
-    expect(state.outputs.branch_name.value).toEqual("");
-  });
-
-  it("repo_dir should match repo name for https without .git", async () => {
-    const url = "https://github.com/coder/coder";
-    const state = await runTerraformApply(import.meta.dir, {
-      agent_id: "foo",
-      base_dir: "/tmp",
-      url,
-    });
-    expect(state.outputs.repo_dir.value).toEqual("/tmp/coder");
-    expect(state.outputs.clone_url.value).toEqual(url);
-    expect(state.outputs.web_url.value).toEqual(url);
-    expect(state.outputs.branch_name.value).toEqual("");
-  });
-
-  it("repo_dir should match repo name for ssh", async () => {
-    const url = "git@github.com:coder/coder.git";
-    const state = await runTerraformApply(import.meta.dir, {
-      agent_id: "foo",
-      base_dir: "/tmp",
-      url,
-    });
-    expect(state.outputs.repo_dir.value).toEqual("/tmp/coder");
-    expect(state.outputs.git_provider.value).toEqual("");
-    expect(state.outputs.clone_url.value).toEqual(url);
-    const https_url = "https://github.com/coder/coder.git";
-    expect(state.outputs.web_url.value).toEqual(https_url);
-    expect(state.outputs.branch_name.value).toEqual("");
-  });
-
-  it("repo_dir should match base_dir/folder_name", async () => {
-    const url = "git@github.com:coder/coder.git";
-    const state = await runTerraformApply(import.meta.dir, {
-      agent_id: "foo",
-      base_dir: "/tmp",
-      folder_name: "foo",
-      url,
-    });
-    expect(state.outputs.repo_dir.value).toEqual("/tmp/foo");
-    expect(state.outputs.folder_name.value).toEqual("foo");
-    expect(state.outputs.clone_url.value).toEqual(url);
-    const https_url = "https://github.com/coder/coder.git";
-    expect(state.outputs.web_url.value).toEqual(https_url);
-    expect(state.outputs.branch_name.value).toEqual("");
-  });
-
-  it("branch_name should not include query string", async () => {
-    const state = await runTerraformApply(import.meta.dir, {
-      agent_id: "foo",
-      url: "https://gitlab.com/mike.brew/repo-tests.log/-/tree/feat/branch?ref_type=heads",
-    });
-    expect(state.outputs.repo_dir.value).toEqual("~/repo-tests.log");
-    expect(state.outputs.folder_name.value).toEqual("repo-tests.log");
-    const https_url = "https://gitlab.com/mike.brew/repo-tests.log";
-    expect(state.outputs.clone_url.value).toEqual(https_url);
-    expect(state.outputs.web_url.value).toEqual(https_url);
-    expect(state.outputs.branch_name.value).toEqual("feat/branch");
-  });
-
-  it("branch_name should not include fragments", async () => {
-    const state = await runTerraformApply(import.meta.dir, {
-      agent_id: "foo",
-      base_dir: "/tmp",
-      url: "https://gitlab.com/mike.brew/repo-tests.log/-/tree/feat/branch#name",
-    });
-    expect(state.outputs.repo_dir.value).toEqual("/tmp/repo-tests.log");
-    const https_url = "https://gitlab.com/mike.brew/repo-tests.log";
-    expect(state.outputs.clone_url.value).toEqual(https_url);
-    expect(state.outputs.web_url.value).toEqual(https_url);
-    expect(state.outputs.branch_name.value).toEqual("feat/branch");
-  });
-
-  it("gitlab url with branch should match", async () => {
-    const state = await runTerraformApply(import.meta.dir, {
-      agent_id: "foo",
-      base_dir: "/tmp",
-      url: "https://gitlab.com/mike.brew/repo-tests.log/-/tree/feat/branch",
-    });
-    expect(state.outputs.repo_dir.value).toEqual("/tmp/repo-tests.log");
-    expect(state.outputs.git_provider.value).toEqual("gitlab");
-    const https_url = "https://gitlab.com/mike.brew/repo-tests.log";
-    expect(state.outputs.clone_url.value).toEqual(https_url);
-    expect(state.outputs.web_url.value).toEqual(https_url);
-    expect(state.outputs.branch_name.value).toEqual("feat/branch");
-  });
-
-  it("github url with branch should match", async () => {
-    const state = await runTerraformApply(import.meta.dir, {
-      agent_id: "foo",
-      base_dir: "/tmp",
-      url: "https://github.com/michaelbrewer/repo-tests.log/tree/feat/branch",
-    });
-    expect(state.outputs.repo_dir.value).toEqual("/tmp/repo-tests.log");
-    expect(state.outputs.git_provider.value).toEqual("github");
-    const https_url = "https://github.com/michaelbrewer/repo-tests.log";
-    expect(state.outputs.clone_url.value).toEqual(https_url);
-    expect(state.outputs.web_url.value).toEqual(https_url);
-    expect(state.outputs.branch_name.value).toEqual("feat/branch");
-  });
-
-  it("self-host git url with branch should match", async () => {
-    const state = await runTerraformApply(import.meta.dir, {
-      agent_id: "foo",
-      base_dir: "/tmp",
-      url: "https://git.example.com/example/project/-/tree/feat/example",
-      git_providers: `
-      {
-        "https://git.example.com/" = {
-          provider = "gitlab"
-        }
-      }`,
-    });
-    expect(state.outputs.repo_dir.value).toEqual("/tmp/project");
-    expect(state.outputs.git_provider.value).toEqual("gitlab");
-    const https_url = "https://git.example.com/example/project";
-    expect(state.outputs.clone_url.value).toEqual(https_url);
-    expect(state.outputs.web_url.value).toEqual(https_url);
-    expect(state.outputs.branch_name.value).toEqual("feat/example");
-  });
-
-  it("handle unsupported git provider configuration", async () => {
-    const t = async () => {
-      await runTerraformApply(import.meta.dir, {
-        agent_id: "foo",
-        url: "foo",
-        git_providers: `
-        {
-          "https://git.example.com/" = {
-            provider = "bitbucket"
-          }
-        }`,
-      });
-    };
-    expect(t).toThrow('Allowed values for provider are "github" or "gitlab".');
-  });
-
-  it("handle unknown git provider url", async () => {
-    const url = "https://git.unknown.com/coder/coder";
-    const state = await runTerraformApply(import.meta.dir, {
-      agent_id: "foo",
-      base_dir: "/tmp",
-      url,
-    });
-    expect(state.outputs.repo_dir.value).toEqual("/tmp/coder");
-    expect(state.outputs.clone_url.value).toEqual(url);
-    expect(state.outputs.web_url.value).toEqual(url);
-    expect(state.outputs.branch_name.value).toEqual("");
-  });
-
-  it("runs with github clone with switch to feat/branch", async () => {
-    const state = await runTerraformApply(import.meta.dir, {
-      agent_id: "foo",
-      url: "https://github.com/michaelbrewer/repo-tests.log/tree/feat/branch",
-    });
-    const output = await executeScriptInContainer(state, "alpine/git");
-    expect(output.exitCode).toBe(0);
-    expect(output.stdout).toEqual([
-      "Creating directory ~/repo-tests.log...",
-      "Cloning https://github.com/michaelbrewer/repo-tests.log to ~/repo-tests.log on branch feat/branch...",
-    ]);
-  });
-
-  it("runs with gitlab clone with switch to feat/branch", async () => {
-    const state = await runTerraformApply(import.meta.dir, {
-      agent_id: "foo",
-      url: "https://gitlab.com/mike.brew/repo-tests.log/-/tree/feat/branch",
-    });
-    const output = await executeScriptInContainer(state, "alpine/git");
-    expect(output.exitCode).toBe(0);
-    expect(output.stdout).toEqual([
-      "Creating directory ~/repo-tests.log...",
-      "Cloning https://gitlab.com/mike.brew/repo-tests.log to ~/repo-tests.log on branch feat/branch...",
-    ]);
-  });
-
-  it("runs with github clone with branch_name set to feat/branch", async () => {
-    const url = "https://github.com/michaelbrewer/repo-tests.log";
-    const branch_name = "feat/branch";
-    const state = await runTerraformApply(import.meta.dir, {
-      agent_id: "foo",
-      url,
-      branch_name,
-    });
-    expect(state.outputs.repo_dir.value).toEqual("~/repo-tests.log");
-    expect(state.outputs.clone_url.value).toEqual(url);
-    expect(state.outputs.web_url.value).toEqual(url);
-    expect(state.outputs.branch_name.value).toEqual(branch_name);
-
-    const output = await executeScriptInContainer(state, "alpine/git");
-    expect(output.exitCode).toBe(0);
-    expect(output.stdout).toEqual([
-      "Creating directory ~/repo-tests.log...",
-      "Cloning https://github.com/michaelbrewer/repo-tests.log to ~/repo-tests.log on branch feat/branch...",
-    ]);
-  });
 });

git-clone/main.tf

@@ -4,7 +4,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = ">= 0.12"
+      version = ">= 0.11"
     }
   }
 }
@@ -14,9 +14,9 @@ variable "url" {
   type        = string
 }
 
-variable "base_dir" {
+variable "path" {
   default     = ""
-  description = "The base directory to clone the repository. Defaults to \"$HOME\"."
+  description = "The path to clone the repository. Defaults to \"$HOME/<basename of url>\"."
   type        = string
 }
 
@@ -25,94 +25,11 @@ variable "agent_id" {
   type        = string
 }
 
-variable "git_providers" {
-  type = map(object({
-    provider = string
-  }))
-  description = "A mapping of URLs to their git provider."
-  default = {
-    "https://github.com/" = {
-      provider = "github"
-    },
-    "https://gitlab.com/" = {
-      provider = "gitlab"
-    },
-  }
-  validation {
-    error_message = "Allowed values for provider are \"github\" or \"gitlab\"."
-    condition     = alltrue([for provider in var.git_providers : contains(["github", "gitlab"], provider.provider)])
-  }
-}
-
-variable "branch_name" {
-  description = "The branch name to clone. If not provided, the default branch will be cloned."
-  type        = string
-  default     = ""
-}
-
-variable "folder_name" {
-  description = "The destination folder to clone the repository into."
-  type        = string
-  default     = ""
-}
-
-locals {
-  # Remove query parameters and fragments from the URL
-  url = replace(replace(var.url, "/\\?.*/", ""), "/#.*/", "")
-
-  # Find the git provider based on the URL and determine the tree path
-  provider_key = try(one([for key in keys(var.git_providers) : key if startswith(local.url, key)]), null)
-  provider     = try(lookup(var.git_providers, local.provider_key).provider, "")
-  tree_path    = local.provider == "gitlab" ? "/-/tree/" : local.provider == "github" ? "/tree/" : ""
-
-  # Remove tree and branch name from the URL
-  clone_url = var.branch_name == "" && local.tree_path != "" ? replace(local.url, "/${local.tree_path}.*/", "") : local.url
-  # Extract the branch name from the URL
-  branch_name = var.branch_name == "" && local.tree_path != "" ? replace(replace(local.url, local.clone_url, ""), "/.*${local.tree_path}/", "") : var.branch_name
-  # Extract the folder name from the URL
-  folder_name = var.folder_name == "" ? replace(basename(local.clone_url), ".git", "") : var.folder_name
-  # Construct the path to clone the repository
-  clone_path = var.base_dir != "" ? join("/", [var.base_dir, local.folder_name]) : join("/", ["~", local.folder_name])
-  # Construct the web URL
-  web_url = startswith(local.clone_url, "git@") ? replace(replace(local.clone_url, ":", "/"), "git@", "https://") : local.clone_url
-}
-
-output "repo_dir" {
-  value       = local.clone_path
-  description = "Full path of cloned repo directory"
-}
-
-output "git_provider" {
-  value       = local.provider
-  description = "The git provider of the repository"
-}
-
-output "folder_name" {
-  value       = local.folder_name
-  description = "The name of the folder that will be created"
-}
-
-output "clone_url" {
-  value       = local.clone_url
-  description = "The exact Git repository URL that will be cloned"
-}
-
-output "web_url" {
-  value       = local.web_url
-  description = "Git https repository URL (may be invalid for unsupported providers)"
-}
-
-output "branch_name" {
-  value       = local.branch_name
-  description = "Git branch name (may be empty)"
-}
-
 resource "coder_script" "git_clone" {
   agent_id = var.agent_id
   script = templatefile("${path.module}/run.sh", {
-    CLONE_PATH = local.clone_path,
+    CLONE_PATH : var.path != "" ? var.path : join("/", ["~", basename(var.url)]),
-    REPO_URL : local.clone_url,
+    REPO_URL : var.url,
-    BRANCH_NAME : local.branch_name,
   })
   display_name       = "Git Clone"
   icon               = "/icon/git.svg"

git-clone/run.sh

@@ -2,7 +2,6 @@
 
 REPO_URL="${REPO_URL}"
 CLONE_PATH="${CLONE_PATH}"
-BRANCH_NAME="${BRANCH_NAME}"
 # Expand home if it's specified!
 CLONE_PATH="$${CLONE_PATH/#\~/$${HOME}}"
 
@@ -34,13 +33,8 @@ fi
 # Check if the directory is empty
 # and if it is, clone the repo, otherwise skip cloning
 if [ -z "$(ls -A "$CLONE_PATH")" ]; then
-  if [ -z "$BRANCH_NAME" ]; then
   echo "Cloning $REPO_URL to $CLONE_PATH..."
   git clone "$REPO_URL" "$CLONE_PATH"
-  else
-    echo "Cloning $REPO_URL to $CLONE_PATH on branch $BRANCH_NAME..."
-    git clone "$REPO_URL" -b "$BRANCH_NAME" "$CLONE_PATH"
-  fi
 else
   echo "$CLONE_PATH already exists and isn't empty, skipping clone!"
   exit 0

git-commit-signing/README.md

@@ -1,25 +0,0 @@
----
-display_name: Git commit signing
-description: Configures Git to sign commits using your Coder SSH key
-icon: ../.icons/git.svg
-maintainer_github: coder
-verified: true
-tags: [helper, git]
----
-
-# git-commit-signing
-
-This module downloads your SSH key from Coder and uses it to sign commits with Git.
-It requires `curl` and `jq` to be installed inside your workspace.
-
-Please observe that using the SSH key that's part of your Coder account for commit signing, means that in the event of a breach of your Coder account, or a malicious admin, someone could perform commit signing pretending to be you.
-
-This module has a chance of conflicting with the user's dotfiles / the personalize module if one of those has configuration directives that overwrite this module's / each other's git configuration.
-
-```tf
-module "git-commit-signing" {
-  source   = "registry.coder.com/modules/git-commit-signing/coder"
-  version  = "1.0.11"
-  agent_id = coder_agent.example.id
-}
-```

git-commit-signing/main.tf

@@ -1,25 +0,0 @@
-terraform {
-  required_version = ">= 1.0"
-
-  required_providers {
-    coder = {
-      source  = "coder/coder"
-      version = ">= 0.12"
-    }
-  }
-}
-
-variable "agent_id" {
-  type        = string
-  description = "The ID of a Coder agent."
-}
-
-resource "coder_script" "git-commit-signing" {
-  display_name = "Git commit signing"
-  icon         = "/icon/git.svg"
-
-  script       = file("${path.module}/run.sh")
-  run_on_start = true
-
-  agent_id = var.agent_id
-}

git-commit-signing/run.sh

@@ -1,42 +0,0 @@
-#!/usr/bin/env sh
-
-if ! command -v git > /dev/null; then
-  echo "git is not installed"
-  exit 1
-fi
-
-if ! command -v curl > /dev/null; then
-  echo "curl is not installed"
-  exit 1
-fi
-
-if ! command -v jq > /dev/null; then
-  echo "jq is not installed"
-  exit 1
-fi
-
-mkdir -p ~/.ssh/git-commit-signing
-
-echo "Downloading SSH key"
-
-ssh_key=$(curl --request GET \
-  --url "${CODER_AGENT_URL}api/v2/workspaceagents/me/gitsshkey" \
-  --header "Coder-Session-Token: ${CODER_AGENT_TOKEN}" \
-  --silent --show-error)
-
-jq --raw-output ".public_key" > ~/.ssh/git-commit-signing/coder.pub << EOF
-$ssh_key
-EOF
-
-jq --raw-output ".private_key" > ~/.ssh/git-commit-signing/coder << EOF
-$ssh_key
-EOF
-
-chmod -R 600 ~/.ssh/git-commit-signing/coder
-chmod -R 644 ~/.ssh/git-commit-signing/coder.pub
-
-echo "Configuring git to use the SSH key"
-
-git config --global gpg.format ssh
-git config --global commit.gpgsign true
-git config --global user.signingkey ~/.ssh/git-commit-signing/coder

git-config/README.md

@@ -11,10 +11,9 @@ tags: [helper, git]
 
 Runs a script that updates git credentials in the workspace to match the user's Coder credentials, optionally allowing to the developer to override the defaults.
 
-```tf
+```hcl
 module "git-config" {
-  source   = "registry.coder.com/modules/git-config/coder"
+  source = "https://registry.coder.com/modules/git-config"
-  version  = "1.0.15"
   agent_id = coder_agent.example.id
 }
 ```
@@ -25,10 +24,9 @@ TODO: Add screenshot
 
 ### Allow users to override both username and email
 
-```tf
+```hcl
 module "git-config" {
-  source             = "registry.coder.com/modules/git-config/coder"
+  source = "https://registry.coder.com/modules/git-config"
-  version            = "1.0.15"
   agent_id = coder_agent.example.id
   allow_email_change = true
 }
@@ -38,12 +36,13 @@ TODO: Add screenshot
 
 ## Disallowing users from overriding both username and email
 
-```tf
+```hcl
 module "git-config" {
-  source                = "registry.coder.com/modules/git-config/coder"
+  source = "https://registry.coder.com/modules/git-config"
-  version               = "1.0.15"
   agent_id = coder_agent.example.id
   allow_username_change = false
   allow_email_change = false
 }
 ```
+
+TODO: Add screenshot

git-config/main.test.ts

@@ -1,5 +1,6 @@
 import { describe, expect, it } from "bun:test";
 import {
+  executeScriptInContainer,
   runTerraformApply,
   runTerraformInit,
   testRequiredVariables,
@@ -12,116 +13,31 @@ describe("git-config", async () => {
     agent_id: "foo",
   });
 
-  it("can run apply allow_username_change and allow_email_change disabled", async () => {
+  it("fails without git", async () => {
     const state = await runTerraformApply(import.meta.dir, {
       agent_id: "foo",
-      allow_username_change: "false",
-      allow_email_change: "false",
     });
-
+    const output = await executeScriptInContainer(state, "alpine");
-    const resources = state.resources;
+    expect(output.exitCode).toBe(1);
-    expect(resources).toHaveLength(6);
+    expect(output.stdout).toEqual([
-    expect(resources).toMatchObject([
+      "\u001B[0;1mChecking git-config!",
-      { type: "coder_workspace", name: "me" },
+      "Git is not installed!",
-      { type: "coder_workspace_owner", name: "me" },
-      { type: "coder_env", name: "git_author_email" },
-      { type: "coder_env", name: "git_author_name" },
-      { type: "coder_env", name: "git_commmiter_email" },
-      { type: "coder_env", name: "git_commmiter_name" },
     ]);
   });
 
-  it("can run apply allow_email_change enabled", async () => {
+  it("runs with git", async () => {
     const state = await runTerraformApply(import.meta.dir, {
       agent_id: "foo",
-      allow_email_change: "true",
     });
-
+    const output = await executeScriptInContainer(state, "alpine/git");
-    const resources = state.resources;
+    expect(output.exitCode).toBe(0);
-    expect(resources).toHaveLength(8);
+    expect(output.stdout).toEqual([
-    expect(resources).toMatchObject([
+      "\u001B[0;1mChecking git-config!",
-      { type: "coder_parameter", name: "user_email" },
+      "git-config: No user.email found, setting to ",
-      { type: "coder_parameter", name: "username" },
+      "git-config: No user.name found, setting to default",
-      { type: "coder_workspace", name: "me" },
+      "",
-      { type: "coder_workspace_owner", name: "me" },
+      "\u001B[0;1mgit-config: using email: ",
-      { type: "coder_env", name: "git_author_email" },
+      "\u001B[0;1mgit-config: using username: default",
-      { type: "coder_env", name: "git_author_name" },
-      { type: "coder_env", name: "git_commmiter_email" },
-      { type: "coder_env", name: "git_commmiter_name" },
     ]);
   });
-
-  it("can run apply allow_email_change enabled", async () => {
-    const state = await runTerraformApply(
-      import.meta.dir,
-      {
-        agent_id: "foo",
-        allow_username_change: "false",
-        allow_email_change: "false",
-      },
-      { CODER_WORKSPACE_OWNER_EMAIL: "foo@email.com" },
-    );
-
-    const resources = state.resources;
-    expect(resources).toHaveLength(6);
-    expect(resources).toMatchObject([
-      { type: "coder_workspace", name: "me" },
-      { type: "coder_workspace_owner", name: "me" },
-      { type: "coder_env", name: "git_author_email" },
-      { type: "coder_env", name: "git_author_name" },
-      { type: "coder_env", name: "git_commmiter_email" },
-      { type: "coder_env", name: "git_commmiter_name" },
-    ]);
-  });
-
-  it("set custom order for coder_parameter for both fields", async () => {
-    const order = 20;
-    const state = await runTerraformApply(import.meta.dir, {
-      agent_id: "foo",
-      allow_username_change: "true",
-      allow_email_change: "true",
-      coder_parameter_order: order.toString(),
-    });
-    const resources = state.resources;
-    expect(resources).toHaveLength(8);
-    expect(resources).toMatchObject([
-      { type: "coder_parameter", name: "user_email" },
-      { type: "coder_parameter", name: "username" },
-      { type: "coder_workspace", name: "me" },
-      { type: "coder_workspace_owner", name: "me" },
-      { type: "coder_env", name: "git_author_email" },
-      { type: "coder_env", name: "git_author_name" },
-      { type: "coder_env", name: "git_commmiter_email" },
-      { type: "coder_env", name: "git_commmiter_name" },
-    ]);
-    // user_email order is the same as the order
-    expect(resources[0].instances[0].attributes.order).toBe(order);
-    // username order is incremented by 1
-    // @ts-ignore: Object is possibly 'null'.
-    expect(resources[1].instances[0]?.attributes.order).toBe(order + 1);
-  });
-
-  it("set custom order for coder_parameter for just username", async () => {
-    const order = 30;
-    const state = await runTerraformApply(import.meta.dir, {
-      agent_id: "foo",
-      allow_email_change: "false",
-      allow_username_change: "true",
-      coder_parameter_order: order.toString(),
-    });
-    const resources = state.resources;
-    expect(resources).toHaveLength(7);
-    expect(resources).toMatchObject([
-      { type: "coder_parameter", name: "username" },
-      { type: "coder_workspace", name: "me" },
-      { type: "coder_workspace_owner", name: "me" },
-      { type: "coder_env", name: "git_author_email" },
-      { type: "coder_env", name: "git_author_name" },
-      { type: "coder_env", name: "git_commmiter_email" },
-      { type: "coder_env", name: "git_commmiter_name" },
-    ]);
-    // user_email was not created
-    // username order is incremented by 1
-    expect(resources[0].instances[0].attributes.order).toBe(order + 1);
-  });
 });

git-config/main.tf

@@ -4,7 +4,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = ">= 0.23"
+      version = ">= 0.12"
     }
   }
 }
@@ -26,22 +26,15 @@ variable "allow_email_change" {
   default     = false
 }
 
-variable "coder_parameter_order" {
-  type        = number
-  description = "The order determines the position of a template parameter in the UI/CLI presentation. The lowest order is shown first and parameters with equal order are sorted by name (ascending order)."
-  default     = null
-}
 
 data "coder_workspace" "me" {}
-data "coder_workspace_owner" "me" {}
 
 data "coder_parameter" "user_email" {
   count        = var.allow_email_change ? 1 : 0
   name         = "user_email"
   type         = "string"
   default      = ""
-  order        = var.coder_parameter_order != null ? var.coder_parameter_order + 0 : null
+  description  = "Git user.email to be used for commits. Leave empty to default to Coder username."
-  description  = "Git user.email to be used for commits. Leave empty to default to Coder user's email."
   display_name = "Git config user.email"
   mutable      = true
 }
@@ -51,34 +44,18 @@ data "coder_parameter" "username" {
   name         = "username"
   type         = "string"
   default      = ""
-  order        = var.coder_parameter_order != null ? var.coder_parameter_order + 1 : null
+  description  = "Git user.name to be used for commits. Leave empty to default to Coder username."
-  description  = "Git user.name to be used for commits. Leave empty to default to Coder user's Full Name."
+  display_name = "Git config user.name"
-  display_name = "Full Name for Git config"
   mutable      = true
 }
 
-resource "coder_env" "git_author_name" {
+resource "coder_script" "git_config" {
   agent_id = var.agent_id
-  name     = "GIT_AUTHOR_NAME"
+  script = templatefile("${path.module}/run.sh", {
-  value    = coalesce(try(data.coder_parameter.username[0].value, ""), data.coder_workspace_owner.me.full_name, data.coder_workspace_owner.me.name)
+    GIT_USERNAME = try(data.coder_parameter.username[0].value, "") == "" ? data.coder_workspace.me.owner : try(data.coder_parameter.username[0].value, "")
-}
+    GIT_EMAIL    = try(data.coder_parameter.user_email[0].value, "") == "" ? data.coder_workspace.me.owner_email : try(data.coder_parameter.user_email[0].value, "")
-
+  })
-resource "coder_env" "git_commmiter_name" {
+  display_name = "Git Config"
-  agent_id = var.agent_id
+  icon         = "/icon/git.svg"
-  name     = "GIT_COMMITTER_NAME"
+  run_on_start = true
-  value    = coalesce(try(data.coder_parameter.username[0].value, ""), data.coder_workspace_owner.me.full_name, data.coder_workspace_owner.me.name)
-}
-
-resource "coder_env" "git_author_email" {
-  agent_id = var.agent_id
-  name     = "GIT_AUTHOR_EMAIL"
-  value    = coalesce(try(data.coder_parameter.user_email[0].value, ""), data.coder_workspace_owner.me.email)
-  count    = data.coder_workspace_owner.me.email != "" ? 1 : 0
-}
-
-resource "coder_env" "git_commmiter_email" {
-  agent_id = var.agent_id
-  name     = "GIT_COMMITTER_EMAIL"
-  value    = coalesce(try(data.coder_parameter.user_email[0].value, ""), data.coder_workspace_owner.me.email)
-  count    = data.coder_workspace_owner.me.email != "" ? 1 : 0
 }

git-config/run.sh

@@ -0,0 +1,24 @@
+#!/usr/bin/env sh
+
+BOLD='\033[0;1m'
+printf "$${BOLD}Checking git-config!\n"
+
+# Check if git is installed
+command -v git >/dev/null 2>&1 || {
+    echo "Git is not installed!"
+    exit 1
+}
+
+# Set git username and email if missing
+if [ -z $(git config --get user.email) ]; then
+    printf "git-config: No user.email found, setting to ${GIT_EMAIL}\n"
+    git config --global user.email "${GIT_EMAIL}"
+fi
+
+if [ -z $(git config --get user.name) ]; then
+    printf "git-config: No user.name found, setting to ${GIT_USERNAME}\n"
+    git config --global user.name "${GIT_USERNAME}"
+fi
+
+printf "\n$${BOLD}git-config: using email: $(git config --get user.email)\n"
+printf "$${BOLD}git-config: using username: $(git config --get user.name)\n\n"

github-upload-public-key/README.md

@@ -1,53 +0,0 @@
----
-display_name: Github Upload Public Key
-description: Automates uploading Coder public key to Github so users don't have to.
-icon: ../.icons/github.svg
-maintainer_github: coder
-verified: true
-tags: [helper, git]
----
-
-# github-upload-public-key
-
-Templates that utilize Github External Auth can automatically ensure that the Coder public key is uploaded to Github so that users can clone repositories without needing to upload the public key themselves.
-
-```tf
-module "github-upload-public-key" {
-  source   = "registry.coder.com/modules/github-upload-public-key/coder"
-  version  = "1.0.15"
-  agent_id = coder_agent.example.id
-}
-```
-
-# Requirements
-
-This module requires `curl` and `jq` to be installed inside your workspace.
-
-Github External Auth must be enabled in the workspace for this module to work. The Github app that is configured for external auth must have both read and write permissions to "Git SSH keys" in order to upload the public key. Additionally, a Coder admin must also have the `admin:public_key` scope added to the external auth configuration of the Coder deployment. For example:
-
-```
-CODER_EXTERNAL_AUTH_0_ID="USER_DEFINED_ID"
-CODER_EXTERNAL_AUTH_0_TYPE=github
-CODER_EXTERNAL_AUTH_0_CLIENT_ID=xxxxxx
-CODER_EXTERNAL_AUTH_0_CLIENT_SECRET=xxxxxxx
-CODER_EXTERNAL_AUTH_0_SCOPES="repo,workflow,admin:public_key"
-```
-
-Note that the default scopes if not provided are `repo,workflow`. If the module is failing to complete after updating the external auth configuration, instruct users of the module to "Unlink" and "Link" their Github account in the External Auth user settings page to get the new scopes.
-
-# Example
-
-Using a coder github external auth with a non-default id: (default is `github`)
-
-```tf
-data "coder_external_auth" "github" {
-  id = "myauthid"
-}
-
-module "github-upload-public-key" {
-  source           = "registry.coder.com/modules/github-upload-public-key/coder"
-  version          = "1.0.15"
-  agent_id         = coder_agent.example.id
-  external_auth_id = data.coder_external_auth.github.id
-}
-```

github-upload-public-key/main.test.ts

@@ -1,132 +0,0 @@
-import { type Server, serve } from "bun";
-import { describe, expect, it } from "bun:test";
-import {
-  createJSONResponse,
-  execContainer,
-  findResourceInstance,
-  runContainer,
-  runTerraformApply,
-  runTerraformInit,
-  testRequiredVariables,
-  writeCoder,
-} from "../test";
-
-describe("github-upload-public-key", async () => {
-  await runTerraformInit(import.meta.dir);
-
-  testRequiredVariables(import.meta.dir, {
-    agent_id: "foo",
-  });
-
-  it("creates new key if one does not exist", async () => {
-    const { instance, id, server } = await setupContainer();
-    await writeCoder(id, "echo foo");
-
-    const url = server.url.toString().slice(0, -1);
-    const exec = await execContainer(id, [
-      "env",
-      `CODER_ACCESS_URL=${url}`,
-      `GITHUB_API_URL=${url}`,
-      "CODER_OWNER_SESSION_TOKEN=foo",
-      "CODER_EXTERNAL_AUTH_ID=github",
-      "bash",
-      "-c",
-      instance.script,
-    ]);
-    expect(exec.stdout).toContain(
-      "Your Coder public key has been added to GitHub!",
-    );
-    expect(exec.exitCode).toBe(0);
-    // we need to increase timeout to pull the container
-  }, 15000);
-
-  it("does nothing if one already exists", async () => {
-    const { instance, id, server } = await setupContainer();
-    // use keyword to make server return a existing key
-    await writeCoder(id, "echo findkey");
-
-    const url = server.url.toString().slice(0, -1);
-    const exec = await execContainer(id, [
-      "env",
-      `CODER_ACCESS_URL=${url}`,
-      `GITHUB_API_URL=${url}`,
-      "CODER_OWNER_SESSION_TOKEN=foo",
-      "CODER_EXTERNAL_AUTH_ID=github",
-      "bash",
-      "-c",
-      instance.script,
-    ]);
-    expect(exec.stdout).toContain(
-      "Your Coder public key is already on GitHub!",
-    );
-    expect(exec.exitCode).toBe(0);
-  });
-});
-
-const setupContainer = async (
-  image = "lorello/alpine-bash",
-  vars: Record<string, string> = {},
-) => {
-  const server = await setupServer();
-  const state = await runTerraformApply(import.meta.dir, {
-    agent_id: "foo",
-    ...vars,
-  });
-  const instance = findResourceInstance(state, "coder_script");
-  const id = await runContainer(image);
-  return { id, instance, server };
-};
-
-const setupServer = async (): Promise<Server> => {
-  let url: URL;
-  const fakeSlackHost = serve({
-    fetch: (req) => {
-      url = new URL(req.url);
-      if (url.pathname === "/api/v2/users/me/gitsshkey") {
-        return createJSONResponse({
-          public_key: "exists",
-        });
-      }
-
-      if (url.pathname === "/user/keys") {
-        if (req.method === "POST") {
-          return createJSONResponse(
-            {
-              key: "created",
-            },
-            201,
-          );
-        }
-
-        // case: key already exists
-        if (req.headers.get("Authorization") === "Bearer findkey") {
-          return createJSONResponse([
-            {
-              key: "foo",
-            },
-            {
-              key: "exists",
-            },
-          ]);
-        }
-
-        // case: key does not exist
-        return createJSONResponse([
-          {
-            key: "foo",
-          },
-        ]);
-      }
-
-      return createJSONResponse(
-        {
-          error: "not_found",
-        },
-        404,
-      );
-    },
-    port: 0,
-  });
-
-  return fakeSlackHost;
-};

github-upload-public-key/main.tf

@@ -1,43 +0,0 @@
-terraform {
-  required_version = ">= 1.0"
-
-  required_providers {
-    coder = {
-      source  = "coder/coder"
-      version = ">= 0.23"
-    }
-  }
-}
-
-variable "agent_id" {
-  type        = string
-  description = "The ID of a Coder agent."
-}
-
-variable "external_auth_id" {
-  type        = string
-  description = "The ID of the GitHub external auth."
-  default     = "github"
-}
-
-variable "github_api_url" {
-  type        = string
-  description = "The URL of the GitHub instance."
-  default     = "https://api.github.com"
-}
-
-data "coder_workspace" "me" {}
-data "coder_workspace_owner" "me" {}
-
-resource "coder_script" "github_upload_public_key" {
-  agent_id = var.agent_id
-  script = templatefile("${path.module}/run.sh", {
-    CODER_OWNER_SESSION_TOKEN : data.coder_workspace_owner.me.session_token,
-    CODER_ACCESS_URL : data.coder_workspace.me.access_url,
-    CODER_EXTERNAL_AUTH_ID : var.external_auth_id,
-    GITHUB_API_URL : var.github_api_url,
-  })
-  display_name = "Github Upload Public Key"
-  icon         = "/icon/github.svg"
-  run_on_start = true
-}

github-upload-public-key/run.sh

@@ -1,110 +0,0 @@
-#!/usr/bin/env bash
-
-if [ -z "$CODER_ACCESS_URL" ]; then
-  if [ -z "${CODER_ACCESS_URL}" ]; then
-    echo "CODER_ACCESS_URL is empty!"
-    exit 1
-  fi
-  CODER_ACCESS_URL=${CODER_ACCESS_URL}
-fi
-
-if [ -z "$CODER_OWNER_SESSION_TOKEN" ]; then
-  if [ -z "${CODER_OWNER_SESSION_TOKEN}" ]; then
-    echo "CODER_OWNER_SESSION_TOKEN is empty!"
-    exit 1
-  fi
-  CODER_OWNER_SESSION_TOKEN=${CODER_OWNER_SESSION_TOKEN}
-fi
-
-if [ -z "$CODER_EXTERNAL_AUTH_ID" ]; then
-  if [ -z "${CODER_EXTERNAL_AUTH_ID}" ]; then
-    echo "CODER_EXTERNAL_AUTH_ID is empty!"
-    exit 1
-  fi
-  CODER_EXTERNAL_AUTH_ID=${CODER_EXTERNAL_AUTH_ID}
-fi
-
-if [ -z "$GITHUB_API_URL" ]; then
-  if [ -z "${GITHUB_API_URL}" ]; then
-    echo "GITHUB_API_URL is empty!"
-    exit 1
-  fi
-  GITHUB_API_URL=${GITHUB_API_URL}
-fi
-
-echo "Fetching GitHub token..."
-GITHUB_TOKEN=$(coder external-auth access-token $CODER_EXTERNAL_AUTH_ID)
-if [ $? -ne 0 ]; then
-  printf "Authenticate with Github to automatically upload Coder public key:\n$GITHUB_TOKEN\n"
-  exit 1
-fi
-
-echo "Fetching public key from Coder..."
-PUBLIC_KEY_RESPONSE=$(
-  curl -L -s \
-    -w "\n%%{http_code}" \
-    -H 'accept: application/json' \
-    -H "cookie: coder_session_token=$CODER_OWNER_SESSION_TOKEN" \
-    "$CODER_ACCESS_URL/api/v2/users/me/gitsshkey"
-)
-PUBLIC_KEY_RESPONSE_STATUS=$(tail -n1 <<< "$PUBLIC_KEY_RESPONSE")
-PUBLIC_KEY_BODY=$(sed \$d <<< "$PUBLIC_KEY_RESPONSE")
-
-if [ "$PUBLIC_KEY_RESPONSE_STATUS" -ne 200 ]; then
-  echo "Failed to fetch Coder public SSH key with status code $PUBLIC_KEY_RESPONSE_STATUS!"
-  echo "$PUBLIC_KEY_BODY"
-  exit 1
-fi
-PUBLIC_KEY=$(jq -r '.public_key' <<< "$PUBLIC_KEY_BODY")
-if [ -z "$PUBLIC_KEY" ]; then
-  echo "No Coder public SSH key found!"
-  exit 1
-fi
-
-echo "Fetching public keys from GitHub..."
-GITHUB_KEYS_RESPONSE=$(
-  curl -L -s \
-    -w "\n%%{http_code}" \
-    -H "Accept: application/vnd.github+json" \
-    -H "Authorization: Bearer $GITHUB_TOKEN" \
-    -H "X-GitHub-Api-Version: 2022-11-28" \
-    $GITHUB_API_URL/user/keys
-)
-GITHUB_KEYS_RESPONSE_STATUS=$(tail -n1 <<< "$GITHUB_KEYS_RESPONSE")
-GITHUB_KEYS_RESPONSE_BODY=$(sed \$d <<< "$GITHUB_KEYS_RESPONSE")
-
-if [ "$GITHUB_KEYS_RESPONSE_STATUS" -ne 200 ]; then
-  echo "Failed to fetch Coder public SSH key with status code $GITHUB_KEYS_RESPONSE_STATUS!"
-  echo "$GITHUB_KEYS_RESPONSE_BODY"
-  exit 1
-fi
-
-GITHUB_MATCH=$(jq -r --arg PUBLIC_KEY "$PUBLIC_KEY" '.[] | select(.key == $PUBLIC_KEY) | .key' <<< "$GITHUB_KEYS_RESPONSE_BODY")
-
-if [ "$PUBLIC_KEY" = "$GITHUB_MATCH" ]; then
-  echo "Your Coder public key is already on GitHub!"
-  exit 0
-fi
-
-echo "Your Coder public key is not in GitHub. Adding it now..."
-CODER_PUBLIC_KEY_NAME="$CODER_ACCESS_URL Workspaces"
-UPLOAD_RESPONSE=$(
-  curl -L -s \
-    -X POST \
-    -w "\n%%{http_code}" \
-    -H "Accept: application/vnd.github+json" \
-    -H "Authorization: Bearer $GITHUB_TOKEN" \
-    -H "X-GitHub-Api-Version: 2022-11-28" \
-    $GITHUB_API_URL/user/keys \
-    -d "{\"title\":\"$CODER_PUBLIC_KEY_NAME\",\"key\":\"$PUBLIC_KEY\"}"
-)
-UPLOAD_RESPONSE_STATUS=$(tail -n1 <<< "$UPLOAD_RESPONSE")
-UPLOAD_RESPONSE_BODY=$(sed \$d <<< "$UPLOAD_RESPONSE")
-
-if [ "$UPLOAD_RESPONSE_STATUS" -ne 201 ]; then
-  echo "Failed to upload Coder public SSH key with status code $UPLOAD_RESPONSE_STATUS!"
-  echo "$UPLOAD_RESPONSE_BODY"
-  exit 1
-fi
-
-echo "Your Coder public key has been added to GitHub!"

hcp-vault-secrets/README.md

@@ -1,80 +0,0 @@
----
-display_name: "HCP Vault Secrets"
-description: "Fetch secrets from HCP Vault"
-icon: ../.icons/vault.svg
-maintainer_github: coder
-partner_github: hashicorp
-verified: true
-tags: [helper, integration, vault, hashicorp, hvs]
----
-
-# HCP Vault Secrets
-
-This module lets you fetch all or selective secrets from a [HCP Vault Secrets](https://developer.hashicorp.com/hcp/docs/vault-secrets) app into your [Coder](https://coder.com) workspaces. It makes use of the [`hcp_vault_secrets_app`](https://registry.terraform.io/providers/hashicorp/hcp/latest/docs/data-sources/vault_secrets_app) data source from the [HCP provider](https://registry.terraform.io/providers/hashicorp/hcp/latest).
-
-```tf
-module "vault" {
-  source     = "registry.coder.com/modules/hcp-vault-secrets/coder"
-  version    = "1.0.7"
-  agent_id   = coder_agent.example.id
-  app_name   = "demo-app"
-  project_id = "aaa-bbb-ccc"
-}
-```
-
-## Configuration
-
-To configure the HCP Vault Secrets module, follow these steps,
-
-1. [Create secrets in HCP Vault Secrets](https://developer.hashicorp.com/vault/tutorials/hcp-vault-secrets-get-started/hcp-vault-secrets-create-secret)
-2. Create an HCP Service Principal from the HCP Vault Secrets app in the HCP console. This will give you the `HCP_CLIENT_ID` and `HCP_CLIENT_SECRET` that you need to authenticate with HCP Vault Secrets.
-   ![HCP vault secrets credentials](../.images/hcp-vault-secrets-credentials.png)
-3. Set `HCP_CLIENT_ID` and `HCP_CLIENT_SECRET` variables on the coder provisioner (recommended) or supply them as input to the module.
-4. Set the `project_id`. This is the ID of the project where the HCP Vault Secrets app is running.
-
-> See the [HCP Vault Secrets documentation](https://developer.hashicorp.com/hcp/docs/vault-secrets) for more information.
-
-## Fetch All Secrets
-
-To fetch all secrets from the HCP Vault Secrets app, skip the `secrets` input.
-
-```tf
-module "vault" {
-  source     = "registry.coder.com/modules/hcp-vault-secrets/coder"
-  version    = "1.0.7"
-  agent_id   = coder_agent.example.id
-  app_name   = "demo-app"
-  project_id = "aaa-bbb-ccc"
-}
-```
-
-## Fetch Selective Secrets
-
-To fetch selective secrets from the HCP Vault Secrets app, set the `secrets` input.
-
-```tf
-module "vault" {
-  source     = "registry.coder.com/modules/hcp-vault-secrets/coder"
-  version    = "1.0.7"
-  agent_id   = coder_agent.example.id
-  app_name   = "demo-app"
-  project_id = "aaa-bbb-ccc"
-  secrets    = ["MY_SECRET_1", "MY_SECRET_2"]
-}
-```
-
-## Set Client ID and Client Secret as Inputs
-
-Set `client_id` and `client_secret` as module inputs.
-
-```tf
-module "vault" {
-  source        = "registry.coder.com/modules/hcp-vault-secrets/coder"
-  version       = "1.0.7"
-  agent_id      = coder_agent.example.id
-  app_name      = "demo-app"
-  project_id    = "aaa-bbb-ccc"
-  client_id     = "HCP_CLIENT_ID"
-  client_secret = "HCP_CLIENT_SECRET"
-}
-```

hcp-vault-secrets/main.tf

@@ -1,73 +0,0 @@
-terraform {
-  required_version = ">= 1.0"
-
-  required_providers {
-    coder = {
-      source  = "coder/coder"
-      version = ">= 0.12.4"
-    }
-    hcp = {
-      source  = "hashicorp/hcp"
-      version = ">= 0.82.0"
-    }
-  }
-}
-
-provider "hcp" {
-  client_id     = var.client_id
-  client_secret = var.client_secret
-  project_id    = var.project_id
-}
-
-provider "coder" {}
-
-variable "agent_id" {
-  type        = string
-  description = "The ID of a Coder agent."
-}
-
-variable "project_id" {
-  type        = string
-  description = "The ID of the HCP project."
-}
-
-variable "client_id" {
-  type        = string
-  description = <<-EOF
-  The client ID for the HCP Vault Secrets service principal. (Optional if HCP_CLIENT_ID is set as an environment variable.)
-  EOF
-  default     = null
-  sensitive   = true
-}
-
-variable "client_secret" {
-  type        = string
-  description = <<-EOF
-  The client secret for the HCP Vault Secrets service principal. (Optional if HCP_CLIENT_SECRET is set as an environment variable.)
-  EOF
-  default     = null
-  sensitive   = true
-}
-
-variable "app_name" {
-  type        = string
-  description = "The name of the secrets app in HCP Vault Secrets"
-}
-
-variable "secrets" {
-  type        = list(string)
-  description = "The names of the secrets to retrieve from HCP Vault Secrets"
-  default     = null
-}
-
-data "hcp_vault_secrets_app" "secrets" {
-  app_name = var.app_name
-}
-
-resource "coder_env" "hvs_secrets" {
-  # https://support.hashicorp.com/hc/en-us/articles/4538432032787-Variable-has-a-sensitive-value-and-cannot-be-used-as-for-each-arguments
-  for_each = var.secrets != null ? toset(var.secrets) : nonsensitive(toset(keys(data.hcp_vault_secrets_app.secrets.secrets)))
-  agent_id = var.agent_id
-  name     = each.key
-  value    = data.hcp_vault_secrets_app.secrets.secrets[each.key]
-}

jetbrains-gateway/README.md

@@ -11,15 +11,13 @@ tags: [ide, jetbrains, helper, parameter]
 
 This module adds a JetBrains Gateway Button to open any workspace with a single click.
 
-```tf
+```hcl
 module "jetbrains_gateway" {
-  source         = "registry.coder.com/modules/jetbrains-gateway/coder"
+  source         = "https://registry.coder.com/modules/jetbrains-gateway"
-  version        = "1.0.21"
   agent_id       = coder_agent.example.id
   agent_name     = "example"
   folder         = "/home/coder/example"
-  jetbrains_ides = ["CL", "GO", "IU", "PY", "WS"]
+  jetbrains_ides = ["GO", "WS", "IU", "IC", "PY", "PC", "PS", "CL", "RM", "DB", "RD"]
-  default        = "GO"
 }
 ```
 
@@ -27,12 +25,11 @@ module "jetbrains_gateway" {
 
 ## Examples
 
-### Add GoLand and WebStorm as options with the default set to GoLand
+### Add GoLand and WebStorm with the default set to GoLand
 
-```tf
+```hcl
 module "jetbrains_gateway" {
-  source         = "registry.coder.com/modules/jetbrains-gateway/coder"
+  source          = "https://registry.coder.com/modules/jetbrains-gateway"
-  version        = "1.0.21"
   agent_id        = coder_agent.example.id
   agent_name      = "example"
   folder          = "/home/coder/example"
@@ -41,37 +38,6 @@ module "jetbrains_gateway" {
 }
 ```
 
-### Use the latest release version
-
-```tf
-module "jetbrains_gateway" {
-  source         = "registry.coder.com/modules/jetbrains-gateway/coder"
-  version        = "1.0.21"
-  agent_id       = coder_agent.example.id
-  agent_name     = "example"
-  folder         = "/home/coder/example"
-  jetbrains_ides = ["GO", "WS"]
-  default        = "GO"
-  latest         = true
-}
-```
-
-### Use the latest EAP version
-
-```tf
-module "jetbrains_gateway" {
-  source         = "registry.coder.com/modules/jetbrains-gateway/coder"
-  version        = "1.0.21"
-  agent_id       = coder_agent.example.id
-  agent_name     = "example"
-  folder         = "/home/coder/example"
-  jetbrains_ides = ["GO", "WS"]
-  default        = "GO"
-  latest         = true
-  channel        = "eap"
-}
-```
-
 ## Supported IDEs
 
 This module and JetBrains Gateway support the following JetBrains IDEs:
@@ -79,8 +45,11 @@ This module and JetBrains Gateway support the following JetBrains IDEs:
 - GoLand (`GO`)
 - WebStorm (`WS`)
 - IntelliJ IDEA Ultimate (`IU`)
+- IntelliJ IDEA Community (`IC`)
 - PyCharm Professional (`PY`)
+- PyCharm Community (`PC`)
 - PhpStorm (`PS`)
 - CLion (`CL`)
 - RubyMine (`RM`)
+- DataGrip (`DB`)
 - Rider (`RD`)

jetbrains-gateway/main.test.ts

@@ -2,6 +2,7 @@ import { it, expect, describe } from "bun:test";
 import {
   runTerraformInit,
   testRequiredVariables,
+  executeScriptInContainer,
   runTerraformApply,
 } from "../test";
 
@@ -10,37 +11,20 @@ describe("jetbrains-gateway", async () => {
 
   await testRequiredVariables(import.meta.dir, {
     agent_id: "foo",
-    agent_name: "foo",
+    agent_name: "bar",
-    folder: "/home/foo",
+    folder: "/baz/",
-  });
+    jetbrains_ides: '["IU", "IC", "PY"]',
-
-  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",
-      agent_name: "foo",
+      agent_name: "bar",
-      folder: "/home/foo",
+      folder: "/baz/",
-      jetbrains_ides: '["IU", "GO", "PY"]',
+      jetbrains_ides: '["IU", "IC", "PY"]',
     });
-    expect(state.outputs.identifier.value).toBe("IU");
+    expect(state.outputs.jetbrains_ides.value).toBe(
+      '["IU","232.9921.47","https://download.jetbrains.com/idea/ideaIU-2023.2.2.tar.gz"]',
+    );
   });
 });

jetbrains-gateway/main.tf

@@ -4,11 +4,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = ">= 0.17"
+      version = ">= 0.11"
-    }
-    http = {
-      source  = "hashicorp/http"
-      version = ">= 3.0"
     }
   }
 }
@@ -18,24 +14,14 @@ variable "agent_id" {
   description = "The ID of a Coder agent."
 }
 
-variable "slug" {
-  type        = string
-  description = "The slug for the coder_app. Allows resuing the module with the same template."
-  default     = "gateway"
-}
-
 variable "agent_name" {
   type        = string
-  description = "Agent name."
+  description = "The name of a Coder agent."
 }
 
 variable "folder" {
   type        = string
   description = "The directory to open in the IDE. e.g. /home/coder/project"
-  validation {
-    condition     = can(regex("^(?:/[^/]+)+$", var.folder))
-    error_message = "The folder must be a full path and must not start with a ~."
-  }
 }
 
 variable "default" {
@@ -44,95 +30,16 @@ variable "default" {
   description = "Default IDE"
 }
 
-variable "order" {
-  type        = number
-  description = "The order determines the position of app in the UI presentation. The lowest order is shown first and apps with equal order are sorted by name (ascending order)."
-  default     = null
-}
-
-variable "coder_parameter_order" {
-  type        = number
-  description = "The order determines the position of a template parameter in the UI/CLI presentation. The lowest order is shown first and parameters with equal order are sorted by name (ascending order)."
-  default     = null
-}
-
-variable "latest" {
-  type        = bool
-  description = "Whether to fetch the latest version of the IDE."
-  default     = false
-}
-
-variable "channel" {
-  type        = string
-  description = "JetBrains IDE release channel. Valid values are release and eap."
-  default     = "release"
-  validation {
-    condition     = can(regex("^(release|eap)$", var.channel))
-    error_message = "The channel must be either release or eap."
-  }
-}
-
-variable "jetbrains_ide_versions" {
-  type = map(object({
-    build_number = string
-    version      = string
-  }))
-  description = "The set of versions for each jetbrains IDE"
-  default = {
-    "IU" = {
-      build_number = "241.14494.240"
-      version      = "2024.1"
-    }
-    "PS" = {
-      build_number = "241.14494.237"
-      version      = "2024.1"
-    }
-    "WS" = {
-      build_number = "241.14494.235"
-      version      = "2024.1"
-    }
-    "PY" = {
-      build_number = "241.14494.241"
-      version      = "2024.1"
-    }
-    "CL" = {
-      build_number = "241.14494.288"
-      version      = "2024.1"
-    }
-    "GO" = {
-      build_number = "241.14494.238"
-      version      = "2024.1"
-    }
-    "RM" = {
-      build_number = "241.14494.234"
-      version      = "2024.1"
-    }
-    "RD" = {
-      build_number = "241.14494.307"
-      version      = "2024.1"
-    }
-  }
-  validation {
-    condition = (
-      alltrue([
-        for code in keys(var.jetbrains_ide_versions) : contains(["IU", "PS", "WS", "PY", "CL", "GO", "RM", "RD"], code)
-      ])
-    )
-    error_message = "The jetbrains_ide_versions must contain a map of valid product codes. Valid product codes are ${join(",", ["IU", "PS", "WS", "PY", "CL", "GO", "RM", "RD"])}."
-  }
-}
-
 variable "jetbrains_ides" {
   type        = list(string)
   description = "The list of IDE product codes."
-  default     = ["IU", "PS", "WS", "PY", "CL", "GO", "RM", "RD"]
   validation {
     condition = (
       alltrue([
-        for code in var.jetbrains_ides : contains(["IU", "PS", "WS", "PY", "CL", "GO", "RM", "RD"], code)
+        for code in var.jetbrains_ides : contains(["IU", "IC", "PS", "WS", "PY", "PC", "CL", "GO", "DB", "RD", "RM"], code)
       ])
     )
-    error_message = "The jetbrains_ides must be a list of valid product codes. Valid product codes are ${join(",", ["IU", "PS", "WS", "PY", "CL", "GO", "RM", "RD"])}."
+    error_message = "The jetbrains_ides must be a list of valid product codes. Valid product codes are: IU, IC, PS, WS, PY, PC, CL, GO, DB, RD, RM."
   }
   # check if the list is empty
   validation {
@@ -146,123 +53,96 @@ variable "jetbrains_ides" {
   }
 }
 
-data "http" "jetbrains_ide_versions" {
-  for_each = var.latest ? toset(var.jetbrains_ides) : toset([])
-  url      = "https://data.services.jetbrains.com/products/releases?code=${each.key}&latest=true&type=${var.channel}"
-}
-
 locals {
   jetbrains_ides = {
     "GO" = {
       icon  = "/icon/goland.svg",
       name  = "GoLand",
-      identifier    = "GO",
+      value = jsonencode(["GO", "232.9921.53", "https://download.jetbrains.com/go/goland-2023.2.2.tar.gz"])
-      build_number  = var.jetbrains_ide_versions["GO"].build_number,
-      download_link = "https://download.jetbrains.com/go/goland-${var.jetbrains_ide_versions["GO"].version}.tar.gz"
-      version       = var.jetbrains_ide_versions["GO"].version
     },
     "WS" = {
       icon  = "/icon/webstorm.svg",
       name  = "WebStorm",
-      identifier    = "WS",
+      value = jsonencode(["WS", "232.9921.42", "https://download.jetbrains.com/webstorm/WebStorm-2023.2.2.tar.gz"])
-      build_number  = var.jetbrains_ide_versions["WS"].build_number,
-      download_link = "https://download.jetbrains.com/webstorm/WebStorm-${var.jetbrains_ide_versions["WS"].version}.tar.gz"
-      version       = var.jetbrains_ide_versions["WS"].version
     },
     "IU" = {
       icon  = "/icon/intellij.svg",
       name  = "IntelliJ IDEA Ultimate",
-      identifier    = "IU",
+      value = jsonencode(["IU", "232.9921.47", "https://download.jetbrains.com/idea/ideaIU-2023.2.2.tar.gz"])
-      build_number  = var.jetbrains_ide_versions["IU"].build_number,
+    },
-      download_link = "https://download.jetbrains.com/idea/ideaIU-${var.jetbrains_ide_versions["IU"].version}.tar.gz"
+    "IC" = {
-      version       = var.jetbrains_ide_versions["IU"].version
+      icon  = "/icon/intellij.svg",
+      name  = "IntelliJ IDEA Community",
+      value = jsonencode(["IC", "232.9921.47", "https://download.jetbrains.com/idea/ideaIC-2023.2.2.tar.gz"])
     },
     "PY" = {
       icon  = "/icon/pycharm.svg",
       name  = "PyCharm Professional",
-      identifier    = "PY",
+      value = jsonencode(["PY", "232.9559.58", "https://download.jetbrains.com/python/pycharm-professional-2023.2.1.tar.gz"])
-      build_number  = var.jetbrains_ide_versions["PY"].build_number,
-      download_link = "https://download.jetbrains.com/python/pycharm-professional-${var.jetbrains_ide_versions["PY"].version}.tar.gz"
-      version       = var.jetbrains_ide_versions["PY"].version
     },
+    "PC" = {
+      icon  = "/icon/pycharm.svg",
+      name  = "PyCharm Community",
+      value = jsonencode(["PC", "232.9559.58", "https://download.jetbrains.com/python/pycharm-community-2023.2.1.tar.gz"])
+    },
+    "RD" = {
+      icon  = "/icon/rider.svg",
+      name  = "Rider",
+      value = jsonencode(["RD", "232.9559.61", "https://download.jetbrains.com/rider/JetBrains.Rider-2023.2.1.tar.gz"])
+    }
     "CL" = {
       icon  = "/icon/clion.svg",
       name  = "CLion",
-      identifier    = "CL",
+      value = jsonencode(["CL", "232.9921.42", "https://download.jetbrains.com/cpp/CLion-2023.2.2.tar.gz"])
-      build_number  = var.jetbrains_ide_versions["CL"].build_number,
+    },
-      download_link = "https://download.jetbrains.com/cpp/CLion-${var.jetbrains_ide_versions["CL"].version}.tar.gz"
+    "DB" = {
-      version       = var.jetbrains_ide_versions["CL"].version
+      icon  = "/icon/datagrip.svg",
+      name  = "DataGrip",
+      value = jsonencode(["DB", "232.9559.28", "https://download.jetbrains.com/datagrip/datagrip-2023.2.1.tar.gz"])
     },
     "PS" = {
       icon  = "/icon/phpstorm.svg",
       name  = "PhpStorm",
-      identifier    = "PS",
+      value = jsonencode(["PS", "232.9559.64", "https://download.jetbrains.com/webide/PhpStorm-2023.2.1.tar.gz"])
-      build_number  = var.jetbrains_ide_versions["PS"].build_number,
-      download_link = "https://download.jetbrains.com/webide/PhpStorm-${var.jetbrains_ide_versions["PS"].version}.tar.gz"
-      version       = var.jetbrains_ide_versions["PS"].version
     },
     "RM" = {
       icon  = "/icon/rubymine.svg",
       name  = "RubyMine",
-      identifier    = "RM",
+      value = jsonencode(["RM", "232.9921.48", "https://download.jetbrains.com/ruby/RubyMine-2023.2.2.tar.gz"])
-      build_number  = var.jetbrains_ide_versions["RM"].build_number,
-      download_link = "https://download.jetbrains.com/ruby/RubyMine-${var.jetbrains_ide_versions["RM"].version}.tar.gz"
-      version       = var.jetbrains_ide_versions["RM"].version
-    }
-    "RD" = {
-      icon          = "/icon/rider.svg",
-      name          = "Rider",
-      identifier    = "RD",
-      build_number  = var.jetbrains_ide_versions["RD"].build_number,
-      download_link = "https://download.jetbrains.com/rider/JetBrains.Rider-${var.jetbrains_ide_versions["RD"].version}.tar.gz"
-      version       = var.jetbrains_ide_versions["RD"].version
     }
   }
-
-  icon          = local.jetbrains_ides[data.coder_parameter.jetbrains_ide.value].icon
-  json_data     = var.latest ? jsondecode(data.http.jetbrains_ide_versions[data.coder_parameter.jetbrains_ide.value].response_body) : {}
-  key           = var.latest ? keys(local.json_data)[0] : ""
-  display_name  = local.jetbrains_ides[data.coder_parameter.jetbrains_ide.value].name
-  identifier    = data.coder_parameter.jetbrains_ide.value
-  download_link = var.latest ? local.json_data[local.key][0].downloads.linux.link : local.jetbrains_ides[data.coder_parameter.jetbrains_ide.value].download_link
-  build_number  = var.latest ? local.json_data[local.key][0].build : local.jetbrains_ides[data.coder_parameter.jetbrains_ide.value].build_number
-  version       = var.latest ? local.json_data[local.key][0].version : var.jetbrains_ide_versions[data.coder_parameter.jetbrains_ide.value].version
 }
 
 data "coder_parameter" "jetbrains_ide" {
-  type         = "string"
+  type         = "list(string)"
   name         = "jetbrains_ide"
   display_name = "JetBrains IDE"
   icon         = "/icon/gateway.svg"
   mutable      = true
-  default      = var.default == "" ? var.jetbrains_ides[0] : var.default
+  # check if default is in the jet_brains_ides list and if it is not empty or null otherwise set it to null
-  order        = var.coder_parameter_order
+  default = var.default != null && var.default != "" && contains(var.jetbrains_ides, var.default) ? local.jetbrains_ides[var.default].value : local.jetbrains_ides[var.jetbrains_ides[0]].value
 
   dynamic "option" {
-    for_each = var.jetbrains_ides
+    for_each = { for key, value in local.jetbrains_ides : key => value if contains(var.jetbrains_ides, key) }
     content {
-      icon  = local.jetbrains_ides[option.value].icon
+      icon  = option.value.icon
-      name  = local.jetbrains_ides[option.value].name
+      name  = option.value.name
-      value = option.value
+      value = option.value.value
     }
   }
 }
 
 data "coder_workspace" "me" {}
-data "coder_workspace_owner" "me" {}
 
 resource "coder_app" "gateway" {
   agent_id     = var.agent_id
-  slug         = var.slug
+  display_name = data.coder_parameter.jetbrains_ide.option[index(data.coder_parameter.jetbrains_ide.option.*.value, data.coder_parameter.jetbrains_ide.value)].name
-  display_name = local.display_name
+  slug         = "gateway"
-  icon         = local.icon
+  icon         = data.coder_parameter.jetbrains_ide.option[index(data.coder_parameter.jetbrains_ide.option.*.value, data.coder_parameter.jetbrains_ide.value)].icon
   external     = true
-  order        = var.order
   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=",
@@ -272,38 +152,14 @@ resource "coder_app" "gateway" {
     "&token=",
     "$SESSION_TOKEN",
     "&ide_product_code=",
-    data.coder_parameter.jetbrains_ide.value,
+    jsondecode(data.coder_parameter.jetbrains_ide.value)[0],
     "&ide_build_number=",
-    local.build_number,
+    jsondecode(data.coder_parameter.jetbrains_ide.value)[1],
     "&ide_download_link=",
-    local.download_link,
+    jsondecode(data.coder_parameter.jetbrains_ide.value)[2],
   ])
 }
 
-output "identifier" {
+output "jetbrains_ides" {
-  value = local.identifier
+  value = data.coder_parameter.jetbrains_ide.value
-}
-
-output "display_name" {
-  value = local.display_name
-}
-
-output "icon" {
-  value = local.icon
-}
-
-output "download_link" {
-  value = local.download_link
-}
-
-output "build_number" {
-  value = local.build_number
-}
-
-output "version" {
-  value = local.version
-}
-
-output "url" {
-  value = coder_app.gateway.url
 }

jfrog-oauth/.npmrc.tftpl

@@ -1,5 +0,0 @@
-email=${ARTIFACTORY_EMAIL}
-%{ for REPO in REPOS ~}
-${REPO.SCOPE}registry=${JFROG_URL}/artifactory/api/npm/${REPO.NAME}
-//${JFROG_HOST}/artifactory/api/npm/${REPO.NAME}/:_authToken=${ARTIFACTORY_ACCESS_TOKEN}
-%{ endfor ~}

jfrog-oauth/README.md

@@ -1,104 +0,0 @@
----
-display_name: JFrog (OAuth)
-description: Install the JF CLI and authenticate with Artifactory using OAuth.
-icon: ../.icons/jfrog.svg
-maintainer_github: coder
-partner_github: jfrog
-verified: true
-tags: [integration, jfrog]
----
-
-# JFrog
-
-Install the JF CLI and authenticate package managers with Artifactory using OAuth configured via the Coder [`external-auth`](https://coder.com/docs/v2/latest/admin/external-auth) feature.
-
-![JFrog OAuth](../.images/jfrog-oauth.png)
-
-```tf
-module "jfrog" {
-  source         = "registry.coder.com/modules/jfrog-oauth/coder"
-  version        = "1.0.19"
-  agent_id       = coder_agent.example.id
-  jfrog_url      = "https://example.jfrog.io"
-  username_field = "username" # If you are using GitHub to login to both Coder and Artifactory, use username_field = "username"
-
-  package_managers = {
-    npm    = ["npm", "@scoped:npm-scoped"]
-    go     = ["go", "another-go-repo"]
-    pypi   = ["pypi", "extra-index-pypi"]
-    docker = ["example-docker-staging.jfrog.io", "example-docker-production.jfrog.io"]
-  }
-}
-```
-
-> Note
-> This module does not install `npm`, `go`, `pip`, etc but only configure them. You need to handle the installation of these tools yourself.
-
-## Prerequisites
-
-This module is usable by JFrog self-hosted (on-premises) Artifactory as it requires configuring a custom integration. This integration benefits from Coder's [external-auth](https://coder.com/docs/v2/latest/admin/external-auth) feature and allows each user to authenticate with Artifactory using an OAuth flow and issues user-scoped tokens to each user. For configuration instructions, see this [guide](https://coder.com/docs/v2/latest/guides/artifactory-integration#jfrog-oauth) on the Coder documentation.
-
-## Examples
-
-Configure the Python pip package manager to fetch packages from Artifactory while mapping the Coder email to the Artifactory username.
-
-```tf
-module "jfrog" {
-  source         = "registry.coder.com/modules/jfrog-oauth/coder"
-  version        = "1.0.19"
-  agent_id       = coder_agent.example.id
-  jfrog_url      = "https://example.jfrog.io"
-  username_field = "email"
-
-  package_managers = {
-    pypi = ["pypi"]
-  }
-}
-```
-
-You should now be able to install packages from Artifactory using both the `jf pip` and `pip` command.
-
-```shell
-jf pip install requests
-```
-
-```shell
-pip install requests
-```
-
-### Configure code-server with JFrog extension
-
-The [JFrog extension](https://open-vsx.org/extension/JFrog/jfrog-vscode-extension) for VS Code allows you to interact with Artifactory from within the IDE.
-
-```tf
-module "jfrog" {
-  source                = "registry.coder.com/modules/jfrog-oauth/coder"
-  version               = "1.0.19"
-  agent_id              = coder_agent.example.id
-  jfrog_url             = "https://example.jfrog.io"
-  username_field        = "username" # If you are using GitHub to login to both Coder and Artifactory, use username_field = "username"
-  configure_code_server = true       # Add JFrog extension configuration for code-server
-  package_managers = {
-    npm  = ["npm"]
-    go   = ["go"]
-    pypi = ["pypi"]
-  }
-}
-```
-
-### Using the access token in other terraform resources
-
-JFrog Access token is also available as a terraform output. You can use it in other terraform resources. For example, you can use it to configure an [Artifactory docker registry](https://jfrog.com/help/r/jfrog-artifactory-documentation/docker-registry) with the [docker terraform provider](https://registry.terraform.io/providers/kreuzwerker/docker/latest/docs).
-
-```tf
-provider "docker" {
-  # ...
-  registry_auth {
-    address  = "https://example.jfrog.io/artifactory/api/docker/REPO-KEY"
-    username = module.jfrog.username
-    password = module.jfrog.access_token
-  }
-}
-```
-
-> Here `REPO_KEY` is the name of docker repository in Artifactory.

jfrog-oauth/main.test.ts

@@ -1,129 +0,0 @@
-import { describe, expect, it } from "bun:test";
-import {
-  findResourceInstance,
-  runTerraformInit,
-  runTerraformApply,
-  testRequiredVariables,
-} from "../test";
-
-describe("jfrog-oauth", async () => {
-  type TestVariables = {
-    agent_id: string;
-    jfrog_url: string;
-    package_managers: string;
-
-    username_field?: string;
-    jfrog_server_id?: string;
-    external_auth_id?: string;
-    configure_code_server?: boolean;
-  };
-
-  await runTerraformInit(import.meta.dir);
-
-  const fakeFrogApi = "localhost:8081/artifactory/api";
-  const fakeFrogUrl = "http://localhost:8081";
-  const user = "default";
-
-  it("can run apply with required variables", async () => {
-    testRequiredVariables<TestVariables>(import.meta.dir, {
-      agent_id: "some-agent-id",
-      jfrog_url: fakeFrogUrl,
-      package_managers: "{}",
-    });
-  });
-
-  it("generates an npmrc with scoped repos", async () => {
-    const state = await runTerraformApply<TestVariables>(import.meta.dir, {
-      agent_id: "some-agent-id",
-      jfrog_url: fakeFrogUrl,
-      package_managers: JSON.stringify({
-        npm: ["global", "@foo:foo", "@bar:bar"],
-      }),
-    });
-    const coderScript = findResourceInstance(state, "coder_script");
-    const npmrcStanza = `cat << EOF > ~/.npmrc
-email=${user}@example.com
-registry=http://${fakeFrogApi}/npm/global
-//${fakeFrogApi}/npm/global/:_authToken=
-@foo:registry=http://${fakeFrogApi}/npm/foo
-//${fakeFrogApi}/npm/foo/:_authToken=
-@bar:registry=http://${fakeFrogApi}/npm/bar
-//${fakeFrogApi}/npm/bar/:_authToken=
-
-EOF`;
-    expect(coderScript.script).toContain(npmrcStanza);
-    expect(coderScript.script).toContain(
-      'jf npmc --global --repo-resolve "global"',
-    );
-    expect(coderScript.script).toContain(
-      'if [ -z "YES" ]; then\n  not_configured npm',
-    );
-  });
-
-  it("generates a pip config with extra-indexes", async () => {
-    const state = await runTerraformApply<TestVariables>(import.meta.dir, {
-      agent_id: "some-agent-id",
-      jfrog_url: fakeFrogUrl,
-      package_managers: JSON.stringify({
-        pypi: ["global", "foo", "bar"],
-      }),
-    });
-    const coderScript = findResourceInstance(state, "coder_script");
-    const pipStanza = `cat << EOF > ~/.pip/pip.conf
-[global]
-index-url = https://${user}:@${fakeFrogApi}/pypi/global/simple
-extra-index-url =
-    https://${user}:@${fakeFrogApi}/pypi/foo/simple
-    https://${user}:@${fakeFrogApi}/pypi/bar/simple
-
-EOF`;
-    expect(coderScript.script).toContain(pipStanza);
-    expect(coderScript.script).toContain(
-      'jf pipc --global --repo-resolve "global"',
-    );
-    expect(coderScript.script).toContain(
-      'if [ -z "YES" ]; then\n  not_configured pypi',
-    );
-  });
-
-  it("registers multiple docker repos", async () => {
-    const state = await runTerraformApply<TestVariables>(import.meta.dir, {
-      agent_id: "some-agent-id",
-      jfrog_url: fakeFrogUrl,
-      package_managers: JSON.stringify({
-        docker: ["foo.jfrog.io", "bar.jfrog.io", "baz.jfrog.io"],
-      }),
-    });
-    const coderScript = findResourceInstance(state, "coder_script");
-    const dockerStanza = ["foo", "bar", "baz"]
-      .map((r) => `register_docker "${r}.jfrog.io"`)
-      .join("\n");
-    expect(coderScript.script).toContain(dockerStanza);
-    expect(coderScript.script).toContain(
-      'if [ -z "YES" ]; then\n  not_configured docker',
-    );
-  });
-
-  it("sets goproxy with multiple repos", async () => {
-    const state = await runTerraformApply<TestVariables>(import.meta.dir, {
-      agent_id: "some-agent-id",
-      jfrog_url: fakeFrogUrl,
-      package_managers: JSON.stringify({
-        go: ["foo", "bar", "baz"],
-      }),
-    });
-    const proxyEnv = findResourceInstance(state, "coder_env", "goproxy");
-    const proxies = ["foo", "bar", "baz"]
-      .map((r) => `https://${user}:@${fakeFrogApi}/go/${r}`)
-      .join(",");
-    expect(proxyEnv.value).toEqual(proxies);
-
-    const coderScript = findResourceInstance(state, "coder_script");
-    expect(coderScript.script).toContain(
-      'jf goc --global --repo-resolve "foo"',
-    );
-    expect(coderScript.script).toContain(
-      'if [ -z "YES" ]; then\n  not_configured go',
-    );
-  });
-});

jfrog-oauth/main.tf

@@ -1,173 +0,0 @@
-terraform {
-  required_version = ">= 1.0"
-
-  required_providers {
-    coder = {
-      source  = "coder/coder"
-      version = ">= 0.23"
-    }
-  }
-}
-
-variable "jfrog_url" {
-  type        = string
-  description = "JFrog instance URL. e.g. https://myartifactory.jfrog.io"
-  # ensue the URL is HTTPS or HTTP
-  validation {
-    condition     = can(regex("^(https|http)://", var.jfrog_url))
-    error_message = "jfrog_url must be a valid URL starting with either 'https://' or 'http://'"
-  }
-}
-
-variable "jfrog_server_id" {
-  type        = string
-  description = "The server ID of the JFrog instance for JFrog CLI configuration"
-  default     = "0"
-}
-
-variable "username_field" {
-  type        = string
-  description = "The field to use for the artifactory username. i.e. Coder username or email."
-  default     = "username"
-  validation {
-    condition     = can(regex("^(email|username)$", var.username_field))
-    error_message = "username_field must be either 'email' or 'username'"
-  }
-}
-
-variable "external_auth_id" {
-  type        = string
-  description = "JFrog external auth ID. Default: 'jfrog'"
-  default     = "jfrog"
-}
-
-variable "agent_id" {
-  type        = string
-  description = "The ID of a Coder agent."
-}
-
-variable "configure_code_server" {
-  type        = bool
-  description = "Set to true to configure code-server to use JFrog."
-  default     = false
-}
-
-variable "package_managers" {
-  type = object({
-    npm    = optional(list(string), [])
-    go     = optional(list(string), [])
-    pypi   = optional(list(string), [])
-    docker = optional(list(string), [])
-  })
-  description = <<-EOF
-    A map of package manager names to their respective artifactory repositories. Unused package managers can be omitted.
-    For example:
-      {
-        npm    = ["GLOBAL_NPM_REPO_KEY", "@SCOPED:NPM_REPO_KEY"]
-        go     = ["YOUR_GO_REPO_KEY", "ANOTHER_GO_REPO_KEY"]
-        pypi   = ["YOUR_PYPI_REPO_KEY", "ANOTHER_PYPI_REPO_KEY"]
-        docker = ["YOUR_DOCKER_REPO_KEY", "ANOTHER_DOCKER_REPO_KEY"]
-      }
-  EOF
-}
-
-locals {
-  # The username field to use for artifactory
-  username   = var.username_field == "email" ? data.coder_workspace_owner.me.email : data.coder_workspace_owner.me.name
-  jfrog_host = split("://", var.jfrog_url)[1]
-  common_values = {
-    JFROG_URL                = var.jfrog_url
-    JFROG_HOST               = local.jfrog_host
-    JFROG_SERVER_ID          = var.jfrog_server_id
-    ARTIFACTORY_USERNAME     = local.username
-    ARTIFACTORY_EMAIL        = data.coder_workspace_owner.me.email
-    ARTIFACTORY_ACCESS_TOKEN = data.coder_external_auth.jfrog.access_token
-  }
-  npmrc = templatefile(
-    "${path.module}/.npmrc.tftpl",
-    merge(
-      local.common_values,
-      {
-        REPOS = [
-          for r in var.package_managers.npm :
-          strcontains(r, ":") ? zipmap(["SCOPE", "NAME"], ["${split(":", r)[0]}:", split(":", r)[1]]) : { SCOPE = "", NAME = r }
-        ]
-      }
-    )
-  )
-  pip_conf = templatefile(
-    "${path.module}/pip.conf.tftpl", merge(local.common_values, { REPOS = var.package_managers.pypi })
-  )
-}
-
-data "coder_workspace" "me" {}
-data "coder_workspace_owner" "me" {}
-
-data "coder_external_auth" "jfrog" {
-  id = var.external_auth_id
-}
-
-resource "coder_script" "jfrog" {
-  agent_id     = var.agent_id
-  display_name = "jfrog"
-  icon         = "/icon/jfrog.svg"
-  script = templatefile("${path.module}/run.sh", merge(
-    local.common_values,
-    {
-      CONFIGURE_CODE_SERVER = var.configure_code_server
-      HAS_NPM               = length(var.package_managers.npm) == 0 ? "" : "YES"
-      NPMRC                 = local.npmrc
-      REPOSITORY_NPM        = try(element(var.package_managers.npm, 0), "")
-      HAS_GO                = length(var.package_managers.go) == 0 ? "" : "YES"
-      REPOSITORY_GO         = try(element(var.package_managers.go, 0), "")
-      HAS_PYPI              = length(var.package_managers.pypi) == 0 ? "" : "YES"
-      PIP_CONF              = local.pip_conf
-      REPOSITORY_PYPI       = try(element(var.package_managers.pypi, 0), "")
-      HAS_DOCKER            = length(var.package_managers.docker) == 0 ? "" : "YES"
-      REGISTER_DOCKER       = join("\n", formatlist("register_docker \"%s\"", var.package_managers.docker))
-    }
-  ))
-  run_on_start = true
-}
-
-resource "coder_env" "jfrog_ide_url" {
-  count    = var.configure_code_server ? 1 : 0
-  agent_id = var.agent_id
-  name     = "JFROG_IDE_URL"
-  value    = var.jfrog_url
-}
-
-resource "coder_env" "jfrog_ide_access_token" {
-  count    = var.configure_code_server ? 1 : 0
-  agent_id = var.agent_id
-  name     = "JFROG_IDE_ACCESS_TOKEN"
-  value    = data.coder_external_auth.jfrog.access_token
-}
-
-resource "coder_env" "jfrog_ide_store_connection" {
-  count    = var.configure_code_server ? 1 : 0
-  agent_id = var.agent_id
-  name     = "JFROG_IDE_STORE_CONNECTION"
-  value    = true
-}
-
-resource "coder_env" "goproxy" {
-  count    = length(var.package_managers.go) == 0 ? 0 : 1
-  agent_id = var.agent_id
-  name     = "GOPROXY"
-  value = join(",", [
-    for repo in var.package_managers.go :
-    "https://${local.username}:${data.coder_external_auth.jfrog.access_token}@${local.jfrog_host}/artifactory/api/go/${repo}"
-  ])
-}
-
-output "access_token" {
-  description = "value of the JFrog access token"
-  value       = data.coder_external_auth.jfrog.access_token
-  sensitive   = true
-}
-
-output "username" {
-  description = "value of the JFrog username"
-  value       = local.username
-}

jfrog-oauth/pip.conf.tftpl

@@ -1,6 +0,0 @@
-[global]
-index-url = https://${ARTIFACTORY_USERNAME}:${ARTIFACTORY_ACCESS_TOKEN}@${JFROG_HOST}/artifactory/api/pypi/${try(element(REPOS, 0), "")}/simple
-extra-index-url =
-%{ for REPO in try(slice(REPOS, 1, length(REPOS)), []) ~}
-    https://${ARTIFACTORY_USERNAME}:${ARTIFACTORY_ACCESS_TOKEN}@${JFROG_HOST}/artifactory/api/pypi/${REPO}/simple
-%{ endfor ~}

jfrog-oauth/run.sh

@@ -1,131 +0,0 @@
-#!/usr/bin/env bash
-
-BOLD='\033[0;1m'
-
-not_configured() {
-  type=$1
-  echo "🤔 no $type repository is set, skipping $type configuration."
-  echo "You can configure a $type repository by providing a key for '$type' in the 'package_managers' input."
-}
-
-config_complete() {
-  echo "🥳 Configuration complete!"
-}
-
-register_docker() {
-  repo=$1
-  echo -n "${ARTIFACTORY_ACCESS_TOKEN}" | docker login "$repo" --username ${ARTIFACTORY_USERNAME} --password-stdin
-}
-
-# check if JFrog CLI is already installed
-if command -v jf > /dev/null 2>&1; then
-  echo "✅ JFrog CLI is already installed, skipping installation."
-else
-  echo "📦 Installing JFrog CLI..."
-  curl -fL https://install-cli.jfrog.io | sudo sh
-  sudo chmod 755 /usr/local/bin/jf
-fi
-
-# The jf CLI checks $CI when determining whether to use interactive
-# flows.
-export CI=true
-# Authenticate JFrog CLI with Artifactory.
-echo "${ARTIFACTORY_ACCESS_TOKEN}" | jf c add --access-token-stdin --url "${JFROG_URL}" --overwrite "${JFROG_SERVER_ID}"
-# Set the configured server as the default.
-jf c use "${JFROG_SERVER_ID}"
-
-# Configure npm to use the Artifactory "npm" repository.
-if [ -z "${HAS_NPM}" ]; then
-  not_configured npm
-else
-  echo "📦 Configuring npm..."
-  jf npmc --global --repo-resolve "${REPOSITORY_NPM}"
-  cat << EOF > ~/.npmrc
-${NPMRC}
-EOF
-  config_complete
-fi
-
-# Configure the `pip` to use the Artifactory "python" repository.
-if [ -z "${HAS_PYPI}" ]; then
-  not_configured pypi
-else
-  echo "🐍 Configuring pip..."
-  jf pipc --global --repo-resolve "${REPOSITORY_PYPI}"
-  mkdir -p ~/.pip
-  cat << EOF > ~/.pip/pip.conf
-${PIP_CONF}
-EOF
-  config_complete
-fi
-
-# Configure Artifactory "go" repository.
-if [ -z "${HAS_GO}" ]; then
-  not_configured go
-else
-  echo "🐹 Configuring go..."
-  jf goc --global --repo-resolve "${REPOSITORY_GO}"
-  config_complete
-fi
-
-# Configure the JFrog CLI to use the Artifactory "docker" repository.
-if [ -z "${HAS_DOCKER}" ]; then
-  not_configured docker
-else
-  if command -v docker > /dev/null 2>&1; then
-    echo "🔑 Configuring 🐳 docker credentials..."
-    mkdir -p ~/.docker
-    ${REGISTER_DOCKER}
-  else
-    echo "🤔 no docker is installed, skipping docker configuration."
-  fi
-fi
-
-# Install the JFrog vscode extension for code-server.
-if [ "${CONFIGURE_CODE_SERVER}" == "true" ]; then
-  while ! [ -x /tmp/code-server/bin/code-server ]; do
-    counter=0
-    if [ $counter -eq 60 ]; then
-      echo "Timed out waiting for /tmp/code-server/bin/code-server to be installed."
-      exit 1
-    fi
-    echo "Waiting for /tmp/code-server/bin/code-server to be installed..."
-    sleep 1
-    ((counter++))
-  done
-  echo "📦 Installing JFrog extension..."
-  /tmp/code-server/bin/code-server --install-extension jfrog.jfrog-vscode-extension
-  echo "🥳 JFrog extension installed!"
-else
-  echo "🤔 Skipping JFrog extension installation. Set configure_code_server to true to install the JFrog extension."
-fi
-
-# Configure the JFrog CLI completion
-echo "📦 Configuring JFrog CLI completion..."
-# Get the user's shell
-SHELLNAME=$(grep "^$USER" /etc/passwd | awk -F':' '{print $7}' | awk -F'/' '{print $NF}')
-# Generate the completion script
-jf completion $SHELLNAME --install
-begin_stanza="# BEGIN: jf CLI shell completion (added by coder module jfrog-oauth)"
-# Add the completion script to the user's shell profile
-if [ "$SHELLNAME" == "bash" ] && [ -f ~/.bashrc ]; then
-  if ! grep -q "$begin_stanza" ~/.bashrc; then
-    printf "%s\n" "$begin_stanza" >> ~/.bashrc
-    echo 'source "$HOME/.jfrog/jfrog_bash_completion"' >> ~/.bashrc
-    echo "# END: jf CLI shell completion" >> ~/.bashrc
-  else
-    echo "🥳 ~/.bashrc already contains jf CLI shell completion configuration, skipping."
-  fi
-elif [ "$SHELLNAME" == "zsh" ] && [ -f ~/.zshrc ]; then
-  if ! grep -q "$begin_stanza" ~/.zshrc; then
-    printf "\n%s\n" "$begin_stanza" >> ~/.zshrc
-    echo "autoload -Uz compinit" >> ~/.zshrc
-    echo "compinit" >> ~/.zshrc
-    echo 'source "$HOME/.jfrog/jfrog_zsh_completion"' >> ~/.zshrc
-    echo "# END: jf CLI shell completion" >> ~/.zshrc
-  else
-    echo "🥳 ~/.zshrc already contains jf CLI shell completion configuration, skipping."
-  fi
-else
-  echo "🤔 ~/.bashrc or ~/.zshrc does not exist, skipping jf CLI shell completion configuration."
-fi

jfrog-token/.npmrc.tftpl

@@ -1,5 +0,0 @@
-email=${ARTIFACTORY_EMAIL}
-%{ for REPO in REPOS ~}
-${REPO.SCOPE}registry=${JFROG_URL}/artifactory/api/npm/${REPO.NAME}
-//${JFROG_HOST}/artifactory/api/npm/${REPO.NAME}/:_authToken=${ARTIFACTORY_ACCESS_TOKEN}
-%{ endfor ~}

jfrog-token/README.md

@@ -1,125 +0,0 @@
----
-display_name: JFrog (Token)
-description: Install the JF CLI and authenticate with Artifactory using Artifactory terraform provider.
-icon: ../.icons/jfrog.svg
-maintainer_github: coder
-partner_github: jfrog
-verified: true
-tags: [integration, jfrog]
----
-
-# JFrog
-
-Install the JF CLI and authenticate package managers with Artifactory using Artifactory terraform provider.
-
-```tf
-module "jfrog" {
-  source                   = "registry.coder.com/modules/jfrog-token/coder"
-  version                  = "1.0.19"
-  agent_id                 = coder_agent.example.id
-  jfrog_url                = "https://XXXX.jfrog.io"
-  artifactory_access_token = var.artifactory_access_token
-  package_managers = {
-    npm    = ["npm", "@scoped:npm-scoped"]
-    go     = ["go", "another-go-repo"]
-    pypi   = ["pypi", "extra-index-pypi"]
-    docker = ["example-docker-staging.jfrog.io", "example-docker-production.jfrog.io"]
-  }
-}
-```
-
-For detailed instructions, please see this [guide](https://coder.com/docs/v2/latest/guides/artifactory-integration#jfrog-token) on the Coder documentation.
-
-> Note
-> This module does not install `npm`, `go`, `pip`, etc but only configure them. You need to handle the installation of these tools yourself.
-
-![JFrog](../.images/jfrog.png)
-
-## Examples
-
-### Configure npm, go, and pypi to use Artifactory local repositories
-
-```tf
-module "jfrog" {
-  source                   = "registry.coder.com/modules/jfrog-token/coder"
-  version                  = "1.0.19"
-  agent_id                 = coder_agent.example.id
-  jfrog_url                = "https://YYYY.jfrog.io"
-  artifactory_access_token = var.artifactory_access_token # An admin access token
-  package_managers = {
-    npm  = ["npm-local"]
-    go   = ["go-local"]
-    pypi = ["pypi-local"]
-  }
-}
-```
-
-You should now be able to install packages from Artifactory using both the `jf npm`, `jf go`, `jf pip` and `npm`, `go`, `pip` commands.
-
-```shell
-jf npm install prettier
-jf go get github.com/golang/example/hello
-jf pip install requests
-```
-
-```shell
-npm install prettier
-go get github.com/golang/example/hello
-pip install requests
-```
-
-### Configure code-server with JFrog extension
-
-The [JFrog extension](https://open-vsx.org/extension/JFrog/jfrog-vscode-extension) for VS Code allows you to interact with Artifactory from within the IDE.
-
-```tf
-module "jfrog" {
-  source                   = "registry.coder.com/modules/jfrog-token/coder"
-  version                  = "1.0.19"
-  agent_id                 = coder_agent.example.id
-  jfrog_url                = "https://XXXX.jfrog.io"
-  artifactory_access_token = var.artifactory_access_token
-  configure_code_server    = true # Add JFrog extension configuration for code-server
-  package_managers = {
-    npm  = ["npm"]
-    go   = ["go"]
-    pypi = ["pypi"]
-  }
-}
-```
-
-### Add a custom token description
-
-```tf
-data "coder_workspace" "me" {}
-
-module "jfrog" {
-  source                   = "registry.coder.com/modules/jfrog-token/coder"
-  version                  = "1.0.19"
-  agent_id                 = coder_agent.example.id
-  jfrog_url                = "https://XXXX.jfrog.io"
-  artifactory_access_token = var.artifactory_access_token
-  token_description        = "Token for Coder workspace: ${data.coder_workspace_owner.me.name}/${data.coder_workspace.me.name}"
-  package_managers = {
-    npm = ["npm"]
-  }
-}
-```
-
-### Using the access token in other terraform resources
-
-JFrog Access token is also available as a terraform output. You can use it in other terraform resources. For example, you can use it to configure an [Artifactory docker registry](https://jfrog.com/help/r/jfrog-artifactory-documentation/docker-registry) with the [docker terraform provider](https://registry.terraform.io/providers/kreuzwerker/docker/latest/docs).
-
-```tf
-
-provider "docker" {
-  # ...
-  registry_auth {
-    address  = "https://YYYY.jfrog.io/artifactory/api/docker/REPO-KEY"
-    username = module.jfrog.username
-    password = module.jfrog.access_token
-  }
-}
-```
-
-> Here `REPO_KEY` is the name of docker repository in Artifactory.

jfrog-token/main.test.ts

@@ -1,164 +0,0 @@
-import { serve } from "bun";
-import { describe, expect, it } from "bun:test";
-import {
-  createJSONResponse,
-  findResourceInstance,
-  runTerraformInit,
-  runTerraformApply,
-  testRequiredVariables,
-} from "../test";
-
-describe("jfrog-token", async () => {
-  type TestVariables = {
-    agent_id: string;
-    jfrog_url: string;
-    artifactory_access_token: string;
-    package_managers: string;
-
-    token_description?: string;
-    check_license?: boolean;
-    refreshable?: boolean;
-    expires_in?: number;
-    username_field?: string;
-    jfrog_server_id?: string;
-    configure_code_server?: boolean;
-  };
-
-  await runTerraformInit(import.meta.dir);
-
-  // Run a fake JFrog server so the provider can initialize
-  // correctly. This saves us from having to make remote requests!
-  const fakeFrogHost = serve({
-    fetch: (req) => {
-      const url = new URL(req.url);
-      // See https://jfrog.com/help/r/jfrog-rest-apis/license-information
-      if (url.pathname === "/artifactory/api/system/license")
-        return createJSONResponse({
-          type: "Commercial",
-          licensedTo: "JFrog inc.",
-          validThrough: "May 15, 2036",
-        });
-      if (url.pathname === "/access/api/v1/tokens")
-        return createJSONResponse({
-          token_id: "xxx",
-          access_token: "xxx",
-          scopes: "any",
-        });
-      return createJSONResponse({});
-    },
-    port: 0,
-  });
-
-  const fakeFrogApi = `${fakeFrogHost.hostname}:${fakeFrogHost.port}/artifactory/api`;
-  const fakeFrogUrl = `http://${fakeFrogHost.hostname}:${fakeFrogHost.port}`;
-  const user = "default";
-  const token = "xxx";
-
-  it("can run apply with required variables", async () => {
-    testRequiredVariables<TestVariables>(import.meta.dir, {
-      agent_id: "some-agent-id",
-      jfrog_url: fakeFrogUrl,
-      artifactory_access_token: "XXXX",
-      package_managers: "{}",
-    });
-  });
-
-  it("generates an npmrc with scoped repos", async () => {
-    const state = await runTerraformApply<TestVariables>(import.meta.dir, {
-      agent_id: "some-agent-id",
-      jfrog_url: fakeFrogUrl,
-      artifactory_access_token: "XXXX",
-      package_managers: JSON.stringify({
-        npm: ["global", "@foo:foo", "@bar:bar"],
-      }),
-    });
-    const coderScript = findResourceInstance(state, "coder_script");
-    const npmrcStanza = `cat << EOF > ~/.npmrc
-email=${user}@example.com
-registry=http://${fakeFrogApi}/npm/global
-//${fakeFrogApi}/npm/global/:_authToken=xxx
-@foo:registry=http://${fakeFrogApi}/npm/foo
-//${fakeFrogApi}/npm/foo/:_authToken=xxx
-@bar:registry=http://${fakeFrogApi}/npm/bar
-//${fakeFrogApi}/npm/bar/:_authToken=xxx
-
-EOF`;
-    expect(coderScript.script).toContain(npmrcStanza);
-    expect(coderScript.script).toContain(
-      'jf npmc --global --repo-resolve "global"',
-    );
-    expect(coderScript.script).toContain(
-      'if [ -z "YES" ]; then\n  not_configured npm',
-    );
-  });
-
-  it("generates a pip config with extra-indexes", async () => {
-    const state = await runTerraformApply<TestVariables>(import.meta.dir, {
-      agent_id: "some-agent-id",
-      jfrog_url: fakeFrogUrl,
-      artifactory_access_token: "XXXX",
-      package_managers: JSON.stringify({
-        pypi: ["global", "foo", "bar"],
-      }),
-    });
-    const coderScript = findResourceInstance(state, "coder_script");
-    const pipStanza = `cat << EOF > ~/.pip/pip.conf
-[global]
-index-url = https://${user}:${token}@${fakeFrogApi}/pypi/global/simple
-extra-index-url =
-    https://${user}:${token}@${fakeFrogApi}/pypi/foo/simple
-    https://${user}:${token}@${fakeFrogApi}/pypi/bar/simple
-
-EOF`;
-    expect(coderScript.script).toContain(pipStanza);
-    expect(coderScript.script).toContain(
-      'jf pipc --global --repo-resolve "global"',
-    );
-    expect(coderScript.script).toContain(
-      'if [ -z "YES" ]; then\n  not_configured pypi',
-    );
-  });
-
-  it("registers multiple docker repos", async () => {
-    const state = await runTerraformApply<TestVariables>(import.meta.dir, {
-      agent_id: "some-agent-id",
-      jfrog_url: fakeFrogUrl,
-      artifactory_access_token: "XXXX",
-      package_managers: JSON.stringify({
-        docker: ["foo.jfrog.io", "bar.jfrog.io", "baz.jfrog.io"],
-      }),
-    });
-    const coderScript = findResourceInstance(state, "coder_script");
-    const dockerStanza = ["foo", "bar", "baz"]
-      .map((r) => `register_docker "${r}.jfrog.io"`)
-      .join("\n");
-    expect(coderScript.script).toContain(dockerStanza);
-    expect(coderScript.script).toContain(
-      'if [ -z "YES" ]; then\n  not_configured docker',
-    );
-  });
-
-  it("sets goproxy with multiple repos", async () => {
-    const state = await runTerraformApply<TestVariables>(import.meta.dir, {
-      agent_id: "some-agent-id",
-      jfrog_url: fakeFrogUrl,
-      artifactory_access_token: "XXXX",
-      package_managers: JSON.stringify({
-        go: ["foo", "bar", "baz"],
-      }),
-    });
-    const proxyEnv = findResourceInstance(state, "coder_env", "goproxy");
-    const proxies = ["foo", "bar", "baz"]
-      .map((r) => `https://${user}:${token}@${fakeFrogApi}/go/${r}`)
-      .join(",");
-    expect(proxyEnv.value).toEqual(proxies);
-
-    const coderScript = findResourceInstance(state, "coder_script");
-    expect(coderScript.script).toContain(
-      'jf goc --global --repo-resolve "foo"',
-    );
-    expect(coderScript.script).toContain(
-      'if [ -z "YES" ]; then\n  not_configured go',
-    );
-  });
-});

jfrog-token/main.tf

@@ -1,213 +0,0 @@
-terraform {
-  required_version = ">= 1.0"
-
-  required_providers {
-    coder = {
-      source  = "coder/coder"
-      version = ">= 0.23"
-    }
-    artifactory = {
-      source  = "registry.terraform.io/jfrog/artifactory"
-      version = "~> 10.0.2"
-    }
-  }
-}
-
-variable "jfrog_url" {
-  type        = string
-  description = "JFrog instance URL. e.g. https://myartifactory.jfrog.io"
-  # ensue the URL is HTTPS or HTTP
-  validation {
-    condition     = can(regex("^(https|http)://", var.jfrog_url))
-    error_message = "jfrog_url must be a valid URL starting with either 'https://' or 'http://'"
-  }
-}
-
-variable "jfrog_server_id" {
-  type        = string
-  description = "The server ID of the JFrog instance for JFrog CLI configuration"
-  default     = "0"
-}
-
-variable "artifactory_access_token" {
-  type        = string
-  description = "The admin-level access token to use for JFrog."
-}
-
-variable "token_description" {
-  type        = string
-  description = "Free text token description. Useful for filtering and managing tokens."
-  default     = "Token for Coder workspace"
-}
-
-variable "check_license" {
-  type        = bool
-  description = "Toggle for pre-flight checking of Artifactory license. Default to `true`."
-  default     = true
-}
-
-variable "refreshable" {
-  type        = bool
-  description = "Is this token refreshable? Default is `false`."
-  default     = false
-}
-
-variable "expires_in" {
-  type        = number
-  description = "The amount of time, in seconds, it would take for the token to expire."
-  default     = null
-}
-
-variable "username_field" {
-  type        = string
-  description = "The field to use for the artifactory username. Default `username`."
-  default     = "username"
-  validation {
-    condition     = can(regex("^(email|username)$", var.username_field))
-    error_message = "username_field must be either 'email' or 'username'"
-  }
-}
-
-variable "agent_id" {
-  type        = string
-  description = "The ID of a Coder agent."
-}
-
-variable "configure_code_server" {
-  type        = bool
-  description = "Set to true to configure code-server to use JFrog."
-  default     = false
-}
-
-variable "package_managers" {
-  type = object({
-    npm    = optional(list(string), [])
-    go     = optional(list(string), [])
-    pypi   = optional(list(string), [])
-    docker = optional(list(string), [])
-  })
-  description = <<-EOF
-    A map of package manager names to their respective artifactory repositories. Unused package managers can be omitted.
-    For example:
-      {
-        npm    = ["GLOBAL_NPM_REPO_KEY", "@SCOPED:NPM_REPO_KEY"]
-        go     = ["YOUR_GO_REPO_KEY", "ANOTHER_GO_REPO_KEY"]
-        pypi   = ["YOUR_PYPI_REPO_KEY", "ANOTHER_PYPI_REPO_KEY"]
-        docker = ["YOUR_DOCKER_REPO_KEY", "ANOTHER_DOCKER_REPO_KEY"]
-      }
-  EOF
-}
-
-locals {
-  # The username field to use for artifactory
-  username   = var.username_field == "email" ? data.coder_workspace_owner.me.email : data.coder_workspace_owner.me.name
-  jfrog_host = split("://", var.jfrog_url)[1]
-  common_values = {
-    JFROG_URL                = var.jfrog_url
-    JFROG_HOST               = local.jfrog_host
-    JFROG_SERVER_ID          = var.jfrog_server_id
-    ARTIFACTORY_USERNAME     = local.username
-    ARTIFACTORY_EMAIL        = data.coder_workspace_owner.me.email
-    ARTIFACTORY_ACCESS_TOKEN = artifactory_scoped_token.me.access_token
-  }
-  npmrc = templatefile(
-    "${path.module}/.npmrc.tftpl",
-    merge(
-      local.common_values,
-      {
-        REPOS = [
-          for r in var.package_managers.npm :
-          strcontains(r, ":") ? zipmap(["SCOPE", "NAME"], ["${split(":", r)[0]}:", split(":", r)[1]]) : { SCOPE = "", NAME = r }
-        ]
-      }
-    )
-  )
-  pip_conf = templatefile(
-    "${path.module}/pip.conf.tftpl", merge(local.common_values, { REPOS = var.package_managers.pypi })
-  )
-}
-
-# Configure the Artifactory provider
-provider "artifactory" {
-  url           = join("/", [var.jfrog_url, "artifactory"])
-  access_token  = var.artifactory_access_token
-  check_license = var.check_license
-}
-
-resource "artifactory_scoped_token" "me" {
-  # This is hacky, but on terraform plan the data source gives empty strings,
-  # which fails validation.
-  username    = length(local.username) > 0 ? local.username : "dummy"
-  scopes      = ["applied-permissions/user"]
-  refreshable = var.refreshable
-  expires_in  = var.expires_in
-  description = var.token_description
-}
-
-data "coder_workspace" "me" {}
-data "coder_workspace_owner" "me" {}
-
-resource "coder_script" "jfrog" {
-  agent_id     = var.agent_id
-  display_name = "jfrog"
-  icon         = "/icon/jfrog.svg"
-  script = templatefile("${path.module}/run.sh", merge(
-    local.common_values,
-    {
-      CONFIGURE_CODE_SERVER = var.configure_code_server
-      HAS_NPM               = length(var.package_managers.npm) == 0 ? "" : "YES"
-      NPMRC                 = local.npmrc
-      REPOSITORY_NPM        = try(element(var.package_managers.npm, 0), "")
-      HAS_GO                = length(var.package_managers.go) == 0 ? "" : "YES"
-      REPOSITORY_GO         = try(element(var.package_managers.go, 0), "")
-      HAS_PYPI              = length(var.package_managers.pypi) == 0 ? "" : "YES"
-      PIP_CONF              = local.pip_conf
-      REPOSITORY_PYPI       = try(element(var.package_managers.pypi, 0), "")
-      HAS_DOCKER            = length(var.package_managers.docker) == 0 ? "" : "YES"
-      REGISTER_DOCKER       = join("\n", formatlist("register_docker \"%s\"", var.package_managers.docker))
-    }
-  ))
-  run_on_start = true
-}
-
-resource "coder_env" "jfrog_ide_url" {
-  count    = var.configure_code_server ? 1 : 0
-  agent_id = var.agent_id
-  name     = "JFROG_IDE_URL"
-  value    = var.jfrog_url
-}
-
-resource "coder_env" "jfrog_ide_access_token" {
-  count    = var.configure_code_server ? 1 : 0
-  agent_id = var.agent_id
-  name     = "JFROG_IDE_ACCESS_TOKEN"
-  value    = artifactory_scoped_token.me.access_token
-}
-
-resource "coder_env" "jfrog_ide_store_connection" {
-  count    = var.configure_code_server ? 1 : 0
-  agent_id = var.agent_id
-  name     = "JFROG_IDE_STORE_CONNECTION"
-  value    = true
-}
-
-resource "coder_env" "goproxy" {
-  count    = length(var.package_managers.go) == 0 ? 0 : 1
-  agent_id = var.agent_id
-  name     = "GOPROXY"
-  value = join(",", [
-    for repo in var.package_managers.go :
-    "https://${local.username}:${artifactory_scoped_token.me.access_token}@${local.jfrog_host}/artifactory/api/go/${repo}"
-  ])
-}
-
-output "access_token" {
-  description = "value of the JFrog access token"
-  value       = artifactory_scoped_token.me.access_token
-  sensitive   = true
-}
-
-output "username" {
-  description = "value of the JFrog username"
-  value       = local.username
-}

jfrog-token/pip.conf.tftpl

@@ -1,6 +0,0 @@
-[global]
-index-url = https://${ARTIFACTORY_USERNAME}:${ARTIFACTORY_ACCESS_TOKEN}@${JFROG_HOST}/artifactory/api/pypi/${try(element(REPOS, 0), "")}/simple
-extra-index-url =
-%{ for REPO in try(slice(REPOS, 1, length(REPOS)), []) ~}
-    https://${ARTIFACTORY_USERNAME}:${ARTIFACTORY_ACCESS_TOKEN}@${JFROG_HOST}/artifactory/api/pypi/${REPO}/simple
-%{ endfor ~}

jfrog-token/run.sh

@@ -1,130 +0,0 @@
-#!/usr/bin/env bash
-
-BOLD='\033[0;1m'
-
-not_configured() {
-  type=$1
-  echo "🤔 no $type repository is set, skipping $type configuration."
-  echo "You can configure a $type repository by providing a key for '$type' in the 'package_managers' input."
-}
-
-config_complete() {
-  echo "🥳 Configuration complete!"
-}
-
-register_docker() {
-  repo=$1
-  echo -n "${ARTIFACTORY_ACCESS_TOKEN}" | docker login "$repo" --username ${ARTIFACTORY_USERNAME} --password-stdin
-}
-
-# check if JFrog CLI is already installed
-if command -v jf > /dev/null 2>&1; then
-  echo "✅ JFrog CLI is already installed, skipping installation."
-else
-  echo "📦 Installing JFrog CLI..."
-  curl -fL https://install-cli.jfrog.io | sudo sh
-  sudo chmod 755 /usr/local/bin/jf
-fi
-
-# The jf CLI checks $CI when determining whether to use interactive flows.
-export CI=true
-# Authenticate JFrog CLI with Artifactory.
-echo "${ARTIFACTORY_ACCESS_TOKEN}" | jf c add --access-token-stdin --url "${JFROG_URL}" --overwrite "${JFROG_SERVER_ID}"
-# Set the configured server as the default.
-jf c use "${JFROG_SERVER_ID}"
-
-# Configure npm to use the Artifactory "npm" repository.
-if [ -z "${HAS_NPM}" ]; then
-  not_configured npm
-else
-  echo "📦 Configuring npm..."
-  jf npmc --global --repo-resolve "${REPOSITORY_NPM}"
-  cat << EOF > ~/.npmrc
-${NPMRC}
-EOF
-  config_complete
-fi
-
-# Configure the `pip` to use the Artifactory "python" repository.
-if [ -z "${HAS_PYPI}" ]; then
-  not_configured pypi
-else
-  echo "🐍 Configuring pip..."
-  jf pipc --global --repo-resolve "${REPOSITORY_PYPI}"
-  mkdir -p ~/.pip
-  cat << EOF > ~/.pip/pip.conf
-${PIP_CONF}
-EOF
-  config_complete
-fi
-
-# Configure Artifactory "go" repository.
-if [ -z "${HAS_GO}" ]; then
-  not_configured go
-else
-  echo "🐹 Configuring go..."
-  jf goc --global --repo-resolve "${REPOSITORY_GO}"
-  config_complete
-fi
-
-# Configure the JFrog CLI to use the Artifactory "docker" repository.
-if [ -z "${HAS_DOCKER}" ]; then
-  not_configured docker
-else
-  if command -v docker > /dev/null 2>&1; then
-    echo "🔑 Configuring 🐳 docker credentials..."
-    mkdir -p ~/.docker
-    ${REGISTER_DOCKER}
-  else
-    echo "🤔 no docker is installed, skipping docker configuration."
-  fi
-fi
-
-# Install the JFrog vscode extension for code-server.
-if [ "${CONFIGURE_CODE_SERVER}" == "true" ]; then
-  while ! [ -x /tmp/code-server/bin/code-server ]; do
-    counter=0
-    if [ $counter -eq 60 ]; then
-      echo "Timed out waiting for /tmp/code-server/bin/code-server to be installed."
-      exit 1
-    fi
-    echo "Waiting for /tmp/code-server/bin/code-server to be installed..."
-    sleep 1
-    ((counter++))
-  done
-  echo "📦 Installing JFrog extension..."
-  /tmp/code-server/bin/code-server --install-extension jfrog.jfrog-vscode-extension
-  echo "🥳 JFrog extension installed!"
-else
-  echo "🤔 Skipping JFrog extension installation. Set configure_code_server to true to install the JFrog extension."
-fi
-
-# Configure the JFrog CLI completion
-echo "📦 Configuring JFrog CLI completion..."
-# Get the user's shell
-SHELLNAME=$(grep "^$USER" /etc/passwd | awk -F':' '{print $7}' | awk -F'/' '{print $NF}')
-# Generate the completion script
-jf completion $SHELLNAME --install
-begin_stanza="# BEGIN: jf CLI shell completion (added by coder module jfrog-token)"
-# Add the completion script to the user's shell profile
-if [ "$SHELLNAME" == "bash" ] && [ -f ~/.bashrc ]; then
-  if ! grep -q "$begin_stanza" ~/.bashrc; then
-    printf "%s\n" "$begin_stanza" >> ~/.bashrc
-    echo 'source "$HOME/.jfrog/jfrog_bash_completion"' >> ~/.bashrc
-    echo "# END: jf CLI shell completion" >> ~/.bashrc
-  else
-    echo "🥳 ~/.bashrc already contains jf CLI shell completion configuration, skipping."
-  fi
-elif [ "$SHELLNAME" == "zsh" ] && [ -f ~/.zshrc ]; then
-  if ! grep -q "$begin_stanza" ~/.zshrc; then
-    printf "\n%s\n" "$begin_stanza" >> ~/.zshrc
-    echo "autoload -Uz compinit" >> ~/.zshrc
-    echo "compinit" >> ~/.zshrc
-    echo 'source "$HOME/.jfrog/jfrog_zsh_completion"' >> ~/.zshrc
-    echo "# END: jf CLI shell completion" >> ~/.zshrc
-  else
-    echo "🥳 ~/.zshrc already contains jf CLI shell completion configuration, skipping."
-  fi
-else
-  echo "🤔 ~/.bashrc or ~/.zshrc does not exist, skipping jf CLI shell completion configuration."
-fi

jfrog/README.md

@@ -0,0 +1,56 @@
+---
+display_name: JFrog
+description: Install the JF CLI and authenticate with Artifactory
+icon: ../.icons/jfrog.svg
+maintainer_github: coder
+partner_github: jfrog
+verified: true
+tags: [integration]
+---
+
+# JFrog
+
+Install the JF CLI and authenticate package managers with Artifactory.
+
+```hcl
+module "jfrog" {
+    source = "https://registry.coder.com/modules/jfrog"
+    agent_id = coder_agent.example.id
+    jfrog_url = "https://YYYY.jfrog.io"
+    artifactory_access_token = var.artifactory_access_token # An admin access token
+    package_managers = {
+      "npm": "npm-remote",
+      "go": "go-remote",
+      "pypi": "pypi-remote"
+    }
+}
+```
+
+Get a JFrog access token from your Artifactory instance. The token must have admin permissions. It is recommended to store the token in a secret terraform variable.
+
+```hcl
+variable "artifactory_access_token" {
+    type      = string
+    sensitive = true
+}
+```
+
+![JFrog](../.images/jfrog.png)
+
+## Examples
+
+### Configure npm, go, and pypi to use Artifactory local repositories
+
+```hcl
+module "jfrog" {
+    source = "https://registry.coder.com/modules/jfrog"
+    agent_id = coder_agent.example.id
+    jfrog_url = "https://YYYY.jfrog.io"
+    artifactory_access_token = var.artifactory_access_token # An admin access token
+    package_managers = {
+      "npm": "npm-local",
+      "go": "go-local",
+      "pypi": "pypi-local"
+    }
+}
+```

jfrog/main.test.ts

@@ -0,0 +1,41 @@
+import { serve } from "bun";
+import { describe } from "bun:test";
+import {
+  createJSONResponse,
+  runTerraformInit,
+  testRequiredVariables,
+} from "../test";
+
+describe("jfrog", async () => {
+  await runTerraformInit(import.meta.dir);
+
+  // Run a fake JFrog server so the provider can initialize
+  // correctly. This saves us from having to make remote requests!
+  const fakeFrogHost = serve({
+    fetch: (req) => {
+      const url = new URL(req.url);
+      // See https://jfrog.com/help/r/jfrog-rest-apis/license-information
+      if (url.pathname === "/artifactory/api/system/license")
+        return createJSONResponse({
+          type: "Commercial",
+          licensedTo: "JFrog inc.",
+          validThrough: "May 15, 2036",
+        });
+      if (url.pathname === "/access/api/v1/tokens")
+        return createJSONResponse({
+          token_id: "xxx",
+          access_token: "xxx",
+          scope: "any",
+        });
+      return createJSONResponse({});
+    },
+    port: 0,
+  });
+
+  testRequiredVariables(import.meta.dir, {
+    agent_id: "some-agent-id",
+    jfrog_url: "http://" + fakeFrogHost.hostname + ":" + fakeFrogHost.port,
+    artifactory_access_token: "XXXX",
+    package_managers: "{}",
+  });
+});

jfrog/main.tf

@@ -0,0 +1,71 @@
+terraform {
+  required_version = ">= 1.0"
+
+  required_providers {
+    coder = {
+      source  = "coder/coder"
+      version = ">= 0.12"
+    }
+    artifactory = {
+      source  = "registry.terraform.io/jfrog/artifactory"
+      version = "~> 8.4.0"
+    }
+  }
+}
+
+variable "jfrog_url" {
+  type        = string
+  description = "JFrog instance URL. e.g. https://YYY.jfrog.io"
+}
+
+variable "artifactory_access_token" {
+  type        = string
+  description = "The admin-level access token to use for JFrog."
+}
+
+# Configure the Artifactory provider
+provider "artifactory" {
+  url          = join("/", [var.jfrog_url, "artifactory"])
+  access_token = var.artifactory_access_token
+}
+resource "artifactory_scoped_token" "me" {
+  # This is hacky, but on terraform plan the data source gives empty strings,
+  # which fails validation.
+  username = length(data.coder_workspace.me.owner_email) > 0 ? data.coder_workspace.me.owner_email : "plan"
+}
+
+variable "agent_id" {
+  type        = string
+  description = "The ID of a Coder agent."
+}
+
+variable "package_managers" {
+  type        = map(string)
+  description = <<EOF
+A map of package manager names to their respective artifactory repositories.
+For example:
+    {
+      "npm": "npm-local",
+      "go": "go-local",
+      "pypi": "pypi-local"
+    }
+EOF
+}
+
+data "coder_workspace" "me" {}
+
+resource "coder_script" "jfrog" {
+  agent_id     = var.agent_id
+  display_name = "jfrog"
+  icon         = "/icon/jfrog.svg"
+  script = templatefile("${path.module}/run.sh", {
+    JFROG_URL : var.jfrog_url,
+    JFROG_HOST : replace(var.jfrog_url, "https://", ""),
+    ARTIFACTORY_USERNAME : data.coder_workspace.me.owner_email,
+    ARTIFACTORY_ACCESS_TOKEN : artifactory_scoped_token.me.access_token,
+    REPOSITORY_NPM : lookup(var.package_managers, "npm", ""),
+    REPOSITORY_GO : lookup(var.package_managers, "go", ""),
+    REPOSITORY_PYPI : lookup(var.package_managers, "pypi", ""),
+  })
+  run_on_start = true
+}

jfrog/run.sh

@@ -0,0 +1,49 @@
+#!/usr/bin/env sh
+
+BOLD='\033[0;1m'
+printf "$${BOLD}Installing JFrog CLI..."
+
+# Install the JFrog CLI.
+curl -fL https://install-cli.jfrog.io | sudo sh
+sudo chmod 755 /usr/local/bin/jf
+
+# The jf CLI checks $CI when determining whether to use interactive
+# flows.
+export CI=true
+# Authenticate with the JFrog CLI.
+jf c rm 0 || true
+echo "${ARTIFACTORY_ACCESS_TOKEN}" | jf c add --access-token-stdin --url "${JFROG_URL}" 0
+
+# Configure the `npm` CLI to use the Artifactory "npm" repository.
+if [ -z "${REPOSITORY_NPM}" ]; then
+  echo "🤔 REPOSITORY_NPM is not set, skipping npm configuration."
+else
+  echo "📦 Configuring npm..."
+  jf npmc --global --repo-resolve "${JFROG_URL}/artifactory/api/npm/${REPOSITORY_NPM}"
+  cat <<EOF >~/.npmrc
+email = ${ARTIFACTORY_USERNAME}
+registry = ${JFROG_URL}/artifactory/api/npm/${REPOSITORY_NPM}
+EOF
+  jf rt curl /api/npm/auth >>~/.npmrc
+fi
+
+# Configure the `pip` to use the Artifactory "python" repository.
+if [ -z "${REPOSITORY_PYPI}" ]; then
+  echo "🤔 REPOSITORY_PYPI is not set, skipping pip configuration."
+else
+  echo "🐍 Configuring pip..."
+  mkdir -p ~/.pip
+  cat <<EOF >~/.pip/pip.conf
+[global]
+index-url = https://${ARTIFACTORY_USERNAME}:${ARTIFACTORY_ACCESS_TOKEN}@${JFROG_HOST}/artifactory/api/pypi/${REPOSITORY_PYPI}/simple
+EOF
+fi
+
+# Set GOPROXY to use the Artifactory "go" repository.
+if [ -z "${REPOSITORY_GO}" ]; then
+  echo "🤔 REPOSITORY_GO is not set, skipping go configuration."
+else
+  echo "🐹 Configuring go..."
+  export GOPROXY="https://${ARTIFACTORY_USERNAME}:${ARTIFACTORY_ACCESS_TOKEN}@${JFROG_HOST}/artifactory/api/go/${REPOSITORY_GO}"
+fi
+echo "🥳 Configuration complete!"