Merge pull request #66 from nginxinc/main

fix: update parsing logic to handle variables with braces

Author: nginx-nickc

lex.go

@@ -198,12 +198,11 @@ func tokenize(reader io.Reader, tokenCh chan NgxToken) {
 			token.WriteString(la)
 
 		case inVar:
+			token.WriteString(la)
 			// this is using the same logic as the exiting lexer, but this is wrong since it does not terminate on token boundary
 			if !strings.HasSuffix(token.String(), "}") && !isSpace(la) {
-				token.WriteString(la)
 				continue
 			}
-			token.WriteString(la)
 			lexState = inWord
 
 		case inQuote:

lex_test.go

@@ -160,7 +160,8 @@ var lexFixtures = []lexFixture{
 		{"/status.html", 18},
 		{"{", 18},
 		{"try_files", 19},
-		{"/abc/${uri} /abc/${uri}.html", 19},
+		{"/abc/${uri}", 19},
+		{"/abc/${uri}.html", 19},
 		{"=404", 19},
 		{";", 19},
 		{"}", 20},

parse_test.go

@@ -491,6 +491,70 @@ var parseFixtures = []parseFixture{
 			},
 		},
 	}},
+	{"simple-variable-with-braces", "-ignore-directives-1", ParseOptions{IgnoreDirectives: []string{"listen", "server_name"}}, Payload{
+		Status: "ok",
+		Config: []Config{
+			{
+				File:   getTestConfigPath("simple-variable-with-braces", "nginx.conf"),
+				Status: "ok",
+				Parsed: Directives{
+					{
+						Directive: "events",
+						Args:      []string{},
+						Line:      1,
+						Block: Directives{
+							{
+								Directive: "worker_connections",
+								Args:      []string{"1024"},
+								Line:      2,
+							},
+						},
+					},
+					{
+						Directive: "http",
+						Args:      []string{},
+						Line:      5,
+						Block: Directives{
+							{
+								Directive: "server",
+								Args:      []string{},
+								Line:      6,
+								Block: Directives{
+									{
+										Directive: "location",
+										Args:      []string{"/proxy"},
+										Line:      9,
+										Block: Directives{
+											{
+												Directive: "set",
+												Args:      []string{"$backend_protocol", "http"},
+												Line:      10,
+											},
+											{
+												Directive: "set",
+												Args:      []string{"$backend_host", "bar"},
+												Line:      11,
+											},
+											{
+												Directive: "set",
+												Args:      []string{"$foo", ""},
+												Line:      12,
+											},
+											{
+												Directive: "proxy_pass",
+												Args:      []string{"$backend_protocol://$backend_host${foo}"},
+												Line:      13,
+											},
+										},
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+	}},
 	{"with-comments", "-true", ParseOptions{ParseComments: true}, Payload{
 		Status: "ok",
 		Config: []Config{

testdata/configs/simple-variable-with-braces/nginx.conf

@@ -0,0 +1,16 @@
+events {
+    worker_connections 1024;
+}
+
+http {
+    server {
+        listen       127.0.0.1:8080;
+        server_name  default_server;
+        location /proxy {
+            set $backend_protocol http;
+            set $backend_host bar;
+            set $foo '';
+            proxy_pass $backend_protocol://$backend_host${foo};
+        }
+    }
+}