From 7c39726fa34cd059db5e62a73e70884914b6a957 Mon Sep 17 00:00:00 2001 From: Steven Masley Date: Thu, 29 May 2025 12:06:31 -0500 Subject: [PATCH 1/5] chore: dogfood template to choose region based on user group --- dogfood/coder/main.tf | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/dogfood/coder/main.tf b/dogfood/coder/main.tf index bf23dfa96b2f8..4ab85ca32846e 100644 --- a/dogfood/coder/main.tf +++ b/dogfood/coder/main.tf @@ -130,11 +130,33 @@ data "coder_parameter" "image_type" { } } +locals { + default_regions = { + "North America": "us-pittsburgh" + "Europe": "eu-helsinki" + "Australia": "ap-sydney" + "South America": "sa-saopaulo" + "Africa": "za-cpt" + } + + user_groups = data.coder_workspace_owner.me.groups + user_region = try( + local.default_regions[ + one([ + for g in local.user_groups : g + if contains(keys(local.default_regions), g) + ]) + ], + "us-pittsburgh" # fallback value if no group matches + ) +} + + data "coder_parameter" "region" { type = "string" name = "Region" icon = "/emojis/1f30e.png" - default = "us-pittsburgh" + default = local.user_region option { icon = "/emojis/1f1fa-1f1f8.png" name = "Pittsburgh" From fa38ef453903ef3e400290339a5be0b5328cdd8e Mon Sep 17 00:00:00 2001 From: Steven Masley Date: Thu, 29 May 2025 12:08:26 -0500 Subject: [PATCH 2/5] lowercase group names --- dogfood/coder/main.tf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dogfood/coder/main.tf b/dogfood/coder/main.tf index 4ab85ca32846e..1fe7a9502890c 100644 --- a/dogfood/coder/main.tf +++ b/dogfood/coder/main.tf @@ -132,11 +132,11 @@ data "coder_parameter" "image_type" { locals { default_regions = { - "North America": "us-pittsburgh" - "Europe": "eu-helsinki" - "Australia": "ap-sydney" - "South America": "sa-saopaulo" - "Africa": "za-cpt" + "north-america": "us-pittsburgh" + "europe": "eu-helsinki" + "australia": "ap-sydney" + "south-america": "sa-saopaulo" + "africa": "za-cpt" } user_groups = data.coder_workspace_owner.me.groups From 4b174db4edf277a1dea59d1ca7bc4976a80386e1 Mon Sep 17 00:00:00 2001 From: Steven Masley Date: Thu, 29 May 2025 13:27:45 -0500 Subject: [PATCH 3/5] Update dogfood/coder/main.tf Co-authored-by: Atif Ali --- dogfood/coder/main.tf | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/dogfood/coder/main.tf b/dogfood/coder/main.tf index 1fe7a9502890c..32af66af78e57 100644 --- a/dogfood/coder/main.tf +++ b/dogfood/coder/main.tf @@ -140,15 +140,10 @@ locals { } user_groups = data.coder_workspace_owner.me.groups - user_region = try( - local.default_regions[ - one([ - for g in local.user_groups : g - if contains(keys(local.default_regions), g) - ]) - ], - "us-pittsburgh" # fallback value if no group matches - ) + user_region = coalescelist([ + for g in local.user_groups : + local.default_regions[g] if contains(keys(local.default_regions), g) + ], ["us-pittsburgh"])[0] } From a8522457580ce7b1fa447d80f20d3b44e914985e Mon Sep 17 00:00:00 2001 From: Steven Masley Date: Thu, 29 May 2025 14:27:20 -0500 Subject: [PATCH 4/5] fmt --- dogfood/coder/main.tf | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dogfood/coder/main.tf b/dogfood/coder/main.tf index 32af66af78e57..c39c9a2540ff3 100644 --- a/dogfood/coder/main.tf +++ b/dogfood/coder/main.tf @@ -132,17 +132,17 @@ data "coder_parameter" "image_type" { locals { default_regions = { - "north-america": "us-pittsburgh" - "europe": "eu-helsinki" - "australia": "ap-sydney" - "south-america": "sa-saopaulo" - "africa": "za-cpt" + "north-america" : "us-pittsburgh" + "europe" : "eu-helsinki" + "australia" : "ap-sydney" + "south-america" : "sa-saopaulo" + "africa" : "za-cpt" } user_groups = data.coder_workspace_owner.me.groups user_region = coalescelist([ - for g in local.user_groups : - local.default_regions[g] if contains(keys(local.default_regions), g) + for g in local.user_groups : + local.default_regions[g] if contains(keys(local.default_regions), g) ], ["us-pittsburgh"])[0] } From 7e318bce64a0936275200839a195505706365bb4 Mon Sep 17 00:00:00 2001 From: Steven Masley Date: Thu, 29 May 2025 14:30:35 -0500 Subject: [PATCH 5/5] add comment --- dogfood/coder/main.tf | 1 + 1 file changed, 1 insertion(+) diff --git a/dogfood/coder/main.tf b/dogfood/coder/main.tf index c39c9a2540ff3..2c200e82c63da 100644 --- a/dogfood/coder/main.tf +++ b/dogfood/coder/main.tf @@ -132,6 +132,7 @@ data "coder_parameter" "image_type" { locals { default_regions = { + // keys should match group names "north-america" : "us-pittsburgh" "europe" : "eu-helsinki" "australia" : "ap-sydney"