From 6a83fe8793b6d1c377a4808c3fdecc3c02bd15ed Mon Sep 17 00:00:00 2001 From: Stephen Kirby Date: Tue, 26 Sep 2023 20:22:34 +0000 Subject: [PATCH] udpated default to null, improved default logic, renamed test --- fly-region/main.test.ts | 4 ++-- fly-region/main.tf | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fly-region/main.test.ts b/fly-region/main.test.ts index 26af776..86f6bfc 100644 --- a/fly-region/main.test.ts +++ b/fly-region/main.test.ts @@ -6,14 +6,14 @@ import { testRequiredVariables, } from "../test"; -describe("azure-region", async () => { +describe("fly-region", async () => { await runTerraformInit(import.meta.dir); testRequiredVariables(import.meta.dir, {}); it("default output", async () => { const state = await runTerraformApply(import.meta.dir, {}); - expect(state.outputs.value.value).toBe("ams"); + expect(state.outputs.value.value).toBe(""); }); it("customized default", async () => { diff --git a/fly-region/main.tf b/fly-region/main.tf index 7c4a077..0267be7 100644 --- a/fly-region/main.tf +++ b/fly-region/main.tf @@ -270,7 +270,7 @@ data "coder_parameter" "fly_region" { name = "flyio_region" display_name = var.display_name description = var.description - default = (var.default != null && var.default != "") && (contains(var.regions, var.default) || length(var.regions) == 0) ? var.default : null + default = (var.default != null && var.default != "") && ((var.default != null ? contains(var.regions, var.default) : false) || length(var.regions) == 0) ? var.default : null mutable = var.mutable dynamic "option" { for_each = { for k, v in local.regions : k => v if anytrue([for d in var.regions : k == d ]) || length(var.regions) == 0 }