diff --git a/git-commit-signing/README.md b/git-commit-signing/README.md index ada6110..47bc324 100644 --- a/git-commit-signing/README.md +++ b/git-commit-signing/README.md @@ -19,7 +19,7 @@ This module has a chance of conflicting with the user's dotfiles / the personali ```tf module "git-commit-signing" { source = "registry.coder.com/modules/git-commit-signing/coder" - version = "1.0.3" + version = "1.0.9" agent_id = coder_agent.example.id } ``` diff --git a/git-commit-signing/run.sh b/git-commit-signing/run.sh index 6f1941f..c0e0faa 100755 --- a/git-commit-signing/run.sh +++ b/git-commit-signing/run.sh @@ -21,7 +21,8 @@ echo "Downloading SSH key" ssh_key=$(curl --request GET \ --url "${CODER_AGENT_URL}api/v2/workspaceagents/me/gitsshkey" \ - --header "Coder-Session-Token: ${CODER_AGENT_TOKEN}") + --header "Coder-Session-Token: ${CODER_AGENT_TOKEN}" \ + --silent --show-error) jq --raw-output ".public_key" > ~/.ssh/git-commit-signing/coder.pub << EOF $ssh_key diff --git a/jetbrains-gateway/README.md b/jetbrains-gateway/README.md index f4eab32..1717de7 100644 --- a/jetbrains-gateway/README.md +++ b/jetbrains-gateway/README.md @@ -14,11 +14,11 @@ This module adds a JetBrains Gateway Button to open any workspace with a single ```tf module "jetbrains_gateway" { source = "registry.coder.com/modules/jetbrains-gateway/coder" - version = "1.0.8" + version = "1.0.9" agent_id = coder_agent.example.id agent_name = "example" folder = "/home/coder/example" - jetbrains_ides = ["GO", "WS", "IU", "PY", "PS", "CL", "RM"] + jetbrains_ides = ["GO", "WS", "IU", "PY", "PS", "CL", "RM", "RD"] default = "PY" } ``` @@ -32,7 +32,7 @@ module "jetbrains_gateway" { ```tf module "jetbrains_gateway" { source = "registry.coder.com/modules/jetbrains-gateway/coder" - version = "1.0.8" + version = "1.0.9" agent_id = coder_agent.example.id agent_name = "example" folder = "/home/coder/example" @@ -52,3 +52,4 @@ This module and JetBrains Gateway support the following JetBrains IDEs: - PhpStorm (`PS`) - CLion (`CL`) - RubyMine (`RM`) +- Rider (`RD`) diff --git a/jetbrains-gateway/main.tf b/jetbrains-gateway/main.tf index 09f91ab..378b58f 100644 --- a/jetbrains-gateway/main.tf +++ b/jetbrains-gateway/main.tf @@ -48,55 +48,59 @@ variable "jetbrains_ide_versions" { description = "The set of versions for each jetbrains IDE" default = { "IU" = { - build_number = "232.10203.10" - version = "2023.2.4" + build_number = "233.14808.21" + version = "2023.3.5" } "PS" = { - build_number = "232.10072.32" - version = "2023.2.3" + build_number = "233.14808.18" + version = "2023.3.5" } "WS" = { - build_number = "232.10203.14" - version = "2023.2.4" + build_number = "233.14475.40" + version = "2023.3.4" } "PY" = { - build_number = "232.10203.26" - version = "2023.2.4" + build_number = "233.14475.56" + version = "2023.3.4" } "CL" = { - build_number = "232.9921.42" - version = "2023.2.2" + build_number = "233.14475.31" + version = "2023.3.4" } "GO" = { - build_number = "232.10203.20" - version = "2023.2.4" + build_number = "233.14808.20" + version = "2023.3.5" } "RM" = { - build_number = "232.10203.15" - version = "2023.2.4" + build_number = "233.14808.14" + version = "2023.3.5" + } + "RD" = { + build_number = "233.14475.66" + version = "2023.3.4" } } validation { condition = ( alltrue([ - for code in keys(var.jetbrains_ide_versions) : contains(["IU", "PS", "WS", "PY", "CL", "GO", "RM"], code) + for code in keys(var.jetbrains_ide_versions) : contains(["IU", "PS", "WS", "PY", "CL", "GO", "RM", "RD"], code) ]) ) - error_message = "The jetbrains_ide_versions must contain a map of valid product codes. Valid product codes are ${join(",", ["IU", "PS", "WS", "PY", "CL", "GO", "RM"])}." + error_message = "The jetbrains_ide_versions must contain a map of valid product codes. Valid product codes are ${join(",", ["IU", "PS", "WS", "PY", "CL", "GO", "RM", "RD"])}." } } variable "jetbrains_ides" { type = list(string) description = "The list of IDE product codes." - default = ["IU", "PS", "WS", "PY", "CL", "GO", "RM"] + default = ["IU", "PS", "WS", "PY", "CL", "GO", "RM", "RD"] validation { condition = ( alltrue([ - for code in var.jetbrains_ides : contains(["IU", "PS", "WS", "PY", "CL", "GO", "RM"], code) + for code in var.jetbrains_ides : contains(["IU", "PS", "WS", "PY", "CL", "GO", "RM", "RD"], code) ]) ) - error_message = "The jetbrains_ides must be a list of valid product codes. Valid product codes are ${join(",", ["IU", "PS", "WS", "PY", "CL", "GO", "RM"])}." + error_message = "The jetbrains_ides must be a list of valid product codes. Valid product codes are ${join(",", ["IU", "PS", "WS", "PY", "CL", "GO", "RM", "RD"])}." } # check if the list is empty validation { @@ -161,6 +165,13 @@ locals { build_number = var.jetbrains_ide_versions["RM"].build_number, download_link = "https://download.jetbrains.com/ruby/RubyMine-${var.jetbrains_ide_versions["RM"].version}.tar.gz" } + "RD" = { + icon = "/icon/rider.svg", + name = "Rider", + identifier = "RD", + build_number = var.jetbrains_ide_versions["RD"].build_number, + download_link = "https://download.jetbrains.com/rider/JetBrains.Rider-${var.jetbrains_ide_versions["RD"].version}.tar.gz" + } } }