fix: agentapi: fix subpath version off-by-one error

Author: johnstcn

registry/coder/modules/agentapi/main.test.ts

@@ -174,28 +174,28 @@ describe("agentapi", async () => {
     const cases = [
       {
         moduleVariables: {
-          agentapi_version: "v0.3.2",
+          agentapi_version: "v0.3.1",
           agentapi_subdomain: "false",
         },
         shouldThrow: "",
       },
       {
         moduleVariables: {
-          agentapi_version: "v0.3.2",
+          agentapi_version: "v0.3.1",
           agentapi_subdomain: "true",
         },
         shouldThrow: "",
       },
       {
         moduleVariables: {
-          agentapi_version: "v0.3.1",
+          agentapi_version: "v0.3.0",
           agentapi_subdomain: "false",
         },
-        shouldThrow: "Running with subdomain = false is only supported by agentapi >= v0.3.2.",
+        shouldThrow: "Running with subdomain = false is only supported by agentapi >= v0.3.1.",
       },
       {
         moduleVariables: {
-          agentapi_version: "v0.3.1",
+          agentapi_version: "v0.3.0",
           agentapi_subdomain: "true",
         },
         shouldThrow: "",

registry/coder/modules/agentapi/main.tf

@@ -117,7 +117,7 @@ variable "install_agentapi" {
 variable "agentapi_version" {
   type        = string
   description = "The version of AgentAPI to install."
-  default     = "v0.3.2"
+  default     = "v0.3.1"
 }
 
 variable "agentapi_port" {
@@ -127,8 +127,8 @@ variable "agentapi_port" {
 }
 
 locals {
-  # agentapi_subdomain_false_min_version_expr matches a semantic version >= v0.3.2.
-  agentapi_subdomain_false_min_version_expr = "^v(0\\.(3\\.[2-9]+|[4-9]+\\.\\d+)|[1-9]\\d*\\.\\d+\\.\\d+)$"
+  # agentapi_subdomain_false_min_version_expr matches a semantic version >= v0.3.1.
+  agentapi_subdomain_false_min_version_expr = "^v(0\\.(3\\.[1-9]+|[4-9]+\\.\\d+)|[1-9]\\d*\\.\\d+\\.\\d+)$"
 }
 
 variable "agentapi_subdomain" {
@@ -138,10 +138,12 @@ variable "agentapi_subdomain" {
   validation {
     condition = var.agentapi_subdomain || (
       # If version doesn't look like a valid semantic version, just allow it.
-      !can(regex("^v\\d+\\.\\d+\\.\\d+$", var.agentapi_version))
-      || can(regex(local.agentapi_subdomain_false_min_version_expr, var.agentapi_version))
+      # Note that boolean operators do not short-circuit in Terraform.
+      can(regex("^v\\d+\\.\\d+\\.\\d+$", var.agentapi_version)) ?
+      can(regex(local.agentapi_subdomain_false_min_version_expr, var.agentapi_version)) :
+      true
     )
-    error_message = "Running with subdomain = false is only supported by agentapi >= v0.3.2."
+    error_message = "Running with subdomain = false is only supported by agentapi >= v0.3.1."
   }
 }
 
@@ -161,7 +163,7 @@ locals {
   agentapi_wait_for_start_script_b64 = base64encode(file("${path.module}/scripts/agentapi-wait-for-start.sh"))
   // Chat base path is only set if not using a subdomain.
   // NOTE:
-  //   - This requires agentapi version >= v0.3.2.
+  //   - This requires agentapi version >= v0.3.1.
   //   - As CODER_WORKSPACE_AGENT_NAME is a recent addition we use agent ID
   //     for backward compatibility.
   agentapi_chat_base_path = var.agentapi_subdomain ? "" : "/@${data.coder_workspace_owner.me.name}/${data.coder_workspace.me.name}.${var.agent_id}/apps/${var.web_app_slug}/chat"