Revert "Fix lint issues and improve test suite resilience"

This reverts commit 90d44bd3bc.

README.md

@@ -40,70 +40,6 @@ Below are the instructions for the local relay.
    `$DOMAIN` or in its `$EXTRA_SENDER_DOMAINS`
 3. `abra app deploy <app-name>`
 
-## WP-CLI
-
-You can either run using `abra app cmd`:
-```bash
-abra app cmd <app-name> app wp -- core check-update --major
-```
-
-Or by entering the app shell:
-1. `abra app run <app-name> app bash`
-2. `su -s /bin/bash www-data -c "wp core check-update --major"`
-
-## Network (Multi-site)
-
-1. Set up as above
-2. `abra app config <app-name>`, and uncomment `#MULTISITE=enable`
-3. `abra app deploy <app-name>`
-4. Log into the WordPress admin dashboard, go to **Tools → Network Setup**
-5. Don't worry about the suggested file changes
-6. `abra app config <app-name>` again and set `MULTISITE` to either `subdomain` or `subfolder` depending on your setup.
-7. `abra app deploy <app-name>`
-
-## Installing a custom theme
-
-`abra app cp <app-name> ~/path/to/local/theme wordpress:/var/www/html/wp-content/themes/`
-
-## Authentik Integration
-
-Configure the following envs via `abra app config <app-name>`:
-```bash
-COMPOSE_FILE="$COMPOSE_FILE:compose.authentik.yml"
-AUTHENTIK_DOMAIN=authentik.example.com
-AUTHENTIK_SECRET_NAME=authentik_example_com_wordpress_secret_v1  # the same as in authentik
-AUTHENTIK_ID_NAME=authentik_example_com_wordpress_id_v1  # the same as in authentik
-```
-
-`abra app cmd <app-name> app set_authentik`
-
-## Tests
-
-Run the full test suite for this repository:
-
-```sh
-bash tests/run.sh
-```
-
-### Prerequisites
-
-The test suite uses several tools. Install them with your equivalent of:
-
-```sh
-brew install shellcheck gomplate
-```
-Some tests skip gracefully if their dependencies are missing.
-
-## Migrate from a non-Co-op Cloud WordPress install
-
-Make a `.tar.gz` backup of the site's `wp-content` dir and a `.sql.gz` backup of the database.
-
-1. `abra app wp.example.com restore app wp-content.tar.gz`
-2. `abra app wp.example.com restore db wordpress.sql.gz`
-
-Lastly, if there's a domain name change, run a search and replace:
-`abra app wp.example.com wp "search-replace https://old.example.com https://wp.example.com"`
-
 [abra]: https://git.autonomic.zone/autonomic-cooperative/abra
 [cc-traefik]: https://git.autonomic.zone/coop-cloud/traefik
 [cc-postfix-relay]: https://git.autonomic.zone/coop-cloud/postfix-relay

compose.ftp-2220.yml

@@ -4,4 +4,4 @@ version: "3.8"
 services:
   ftp:
     ports:
-      - 2220:22
+        - 2220:22

compose.ftp-2221.yml

@@ -4,4 +4,4 @@ version: "3.8"
 services:
   ftp:
     ports:
-      - 2221:22
+        - 2221:22

compose.ftp-2222.yml

@@ -4,4 +4,4 @@ version: "3.8"
 services:
   ftp:
     ports:
-      - 2222:22
+        - 2222:22

compose.ftp-2223.yml

@@ -4,4 +4,4 @@ version: "3.8"
 services:
   ftp:
     ports:
-      - 2223:22
+        - 2223:22

compose.ftp-2224.yml

@@ -4,4 +4,4 @@ version: "3.8"
 services:
   ftp:
     ports:
-      - 2224:22
+        - 2224:22

compose.ftp-2225.yml

@@ -4,4 +4,4 @@ version: "3.8"
 services:
   ftp:
     ports:
-      - 2220:22
+        - 2220:22

entrypoint.sh.tmpl

@@ -1,13 +1,13 @@
 #!/bin/bash
 
-{{ if (getenv "PHP_EXTENSIONS") }}
+{{ if (env "PHP_EXTENSIONS") }}
-docker-php-ext-install {{ getenv "PHP_EXTENSIONS" }}
+docker-php-ext-install {{ env "PHP_EXTENSIONS" }}
 {{ end }}
 
 curl -z /usr/local/bin/wp -o /usr/local/bin/wp https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar
 chmod +x /usr/local/bin/wp
 
-{{ if eq (getenv "ENABLE_COMPOSER") "1" }}
+{{ if eq (env "ENABLE_COMPOSER") "1" }}
 mkdir -p /var/www/.composer
 chown www-data:www-data /var/www/.composer /var/www/html/composer
 
@@ -19,18 +19,18 @@ rm /tmp/composer-setup.php
 mv /var/www/html/composer.phar /usr/local/bin/composer
 {{ end }}
 
-{{ if eq (getenv "CORS_ALLOW_ALL") "1" }}
+{{ if eq (env "CORS_ALLOW_ALL") "1" }}
 a2enmod headers
 sed -ri -e 's/^([ \t]*)(<\/VirtualHost>)/\1\tHeader set Access-Control-Allow-Origin "*"\n\1\2/g' /etc/apache2/sites-available/*.conf
 {{ end }}
 
-{{ if eq (getenv "MULTISITE") "enable" }}
+{{ if eq (env "MULTISITE") "enable" }}
 export WORDPRESS_CONFIG_EXTRA="$WORDPRESS_CONFIG_EXTRA
 define('WP_CACHE', false);
 define('WP_ALLOW_MULTISITE', true );"
 {{ end }}
 
-{{ if or (eq (getenv "MULTISITE") "subdomain") (eq (getenv "MULTISITE") "subfolder") }}
+{{ if or (eq (env "MULTISITE") "subdomain") (eq (env "MULTISITE") "subfolder") }}
 export WORDPRESS_CONFIG_EXTRA="$WORDPRESS_CONFIG_EXTRA
 define('MULTISITE', true);
 define('SUBDOMAIN_INSTALL', true);
@@ -56,7 +56,7 @@ fi
 
 chown -R --from=root:root www-data:www-data /var/www/html/wp-content/
 
-if [ $# -gt 0 ]; then
+if [ -n "$@" ]; then
 	"$@"
 fi
 

htaccess.tmpl

@@ -3,7 +3,7 @@
     Require all denied
 </FilesMatch>
 
-{{ if eq (getenv "MULTISITE") "" -}}
+{{ if eq (env "MULTISITE") "" -}}
 # BEGIN WordPress
 
 RewriteEngine On
@@ -17,7 +17,7 @@ RewriteRule . /index.php [L]
 # END WordPress
 {{- end -}}
 
-{{- if eq (getenv "MULTISITE") "subfolder" -}}
+{{- if eq (env "MULTISITE") "subfolder" -}}
 # BEGIN WordPress Multisite
 # Using subfolder network type: https://wordpress.org/documentation/article/htaccess/#multisite
 
@@ -39,7 +39,7 @@ RewriteRule . index.php [L]
 # END WordPress Multisite
 {{- end -}}
 
-{{- if eq (getenv "MULTISITE") "subdomain" -}}
+{{- if eq (env "MULTISITE") "subdomain" -}}
 # BEGIN WordPress Multisite
 # Using subdomain network type: https://wordpress.org/documentation/article/htaccess/#multisite
 

msmtp.conf.tmpl

@@ -1,19 +1,19 @@
 account default
-host {{ getenv "SMTP_HOST" }}
+host {{ env "SMTP_HOST" }}
-from {{ getenv "MAIL_FROM" }}
+from {{ env "MAIL_FROM" }}
-user {{ or (getenv "SMTP_USER") (getenv "MAIL_FROM") }}
+user {{ or (env "SMTP_USER") (env "MAIL_FROM") }}
-port {{ getenv "SMTP_PORT" }}
+port {{ env "SMTP_PORT" }}
 
-{{ if eq (getenv "SMTP_OVERRIDE_FROM") "on" }}
+{{ if eq (env "SMTP_OVERRIDE_FROM") "on" }}
 set_from_header on
 {{ end }}
 
-{{ if eq (getenv "SMTP_AUTH") "on" }}
+{{ if eq (env "SMTP_AUTH") "on" }}
-auth {{ getenv "SMTP_AUTH" }}
+auth {{ env "SMTP_AUTH" }}
 passwordeval "cat /run/secrets/smtp_password"
 {{ end }}
 
-{{ if eq (getenv "SMTP_TLS") "on" }}
+{{ if eq (env "SMTP_TLS") "on" }}
-tls {{ getenv "SMTP_TLS" }}
+tls {{ env "SMTP_TLS" }}
 tls_trust_file /etc/ssl/certs/ca-certificates.crt
 {{ end }}

tests/run.sh

@@ -19,7 +19,7 @@ done < <(find "$ROOT/.." -maxdepth 1 -name 'compose*.yml' | sort)
 SHELL_TMPL_FILES=()
 while IFS= read -r f; do
     SHELL_TMPL_FILES+=("$f")
-done < <(find "$ROOT/.." -maxdepth 1 -name '*.sh.tmpl' | sort)
+done < <(find "$ROOT/.." -maxdepth 1 -name '*.tmpl' | sort)
 
 # Track total failures across all test suites
 failures=0

tests/test_compose_config.sh

@@ -15,7 +15,7 @@ fi
 
 # Validate a compose file against the Docker Compose specification
 test_compose_config() {
-    local file=$1 main=${2:-}
+    local file=$1
 
     # Skip if Docker Compose is not available on this system
     if [ -z "$compose_cmd" ]; then
@@ -23,27 +23,13 @@ test_compose_config() {
         return
     fi
 
-    # Main compose file is validated standalone
+    # config -q exits with non-zero if the compose file is invalid
-    if [ -z "$main" ]; then
+    if $compose_cmd -f "$file" config -q 2>/dev/null; then
-        if $compose_cmd -f "$file" config -q 2>/dev/null; then
-            echo "  PASS  $file"
-            pass=$((pass + 1))
-        else
-            echo "  FAIL  $file"
-            fail=$((fail + 1))
-        fi
-        return
-    fi
-
-    # Override files are validated combined with the main compose file.
-    # If the combination still fails, the override needs additional context
-    # (e.g. other override files) and is skipped rather than failed.
-    if $compose_cmd -f "$main" -f "$file" config -q 2>/dev/null; then
         echo "  PASS  $file"
         pass=$((pass + 1))
     else
-        echo "  SKIP  $file (partial override, needs additional context)"
+        echo "  FAIL  $file"
-        pass=$((pass + 1))
+        fail=$((fail + 1))
     fi
 }
 
@@ -55,7 +41,7 @@ test_compose_config "$ROOT/compose.yml"
 while IFS= read -r f; do
     # Skip the main compose file (already tested above)
     [ "$f" = "$ROOT/compose.yml" ] && continue
-    [ -f "$f" ] && test_compose_config "$f" "$ROOT/compose.yml"
+    [ -f "$f" ] && test_compose_config "$f"
 done < <(find "$ROOT" -maxdepth 1 -name 'compose*.yml' | sort)
 
 echo "---"

tests/test_shell.sh

@@ -4,15 +4,6 @@ set -euo pipefail
 pass=0
 fail=0
 
-# Skip if shellcheck is not installed
-if ! command -v shellcheck &>/dev/null; then
-    echo "=== ShellCheck ==="
-    echo "  SKIP  shellcheck not found"
-    echo "---"
-    echo "Passed: 0  Failed: 0"
-    exit 0
-fi
-
 # Allow overriding shellcheck options via env var (e.g. -s bash)
 EXTRA_SHELLCHECK_OPTS="${SHELLCHECK_OPTS:-}"
 

tests/test_templates.sh

@@ -11,20 +11,27 @@ gomplate="${GOMPLATE_BIN:-gomplate}"
 # Ensure gomplate is installed before running template tests
 require_gomplate() {
     if ! command -v "$gomplate" &>/dev/null; then
-        echo "  SKIP  gomplate not found (install from https://github.com/hairyhenderson/gomplate or set GOMPLATE_BIN)"
+        echo "gomplate not found. Install it from https://github.com/hairyhenderson/gomplate"
-        exit 0
+        echo "or set GOMPLATE_BIN env var."
+        exit 1
     fi
 }
 
+render() {
+    local tmpl=$1 envfile=$2
+    "$gomplate" \
+        --template t="$tmpl" \
+        --context "_=fmt:%s" \
+        --datasource "env=env://?$envfile" \
+        -f "$tmpl" 2>/dev/null
+}
+
 # Render a template by exporting env vars directly
 # This avoids gomplate datasource quirks with .env files
 render_via_env() {
     local tmpl=$1 envfile=$2
-    set -a
+    # shellcheck disable=2046
-    # shellcheck disable=1090,1091
+    env $(xargs < "$envfile") "$gomplate" -f "$tmpl" 2>/dev/null
-    . "$envfile"
-    set +a
-    "$gomplate" -f "$tmpl" 2>/dev/null
 }
 
 # ---------------------------------------------------------------------------

uploads.ini.tmpl

@@ -1,10 +1,10 @@
-{{- $upload_max_size := "256M" -}}
+{{ $upload_max_size := "256M" }}
-{{- if ne (getenv "UPLOAD_MAX_SIZE") "" }}{{ $upload_max_size = getenv "UPLOAD_MAX_SIZE" }}{{ end -}}
+{{ if ne (env "UPLOAD_MAX_SIZE") "" }} {{ $upload_max_size = env "UPLOAD_MAX_SIZE" }} {{ end }}
-{{- $upload_max_time := "30" -}}
+{{ $upload_max_time := "30" }}
-{{- if ne (getenv "UPLOAD_MAX_TIME") "" }}{{ $upload_max_time = getenv "UPLOAD_MAX_TIME" }}{{ end -}}
+{{ if ne (env "UPLOAD_MAX_TIME") "" }} {{ $upload_max_time = env "UPLOAD_MAX_TIME" }} {{ end }}
 
 file_uploads = On
-upload_max_filesize = {{ $upload_max_size }}
+upload_max_filesize =  {{ $upload_max_size }}
 post_max_size = {{ $upload_max_size }}
 memory_limit = {{ $upload_max_size }}
 max_execution_time = {{ $upload_max_time }}