Skip to content

chore: update aws_linux template #9325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 25, 2023
Merged

chore: update aws_linux template #9325

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dbede4e
chore: update aws_linux template
matifali Aug 25, 2023
c04c625
fmt
matifali Aug 25, 2023
20aae26
PR comments
matifali Aug 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
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
  • Loading branch information
@matifali
matifali authored Aug 25, 2023
commit dbede4eb7e54c4bb43fef7caa0e7fbca95af9b9a
77 changes: 35 additions & 42 deletions examples/templates/aws-linux/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
coder = {
source = "coder/coder"
version = "~> 0.7.0"
version = "~> 0.11.0"
}
aws = {
source = "hashicorp/aws"
Expand Down Expand Up @@ -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)"
Expand Down Expand Up @@ -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"
}
}

Expand Down Expand Up @@ -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

Expand All @@ -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
Expand All @@ -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"
}