From e126fdbec4692d0e3aa17b8a3adcd3021b65297d Mon Sep 17 00:00:00 2001 From: Stephen Kirby Date: Mon, 2 Oct 2023 21:03:16 +0000 Subject: [PATCH] allowed null default --- jetbrains-gateway/main.test.ts | 18 ++++++++++++++++++ jetbrains-gateway/main.tf | 6 +++--- 2 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 jetbrains-gateway/main.test.ts diff --git a/jetbrains-gateway/main.test.ts b/jetbrains-gateway/main.test.ts new file mode 100644 index 0000000..6ddd89e --- /dev/null +++ b/jetbrains-gateway/main.test.ts @@ -0,0 +1,18 @@ +import { describe, expect, it } from "bun:test"; +import { + executeScriptInContainer, + runTerraformApply, + runTerraformInit, + testRequiredVariables, +} from "../test"; + +describe("jetbrains-gateway`", async () => { + await runTerraformInit(import.meta.dir); + + await testRequiredVariables(import.meta.dir, { + agent_id: "foo", + agent_name: "bar", + project_directory: "/baz/", + jetbrains_ides: "[\"IU\", \"IC\", \"PY\"]", + }); +}); diff --git a/jetbrains-gateway/main.tf b/jetbrains-gateway/main.tf index 6d01326..4dd7309 100644 --- a/jetbrains-gateway/main.tf +++ b/jetbrains-gateway/main.tf @@ -25,7 +25,7 @@ variable "project_directory" { } variable "default" { - default = null + default = "" type = string description = "Default IDE" } @@ -120,7 +120,7 @@ data "coder_parameter" "jetbrains_ide" { icon = "/icon/gateway.svg" mutable = true # check if default is in the jet_brains_ides list and if it is not empty or null otherwise set it to null - default = var.default != null && var.default != "" && contains(var.jetbrains_ides, var.default) ? local.jetbrains_ides[var.default].value : null + default = var.default != null && var.default != "" && contains(var.jetbrains_ides, var.default) ? local.jetbrains_ides[var.default].value : local.jetbrains_ides[var.jetbrains_ides[0]].value dynamic "option" { for_each = { for key, value in local.jetbrains_ides : key => value if contains(var.jetbrains_ides, key) } @@ -156,7 +156,7 @@ resource "coder_app" "gateway" { "&ide_build_number=", jsondecode(data.coder_parameter.jetbrains_ide.value)[1], "&ide_download_link=", - jsondecode(data.coder_parameter.jetbrains_ide.value)[2] + jsondecode(data.coder_parameter.jetbrains_ide.value)[2], ]) }