From 6bc80feaf721bd34891b45e11a74049ef85c9d77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20G=C3=B3mez=20Gracia?= Date: Mon, 10 Feb 2025 15:17:34 +0100 Subject: [PATCH] [bitnami/nginx][bitnami/openresty] Update goss tests (#77137) Signed-off-by: Gonzalo Gomez Gracia --- .vib/nginx/goss/vars.yaml | 2 +- .vib/openresty/goss/openresty.yaml | 11 +++++++++-- .vib/openresty/goss/vars.yaml | 20 ++++++++++++++++++++ 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/.vib/nginx/goss/vars.yaml b/.vib/nginx/goss/vars.yaml index c54936c8332c..54739d1cfa7a 100644 --- a/.vib/nginx/goss/vars.yaml +++ b/.vib/nginx/goss/vars.yaml @@ -30,6 +30,7 @@ modules: - geoip2 - substitutions-filter - vts + - http-dav enabled: - http_stub_status - http_gzip_static @@ -40,7 +41,6 @@ modules: - mail_ssl - http_gunzip - http_auth_request - - http_dav - http_sub - http_geoip - stream_realip diff --git a/.vib/openresty/goss/openresty.yaml b/.vib/openresty/goss/openresty.yaml index f81347f1fd09..e04874380eec 100644 --- a/.vib/openresty/goss/openresty.yaml +++ b/.vib/openresty/goss/openresty.yaml @@ -44,5 +44,12 @@ command: exec: openresty -V 2>&1 exit-status: 0 stdout: - - "pcre-jit" - - "compat" + {{ range $added_module := .Vars.modules.added }} + - "nginx-module-{{ $added_module }}" + {{ end }} + {{ range $enabled_module := .Vars.modules.enabled }} + - "with-{{ $enabled_module }}_module" + {{ end }} + {{ range $additional_config := .Vars.config_opts }} + - "with-{{ $additional_config }}" + {{ end }} diff --git a/.vib/openresty/goss/vars.yaml b/.vib/openresty/goss/vars.yaml index aafe333a89eb..44d4dda21363 100644 --- a/.vib/openresty/goss/vars.yaml +++ b/.vib/openresty/goss/vars.yaml @@ -14,3 +14,23 @@ directories: - /docker-entrypoint-initdb.d - /home/openresty root_dir: /opt/bitnami +config_opts: + - pcre-jit + - compat +modules: + added: + - http-dav + enabled: + - http_stub_status + - http_gzip_static + - http_realip + - http_stub_status + - http_v2 + - http_ssl + - mail_ssl + - http_gunzip + - http_auth_request + - http_sub + - http_geoip + - stream_realip + - stream_ssl