chore: more sensible variable defaults

phorcys420 · phorcys420 · commit 5b41d7acfbd9 · 2024-12-19T13:32:03.000Z
diff --git a/examples/templates/digitalocean-linux/README.md b/examples/templates/digitalocean-linux/README.md
@@ -25,13 +25,13 @@ To deploy workspaces as DigitalOcean Droplets, you'll need:
 - Remove the following sections from the `main.tf` file if you don't want to
   associate your workspaces with a project:
 
-  - `variable "step2_do_project_id"`
+  - `variable "do_project_id"`
   - `resource "digitalocean_project_resources" "project"`
 
 - **Optional:** DigitalOcean SSH key ID (obtain via the `doctl` CLI by running
   `doctl compute ssh-key list`)
 
-- Note that this is only required for Fedora images to work.
+	- Note that this is only required for Fedora images to work.
 
 ### Authentication
 
diff --git a/examples/templates/digitalocean-linux/main.tf b/examples/templates/digitalocean-linux/main.tf
@@ -9,27 +9,26 @@ terraform {
   }
 }
 
-provider "coder" {
-}
+provider "coder" {}
 
-variable "step1_do_project_id" {
+variable "do_project_id" {
   type        = string
   description = <<-EOF
-    Enter project ID
+    DigitalOcean project ID
 
       $ doctl projects list
   EOF
   sensitive   = true
 
   validation {
-    # make sure length of alphanumeric string is 36
-    condition     = length(var.step1_do_project_id) == 36
+    # make sure length of alphanumeric string is 36 (UUIDv4 size)
+    condition     = length(var.do_project_id) == 36
     error_message = "Invalid Digital Ocean Project ID."
   }
 
 }
 
-variable "step2_do_admin_ssh_key" {
+variable "do_admin_ssh_key" {
   type        = number
   description = <<-EOF
     Enter admin SSH key ID (some Droplet images require an SSH key to be set):
@@ -40,10 +39,11 @@ variable "step2_do_admin_ssh_key" {
 
       $ doctl compute ssh-key list
   EOF
-  sensitive   = true
+  sensitive = true
+  default = 0
 
   validation {
-    condition     = var.step2_do_admin_ssh_key >= 0
+    condition     = var.do_admin_ssh_key >= 0
     error_message = "Invalid Digital Ocean SSH key ID, a number is required."
   }
 }
@@ -291,11 +291,11 @@ resource "digitalocean_droplet" "workspace" {
     coder_agent_token = coder_agent.main.token
   })
   # Required to provision Fedora.
-  ssh_keys = var.step2_do_admin_ssh_key > 0 ? [var.step2_do_admin_ssh_key] : []
+  ssh_keys = var.do_admin_ssh_key > 0 ? [var.do_admin_ssh_key] : []
 }
 
 resource "digitalocean_project_resources" "project" {
-  project = var.step1_do_project_id
+  project = var.do_project_id
   # Workaround for terraform plan when using count.
   resources = length(digitalocean_droplet.workspace) > 0 ? [
     digitalocean_volume.home_volume.urn,
