From dbede4eb7e54c4bb43fef7caa0e7fbca95af9b9a Mon Sep 17 00:00:00 2001
From: Muhammad Atif Ali <atif@coder.com>
Date: Fri, 25 Aug 2023 09:43:33 +0300
Subject: [PATCH 1/3] chore: update aws_linux template

Updated the template with the following changes
1. use https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/ec2_instance_state.html to manage start/stop
2. Update agent metadata to use `coder stat`
3. Update some wrong regional flag emojis
---
 examples/templates/aws-linux/main.tf | 77 +++++++++++++---------------
 1 file changed, 35 insertions(+), 42 deletions(-)

diff --git a/examples/templates/aws-linux/main.tf b/examples/templates/aws-linux/main.tf
index 96d9136dfe758..fdb69eb6c2d3e 100644
--- 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.7.0"
+      version = "~> 0.11.0"
     }
     aws = {
       source  = "hashicorp/aws"
@@ -30,24 +30,24 @@ data "coder_parameter" "region" {
     icon  = "/emojis/1f1f0-1f1f7.png"
   }
   option {
-    name  = "Asia Pacific (Osaka-Local)"
+    name  = "Asia Pacific (Osaka)"
     value = "ap-northeast-3"
-    icon  = "/emojis/1f1f0-1f1f7.png"
+    icon  = "/emojis/1f1ef-1f1f5.png"
   }
   option {
     name  = "Asia Pacific (Mumbai)"
     value = "ap-south-1"
-    icon  = "/emojis/1f1f0-1f1f7.png"
+    icon  = "/emojis/1f1ee-1f1f3.png"
   }
   option {
     name  = "Asia Pacific (Singapore)"
     value = "ap-southeast-1"
-    icon  = "/emojis/1f1f0-1f1f7.png"
+    icon  = "/emojis/1f1f8-1f1ec.png"
   }
   option {
     name  = "Asia Pacific (Sydney)"
     value = "ap-southeast-2"
-    icon  = "/emojis/1f1f0-1f1f7.png"
+    icon  = "/emojis/1f1e6-1f1fa.png"
   }
   option {
     name  = "Canada (Central)"
@@ -176,33 +176,21 @@ resource "coder_agent" "main" {
     display_name = "CPU Usage"
     interval     = 5
     timeout      = 5
-    script       = <<-EOT
-      #!/bin/bash
-      set -e
-      top -bn1 | grep "Cpu(s)" | awk '{print $2 + $4 "%"}'
-    EOT
+    script       = "coder stat cpu"
   }
   metadata {
     key          = "memory"
     display_name = "Memory Usage"
     interval     = 5
     timeout      = 5
-    script       = <<-EOT
-      #!/bin/bash
-      set -e
-      free -m | awk 'NR==2{printf "%.2f%%\t", $3*100/$2 }'
-    EOT
+    script       = "coder stat mem"
   }
   metadata {
     key          = "disk"
     display_name = "Disk Usage"
     interval     = 600 # every 10 minutes
     timeout      = 30  # df can take a while on large filesystems
-    script       = <<-EOT
-      #!/bin/bash
-      set -e
-      df /home/coder | awk '$NF=="/"{printf "%s", $5}'
-    EOT
+    script       = "coder stat disk --path $HOME"
   }
 }
 
@@ -257,30 +245,30 @@ sudo -u ${local.linux_user} sh -c '${coder_agent.main.init_script}'
 --//--
 EOT
 
-  user_data_end = <<EOT
-Content-Type: multipart/mixed; boundary="//"
-MIME-Version: 1.0
+#   user_data_end = <<EOT
+# Content-Type: multipart/mixed; boundary="//"
+# MIME-Version: 1.0
 
---//
-Content-Type: text/cloud-config; charset="us-ascii"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Content-Disposition: attachment; filename="cloud-config.txt"
+# --//
+# Content-Type: text/cloud-config; charset="us-ascii"
+# MIME-Version: 1.0
+# Content-Transfer-Encoding: 7bit
+# Content-Disposition: attachment; filename="cloud-config.txt"
 
-#cloud-config
-cloud_final_modules:
-- [scripts-user, always]
+# #cloud-config
+# cloud_final_modules:
+# - [scripts-user, always]
 
---//
-Content-Type: text/x-shellscript; charset="us-ascii"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Content-Disposition: attachment; filename="userdata.txt"
+# --//
+# Content-Type: text/x-shellscript; charset="us-ascii"
+# MIME-Version: 1.0
+# Content-Transfer-Encoding: 7bit
+# Content-Disposition: attachment; filename="userdata.txt"
 
-#!/bin/bash
-sudo shutdown -h now
---//--
-EOT
+# #!/bin/bash
+# sudo shutdown -h now
+# --//--
+# EOT
 
   linux_user = "coder" # Ensure this user/group does not exist in your VM image
 
@@ -291,7 +279,7 @@ resource "aws_instance" "dev" {
   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
+  user_data = data.coder_workspace.me.transition == "start" ? local.user_data_start : null
   tags = {
     Name = "coder-${data.coder_workspace.me.owner}-${data.coder_workspace.me.name}"
     # Required if you are using our example policy, see template README
@@ -314,3 +302,8 @@ resource "coder_metadata" "workspace_info" {
     value = "${aws_instance.dev.root_block_device[0].volume_size} GiB"
   }
 }
+
+resource "aws_ec2_instance_state" "test" {
+  instance_id = aws_instance.dev.id
+  state       = data.coder_workspace.me.transition == "start" ? "running" : "stopped"
+}

From c04c625999d5d34820926b0ad2e9b32c861e59e4 Mon Sep 17 00:00:00 2001
From: Atif Ali <atif@coder.com>
Date: Fri, 25 Aug 2023 07:04:58 +0000
Subject: [PATCH 2/3] fmt

---
 examples/templates/aws-linux/main.tf | 40 ++++++++++++++--------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/examples/templates/aws-linux/main.tf b/examples/templates/aws-linux/main.tf
index fdb69eb6c2d3e..ce1c2ea885335 100644
--- a/examples/templates/aws-linux/main.tf
+++ b/examples/templates/aws-linux/main.tf
@@ -245,30 +245,30 @@ sudo -u ${local.linux_user} sh -c '${coder_agent.main.init_script}'
 --//--
 EOT
 
-#   user_data_end = <<EOT
-# Content-Type: multipart/mixed; boundary="//"
-# MIME-Version: 1.0
+  #   user_data_end = <<EOT
+  # Content-Type: multipart/mixed; boundary="//"
+  # MIME-Version: 1.0
 
-# --//
-# Content-Type: text/cloud-config; charset="us-ascii"
-# MIME-Version: 1.0
-# Content-Transfer-Encoding: 7bit
-# Content-Disposition: attachment; filename="cloud-config.txt"
+  # --//
+  # Content-Type: text/cloud-config; charset="us-ascii"
+  # MIME-Version: 1.0
+  # Content-Transfer-Encoding: 7bit
+  # Content-Disposition: attachment; filename="cloud-config.txt"
 
-# #cloud-config
-# cloud_final_modules:
-# - [scripts-user, always]
+  # #cloud-config
+  # cloud_final_modules:
+  # - [scripts-user, always]
 
-# --//
-# Content-Type: text/x-shellscript; charset="us-ascii"
-# MIME-Version: 1.0
-# Content-Transfer-Encoding: 7bit
-# Content-Disposition: attachment; filename="userdata.txt"
+  # --//
+  # Content-Type: text/x-shellscript; charset="us-ascii"
+  # MIME-Version: 1.0
+  # Content-Transfer-Encoding: 7bit
+  # Content-Disposition: attachment; filename="userdata.txt"
 
-# #!/bin/bash
-# sudo shutdown -h now
-# --//--
-# EOT
+  # #!/bin/bash
+  # sudo shutdown -h now
+  # --//--
+  # EOT
 
   linux_user = "coder" # Ensure this user/group does not exist in your VM image
 

From 20aae261146b4507b17406fd15b3fe068b1f06da Mon Sep 17 00:00:00 2001
From: Atif Ali <atif@coder.com>
Date: Fri, 25 Aug 2023 13:46:55 +0000
Subject: [PATCH 3/3] PR comments

---
 examples/templates/aws-linux/main.tf | 40 ++++------------------------
 1 file changed, 5 insertions(+), 35 deletions(-)

diff --git a/examples/templates/aws-linux/main.tf b/examples/templates/aws-linux/main.tf
index ce1c2ea885335..f1f41024d938a 100644
--- a/examples/templates/aws-linux/main.tf
+++ b/examples/templates/aws-linux/main.tf
@@ -211,11 +211,9 @@ resource "coder_app" "code-server" {
 }
 
 locals {
-
-  # User data is used to stop/start AWS instances. See:
-  # https://github.com/hashicorp/terraform-provider-aws/issues/22
-
-  user_data_start = <<EOT
+  linux_user = "coder" # Ensure this user/group does not exist in your VM image
+  # User data is used to run the init_script
+  user_data = <<EOT
 Content-Type: multipart/mixed; boundary="//"
 MIME-Version: 1.0
 
@@ -244,34 +242,6 @@ Content-Disposition: attachment; filename="userdata.txt"
 sudo -u ${local.linux_user} sh -c '${coder_agent.main.init_script}'
 --//--
 EOT
-
-  #   user_data_end = <<EOT
-  # Content-Type: multipart/mixed; boundary="//"
-  # MIME-Version: 1.0
-
-  # --//
-  # Content-Type: text/cloud-config; charset="us-ascii"
-  # MIME-Version: 1.0
-  # Content-Transfer-Encoding: 7bit
-  # Content-Disposition: attachment; filename="cloud-config.txt"
-
-  # #cloud-config
-  # cloud_final_modules:
-  # - [scripts-user, always]
-
-  # --//
-  # Content-Type: text/x-shellscript; charset="us-ascii"
-  # MIME-Version: 1.0
-  # Content-Transfer-Encoding: 7bit
-  # Content-Disposition: attachment; filename="userdata.txt"
-
-  # #!/bin/bash
-  # sudo shutdown -h now
-  # --//--
-  # EOT
-
-  linux_user = "coder" # Ensure this user/group does not exist in your VM image
-
 }
 
 resource "aws_instance" "dev" {
@@ -279,7 +249,7 @@ resource "aws_instance" "dev" {
   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 : null
+  user_data = local.user_data_start
   tags = {
     Name = "coder-${data.coder_workspace.me.owner}-${data.coder_workspace.me.name}"
     # Required if you are using our example policy, see template README
@@ -303,7 +273,7 @@ resource "coder_metadata" "workspace_info" {
   }
 }
 
-resource "aws_ec2_instance_state" "test" {
+resource "aws_ec2_instance_state" "dev" {
   instance_id = aws_instance.dev.id
   state       = data.coder_workspace.me.transition == "start" ? "running" : "stopped"
 }

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://rainy.clevelandohioweatherforecast.com/php-proxy/index.php?q=https://patch-diff.githubusercontent.com/raw/coder/coder/pull/9325.patch" target="_blank">Alternative Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/index.php?u=https://patch-diff.githubusercontent.com/raw/coder/coder/pull/9325.patch" target="_blank">pFad Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v3index.php?u=https://patch-diff.githubusercontent.com/raw/coder/coder/pull/9325.patch" target="_blank">pFad v3 Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v4index.php?u=https://patch-diff.githubusercontent.com/raw/coder/coder/pull/9325.patch" target="_blank">pFad v4 Proxy</a></p></body>
</html>