From 8122e3a3fb91dd3ec5cdf0b70c88071e058b2b05 Mon Sep 17 00:00:00 2001
From: Muhammad Atif Ali <me@matifali.dev>
Date: Tue, 22 Oct 2024 11:58:54 +0500
Subject: [PATCH] Update server_base_path format logic in modules

This change addresses the improvement of readability and consistency by simplifying the `server_base_path` construction logic, thereby enhancing maintainability across the respective Terraform modules.
---
 filebrowser/main.tf      | 2 +-
 jupyter-notebook/main.tf | 2 +-
 jupyterlab/main.tf       | 2 +-
 vscode-desktop/main.tf   | 2 +-
 vscode-web/main.tf       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/filebrowser/main.tf b/filebrowser/main.tf
index bbaee6b..703dbbd 100644
--- a/filebrowser/main.tf
+++ b/filebrowser/main.tf
@@ -117,7 +117,7 @@ resource "coder_app" "filebrowser" {
 }
 
 locals {
-  server_base_path = var.subdomain ? "" : format(var.agent_name != null ? "/@%s/%s.%s/apps/%s" : "/@%s/%s/apps/%s", data.coder_workspace_owner.me.name, data.coder_workspace.me.name, var.agent_name, var.slug)
+  server_base_path = var.subdomain ? "" : format("/@%s/%s%s/apps/%s", data.coder_workspace_owner.me.name, data.coder_workspace.me.name, var.agent_name != null ? ".${var.agent_name}" : "", var.slug)
   url              = "http://localhost:${var.port}${local.server_base_path}"
   healthcheck_url  = "http://localhost:${var.port}${local.server_base_path}/health"
 }
diff --git a/jupyter-notebook/main.tf b/jupyter-notebook/main.tf
index 05db5a8..160c816 100644
--- a/jupyter-notebook/main.tf
+++ b/jupyter-notebook/main.tf
@@ -95,7 +95,7 @@ data "coder_workspace_owner" "me" {}
 data "coder_workspace" "me" {}
 
 locals {
-  server_base_path = var.subdomain ? "" : format(var.agent_name != null ? "/@%s/%s.%s/apps/%s" : "/@%s/%s/apps/%s", data.coder_workspace_owner.me.name, data.coder_workspace.me.name, var.agent_name, var.slug)
+  server_base_path = var.subdomain ? "" : format("/@%s/%s%s/apps/%s", data.coder_workspace_owner.me.name, data.coder_workspace.me.name, var.agent_name != null ? ".${var.agent_name}" : "", var.slug)
   url              = "http://localhost:${var.port}${local.server_base_path}"
   healthcheck_url  = "http://localhost:${var.port}${local.server_base_path}/api"
 }
diff --git a/jupyterlab/main.tf b/jupyterlab/main.tf
index 7a9943c..d8e1a72 100644
--- a/jupyterlab/main.tf
+++ b/jupyterlab/main.tf
@@ -90,7 +90,7 @@ resource "coder_app" "jupyterlab" {
 }
 
 locals {
-  server_base_path = var.subdomain ? "" : format(var.agent_name != null ? "/@%s/%s.%s/apps/%s" : "/@%s/%s/apps/%s", data.coder_workspace_owner.me.name, data.coder_workspace.me.name, var.agent_name, var.slug)
+  server_base_path = var.subdomain ? "" : format("/@%s/%s%s/apps/%s", data.coder_workspace_owner.me.name, data.coder_workspace.me.name, var.agent_name != null ? ".${var.agent_name}" : "", var.slug)
   url              = "http://localhost:${var.port}${local.server_base_path}"
   healthcheck_url  = "http://localhost:${var.port}${local.server_base_path}/api"
 }
\ No newline at end of file
diff --git a/vscode-desktop/main.tf b/vscode-desktop/main.tf
index 2575645..03cc671 100644
--- a/vscode-desktop/main.tf
+++ b/vscode-desktop/main.tf
@@ -52,7 +52,7 @@ resource "coder_app" "vscode" {
     "vscode://coder.coder-remote/open?owner=%s&workspace=%s%s%s&url=%s&token=$SESSION_TOKEN",
     data.coder_workspace_owner.me.name,
     data.coder_workspace.me.name,
-    var.folder != "" ? format("&folder=%s", var.folder) : "",
+    var.folder != "" ? "&folder=${var.folder}" : "",
     var.open_recent ? "&openRecent" : "",
     data.coder_workspace.me.access_url
   )
diff --git a/vscode-web/main.tf b/vscode-web/main.tf
index 16c7cc8..a454259 100644
--- a/vscode-web/main.tf
+++ b/vscode-web/main.tf
@@ -191,7 +191,7 @@ resource "coder_app" "vscode-web" {
 }
 
 locals {
-  server_base_path = var.subdomain ? "" : format(var.agent_name != null ? "/@%s/%s.%s/apps/%s" : "/@%s/%s/apps/%s", data.coder_workspace_owner.me.name, data.coder_workspace.me.name, var.agent_name, var.slug)
+  server_base_path = var.subdomain ? "" : format("/@%s/%s%s/apps/%s", data.coder_workspace_owner.me.name, data.coder_workspace.me.name, var.agent_name != null ? ".${var.agent_name}" : "", var.slug)
   url              = var.folder == "" ? "http://localhost:${var.port}${local.server_base_path}" : "http://localhost:${var.port}${local.server_base_path}?folder=${var.folder}"
   healthcheck_url  = "http://localhost:${var.port}${local.server_base_path}/healthz"
 }