From f325dadd6a381f5b004669dd3761a90185701a09 Mon Sep 17 00:00:00 2001
From: Nicolas Duchon <nicolas.duchon@gmail.com>
Date: Tue, 26 Nov 2024 01:05:08 +0100
Subject: [PATCH] refactor: enhance readability

---
 nginx.tmpl | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/nginx.tmpl b/nginx.tmpl
index 6bc6e62..c89cc7c 100644
--- a/nginx.tmpl
+++ b/nginx.tmpl
@@ -562,7 +562,7 @@ proxy_set_header Proxy "";
     {{- end }}
 
     {{- range $hostname, $vhost := $parsedVhosts }}
-        {{- $vhost_data := when (hasKey $globals.vhosts $hostname) (get $globals.vhosts $hostname) (dict) }}
+        {{- $vhost_data := get $globals.vhosts $hostname | default (dict) }}
         {{- $paths := $vhost_data.paths | default (dict) }}
 
         {{- if (empty $vhost) }}
@@ -574,11 +574,10 @@ proxy_set_header Proxy "";
                 {{- $vpath = dict "dest" "" "port" "default" }}
             {{- end }}
             {{- $dest := $vpath.dest | default "" }}
-            {{- $port := when (hasKey $vpath "port") (toString $vpath.port) "default" }}
-            {{- $path_data := when (hasKey $paths $path) (get $paths $path) (dict) }}
-            {{- $path_ports := when (hasKey $path_data "ports") (get $path_data "ports") (dict) }}
-            {{- $path_port_containers := when (hasKey $path_ports $port) (get $path_ports $port) (list) }}
-            {{- $path_port_containers = concat $path_port_containers $containers }}
+            {{- $port := $vpath.port | default "default" | toString }}
+            {{- $path_data := get $paths $path | default (dict) }}
+            {{- $path_ports := $path_data.ports | default (dict) }}
+            {{- $path_port_containers := get $path_ports $port | default (list) | concat $containers }}
             {{- $_ := set $path_ports $port $path_port_containers }}
             {{- $_ := set $path_data "ports" $path_ports }}
             {{- if (not (hasKey $path_data "dest")) }}
@@ -611,7 +610,7 @@ proxy_set_header Proxy "";
         {{- continue }}
     {{- end }}
 
-    {{- $vhost_data := when (hasKey $globals.vhosts $hostname) (get $globals.vhosts $hostname) (dict) }}
+    {{- $vhost_data := get $globals.vhosts $hostname | default (dict) }}
     {{- $paths := $vhost_data.paths | default (dict) }}
 
     {{- $tmp_paths := groupByWithDefault $containers "Env.VIRTUAL_PATH" "/" }}
@@ -619,10 +618,9 @@ proxy_set_header Proxy "";
     {{- range $path, $containers := $tmp_paths }}
         {{- $dest := groupByKeys $containers "Env.VIRTUAL_DEST" | first | default "" }}
         {{- $port := "legacy" }}
-        {{- $path_data := when (hasKey $paths $path) (get $paths $path) (dict) }}
-        {{- $path_ports := when (hasKey $path_data "ports") (get $path_data "ports") (dict) }}
-        {{- $path_port_containers := when (hasKey $path_ports $port) (get $path_ports $port) (list) }}
-        {{- $path_port_containers = concat $path_port_containers $containers }}
+        {{- $path_data := get $paths $path | default (dict) }}
+        {{- $path_ports := $path_data.ports | default (dict) }}
+        {{- $path_port_containers := get $path_ports $port | default (list) | concat $containers }}
         {{- $_ := set $path_ports $port $path_port_containers }}
         {{- $_ := set $path_data "ports" $path_ports }}
         {{- if (not (hasKey $path_data "dest")) }}