fix snaps

Author: AlexFenlon

internal/configs/version1/__snapshots__/template_test.snap

@@ -742,6 +742,7 @@ server {
         proxy_read_timeout 10s;
         proxy_send_timeout 10s;
         client_max_body_size 2m;
+        client_body_buffer_size 16k;
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -900,7 +901,6 @@ server {
         proxy_read_timeout 10s;
         proxy_send_timeout 10s;
         client_max_body_size 2m;
-        client_body_buffer_size 16k;
         
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
@@ -1278,6 +1278,7 @@ server {
         proxy_read_timeout 10s;
         proxy_send_timeout 10s;
         client_max_body_size 2m;
+        client_body_buffer_size 16k;
         
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
@@ -2333,7 +2334,6 @@ server {
         proxy_read_timeout 10s;
         proxy_send_timeout 10s;
         client_max_body_size 2m;
-        client_body_buffer_size 16k;
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -2806,102 +2806,6 @@ server {
 
 ---
 
-[TestExecuteTemplate_ForIngressWithoutClientBodyBufferSize - 1]
-# configuration for default/cafe-ingress
-upstream test {
-    zone test 256k;
-    server 127.0.0.1:8181 max_fails=0 fail_timeout=1s max_conns=0 slow_start=5s;keepalive 16;
-}
-
-
-
-
-server {
-    listen 443 ssl;listen [::]:443 ssl;
-    ssl_certificate secret.pem;
-    ssl_certificate_key secret.pem;
-
-    server_tokens "off";
-
-    server_name test.example.com;
-
-    status_zone test.example.com;
-    set $resource_type "ingress";
-    set $resource_name "cafe-ingress";
-    set $resource_namespace "default";
-    app_protect_enable on;
-    app_protect_policy_file /etc/nginx/waf/nac-policies/default-dataguard-alarm;
-    app_protect_security_log_enable on;
-    app_protect_security_log /etc/nginx/waf/nac-logconfs/test_logconf syslog:server=127.0.0.1:514;
-    app_protect_security_log /etc/nginx/waf/nac-logconfs/test_logconf2;
-    
-    app_protect_dos_enable on;
-    app_protect_dos_policy_file /test/policy.json;
-    app_protect_dos_security_log_enable on;
-    app_protect_dos_security_log /test/logConf.json;
-    set $loggable '0';
-    # app-protect-dos module will set it to '1'  if a request doesn't pass the rate limit
-    access_log /var/log/dos log_dos if=$loggable;
-    app_protect_dos_monitor uri=/path/to/monitor protocol=http1 timeout=30;
-    app_protect_dos_name "testdos";
-    app_protect_dos_access_file "/etc/nginx/dos/allowlist/default_test.example.com";
-
-    
-    if ($scheme = http) {
-        return 301 https://$host:443$request_uri;
-    }
-
-    
-    auth_jwt_key_file /etc/nginx/secrets/key.jwk;
-    auth_jwt "closed site" token=$cookie_auth_token;
-    error_page 401 @login_url-default-cafe-ingress;
-    
-    location @hc-test {
-        proxy_set_header Test-Header "test-header-value";
-        proxy_connect_timeout 0s;
-        proxy_read_timeout 0s;
-        proxy_send_timeout 0s;
-        proxy_pass ://test;
-        health_check uri= interval=1s fails=1 passes=1;
-    }
-    
-    location @login_url-default-cafe-ingress {
-        internal;
-        return 302 https://test.example.com/login;
-    }
-    
-    location /tea {
-        set $service "";
-        status_zone "";
-        # location for minion default/tea-minion
-        set $resource_name "tea-minion";
-        set $resource_namespace "default";
-        proxy_http_version 1.1;
-        proxy_set_header Connection "";
-        auth_jwt_key_file /etc/nginx/secrets/location-key.jwk;
-        auth_jwt "closed site" token=$cookie_auth_token;
-
-        proxy_connect_timeout 10s;
-        proxy_read_timeout 10s;
-        proxy_send_timeout 10s;
-        client_max_body_size 2m;
-        
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Host $host;
-        proxy_set_header X-Forwarded-Port $server_port;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_buffering off;
-        proxy_pass http://test;
-
-        
-    }
-    
-}
-
----
-
 [TestExecuteTemplate_ForMainForNGINXPlusTLSPassthroughPortDisabled - 1]
 worker_processes  auto;
 worker_rlimit_nofile 65536;

internal/configs/version1/template_test.go

@@ -325,25 +325,6 @@ func TestExecuteTemplate_ForIngressWithClientBodyBufferSize(t *testing.T) {
 	snaps.MatchSnapshot(t, buf.String())
 }
 
-func TestExecuteTemplate_ForIngressWithoutClientBodyBufferSize(t *testing.T) {
-	t.Parallel()
-
-	tmpl := newNGINXPlusIngressTmpl(t)
-	buf := &bytes.Buffer{}
-
-	err := tmpl.Execute(buf, ingressCfg)
-	t.Log(buf.String())
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	want := "client_body_buffer_size 8k"
-	if strings.Contains(buf.String(), want) {
-		t.Errorf("want %q in generated config when ClientBodyBufferSize is not set", want)
-	}
-	snaps.MatchSnapshot(t, buf.String())
-}
-
 func TestExecuteTemplate_ForMergeableIngressWithSecondMinionWithPathRegexAnnotation(t *testing.T) {
 	t.Parallel()