Allow plus symbol in SERVER_NAME validation

- Update regex in validate_server_name to include '+'
- Update corresponding validation error message
- Add BATS test case for SERVER_NAME containing '+'
- Apply shfmt auto-formatting across BATS test files

Author: underhax

opt/monitoring/lib/validation.sh

@@ -355,8 +355,8 @@ validate_server_name() {
     printf "SERVER_NAME is not set\n" >&2
     return 1
   }
-  [[ ${val} =~ ^[a-zA-Z0-9\ ._-]+$ ]] || {
-    printf "SERVER_NAME format is invalid (allowed: a-z, A-Z, 0-9, space, ., _, -)\n" >&2
+  [[ ${val} =~ ^[a-zA-Z0-9\ ._+-]+$ ]] || {
+    printf "SERVER_NAME format is invalid (allowed: a-z, A-Z, 0-9, space, ., _, -, +)\n" >&2
     return 1
   }
   return 0

tests/common.bats

@@ -22,31 +22,31 @@ setup() {
 @test "common: die prints ERROR to stderr and exits 1" {
   run die "something broke"
   [ "$status" -eq 1 ]
-  [[ "$output" == *"ERROR: something broke"* ]]
+  [[ $output == *"ERROR: something broke"* ]]
 }
 
 @test "common: die handles multiple arguments" {
   run die "disk full" "on /dev/sda1"
   [ "$status" -eq 1 ]
-  [[ "$output" == *"ERROR: disk full on /dev/sda1"* ]]
+  [[ $output == *"ERROR: disk full on /dev/sda1"* ]]
 }
 
 @test "common: die handles empty message" {
   run die
   [ "$status" -eq 1 ]
-  [[ "$output" == *"ERROR:"* ]]
+  [[ $output == *"ERROR:"* ]]
 }
 
 @test "common: info prints INFO to stderr" {
   run info "startup complete"
   [ "$status" -eq 0 ]
-  [[ "$output" == *"INFO:  startup complete"* ]]
+  [[ $output == *"INFO:  startup complete"* ]]
 }
 
 @test "common: info handles multiple arguments" {
   run info "loaded" "5 modules"
   [ "$status" -eq 0 ]
-  [[ "$output" == *"INFO:  loaded 5 modules"* ]]
+  [[ $output == *"INFO:  loaded 5 modules"* ]]
 }
 
 @test "common: debug is silent when VERBOSE=0" {
@@ -69,7 +69,7 @@ setup() {
   VERBOSE=1
   run debug "trace message"
   [ "$status" -eq 0 ]
-  [[ "$output" == *"DEBUG: trace message"* ]]
+  [[ $output == *"DEBUG: trace message"* ]]
 }
 
 @test "common: check_deps succeeds with no arguments" {
@@ -79,7 +79,7 @@ setup() {
 
 @test "common: check_deps succeeds when all commands exist" {
   command() {
-    if [[ "$1" == "-v" ]]; then return 0; fi
+    if [[ $1 == "-v" ]]; then return 0; fi
     builtin command "$@"
   }
   run check_deps bash cat ls
@@ -88,25 +88,25 @@ setup() {
 
 @test "common: check_deps fails with single missing command" {
   command() {
-    if [[ "$1" == "-v" && "$2" == "nonexistent_cmd" ]]; then return 1; fi
-    if [[ "$1" == "-v" ]]; then return 0; fi
+    if [[ $1 == "-v" && $2 == "nonexistent_cmd" ]]; then return 1; fi
+    if [[ $1 == "-v" ]]; then return 0; fi
     builtin command "$@"
   }
   run check_deps bash nonexistent_cmd
   [ "$status" -eq 1 ]
-  [[ "$output" == *"Missing required commands: nonexistent_cmd"* ]]
+  [[ $output == *"Missing required commands: nonexistent_cmd"* ]]
 }
 
 @test "common: check_deps reports multiple missing commands" {
   command() {
-    if [[ "$1" == "-v" && ("$2" == "foo" || "$2" == "bar") ]]; then return 1; fi
-    if [[ "$1" == "-v" ]]; then return 0; fi
+    if [[ $1 == "-v" && ($2 == "foo" || $2 == "bar") ]]; then return 1; fi
+    if [[ $1 == "-v" ]]; then return 0; fi
     builtin command "$@"
   }
   run check_deps foo bar
   [ "$status" -eq 1 ]
-  [[ "$output" == *"foo"* ]]
-  [[ "$output" == *"bar"* ]]
+  [[ $output == *"foo"* ]]
+  [[ $output == *"bar"* ]]
 }
 
 @test "common: load_senders sources sender modules" {
@@ -162,25 +162,25 @@ setup() {
 @test "common: get_available_notifiers without prefix returns all notifiers" {
   run get_available_notifiers
   [ "$status" -eq 0 ]
-  [[ "$output" == *"telegram"* ]]
-  [[ "$output" == *"matrix"* ]]
-  [[ "$output" == *"ntfy"* ]]
+  [[ $output == *"telegram"* ]]
+  [[ $output == *"matrix"* ]]
+  [[ $output == *"ntfy"* ]]
 }
 
 @test "common: get_available_notifiers with login- prefix returns login notifiers" {
   run get_available_notifiers "login-"
   [ "$status" -eq 0 ]
-  [[ "$output" == *"telegram"* ]]
-  [[ "$output" == *"matrix"* ]]
-  [[ "$output" == *"ntfy"* ]]
+  [[ $output == *"telegram"* ]]
+  [[ $output == *"matrix"* ]]
+  [[ $output == *"ntfy"* ]]
 }
 
 @test "common: get_available_notifiers with high-load- prefix returns high-load notifiers" {
   run get_available_notifiers "high-load-"
   [ "$status" -eq 0 ]
-  [[ "$output" == *"telegram"* ]]
-  [[ "$output" == *"matrix"* ]]
-  [[ "$output" == *"ntfy"* ]]
+  [[ $output == *"telegram"* ]]
+  [[ $output == *"matrix"* ]]
+  [[ $output == *"ntfy"* ]]
 }
 
 @test "common: get_available_notifiers with nonexistent prefix returns empty" {
@@ -192,20 +192,20 @@ setup() {
 @test "common: get_configured_notifiers returns telegram when BOT_TOKEN set" {
   BOT_TOKEN="000000000:AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
   run get_configured_notifiers
-  [[ "$output" == *"telegram"* ]]
+  [[ $output == *"telegram"* ]]
 }
 
 @test "common: get_configured_notifiers returns matrix when MATRIX_URL set" {
   MATRIX_URL="https://matrix.example.com"
   run get_configured_notifiers
-  [[ "$output" == *"matrix"* ]]
+  [[ $output == *"matrix"* ]]
 }
 
 @test "common: get_configured_notifiers returns ntfy when NTFY_URL set" {
   NTFY_URL="https://ntfy.sh"
   NTFY_TOPIC="test"
   run get_configured_notifiers
-  [[ "$output" == *"ntfy"* ]]
+  [[ $output == *"ntfy"* ]]
 }
 
 @test "common: get_configured_notifiers returns all when all configured" {
@@ -214,9 +214,9 @@ setup() {
   NTFY_URL="https://ntfy.sh"
   NTFY_TOPIC="test"
   run get_configured_notifiers
-  [[ "$output" == *"telegram"* ]]
-  [[ "$output" == *"matrix"* ]]
-  [[ "$output" == *"ntfy"* ]]
+  [[ $output == *"telegram"* ]]
+  [[ $output == *"matrix"* ]]
+  [[ $output == *"ntfy"* ]]
 }
 
 @test "common: get_configured_notifiers returns empty when nothing set" {

tests/high-load-messages.bats

@@ -28,13 +28,13 @@ setup() {
 @test "high-load-messages: _tg_escape escapes underscores" {
   run _tg_escape "my_server_name"
   [ "$status" -eq 0 ]
-  [[ "$output" == *"my\_server\_name"* ]]
+  [[ $output == *"my\_server\_name"* ]]
 }
 
 @test "high-load-messages: _tg_escape escapes asterisks and backticks" {
-  run _tg_escape "test*bold*and\`code\`"
+  run _tg_escape 'test*bold*and`code`'
   [ "$status" -eq 0 ]
-  [[ "$output" != *'*bold*'* ]] || [[ "$output" == *'\*'* ]]
+  [[ $output != *'*bold*'* ]] || [[ $output == *'\*'* ]]
 }
 
 @test "high-load-messages: _tg_escape preserves plain text" {
@@ -47,140 +47,140 @@ setup() {
   PSI_AVAILABLE=1
   run _tg_psi_section
   [ "$status" -eq 0 ]
-  [[ "$output" == *"PSI"* ]]
-  [[ "$output" == *"CPU some"* ]]
-  [[ "$output" == *"IO some"* ]]
-  [[ "$output" == *"Mem some"* ]]
-  [[ "$output" == *"25.50"* ]]
+  [[ $output == *"PSI"* ]]
+  [[ $output == *"CPU some"* ]]
+  [[ $output == *"IO some"* ]]
+  [[ $output == *"Mem some"* ]]
+  [[ $output == *"25.50"* ]]
 }
 
 @test "high-load-messages: _tg_psi_section shows unavailable when PSI off" {
   PSI_AVAILABLE=0
   run _tg_psi_section
   [ "$status" -eq 0 ]
-  [[ "$output" == *"unavailable"* ]]
+  [[ $output == *"unavailable"* ]]
 }
 
 @test "high-load-messages: telegram message contains all metric fields" {
   run high_load_message_telegram
   [ "$status" -eq 0 ]
-  [[ "$output" == *"High Load"* ]]
-  [[ "$output" == *"12.50"* ]]
-  [[ "$output" == *"92.5"* ]]
-  [[ "$output" == *"14.20"* ]]
-  [[ "$output" == *"16.00"* ]]
-  [[ "$output" == *"25.30"* ]]
-  [[ "$output" == *"150.20"* ]]
-  [[ "$output" == *"18.50"* ]]
+  [[ $output == *"High Load"* ]]
+  [[ $output == *"12.50"* ]]
+  [[ $output == *"92.5"* ]]
+  [[ $output == *"14.20"* ]]
+  [[ $output == *"16.00"* ]]
+  [[ $output == *"25.30"* ]]
+  [[ $output == *"150.20"* ]]
+  [[ $output == *"18.50"* ]]
 }
 
 @test "high-load-messages: telegram message includes failed services when set" {
   FAILED_SERVICES="nginx.service, mysql.service"
   run high_load_message_telegram
   [ "$status" -eq 0 ]
-  [[ "$output" == *"Failed Services"* ]]
-  [[ "$output" == *"nginx"* ]]
+  [[ $output == *"Failed Services"* ]]
+  [[ $output == *"nginx"* ]]
 }
 
 @test "high-load-messages: telegram message omits failed services when empty" {
   FAILED_SERVICES=""
   run high_load_message_telegram
   [ "$status" -eq 0 ]
-  [[ "$output" != *"Failed Services"* ]]
+  [[ $output != *"Failed Services"* ]]
 }
 
 @test "high-load-messages: _mx_psi_html contains HTML tags when PSI available" {
   PSI_AVAILABLE=1
   run _mx_psi_html
   [ "$status" -eq 0 ]
-  [[ "$output" == *"<strong>"* ]]
-  [[ "$output" == *"<br>"* ]]
-  [[ "$output" == *"CPU some"* ]]
+  [[ $output == *"<strong>"* ]]
+  [[ $output == *"<br>"* ]]
+  [[ $output == *"CPU some"* ]]
 }
 
 @test "high-load-messages: _mx_psi_html shows unavailable when PSI off" {
   PSI_AVAILABLE=0
   run _mx_psi_html
   [ "$status" -eq 0 ]
-  [[ "$output" == *"<em>"* ]]
-  [[ "$output" == *"unavailable"* ]]
+  [[ $output == *"<em>"* ]]
+  [[ $output == *"unavailable"* ]]
 }
 
 @test "high-load-messages: _mx_psi_plain shows plain text when PSI available" {
   PSI_AVAILABLE=1
   run _mx_psi_plain
   [ "$status" -eq 0 ]
-  [[ "$output" == *"CPU some"* ]]
-  [[ "$output" == *"IO full"* ]]
-  [[ "$output" == *"Mem full"* ]]
+  [[ $output == *"CPU some"* ]]
+  [[ $output == *"IO full"* ]]
+  [[ $output == *"Mem full"* ]]
 }
 
 @test "high-load-messages: _mx_psi_plain shows unavailable when PSI off" {
   PSI_AVAILABLE=0
   run _mx_psi_plain
   [ "$status" -eq 0 ]
-  [[ "$output" == *"unavailable"* ]]
+  [[ $output == *"unavailable"* ]]
 }
 
 @test "high-load-messages: matrix plain contains all fields" {
   run high_load_message_matrix_plain
   [ "$status" -eq 0 ]
-  [[ "$output" == *"prod-server-01"* ]]
-  [[ "$output" == *"12.50"* ]]
-  [[ "$output" == *"92.5"* ]]
-  [[ "$output" == *"Root FS"* ]]
+  [[ $output == *"prod-server-01"* ]]
+  [[ $output == *"12.50"* ]]
+  [[ $output == *"92.5"* ]]
+  [[ $output == *"Root FS"* ]]
 }
 
 @test "high-load-messages: matrix html contains HTML markup" {
   run high_load_message_matrix_html
   [ "$status" -eq 0 ]
-  [[ "$output" == *"<strong>"* ]]
-  [[ "$output" == *"<br>"* ]]
-  [[ "$output" == *"prod-server-01"* ]]
-  [[ "$output" == *"CPU"* ]]
+  [[ $output == *"<strong>"* ]]
+  [[ $output == *"<br>"* ]]
+  [[ $output == *"prod-server-01"* ]]
+  [[ $output == *"CPU"* ]]
 }
 
 @test "high-load-messages: matrix plain includes failed services when set" {
   FAILED_SERVICES="redis.service"
   run high_load_message_matrix_plain
-  [[ "$output" == *"Failed Services"* ]]
-  [[ "$output" == *"redis"* ]]
+  [[ $output == *"Failed Services"* ]]
+  [[ $output == *"redis"* ]]
 }
 
 @test "high-load-messages: _ntfy_psi_section shows data when PSI available" {
   PSI_AVAILABLE=1
   run _ntfy_psi_section
   [ "$status" -eq 0 ]
-  [[ "$output" == *"CPU some"* ]]
-  [[ "$output" == *"IO full"* ]]
+  [[ $output == *"CPU some"* ]]
+  [[ $output == *"IO full"* ]]
 }
 
 @test "high-load-messages: _ntfy_psi_section shows unavailable when PSI off" {
   PSI_AVAILABLE=0
   run _ntfy_psi_section
   [ "$status" -eq 0 ]
-  [[ "$output" == *"unavailable"* ]]
+  [[ $output == *"unavailable"* ]]
 }
 
 @test "high-load-messages: ntfy message contains all fields" {
   run high_load_message_ntfy
   [ "$status" -eq 0 ]
-  [[ "$output" == *"12.50"* ]]
-  [[ "$output" == *"92.5"* ]]
-  [[ "$output" == *"14.20"* ]]
-  [[ "$output" == *"Root FS"* ]]
+  [[ $output == *"12.50"* ]]
+  [[ $output == *"92.5"* ]]
+  [[ $output == *"14.20"* ]]
+  [[ $output == *"Root FS"* ]]
 }
 
 @test "high-load-messages: ntfy title contains server name" {
   run high_load_title_ntfy
   [ "$status" -eq 0 ]
-  [[ "$output" == *"High Load"* ]]
-  [[ "$output" == *"prod-server-01"* ]]
+  [[ $output == *"High Load"* ]]
+  [[ $output == *"prod-server-01"* ]]
 }
 
 @test "high-load-messages: ntfy message includes failed services" {
   FAILED_SERVICES="postgres.service"
   run high_load_message_ntfy
-  [[ "$output" == *"Failed Services"* ]]
-  [[ "$output" == *"postgres"* ]]
+  [[ $output == *"Failed Services"* ]]
+  [[ $output == *"postgres"* ]]
 }