From 1f3da80d4e74abc201d11a66546b47fefacc8247 Mon Sep 17 00:00:00 2001 From: Ricardo Katz Date: Tue, 29 Oct 2024 08:59:17 -0300 Subject: [PATCH] Apply suggestions from code review Co-authored-by: Marco Ebert --- rootfs/etc/nginx/lua/nginx/ngx_conf_external_auth.lua | 6 +++--- rootfs/etc/nginx/template/nginx.tmpl | 4 ++-- test/e2e/annotations/auth.go | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/rootfs/etc/nginx/lua/nginx/ngx_conf_external_auth.lua b/rootfs/etc/nginx/lua/nginx/ngx_conf_external_auth.lua index 5c42b99c0..253ed2d0a 100644 --- a/rootfs/etc/nginx/lua/nginx/ngx_conf_external_auth.lua +++ b/rootfs/etc/nginx/lua/nginx/ngx_conf_external_auth.lua @@ -1,12 +1,12 @@ -local auth_path = ngx.var.auth_access_path -local keepalive_shared_vars = ngx.var.keep_alive_share_vars +local auth_path = ngx.var.auth_path +local auth_keepalive_share_vars = ngx.var.auth_keepalive_share_vars local auth_response_headers = ngx.var.auth_response_headers local ngx_re_split = require("ngx.re").split local ipairs = ipairs local ngx_log = ngx.log local ngx_ERR = ngx.ERR -local res = ngx.location.capture(auth_path, { method = ngx.HTTP_GET, body = '', share_all_vars = keepalive_shared_vars }) +local res = ngx.location.capture(auth_path, { method = ngx.HTTP_GET, body = '', share_all_vars = auth_keepalive_share_vars }) if res.status == ngx.HTTP_OK then local header_parts, err = ngx_re_split(auth_response_headers, ",") if err then diff --git a/rootfs/etc/nginx/template/nginx.tmpl b/rootfs/etc/nginx/template/nginx.tmpl index ba7f9e8b2..e40cef244 100644 --- a/rootfs/etc/nginx/template/nginx.tmpl +++ b/rootfs/etc/nginx/template/nginx.tmpl @@ -1185,8 +1185,8 @@ stream { {{- end }} # `auth_request` module does not support HTTP keepalives in upstream block: # https://trac.nginx.org/nginx/ticket/1579 - set $auth_access_path '{{ $authPath }}'; - set $keep_alive_share_vars {{ $externalAuth.KeepaliveShareVars }}; + set $auth_path '{{ $authPath }}'; + set $auth_keepalive_share_vars {{ $externalAuth.KeepaliveShareVars }}; set $auth_response_headers '{{ buildAuthUpstreamLuaHeaders $externalAuth.ResponseHeaders }}'; access_by_lua_file /etc/nginx/lua/nginx/ngx_conf_external_auth.lua; {{ else }} diff --git a/test/e2e/annotations/auth.go b/test/e2e/annotations/auth.go index 36e23707f..71cb70ea9 100644 --- a/test/e2e/annotations/auth.go +++ b/test/e2e/annotations/auth.go @@ -653,7 +653,7 @@ http { func(server string) bool { return strings.Contains(server, `upstream auth-external-auth`) && strings.Contains(server, `keepalive 10;`) && - strings.Contains(server, `set $keep_alive_share_vars false;`) + strings.Contains(server, `set $auth_keepalive_share_vars false;`) }) }) @@ -673,7 +673,7 @@ http { func(server string) bool { return strings.Contains(server, `upstream auth-external-auth`) && strings.Contains(server, `keepalive 10;`) && - strings.Contains(server, `set $keep_alive_share_vars true`) + strings.Contains(server, `set $auth_keepalive_share_vars true`) }) }) })