From 06d2573aefac38c1a3a58283db87307ef63c1b22 Mon Sep 17 00:00:00 2001
From: Steven Masley <stevenmasley@gmail.com>
Date: Thu, 29 Aug 2024 12:31:45 -0500
Subject: [PATCH 01/17] chore: add subdomain option to terraform module

---
 vscode-web/main.tf | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/vscode-web/main.tf b/vscode-web/main.tf
index 084f8306..26cde98f 100644
--- a/vscode-web/main.tf
+++ b/vscode-web/main.tf
@@ -121,6 +121,15 @@ variable "auto_install_extensions" {
   default     = false
 }
 
+variable "subdomain" {
+  type        = bool
+  description = <<-EOT
+    Determines whether the app will be accessed via it's own subdomain or whether it will be accessed via a path on Coder.
+    If wildcards have not been setup by the administrator then apps with "subdomain" set to true will not be accessible.
+  EOT
+  default     = true
+}
+
 resource "coder_script" "vscode-web" {
   agent_id     = var.agent_id
   display_name = "VS Code Web"
@@ -160,7 +169,7 @@ resource "coder_app" "vscode-web" {
   display_name = var.display_name
   url          = var.folder == "" ? "http://localhost:${var.port}" : "http://localhost:${var.port}?folder=${var.folder}"
   icon         = "/icon/code.svg"
-  subdomain    = true
+  subdomain    = var.subdomain
   share        = var.share
   order        = var.order
 

From 27ea0b1e818eee03b52f154e23f0d8e41f89ac03 Mon Sep 17 00:00:00 2001
From: Steven Masley <stevenmasley@gmail.com>
Date: Thu, 29 Aug 2024 14:30:54 -0500
Subject: [PATCH 02/17] add comment about the version field

---
 CONTRIBUTING.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c0a9c0fa..60b1260b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -47,6 +47,7 @@ You can test a module locally by updating the source as follows
 ```tf
 module "example" {
   source = "git::https://github.com/<USERNAME>/<REPO>.git//<MODULE-NAME>?ref=<BRANCH-NAME>"
+  # You may need to remove the 'version' field, it is incompatible with some sources.
 }
 ```
 

From cadb48fb10e5a1311fe931a1261902ca97f855ff Mon Sep 17 00:00:00 2001
From: Steven Masley <stevenmasley@gmail.com>
Date: Thu, 29 Aug 2024 14:46:48 -0500
Subject: [PATCH 03/17] trying to use base path

---
 code-server/main.tf |  2 ++
 vscode-web/run.sh   | 10 ++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/code-server/main.tf b/code-server/main.tf
index 99616934..a6ebe355 100644
--- a/code-server/main.tf
+++ b/code-server/main.tf
@@ -141,6 +141,8 @@ resource "coder_script" "code-server" {
     EXTENSIONS_DIR : var.extensions_dir,
     FOLDER : var.folder,
     AUTO_INSTALL_EXTENSIONS : var.auto_install_extensions,
+    SERVER_BASE_PATH : format("/%s/%s.%s/apps/vscode-web/",
+    data.coder_workspace_owner.name, data.coder_workspace.name, "main"),
   })
   run_on_start = true
 
diff --git a/vscode-web/run.sh b/vscode-web/run.sh
index ce8782f5..6808de6b 100755
--- a/vscode-web/run.sh
+++ b/vscode-web/run.sh
@@ -10,10 +10,16 @@ if [ -n "${EXTENSIONS_DIR}" ]; then
   EXTENSION_ARG="--extensions-dir=${EXTENSIONS_DIR}"
 fi
 
+# Set extension directory
+SERVER_BASE_PATH=""
+if [ -n "${SERVER_BASE_PATH}" ]; then
+  SERVER_BASE_PATH="--server-base-path=${SERVER_BASE_PATH}"
+fi
+
 run_vscode_web() {
-  echo "👷 Running $VSCODE_WEB serve-local $EXTENSION_ARG --port ${PORT} --host 127.0.0.1 --accept-server-license-terms --without-connection-token --telemetry-level ${TELEMETRY_LEVEL} in the background..."
+  echo "👷 Running $VSCODE_WEB serve-local $EXTENSION_ARG $SERVER_BASE_PATH --port ${PORT} --host 127.0.0.1 --accept-server-license-terms --without-connection-token --telemetry-level ${TELEMETRY_LEVEL} in the background..."
   echo "Check logs at ${LOG_PATH}!"
-  "$VSCODE_WEB" serve-local "$EXTENSION_ARG" --port "${PORT}" --host 127.0.0.1 --accept-server-license-terms --without-connection-token --telemetry-level "${TELEMETRY_LEVEL}" > "${LOG_PATH}" 2>&1 &
+  "$VSCODE_WEB" serve-local "$EXTENSION_ARG" "${SERVER_BASE_PATH}" --port "${PORT}" --host 127.0.0.1 --accept-server-license-terms --without-connection-token --telemetry-level "${TELEMETRY_LEVEL}" > "${LOG_PATH}" 2>&1 &
 }
 
 # Check if the settings file exists...

From aacb4c75725532d48a9ff6211f234e597a3f54ed Mon Sep 17 00:00:00 2001
From: Steven Masley <stevenmasley@gmail.com>
Date: Thu, 29 Aug 2024 14:48:52 -0500
Subject: [PATCH 04/17] change base path

---
 code-server/main.tf | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/code-server/main.tf b/code-server/main.tf
index a6ebe355..583a53e9 100644
--- a/code-server/main.tf
+++ b/code-server/main.tf
@@ -141,8 +141,9 @@ resource "coder_script" "code-server" {
     EXTENSIONS_DIR : var.extensions_dir,
     FOLDER : var.folder,
     AUTO_INSTALL_EXTENSIONS : var.auto_install_extensions,
-    SERVER_BASE_PATH : format("/%s/%s.%s/apps/vscode-web/",
-    data.coder_workspace_owner.name, data.coder_workspace.name, "main"),
+    SERVER_BASE_PATH : "/",
+    //format("/%s/%s.%s/apps/vscode-web/",
+    //data.coder_workspace_owner.name, data.coder_workspace.name, "main"),
   })
   run_on_start = true
 

From bc630be9bc7a54bf4c86e786f0ad4a031c8f0705 Mon Sep 17 00:00:00 2001
From: Steven Masley <stevenmasley@gmail.com>
Date: Thu, 29 Aug 2024 14:53:08 -0500
Subject: [PATCH 05/17] fix bash template variable

---
 code-server/main.tf | 6 +++---
 vscode-web/run.sh   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/code-server/main.tf b/code-server/main.tf
index 583a53e9..59e19606 100644
--- a/code-server/main.tf
+++ b/code-server/main.tf
@@ -141,9 +141,9 @@ resource "coder_script" "code-server" {
     EXTENSIONS_DIR : var.extensions_dir,
     FOLDER : var.folder,
     AUTO_INSTALL_EXTENSIONS : var.auto_install_extensions,
-    SERVER_BASE_PATH : "/",
-    //format("/%s/%s.%s/apps/vscode-web/",
-    //data.coder_workspace_owner.name, data.coder_workspace.name, "main"),
+    # SERVER_BASE_PATH : "/",
+    SERVER_BASE_PATH : format("/%s/%s.%s/apps/vscode-web/",
+    data.coder_workspace_owner.name, data.coder_workspace.name, "main"),
   })
   run_on_start = true
 
diff --git a/vscode-web/run.sh b/vscode-web/run.sh
index 6808de6b..8ee11bf5 100755
--- a/vscode-web/run.sh
+++ b/vscode-web/run.sh
@@ -19,7 +19,7 @@ fi
 run_vscode_web() {
   echo "👷 Running $VSCODE_WEB serve-local $EXTENSION_ARG $SERVER_BASE_PATH --port ${PORT} --host 127.0.0.1 --accept-server-license-terms --without-connection-token --telemetry-level ${TELEMETRY_LEVEL} in the background..."
   echo "Check logs at ${LOG_PATH}!"
-  "$VSCODE_WEB" serve-local "$EXTENSION_ARG" "${SERVER_BASE_PATH}" --port "${PORT}" --host 127.0.0.1 --accept-server-license-terms --without-connection-token --telemetry-level "${TELEMETRY_LEVEL}" > "${LOG_PATH}" 2>&1 &
+  "$VSCODE_WEB" serve-local "$EXTENSION_ARG" "$SERVER_BASE_PATH" --port "${PORT}" --host 127.0.0.1 --accept-server-license-terms --without-connection-token --telemetry-level "${TELEMETRY_LEVEL}" > "${LOG_PATH}" 2>&1 &
 }
 
 # Check if the settings file exists...

From 129d69258d7f03f4a06a2ecefdcb3a8183a19f18 Mon Sep 17 00:00:00 2001
From: Steven Masley <stevenmasley@gmail.com>
Date: Thu, 29 Aug 2024 14:55:03 -0500
Subject: [PATCH 06/17] do not use the same var name for env var

---
 code-server/main.tf | 2 +-
 vscode-web/run.sh   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/code-server/main.tf b/code-server/main.tf
index 59e19606..6f9b328d 100644
--- a/code-server/main.tf
+++ b/code-server/main.tf
@@ -143,7 +143,7 @@ resource "coder_script" "code-server" {
     AUTO_INSTALL_EXTENSIONS : var.auto_install_extensions,
     # SERVER_BASE_PATH : "/",
     SERVER_BASE_PATH : format("/%s/%s.%s/apps/vscode-web/",
-    data.coder_workspace_owner.name, data.coder_workspace.name, "main"),
+    data.coder_workspace_owner.name, data.coder_workspace.name, var.agent_id),
   })
   run_on_start = true
 
diff --git a/vscode-web/run.sh b/vscode-web/run.sh
index 8ee11bf5..651e1269 100755
--- a/vscode-web/run.sh
+++ b/vscode-web/run.sh
@@ -11,15 +11,15 @@ if [ -n "${EXTENSIONS_DIR}" ]; then
 fi
 
 # Set extension directory
-SERVER_BASE_PATH=""
+SERVER_BASE_PATH_ARG=""
 if [ -n "${SERVER_BASE_PATH}" ]; then
-  SERVER_BASE_PATH="--server-base-path=${SERVER_BASE_PATH}"
+  SERVER_BASE_PATH_ARG="--server-base-path=${SERVER_BASE_PATH}"
 fi
 
 run_vscode_web() {
-  echo "👷 Running $VSCODE_WEB serve-local $EXTENSION_ARG $SERVER_BASE_PATH --port ${PORT} --host 127.0.0.1 --accept-server-license-terms --without-connection-token --telemetry-level ${TELEMETRY_LEVEL} in the background..."
+  echo "👷 Running $VSCODE_WEB serve-local $EXTENSION_ARG $SERVER_BASE_PATH_ARG --port ${PORT} --host 127.0.0.1 --accept-server-license-terms --without-connection-token --telemetry-level ${TELEMETRY_LEVEL} in the background..."
   echo "Check logs at ${LOG_PATH}!"
-  "$VSCODE_WEB" serve-local "$EXTENSION_ARG" "$SERVER_BASE_PATH" --port "${PORT}" --host 127.0.0.1 --accept-server-license-terms --without-connection-token --telemetry-level "${TELEMETRY_LEVEL}" > "${LOG_PATH}" 2>&1 &
+  "$VSCODE_WEB" serve-local "$EXTENSION_ARG" "$SERVER_BASE_PATH_ARG" --port "${PORT}" --host 127.0.0.1 --accept-server-license-terms --without-connection-token --telemetry-level "${TELEMETRY_LEVEL}" > "${LOG_PATH}" 2>&1 &
 }
 
 # Check if the settings file exists...

From cdea2b7cb4e44115a55a331f63d4729b0f432449 Mon Sep 17 00:00:00 2001
From: Steven Masley <stevenmasley@gmail.com>
Date: Thu, 29 Aug 2024 14:56:57 -0500
Subject: [PATCH 07/17] vscode web not code-server, whoops

---
 code-server/main.tf | 3 ---
 vscode-web/main.tf  | 2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/code-server/main.tf b/code-server/main.tf
index 6f9b328d..99616934 100644
--- a/code-server/main.tf
+++ b/code-server/main.tf
@@ -141,9 +141,6 @@ resource "coder_script" "code-server" {
     EXTENSIONS_DIR : var.extensions_dir,
     FOLDER : var.folder,
     AUTO_INSTALL_EXTENSIONS : var.auto_install_extensions,
-    # SERVER_BASE_PATH : "/",
-    SERVER_BASE_PATH : format("/%s/%s.%s/apps/vscode-web/",
-    data.coder_workspace_owner.name, data.coder_workspace.name, var.agent_id),
   })
   run_on_start = true
 
diff --git a/vscode-web/main.tf b/vscode-web/main.tf
index 26cde98f..da175ac0 100644
--- a/vscode-web/main.tf
+++ b/vscode-web/main.tf
@@ -147,6 +147,8 @@ resource "coder_script" "vscode-web" {
     EXTENSIONS_DIR : var.extensions_dir,
     FOLDER : var.folder,
     AUTO_INSTALL_EXTENSIONS : var.auto_install_extensions,
+    SERVER_BASE_PATH : format("/%s/%s.%s/apps/vscode-web/",
+    data.coder_workspace_owner.name, data.coder_workspace.name, var.agent_id),
   })
   run_on_start = true
 

From ae6ed88e2c2a2373838e38a75c6f9d7d8995b5c2 Mon Sep 17 00:00:00 2001
From: Steven Masley <stevenmasley@gmail.com>
Date: Thu, 29 Aug 2024 14:58:10 -0500
Subject: [PATCH 08/17] include coder data blocks

---
 vscode-web/main.tf | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/vscode-web/main.tf b/vscode-web/main.tf
index da175ac0..a8c543ba 100644
--- a/vscode-web/main.tf
+++ b/vscode-web/main.tf
@@ -130,6 +130,9 @@ variable "subdomain" {
   default     = true
 }
 
+data "coder_workspace_owner" "me" {}
+data "coder_workspace" "me" {}
+
 resource "coder_script" "vscode-web" {
   agent_id     = var.agent_id
   display_name = "VS Code Web"

From 3335b2a334ae15c86727043212750988f223239a Mon Sep 17 00:00:00 2001
From: Steven Masley <stevenmasley@gmail.com>
Date: Thu, 29 Aug 2024 14:59:10 -0500
Subject: [PATCH 09/17] reference from 'me'

---
 vscode-web/main.tf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vscode-web/main.tf b/vscode-web/main.tf
index a8c543ba..f1b64dc9 100644
--- a/vscode-web/main.tf
+++ b/vscode-web/main.tf
@@ -151,7 +151,7 @@ resource "coder_script" "vscode-web" {
     FOLDER : var.folder,
     AUTO_INSTALL_EXTENSIONS : var.auto_install_extensions,
     SERVER_BASE_PATH : format("/%s/%s.%s/apps/vscode-web/",
-    data.coder_workspace_owner.name, data.coder_workspace.name, var.agent_id),
+    data.coder_workspace_owner.me.name, data.coder_workspace.me.name, var.agent_id),
   })
   run_on_start = true
 

From a52549bd3eda675bb7c20a5b887bc34ef54130a6 Mon Sep 17 00:00:00 2001
From: Steven Masley <stevenmasley@gmail.com>
Date: Thu, 29 Aug 2024 15:01:21 -0500
Subject: [PATCH 10/17] hard code main test

---
 vscode-web/main.tf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vscode-web/main.tf b/vscode-web/main.tf
index f1b64dc9..e7d3917b 100644
--- a/vscode-web/main.tf
+++ b/vscode-web/main.tf
@@ -151,7 +151,7 @@ resource "coder_script" "vscode-web" {
     FOLDER : var.folder,
     AUTO_INSTALL_EXTENSIONS : var.auto_install_extensions,
     SERVER_BASE_PATH : format("/%s/%s.%s/apps/vscode-web/",
-    data.coder_workspace_owner.me.name, data.coder_workspace.me.name, var.agent_id),
+    data.coder_workspace_owner.me.name, data.coder_workspace.me.name, "main"),
   })
   run_on_start = true
 

From 3eecfa9e3d1a10d61c85d0edbd365f2c065dcdd3 Mon Sep 17 00:00:00 2001
From: Steven Masley <stevenmasley@gmail.com>
Date: Thu, 29 Aug 2024 15:03:11 -0500
Subject: [PATCH 11/17] add '@' to user name

---
 vscode-web/main.tf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vscode-web/main.tf b/vscode-web/main.tf
index e7d3917b..68404ad0 100644
--- a/vscode-web/main.tf
+++ b/vscode-web/main.tf
@@ -150,7 +150,7 @@ resource "coder_script" "vscode-web" {
     EXTENSIONS_DIR : var.extensions_dir,
     FOLDER : var.folder,
     AUTO_INSTALL_EXTENSIONS : var.auto_install_extensions,
-    SERVER_BASE_PATH : format("/%s/%s.%s/apps/vscode-web/",
+    SERVER_BASE_PATH : format("/@%s/%s.%s/apps/vscode-web/",
     data.coder_workspace_owner.me.name, data.coder_workspace.me.name, "main"),
   })
   run_on_start = true

From b5cad85fe0250e611b20f072b3db3efb3dee49b8 Mon Sep 17 00:00:00 2001
From: Steven Masley <stevenmasley@gmail.com>
Date: Thu, 29 Aug 2024 15:08:50 -0500
Subject: [PATCH 12/17] try hardcoding something

---
 vscode-web/main.tf | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/vscode-web/main.tf b/vscode-web/main.tf
index 68404ad0..e9a96504 100644
--- a/vscode-web/main.tf
+++ b/vscode-web/main.tf
@@ -172,11 +172,15 @@ resource "coder_app" "vscode-web" {
   agent_id     = var.agent_id
   slug         = var.slug
   display_name = var.display_name
-  url          = var.folder == "" ? "http://localhost:${var.port}" : "http://localhost:${var.port}?folder=${var.folder}"
-  icon         = "/icon/code.svg"
-  subdomain    = var.subdomain
-  share        = var.share
-  order        = var.order
+
+  // @Emyrk/code-server.main/apps/vscode-web/
+  // -> Coder -> "/"
+
+  url       = var.folder == "http://localhost:${var.port}/@Emyrk/code-server.main/apps/vscode-web/"
+  icon      = "/icon/code.svg"
+  subdomain = var.subdomain
+  share     = var.share
+  order     = var.order
 
   healthcheck {
     url       = "http://localhost:${var.port}/healthz"

From 97dceabcda31175826dbb37a152bcaed45a06b8f Mon Sep 17 00:00:00 2001
From: Steven Masley <stevenmasley@gmail.com>
Date: Thu, 29 Aug 2024 15:16:01 -0500
Subject: [PATCH 13/17] add TODO comment

---
 vscode-web/main.tf | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/vscode-web/main.tf b/vscode-web/main.tf
index e9a96504..d0d163b7 100644
--- a/vscode-web/main.tf
+++ b/vscode-web/main.tf
@@ -150,6 +150,7 @@ resource "coder_script" "vscode-web" {
     EXTENSIONS_DIR : var.extensions_dir,
     FOLDER : var.folder,
     AUTO_INSTALL_EXTENSIONS : var.auto_install_extensions,
+    // TODO: This assumes the agent is called "main"
     SERVER_BASE_PATH : format("/@%s/%s.%s/apps/vscode-web/",
     data.coder_workspace_owner.me.name, data.coder_workspace.me.name, "main"),
   })
@@ -173,10 +174,7 @@ resource "coder_app" "vscode-web" {
   slug         = var.slug
   display_name = var.display_name
 
-  // @Emyrk/code-server.main/apps/vscode-web/
-  // -> Coder -> "/"
-
-  url       = var.folder == "http://localhost:${var.port}/@Emyrk/code-server.main/apps/vscode-web/"
+  url       = var.folder == "" ? "http://localhost:${var.port}" : "http://localhost:${var.port}?folder=${var.folder}"
   icon      = "/icon/code.svg"
   subdomain = var.subdomain
   share     = var.share

From b1005ed2c0bae0b946040185616e81465159f54d Mon Sep 17 00:00:00 2001
From: Muhammad Atif Ali <me@matifali.dev>
Date: Mon, 21 Oct 2024 12:26:21 +0500
Subject: [PATCH 14/17] Bump `vscode-web` module version to 1.0.22

---
 vscode-web/README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/vscode-web/README.md b/vscode-web/README.md
index 821d5182..8b5fa688 100644
--- a/vscode-web/README.md
+++ b/vscode-web/README.md
@@ -14,7 +14,7 @@ Automatically install [Visual Studio Code Server](https://code.visualstudio.com/
 ```tf
 module "vscode-web" {
   source         = "registry.coder.com/modules/vscode-web/coder"
-  version        = "1.0.20"
+  version        = "1.0.22"
   agent_id       = coder_agent.example.id
   accept_license = true
 }
@@ -29,7 +29,7 @@ module "vscode-web" {
 ```tf
 module "vscode-web" {
   source         = "registry.coder.com/modules/vscode-web/coder"
-  version        = "1.0.20"
+  version        = "1.0.22"
   agent_id       = coder_agent.example.id
   install_prefix = "/home/coder/.vscode-web"
   folder         = "/home/coder"
@@ -42,7 +42,7 @@ module "vscode-web" {
 ```tf
 module "vscode-web" {
   source         = "registry.coder.com/modules/vscode-web/coder"
-  version        = "1.0.20"
+  version        = "1.0.22"
   agent_id       = coder_agent.example.id
   extensions     = ["github.copilot", "ms-python.python", "ms-toolsai.jupyter"]
   accept_license = true
@@ -56,7 +56,7 @@ Configure VS Code's [settings.json](https://code.visualstudio.com/docs/getstarte
 ```tf
 module "vscode-web" {
   source     = "registry.coder.com/modules/vscode-web/coder"
-  version    = "1.0.20"
+  version    = "1.0.22"
   agent_id   = coder_agent.example.id
   extensions = ["dracula-theme.theme-dracula"]
   settings = {

From eb95ea41ab4095361d102db6980a79e6757d5c29 Mon Sep 17 00:00:00 2001
From: Muhammad Atif Ali <me@matifali.dev>
Date: Mon, 21 Oct 2024 12:29:13 +0500
Subject: [PATCH 15/17] Make `SERVER_BASE_PATH` support subdomain option

---
 vscode-web/main.tf | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/vscode-web/main.tf b/vscode-web/main.tf
index d0d163b7..35be41be 100644
--- a/vscode-web/main.tf
+++ b/vscode-web/main.tf
@@ -150,9 +150,8 @@ resource "coder_script" "vscode-web" {
     EXTENSIONS_DIR : var.extensions_dir,
     FOLDER : var.folder,
     AUTO_INSTALL_EXTENSIONS : var.auto_install_extensions,
-    // TODO: This assumes the agent is called "main"
-    SERVER_BASE_PATH : format("/@%s/%s.%s/apps/vscode-web/",
-    data.coder_workspace_owner.me.name, data.coder_workspace.me.name, "main"),
+    SERVER_BASE_PATH : var.subdomain ? "" : format("/@%s/%s/apps/vscode-web/",
+    data.coder_workspace_owner.me.name, data.coder_workspace.me.name),
   })
   run_on_start = true
 

From aa3d9b8a7aa8684c8c68823cb88d6b0cff480c40 Mon Sep 17 00:00:00 2001
From: Muhammad Atif Ali <me@matifali.dev>
Date: Mon, 21 Oct 2024 12:50:48 +0500
Subject: [PATCH 16/17] Refactor URL handling in vscode-web module

- Consolidates URL and path logic using locals.
- Simplifies script syntax, improving maintainability.
---
 vscode-web/main.tf | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/vscode-web/main.tf b/vscode-web/main.tf
index 35be41be..384b9383 100644
--- a/vscode-web/main.tf
+++ b/vscode-web/main.tf
@@ -150,8 +150,7 @@ resource "coder_script" "vscode-web" {
     EXTENSIONS_DIR : var.extensions_dir,
     FOLDER : var.folder,
     AUTO_INSTALL_EXTENSIONS : var.auto_install_extensions,
-    SERVER_BASE_PATH : var.subdomain ? "" : format("/@%s/%s/apps/vscode-web/",
-    data.coder_workspace_owner.me.name, data.coder_workspace.me.name),
+    SERVER_BASE_PATH : local.server_base_path,
   })
   run_on_start = true
 
@@ -172,16 +171,21 @@ resource "coder_app" "vscode-web" {
   agent_id     = var.agent_id
   slug         = var.slug
   display_name = var.display_name
-
-  url       = var.folder == "" ? "http://localhost:${var.port}" : "http://localhost:${var.port}?folder=${var.folder}"
-  icon      = "/icon/code.svg"
-  subdomain = var.subdomain
-  share     = var.share
-  order     = var.order
+  url          = local.url
+  icon         = "/icon/code.svg"
+  subdomain    = var.subdomain
+  share        = var.share
+  order        = var.order
 
   healthcheck {
-    url       = "http://localhost:${var.port}/healthz"
+    url       = local.healthcheck_url
     interval  = 5
     threshold = 6
   }
 }
+
+locals {
+  server_base_path = var.subdomain ? "" : format("/@%s/%s/apps/%s/", data.coder_workspace_owner.me.name, data.coder_workspace.me.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   = var.subdomain ? "http://localhost:${var.port}/healthz" : "http://localhost:${var.port}${local.server_base_path}/healthz"  
+}

From d6060073287d1133f7c1e521f00a08c004a4f4db Mon Sep 17 00:00:00 2001
From: Muhammad Atif Ali <me@matifali.dev>
Date: Mon, 21 Oct 2024 13:32:21 +0500
Subject: [PATCH 17/17] Fix whitespace in healthcheck_url variable definition

---
 vscode-web/main.tf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vscode-web/main.tf b/vscode-web/main.tf
index 384b9383..207450e5 100644
--- a/vscode-web/main.tf
+++ b/vscode-web/main.tf
@@ -187,5 +187,5 @@ resource "coder_app" "vscode-web" {
 locals {
   server_base_path = var.subdomain ? "" : format("/@%s/%s/apps/%s/", data.coder_workspace_owner.me.name, data.coder_workspace.me.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   = var.subdomain ? "http://localhost:${var.port}/healthz" : "http://localhost:${var.port}${local.server_base_path}/healthz"  
+  healthcheck_url  = var.subdomain ? "http://localhost:${var.port}/healthz" : "http://localhost:${var.port}${local.server_base_path}/healthz"
 }

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://rainy.clevelandohioweatherforecast.com/php-proxy/index.php?q=https://patch-diff.githubusercontent.com/raw/coder/modules/pull/288.patch" target="_blank">Alternative Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/index.php?u=https://patch-diff.githubusercontent.com/raw/coder/modules/pull/288.patch" target="_blank">pFad Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v3index.php?u=https://patch-diff.githubusercontent.com/raw/coder/modules/pull/288.patch" target="_blank">pFad v3 Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v4index.php?u=https://patch-diff.githubusercontent.com/raw/coder/modules/pull/288.patch" target="_blank">pFad v4 Proxy</a></p></body>
</html>