From e41a3832c3ecfbcd02b068f5ceec85f737112cc4 Mon Sep 17 00:00:00 2001 From: Ammar Bandukwala Date: Tue, 9 Aug 2022 22:41:12 +0000 Subject: [PATCH 1/4] Add resource metadata to dogfood image --- dogfood/main.tf | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/dogfood/main.tf b/dogfood/main.tf index df07b7f119fe0..613fd68f464d7 100644 --- a/dogfood/main.tf +++ b/dogfood/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { coder = { source = "coder/coder" - version = "0.4.2" + version = "0.4.5" } docker = { source = "kreuzwerker/docker" @@ -49,6 +49,9 @@ resource "docker_volume" "home_volume" { name = "coder-${data.coder_workspace.me.owner}-${data.coder_workspace.me.name}-home" } + + + resource "docker_container" "workspace" { count = data.coder_workspace.me.start_count image = "docker.io/codercom/oss-dogfood:main" @@ -79,3 +82,24 @@ 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 = docker_container.workspace[0].image + } + item { + key = "memory" + value = docker_container.workspace[0].memory + } + item { + key = "runtime" + value = docker_container.workspace[0].runtime + } + item { + key = "🤫🤫🤫" + value = "❤️❤️❤️" + } +} From a28ae01d624a9add6179ef8cd490f458cb19dd5a Mon Sep 17 00:00:00 2001 From: Ammar Bandukwala Date: Tue, 9 Aug 2022 22:42:10 +0000 Subject: [PATCH 2/4] Remove broken item --- dogfood/main.tf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dogfood/main.tf b/dogfood/main.tf index 613fd68f464d7..3ed1600a65ea3 100644 --- a/dogfood/main.tf +++ b/dogfood/main.tf @@ -86,10 +86,6 @@ resource "docker_container" "workspace" { resource "coder_metadata" "container_info" { count = data.coder_workspace.me.start_count resource_id = docker_container.workspace[0].id - item { - key = "image" - value = docker_container.workspace[0].image - } item { key = "memory" value = docker_container.workspace[0].memory From 670bca1df4afd17885eddd97dfbf35974315d1be Mon Sep 17 00:00:00 2001 From: Ammar Bandukwala Date: Tue, 9 Aug 2022 22:42:51 +0000 Subject: [PATCH 3/4] fixup! Remove broken item --- dogfood/main.tf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dogfood/main.tf b/dogfood/main.tf index 3ed1600a65ea3..4ce1cad533174 100644 --- a/dogfood/main.tf +++ b/dogfood/main.tf @@ -95,7 +95,8 @@ resource "coder_metadata" "container_info" { value = docker_container.workspace[0].runtime } item { - key = "🤫🤫🤫" + key = "🤫🤫🤫

" value = "❤️❤️❤️" + sensitive = true } } From 0f0999e409c9a94c0860f5e0a62a5ad31730df63 Mon Sep 17 00:00:00 2001 From: Ammar Bandukwala Date: Tue, 9 Aug 2022 23:24:52 +0000 Subject: [PATCH 4/4] fixup! Remove broken item --- dogfood/main.tf | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dogfood/main.tf b/dogfood/main.tf index 4ce1cad533174..15594e0ab55c3 100644 --- a/dogfood/main.tf +++ b/dogfood/main.tf @@ -49,6 +49,15 @@ resource "docker_volume" "home_volume" { name = "coder-${data.coder_workspace.me.owner}-${data.coder_workspace.me.name}-home" } +resource "coder_metadata" "home_info" { + resource_id = docker_volume.home_volume.id + item { + key = "🤫🤫🤫

" + value = "❤️❤️❤️" + sensitive = true + } +} + @@ -94,9 +103,4 @@ resource "coder_metadata" "container_info" { key = "runtime" value = docker_container.workspace[0].runtime } - item { - key = "🤫🤫🤫

" - value = "❤️❤️❤️" - sensitive = true - } }