Skip to content

add metadata to example templates #3451

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 9 commits into from
Aug 10, 2022
Merged

add metadata to example templates #3451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8c4dbcf
add metadata to Docker templates
bpmct Aug 10, 2022
876c5d9
add metadata to AWS templates
bpmct Aug 10, 2022
c7cbeca
add metadata to Azure
bpmct Aug 10, 2022
2ca9b75
just use "disk" vs" disk size"
bpmct Aug 10, 2022
8d70cee
add metadata to GCP templates
bpmct Aug 10, 2022
27057cd
add metadata to DigitalOcean
bpmct Aug 10, 2022
cd07ba1
remove metadata from docker-code-server
bpmct Aug 10, 2022
637e064
fix closing bracket
bpmct Aug 10, 2022
2c67a57
GB -> GiB
bpmct Aug 10, 2022
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
20 changes: 18 additions & 2 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.4.3"
version = "0.4.5"
}
}
}
Expand Down Expand Up @@ -146,7 +146,7 @@ EOT
resource "aws_instance" "dev" {
ami = data.aws_ami.ubuntu.id
availability_zone = "${var.region}a"
instance_type = "${var.instance_type}"
instance_type = var.instance_type

user_data = data.coder_workspace.me.transition == "start" ? local.user_data_start : local.user_data_end
tags = {
Expand All @@ -155,3 +155,19 @@ resource "aws_instance" "dev" {
Coder_Provisioned = "true"
}
}

resource "coder_metadata" "workspace_info" {
resource_id = aws_instance.dev.id
item {
key = "region"
value = var.region
}
item {
key = "instance type"
value = aws_instance.dev.instance_type
}
item {
key = "disk"
value = "${aws_instance.dev.root_block_device[0].volume_size} GiB"
}
}
20 changes: 18 additions & 2 deletions examples/templates/aws-windows/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.4.3"
version = "0.4.5"
}
}
}
Expand Down Expand Up @@ -99,7 +99,7 @@ EOT
resource "aws_instance" "dev" {
ami = data.aws_ami.windows.id
availability_zone = "${var.region}a"
instance_type = "${var.instance_type}"
instance_type = var.instance_type
count = 1

user_data = data.coder_workspace.me.transition == "start" ? local.user_data_start : local.user_data_end
Expand All @@ -110,3 +110,19 @@ resource "aws_instance" "dev" {
}

}

resource "coder_metadata" "workspace_info" {
resource_id = aws_instance.dev.id
item {
key = "region"
value = var.region
}
item {
key = "instance type"
value = aws_instance.dev.instance_type
}
item {
key = "disk"
value = "${aws_instance.dev.root_block_device[0].volume_size} GiB"
}
}
29 changes: 24 additions & 5 deletions examples/templates/azure-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.4.3"
version = "0.4.5"
}
azurerm = {
source = "hashicorp/azurerm"
Expand Down Expand Up @@ -89,9 +89,9 @@ locals {
prefix = "coder-${data.coder_workspace.me.owner}-${data.coder_workspace.me.name}"

userdata = templatefile("cloud-config.yaml.tftpl", {
username = lower(substr(data.coder_workspace.me.owner, 0, 32))
init_script = base64encode(coder_agent.main.init_script)
hostname = lower(data.coder_workspace.me.name)
username = lower(substr(data.coder_workspace.me.owner, 0, 32))
init_script = base64encode(coder_agent.main.init_script)
hostname = lower(data.coder_workspace.me.name)
})
}

Expand Down Expand Up @@ -173,7 +173,7 @@ resource "azurerm_linux_virtual_machine" "main" {
name = "vm"
resource_group_name = azurerm_resource_group.main.name
location = azurerm_resource_group.main.location
size = var.instance_type
size = var.instance_type
// cloud-init overwrites this, so the value here doesn't matter
admin_username = "adminuser"
admin_ssh_key {
Expand Down Expand Up @@ -209,3 +209,22 @@ resource "azurerm_virtual_machine_data_disk_attachment" "home" {
lun = "10"
caching = "ReadWrite"
}

resource "coder_metadata" "workspace_info" {
count = data.coder_workspace.me.start_count
resource_id = azurerm_linux_virtual_machine.main[0].id

item {
key = "type"
value = azurerm_linux_virtual_machine.main[0].size
}
}

resource "coder_metadata" "home_info" {
resource_id = azurerm_managed_disk.home.id

item {
key = "size"
value = "${var.home_size} GiB"
}
}
26 changes: 25 additions & 1 deletion examples/templates/do-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.4.3"
version = "0.4.5"
}
digitalocean = {
source = "digitalocean/digitalocean"
Expand Down Expand Up @@ -133,3 +133,27 @@ resource "digitalocean_project_resources" "project" {
digitalocean_volume.home_volume.urn
]
}

resource "coder_metadata" "workspace-info" {
count = data.coder_workspace.me.start_count
resource_id = digitalocean_droplet.workspace[0].id

item {
key = "region"
value = digitalocean_droplet.workspace[0].region
}
item {
key = "image"
value = digitalocean_droplet.workspace[0].image
}
}

resource "coder_metadata" "volume-info" {
resource_id = digitalocean_volume.home_volume.id

item {
key = "size"
value = "${digitalocean_volume.home_volume.size} GiB"
}

}
8 changes: 4 additions & 4 deletions examples/templates/docker-code-server/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.4.3"
version = "0.4.5"
}
docker = {
source = "kreuzwerker/docker"
Expand Down Expand Up @@ -45,9 +45,9 @@ resource "coder_agent" "main" {
# You can remove this block if you'd prefer to configure Git manually or using
# dotfiles. (see docs/dotfiles.md)
env = {
GIT_AUTHOR_NAME = "${data.coder_workspace.me.owner}"
GIT_COMMITTER_NAME = "${data.coder_workspace.me.owner}"
GIT_AUTHOR_EMAIL = "${data.coder_workspace.me.owner_email}"
GIT_AUTHOR_NAME = "${data.coder_workspace.me.owner}"
GIT_COMMITTER_NAME = "${data.coder_workspace.me.owner}"
GIT_AUTHOR_EMAIL = "${data.coder_workspace.me.owner_email}"
GIT_COMMITTER_EMAIL = "${data.coder_workspace.me.owner_email}"
}
}
Expand Down
12 changes: 11 additions & 1 deletion examples/templates/docker-image-builds/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ terraform {
required_providers {
coder = {
source = "coder/coder"
version = "0.4.3"
version = "0.4.5"
}
docker = {
source = "kreuzwerker/docker"
Expand Down Expand Up @@ -120,3 +120,13 @@ resource "docker_container" "workspace" {
read_only = false
}
}

resource "coder_metadata" "container_info" {
count = data.coder_workspace.me.start_count
resource_id = docker_container.workspace[0].id

item {
key = "image"
value = var.docker_image
}
}
12 changes: 11 additions & 1 deletion examples/templates/docker-with-dotfiles/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ terraform {
required_providers {
coder = {
source = "coder/coder"
version = "0.4.3"
version = "0.4.5"
}
docker = {
source = "kreuzwerker/docker"
Expand Down Expand Up @@ -66,3 +66,13 @@ resource "docker_container" "workspace" {
read_only = false
}
}

resource "coder_metadata" "container_info" {
count = data.coder_workspace.me.start_count
resource_id = docker_container.workspace[0].id

item {
key = "image"
value = var.docker_image
}
}
18 changes: 14 additions & 4 deletions examples/templates/docker/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.4.3"
version = "0.4.5"
}
docker = {
source = "kreuzwerker/docker"
Expand Down Expand Up @@ -80,9 +80,9 @@ resource "coder_agent" "main" {
# You can remove this block if you'd prefer to configure Git manually or using
# dotfiles. (see docs/dotfiles.md)
env = {
GIT_AUTHOR_NAME = "${data.coder_workspace.me.owner}"
GIT_COMMITTER_NAME = "${data.coder_workspace.me.owner}"
GIT_AUTHOR_EMAIL = "${data.coder_workspace.me.owner_email}"
GIT_AUTHOR_NAME = "${data.coder_workspace.me.owner}"
GIT_COMMITTER_NAME = "${data.coder_workspace.me.owner}"
GIT_AUTHOR_EMAIL = "${data.coder_workspace.me.owner_email}"
GIT_COMMITTER_EMAIL = "${data.coder_workspace.me.owner_email}"
}
}
Expand Down Expand Up @@ -138,3 +138,13 @@ resource "docker_container" "workspace" {
read_only = false
}
}

resource "coder_metadata" "container_info" {
count = data.coder_workspace.me.start_count
resource_id = docker_container.workspace[0].id

item {
key = "image"
value = var.docker_image
}
}
21 changes: 20 additions & 1 deletion examples/templates/gcp-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.4.3"
version = "0.4.5"
}
google = {
source = "hashicorp/google"
Expand Down Expand Up @@ -91,3 +91,22 @@ locals {
# Ensure Coder username is a valid Linux username
linux_user = lower(substr(data.coder_workspace.me.owner, 0, 32))
}

resource "coder_metadata" "workspace_info" {
count = data.coder_workspace.me.start_count
resource_id = google_compute_instance.dev[0].id

item {
key = "type"
value = google_compute_instance.dev[0].machine_type
}
}

resource "coder_metadata" "home_info" {
resource_id = google_compute_disk.root.id

item {
key = "size"
value = "${google_compute_disk.root.size} GiB"
}
}
12 changes: 11 additions & 1 deletion examples/templates/gcp-vm-container/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.4.3"
version = "0.4.5"
}
google = {
source = "hashicorp/google"
Expand Down Expand Up @@ -88,3 +88,13 @@ resource "coder_agent_instance" "dev" {
agent_id = coder_agent.main.id
instance_id = google_compute_instance.dev[0].instance_id
}

resource "coder_metadata" "workspace_info" {
count = data.coder_workspace.me.start_count
resource_id = google_compute_instance.dev[0].id

item {
key = "image"
value = module.gce-container.container.image
}
}
20 changes: 19 additions & 1 deletion examples/templates/gcp-windows/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.4.3"
version = "0.4.5"
}
google = {
source = "hashicorp/google"
Expand Down Expand Up @@ -75,3 +75,21 @@ resource "google_compute_instance" "dev" {
serial-port-enable = "TRUE"
}
}
resource "coder_metadata" "workspace_info" {
count = data.coder_workspace.me.start_count
resource_id = google_compute_instance.dev[0].id

item {
key = "type"
value = google_compute_instance.dev[0].machine_type
}
}

resource "coder_metadata" "home_info" {
resource_id = google_compute_disk.root.id

item {
key = "size"
value = "${google_compute_disk.root.size} GiB"
}
}