coder · mtojek · Mar 15, 2023 · Mar 1, 2023 · Mar 1, 2023 · Mar 1, 2023
diff --git a/examples/templates/aws-ecs-container/main.tf b/examples/templates/aws-ecs-container/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "~> 0.6.12"
+      version = "~> 0.6.17"
     }
     aws = {
       source  = "hashicorp/aws"
@@ -11,16 +11,28 @@ terraform {
   }
 }
 
+provider "coder" {
+  feature_use_managed_variables = true
+}
+
 variable "ecs-cluster" {
   description = "Input the ECS cluster ARN to host the workspace"
-  default     = ""
 }
-variable "cpu" {
-  default = "1024"
+
+data "coder_parameter" "cpu" {
+  name        = "cpu"
+  description = "The number of CPU units to reserve for the container"
+  type        = "number"
+  default     = "1024"
+  mutable     = true
 }
 
-variable "memory" {
-  default = "2048"
+data "coder_parameter" "memory" {
+  name        = "memory"
+  description = "The amount of memory (in MiB) to allow the container to use"
+  type        = "number"
+  default     = "2048"
+  mutable     = true
 }
 
 # configure AWS provider with creds present on Coder server host
@@ -34,14 +46,14 @@ resource "aws_ecs_task_definition" "workspace" {
   family = "coder"
 
   requires_compatibilities = ["EC2"]
-  cpu                      = var.cpu
-  memory                   = var.memory
+  cpu                      = data.coder_parameter.cpu.value
+  memory                   = data.coder_parameter.memory.value
   container_definitions = jsonencode([
     {
       name      = "coder-workspace-${data.coder_workspace.me.id}"
       image     = "codercom/enterprise-base:ubuntu"
-      cpu       = 1024
-      memory    = 2048
+      cpu       = tonumber(data.coder_parameter.cpu.value)
+      memory    = tonumber(data.coder_parameter.memory.value)
       essential = true
       user      = "coder"
       command   = ["sh", "-c", coder_agent.coder.init_script]
@@ -92,11 +104,10 @@ resource "aws_ecs_service" "workspace" {
 data "coder_workspace" "me" {}
 
 resource "coder_agent" "coder" {
-  arch = "amd64"
-  auth = "token"
-  os   = "linux"
-  dir  = "/home/coder"
-
+  arch                   = "amd64"
+  auth                   = "token"
+  os                     = "linux"
+  dir                    = "/home/coder"
   login_before_ready     = false
   startup_script_timeout = 180
   startup_script         = <<-EOT

diff --git a/examples/templates/aws-linux/main.tf b/examples/templates/aws-linux/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "~> 0.6.12"
+      version = "~> 0.6.17"
     }
     aws = {
       source  = "hashicorp/aws"
@@ -11,53 +11,133 @@ terraform {
   }
 }
 
-# Last updated 2022-05-31
+# Last updated 2023-03-14
 # aws ec2 describe-regions | jq -r '[.Regions[].RegionName] | sort'
-variable "region" {
-  description = "What region should your workspace live in?"
+data "coder_parameter" "region" {
+  name        = "Region"
+  description = "The region to deploy the workspace in."
   default     = "us-east-1"
-  validation {
-    condition = contains([
-      "ap-northeast-1",
-      "ap-northeast-2",
-      "ap-northeast-3",
-      "ap-south-1",
-      "ap-southeast-1",
-      "ap-southeast-2",
-      "ca-central-1",
-      "eu-central-1",
-      "eu-north-1",
-      "eu-west-1",
-      "eu-west-2",
-      "eu-west-3",
-      "sa-east-1",
-      "us-east-1",
-      "us-east-2",
-      "us-west-1",
-      "us-west-2"
-    ], var.region)
-    error_message = "Invalid region!"
+  mutable     = false
+  option {
+    name  = "Asia Pacific (Tokyo)"
+    value = "ap-northeast-1"
+    icon  = "/emojis/1f1ef-1f1f5.png"
+  }
+  option {
+    name  = "Asia Pacific (Seoul)"
+    value = "ap-northeast-2"
+    icon  = "/emojis/1f1f0-1f1f7.png"
+  }
+  option {
+    name  = "Asia Pacific (Osaka-Local)"
+    value = "ap-northeast-3"
+    icon  = "/emojis/1f1f0-1f1f7.png"
+  }
+  option {
+    name  = "Asia Pacific (Mumbai)"
+    value = "ap-south-1"
+    icon  = "/emojis/1f1f0-1f1f7.png"
+  }
+  option {
+    name  = "Asia Pacific (Singapore)"
+    value = "ap-southeast-1"
+    icon  = "/emojis/1f1f0-1f1f7.png"
+  }
+  option {
+    name  = "Asia Pacific (Sydney)"
+    value = "ap-southeast-2"
+    icon  = "/emojis/1f1f0-1f1f7.png"
+  }
+  option {
+    name  = "Canada (Central)"
+    value = "ca-central-1"
+    icon  = "/emojis/1f1e8-1f1e6.png"
+  }
+  option {
+    name  = "EU (Frankfurt)"
+    value = "eu-central-1"
+    icon  = "/emojis/1f1ea-1f1fa.png"
+  }
+  option {
+    name  = "EU (Stockholm)"
+    value = "eu-north-1"
+    icon  = "/emojis/1f1ea-1f1fa.png"
+  }
+  option {
+    name  = "EU (Ireland)"
+    value = "eu-west-1"
+    icon  = "/emojis/1f1ea-1f1fa.png"
+  }
+  option {
+    name  = "EU (London)"
+    value = "eu-west-2"
+    icon  = "/emojis/1f1ea-1f1fa.png"
+  }
+  option {
+    name  = "EU (Paris)"
+    value = "eu-west-3"
+    icon  = "/emojis/1f1ea-1f1fa.png"
+  }
+  option {
+    name  = "South America (São Paulo)"
+    value = "sa-east-1"
+    icon  = "/emojis/1f1e7-1f1f7.png"
+  }
+  option {
+    name  = "US East (N. Virginia)"
+    value = "us-east-1"
+    icon  = "/emojis/1f1fa-1f1f8.png"
+  }
+  option {
+    name  = "US East (Ohio)"
+    value = "us-east-2"
+    icon  = "/emojis/1f1fa-1f1f8.png"
+  }
+  option {
+    name  = "US West (N. California)"
+    value = "us-west-1"
+    icon  = "/emojis/1f1fa-1f1f8.png"
+  }
+  option {
+    name  = "US West (Oregon)"
+    value = "us-west-2"
+    icon  = "/emojis/1f1fa-1f1f8.png"
   }
 }
 
-variable "instance_type" {
+data "coder_parameter" "instance_type" {
+  name        = "Instance Type"
   description = "What instance type should your workspace use?"
   default     = "t3.micro"
-  validation {
-    condition = contains([
-      "t3.micro",
-      "t3.small",
-      "t3.medium",
-      "t3.large",
-      "t3.xlarge",
-      "t3.2xlarge",
-    ], var.instance_type)
-    error_message = "Invalid instance type!"
+  mutable     = false
+  option {
+    name  = "2 vCPU, 1 GiB RAM"
+    value = "t3.micro"
+  }
+  option {
+    name  = "2 vCPU, 2 GiB RAM"
+    value = "t3.small"
+  }
+  option {
+    name  = "2 vCPU, 4 GiB RAM"
+    value = "t3.medium"
+  }
+  option {
+    name  = "2 vCPU, 8 GiB RAM"
+    value = "t3.large"
+  }
+  option {
+    name  = "4 vCPU, 16 GiB RAM"
+    value = "t3.xlarge"
+  }
+  option {
+    name  = "8 vCPU, 32 GiB RAM"
+    value = "t3.2xlarge"
   }
 }
 
 provider "aws" {
-  region = var.region
+  region = data.coder_parameter.region.value
 }
 
 data "coder_workspace" "me" {
@@ -77,10 +157,9 @@ data "aws_ami" "ubuntu" {
 }
 
 resource "coder_agent" "main" {
-  arch = "amd64"
-  auth = "aws-instance-identity"
-  os   = "linux"
-
+  arch                   = "amd64"
+  auth                   = "aws-instance-identity"
+  os                     = "linux"
   login_before_ready     = false
   startup_script_timeout = 180
   startup_script         = <<-EOT
@@ -174,8 +253,8 @@ EOT
 
 resource "aws_instance" "dev" {
   ami               = data.aws_ami.ubuntu.id
-  availability_zone = "${var.region}a"
-  instance_type     = var.instance_type
+  availability_zone = "${data.coder_parameter.region.value}a"
+  instance_type     = data.coder_parameter.instance_type.value
 
   user_data = data.coder_workspace.me.transition == "start" ? local.user_data_start : local.user_data_end
   tags = {
@@ -189,7 +268,7 @@ resource "coder_metadata" "workspace_info" {
   resource_id = aws_instance.dev.id
   item {
     key   = "region"
-    value = var.region
+    value = data.coder_parameter.region.value
   }
   item {
     key   = "instance type"