Scaleway template - Additional QoL fixes

Author: mossylion

registry/mossylion/templates/scaleway-instance/cloud-init/userdata.sh.tftpl

@@ -1,2 +1,2 @@
 #!/bin/bash
-sudo -u '${linux_user}' CODER_AGENT_TOKEN=${coder_agent_token} sh -c '${init_script}'
+sudo -u '${linux_user}' sh -c 'CODER_AGENT_TOKEN="${coder_agent_token}" ${init_script}'

registry/mossylion/templates/scaleway-instance/main.tf

@@ -59,11 +59,22 @@ data "coder_provisioner" "me" {}
 
 data "coder_workspace" "me" {}
 
+data "coder_workspace_owner" "me" {}
+
 resource "coder_agent" "main" {
   arch = data.coder_provisioner.me.arch
   os   = data.coder_provisioner.me.os
   auth = "token"
 
+  startup_script = <<-EOT
+    set -e
+
+    # Install additional tools or run commands at workspace startup
+    # Uncomment and customize as needed:
+    # sudo apt-get update
+    # sudo apt-get install -y build-essential
+  EOT
+
   metadata {
     display_name = "CPU Usage"
     key          = "0_cpu_usage"
@@ -82,16 +93,18 @@ resource "coder_agent" "main" {
   metadata {
     display_name = "Disk Usage"
     key          = "1_disk_usage"
-    script       = "coder stat disk"
-    interval     = 10
-    timeout      = 1
+    script       = "coder stat disk --path /home/${local.linux_user}"
+    interval     = 600
+    timeout      = 30
   }
 }
 
 module "code-server" {
   source   = "registry.coder.com/modules/code-server/coder"
   version  = "1.3.1"
   agent_id = coder_agent.main.id
+  order    = 1
+  folder   = "/home/${local.linux_user}"
 }
 
 # Runs a script at workspace start/stop or on a cron schedule
@@ -104,6 +117,37 @@ module "dotfiles" {
   agent_id = coder_agent.main.id
 }
 
+resource "coder_metadata" "workspace_info" {
+  count       = data.coder_workspace.me.start_count
+  resource_id = scaleway_instance_server.workspace[0].id
+
+  item {
+    key   = "region"
+    value = data.coder_parameter.region.value
+  }
+  item {
+    key   = "instance type"
+    value = scaleway_instance_server.workspace[0].type
+  }
+  item {
+    key   = "image"
+    value = data.coder_parameter.base_image.value
+  }
+}
+
+resource "coder_metadata" "volume_info" {
+  resource_id = scaleway_block_volume.persistent_storage.id
+
+  item {
+    key   = "size"
+    value = "${scaleway_block_volume.persistent_storage.size_in_gb} GiB"
+  }
+  item {
+    key   = "iops"
+    value = scaleway_block_volume.persistent_storage.iops
+  }
+}
+
 data "coder_parameter" "region" {
   name        = "Scaleway Region"
   description = "Region to deploy server into"
@@ -148,7 +192,7 @@ data "coder_parameter" "base_image" {
   option {
     name  = "Ubuntu 24.04 (Noble)"
     value = "ubuntu_noble"
-    icon  = "/icon/fedora.svg"
+    icon  = "/icon/ubuntu.svg"
   }
 
   option {
@@ -219,7 +263,7 @@ data "coder_parameter" "volume_iops" {
 
 resource "scaleway_instance_server" "workspace" {
   count      = data.coder_workspace.me.start_count
-  name       = data.coder_workspace.me.name
+  name       = "coder-${lower(data.coder_workspace_owner.me.name)}-${lower(data.coder_workspace.me.name)}"
   type       = data.coder_parameter.instance_size.value
   image      = data.coder_parameter.base_image.value
   ip_ids     = [scaleway_instance_ip.server_ip[0].id, scaleway_instance_ip.v4_server_ip[0].id]
@@ -232,7 +276,7 @@ resource "scaleway_instance_server" "workspace" {
 
 resource "scaleway_block_volume" "persistent_storage" {
   iops       = data.coder_parameter.volume_iops.value
-  name       = "${data.coder_workspace.me.name}-home"
+  name       = "coder-${lower(data.coder_workspace_owner.me.name)}-${lower(data.coder_workspace.me.name)}-home"
   size_in_gb = data.coder_parameter.disk_size.value
   project_id = var.project_id
 }
@@ -264,8 +308,3 @@ variable "secret_key" {
   type        = string
   description = "Secret key to use to deploy"
 }
-
-variable "region" {
-  type        = string
-  description = "Region to deploy into"
-}