fix vs test and snaps

Author: AlexFenlon

internal/configs/version1/__snapshots__/template_test.snap

@@ -733,6 +733,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;
@@ -1268,6 +1269,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;

internal/configs/version2/nginx-plus.virtualserver.tmpl

@@ -675,7 +675,7 @@ server {
         {{ $proxyOrGRPC }}_send_timeout {{ $l.ProxySendTimeout }};
         client_max_body_size {{ $l.ClientMaxBodySize }};
         {{- if $l.ClientBodyBufferSize }}
-        client_body_buffer_size {{ $l.ClientBodyBufferSize }}
+        client_body_buffer_size {{ $l.ClientBodyBufferSize }};
         {{- end }}
 
             {{- if $l.ProxyMaxTempFileSize }}

internal/configs/virtualserver.go

@@ -2647,7 +2647,7 @@ func generateLocationForProxying(path string, upstreamName string, upstream conf
 		ProxyReadTimeout:         generateTimeWithDefault(upstream.ProxyReadTimeout, cfgParams.ProxyReadTimeout),
 		ProxySendTimeout:         generateTimeWithDefault(upstream.ProxySendTimeout, cfgParams.ProxySendTimeout),
 		ClientMaxBodySize:        generateString(upstream.ClientMaxBodySize, cfgParams.ClientMaxBodySize),
-		ClientBodyBufferSize:     upstream.ClientBodyBufferSize,
+		ClientBodyBufferSize:     generateString(upstream.ClientBodyBufferSize, cfgParams.ClientBodyBufferSize),
 		ProxyMaxTempFileSize:     cfgParams.ProxyMaxTempFileSize,
 		ProxyBuffering:           generateBool(upstream.ProxyBuffering, cfgParams.ProxyBuffering),
 		ProxyBuffers:             generateBuffers(upstream.ProxyBuffers, cfgParams.ProxyBuffers),

internal/configs/virtualserver_test.go

@@ -16271,6 +16271,7 @@ func TestGenerateLocationForGrpcProxying(t *testing.T) {
 		ProxyReadTimeout:     "31s",
 		ProxySendTimeout:     "32s",
 		ClientMaxBodySize:    "1m",
+		ClientBodyBufferSize: "16k",
 		ProxyMaxTempFileSize: "1024m",
 		ProxyBuffering:       true,
 		ProxyBuffers:         "8 4k",
@@ -16290,6 +16291,7 @@ func TestGenerateLocationForGrpcProxying(t *testing.T) {
 		ProxyReadTimeout:         "31s",
 		ProxySendTimeout:         "32s",
 		ClientMaxBodySize:        "1m",
+		ClientBodyBufferSize:     "16k",
 		ProxyMaxTempFileSize:     "1024m",
 		ProxyBuffering:           true,
 		ProxyBuffers:             "8 4k",