feat: add group attributes to all modules

examples/modules/README.md

@@ -15,7 +15,7 @@ tags: [helper]
 module "MODULE_NAME" {
   count   = data.coder_workspace.me.start_count
   source  = "registry.coder.com/NAMESPACE/MODULE_NAME/coder"
-  version = "1.0.2"
+  version = "1.0.0"
 }
 ```
 
@@ -31,7 +31,7 @@ Install the Dracula theme from [OpenVSX](https://open-vsx.org/):
 module "MODULE_NAME" {
   count    = data.coder_workspace.me.start_count
   source   = "registry.coder.com/NAMESPACE/MODULE_NAME/coder"
-  version  = "1.0.2"
+  version  = "1.0.0"
   agent_id = coder_agent.example.id
   extensions = [
     "dracula-theme.theme-dracula"
@@ -49,7 +49,7 @@ Configure VS Code's [settings.json](https://code.visualstudio.com/docs/getstarte
 module "MODULE_NAME" {
   count      = data.coder_workspace.me.start_count
   source     = "registry.coder.com/NAMESPACE/MODULE_NAME/coder"
-  version    = "1.0.2"
+  version    = "1.0.0"
   agent_id   = coder_agent.example.id
   extensions = ["dracula-theme.theme-dracula"]
   settings = {
@@ -65,7 +65,7 @@ Run code-server in the background, don't fetch it from GitHub:
 ```tf
 module "MODULE_NAME" {
   source   = "registry.coder.com/NAMESPACE/MODULE_NAME/coder"
-  version  = "1.0.2"
+  version  = "1.0.0"
   agent_id = coder_agent.example.id
   offline  = true
 }

examples/modules/main.tf

@@ -4,7 +4,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = ">= 0.17"
+      version = ">= 2.5"
     }
   }
 }
@@ -105,4 +105,3 @@ data "coder_parameter" "MODULE_NAME" {
     }
   }
 }
-

registry/coder/modules/aider/main.tf

@@ -4,7 +4,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = ">= 0.17"
+      version = ">= 2.5"
     }
   }
 }
@@ -24,6 +24,12 @@ variable "order" {
   default     = null
 }
 
+variable "group" {
+  type        = string
+  description = "The name of a group that this app belongs to."
+  default     = null
+}
+
 variable "icon" {
   type        = string
   description = "The icon to use for the app."
@@ -224,17 +230,17 @@ resource "coder_script" "aider" {
     }
 
     echo "Setting up Aider AI pair programming..."
-    
+
     if [ "${var.use_screen}" = "true" ] && [ "${var.use_tmux}" = "true" ]; then
       echo "Error: Both use_screen and use_tmux cannot be enabled at the same time."
       exit 1
     fi
-    
+
     mkdir -p "${var.folder}"
 
     if [ "$(uname)" = "Linux" ]; then
       echo "Checking dependencies for Linux..."
-      
+
       if [ "${var.use_tmux}" = "true" ]; then
         if ! command_exists tmux; then
           echo "Installing tmux for persistent sessions..."
@@ -296,7 +302,7 @@ resource "coder_script" "aider" {
 
     if [ "${var.install_aider}" = "true" ]; then
       echo "Installing Aider..."
-      
+
       if ! command_exists python3 || ! command_exists pip3; then
         echo "Installing Python dependencies required for Aider..."
         if command -v apt-get >/dev/null 2>&1; then
@@ -319,67 +325,67 @@ resource "coder_script" "aider" {
       else
         echo "Python is already installed, skipping installation."
       fi
-      
+
       if ! command_exists aider; then
         curl -LsSf https://aider.chat/install.sh | sh
       fi
-      
+
       if [ -f "$HOME/.bashrc" ]; then
         if ! grep -q 'export PATH="$HOME/bin:$PATH"' "$HOME/.bashrc"; then
           echo 'export PATH="$HOME/bin:$PATH"' >> "$HOME/.bashrc"
         fi
       fi
-      
+
       if [ -f "$HOME/.zshrc" ]; then
         if ! grep -q 'export PATH="$HOME/bin:$PATH"' "$HOME/.zshrc"; then
           echo 'export PATH="$HOME/bin:$PATH"' >> "$HOME/.zshrc"
         fi
       fi
-      
+
     fi
-    
+
     if [ -n "${local.encoded_post_install_script}" ]; then
       echo "Running post-install script..."
       echo "${local.encoded_post_install_script}" | base64 -d > /tmp/post_install.sh
       chmod +x /tmp/post_install.sh
       /tmp/post_install.sh
     fi
-    
+
     if [ "${var.experiment_report_tasks}" = "true" ]; then
       echo "Configuring Aider to report tasks via Coder MCP..."
-      
+
       mkdir -p "$HOME/.config/aider"
-      
+
       cat > "$HOME/.config/aider/config.yml" << EOL
 ${trimspace(local.combined_extensions)}
 EOL
       echo "Added Coder MCP extension to Aider config.yml"
     fi
 
     echo "Starting persistent Aider session..."
-    
+
     touch "$HOME/.aider.log"
-    
+
     export LANG=en_US.UTF-8
     export LC_ALL=en_US.UTF-8
-    
+
     export PATH="$HOME/bin:$PATH"
-    
+
     if [ "${var.use_tmux}" = "true" ]; then
       if [ -n "${var.task_prompt}" ]; then
         echo "Running Aider with message in tmux session..."
-        
+
         # Configure tmux for shared sessions
         if [ ! -f "$HOME/.tmux.conf" ]; then
           echo "Creating ~/.tmux.conf with shared session settings..."
           echo "set -g mouse on" > "$HOME/.tmux.conf"
         fi
-        
+
         if ! grep -q "^set -g mouse on$" "$HOME/.tmux.conf"; then
           echo "Adding 'set -g mouse on' to ~/.tmux.conf..."
           echo "set -g mouse on" >> "$HOME/.tmux.conf"
         fi
-        
+
         echo "Starting Aider using ${var.ai_provider} provider and model: ${var.ai_model}"
         tmux new-session -d -s ${var.session_name} -c ${var.folder} "export ${local.env_var_name}=\"${var.ai_api_key}\"; aider --architect --yes-always ${local.model_flag} ${var.ai_model} --message \"${local.combined_prompt}\""
         echo "Aider task started in tmux session '${var.session_name}'. Check the UI for progress."
@@ -389,25 +395,25 @@ EOL
           echo "Creating ~/.tmux.conf with shared session settings..."
           echo "set -g mouse on" > "$HOME/.tmux.conf"
         fi
-        
+
         if ! grep -q "^set -g mouse on$" "$HOME/.tmux.conf"; then
           echo "Adding 'set -g mouse on' to ~/.tmux.conf..."
           echo "set -g mouse on" >> "$HOME/.tmux.conf"
         fi
-        
+
         echo "Starting Aider using ${var.ai_provider} provider and model: ${var.ai_model}"
         tmux new-session -d -s ${var.session_name} -c ${var.folder} "export ${local.env_var_name}=\"${var.ai_api_key}\"; aider --architect --yes-always ${local.model_flag} ${var.ai_model} --message \"${var.system_prompt}\""
         echo "Tmux session '${var.session_name}' started. Access it by clicking the Aider button."
       fi
     else
       if [ -n "${var.task_prompt}" ]; then
         echo "Running Aider with message in screen session..."
-        
+
         if [ ! -f "$HOME/.screenrc" ]; then
           echo "Creating ~/.screenrc and adding multiuser settings..."
           echo -e "multiuser on\nacladd $(whoami)" > "$HOME/.screenrc"
         fi
-        
+
         if ! grep -q "^multiuser on$" "$HOME/.screenrc"; then
           echo "Adding 'multiuser on' to ~/.screenrc..."
           echo "multiuser on" >> "$HOME/.screenrc"
@@ -417,7 +423,7 @@ EOL
           echo "Adding 'acladd $(whoami)' to ~/.screenrc..."
           echo "acladd $(whoami)" >> "$HOME/.screenrc"
         fi
-        
+
         echo "Starting Aider using ${var.ai_provider} provider and model: ${var.ai_model}"
         screen -U -dmS ${var.session_name} bash -c "
           cd ${var.folder}
@@ -426,15 +432,15 @@ EOL
           aider --architect --yes-always ${local.model_flag} ${var.ai_model} --message \"${local.combined_prompt}\"
           /bin/bash
         "
-        
+
         echo "Aider task started in screen session '${var.session_name}'. Check the UI for progress."
       else
-        
+
         if [ ! -f "$HOME/.screenrc" ]; then
           echo "Creating ~/.screenrc and adding multiuser settings..."
           echo -e "multiuser on\nacladd $(whoami)" > "$HOME/.screenrc"
         fi
-        
+
         if ! grep -q "^multiuser on$" "$HOME/.screenrc"; then
           echo "Adding 'multiuser on' to ~/.screenrc..."
           echo "multiuser on" >> "$HOME/.screenrc"
@@ -444,7 +450,7 @@ EOL
           echo "Adding 'acladd $(whoami)' to ~/.screenrc..."
           echo "acladd $(whoami)" >> "$HOME/.screenrc"
         fi
-        
+
         echo "Starting Aider using ${var.ai_provider} provider and model: ${var.ai_model}"
         screen -U -dmS ${var.session_name} bash -c "
           cd ${var.folder}
@@ -456,7 +462,7 @@ EOL
         echo "Screen session '${var.session_name}' started. Access it by clicking the Aider button."
       fi
     fi
-    
+
     echo "Aider setup complete!"
   EOT
   run_on_start = true
@@ -471,12 +477,12 @@ resource "coder_app" "aider_cli" {
   command      = <<-EOT
     #!/bin/bash
     set -e
-    
+
     export PATH="$HOME/bin:$HOME/.local/bin:$PATH"
-    
+
     export LANG=en_US.UTF-8
     export LC_ALL=en_US.UTF-8
-    
+
     if [ "${var.use_tmux}" = "true" ]; then
       if tmux has-session -t ${var.session_name} 2>/dev/null; then
         echo "Attaching to existing Aider tmux session..."
@@ -499,4 +505,5 @@ resource "coder_app" "aider_cli" {
     fi
   EOT
   order        = var.order
+  group        = var.group
 }

registry/coder/modules/amazon-dcv-windows/README.md

@@ -19,7 +19,7 @@ Enable DCV Server and Web Client on Windows workspaces.
 module "dcv" {
   count    = data.coder_workspace.me.start_count
   source   = "registry.coder.com/coder/amazon-dcv-windows/coder"
-  version  = "1.0.24"
+  version  = "1.1.0"
   agent_id = resource.coder_agent.main.id
 }
 

registry/coder/modules/amazon-dcv-windows/main.tf

@@ -4,11 +4,23 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = ">= 0.17"
+      version = ">= 2.5"
     }
   }
 }
 
+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 "group" {
+  type        = string
+  description = "The name of a group that this app belongs to."
+  default     = null
+}
+
 variable "agent_id" {
   type        = string
   description = "The ID of a Coder agent."
@@ -45,6 +57,8 @@ resource "coder_app" "web-dcv" {
   url          = "https://localhost:${var.port}${local.web_url_path}?username=${local.admin_username}&password=${var.admin_password}"
   icon         = "/icon/dcv.svg"
   subdomain    = var.subdomain
+  order        = var.order
+  group        = var.group
 }
 
 resource "coder_script" "install-dcv" {

registry/coder/modules/amazon-q/README.md

@@ -14,7 +14,7 @@ Run [Amazon Q](https://aws.amazon.com/q/) in your workspace to access Amazon's A
 ```tf
 module "amazon-q" {
   source   = "registry.coder.com/coder/amazon-q/coder"
-  version  = "1.0.1"
+  version  = "1.1.0"
   agent_id = coder_agent.example.id
   # Required: see below for how to generate
   experiment_auth_tarball = var.amazon_q_auth_tarball
@@ -82,7 +82,7 @@ module "amazon-q" {
 ```tf
 module "amazon-q" {
   source                  = "registry.coder.com/coder/amazon-q/coder"
-  version                 = "1.0.1"
+  version                 = "1.1.0"
   agent_id                = coder_agent.example.id
   experiment_auth_tarball = var.amazon_q_auth_tarball
   experiment_use_tmux     = true
@@ -94,7 +94,7 @@ module "amazon-q" {
 ```tf
 module "amazon-q" {
   source                  = "registry.coder.com/coder/amazon-q/coder"
-  version                 = "1.0.1"
+  version                 = "1.1.0"
   agent_id                = coder_agent.example.id
   experiment_auth_tarball = var.amazon_q_auth_tarball
   experiment_report_tasks = true
@@ -106,7 +106,7 @@ module "amazon-q" {
 ```tf
 module "amazon-q" {
   source                         = "registry.coder.com/coder/amazon-q/coder"
-  version                        = "1.0.1"
+  version                        = "1.1.0"
   agent_id                       = coder_agent.example.id
   experiment_auth_tarball        = var.amazon_q_auth_tarball
   experiment_pre_install_script  = "echo Pre-install!"