Merge branch 'NLB-1190' into 'master'

fix: add njs directives

Closes NLB-1190

See merge request f5/nginx/crossplane-go!25

Author: valyria257

analyze.go

@@ -2091,18 +2091,45 @@ var directives = map[string][]uint{
 	"js_access": {
 		ngxStreamMainConf | ngxStreamSrvConf | ngxConfTake1,
 	},
+	"js_body_filter": {
+		ngxHTTPLocConf | ngxHTTPLmtConf | ngxConfTake1,
+	},
 	"js_content": {
 		ngxHTTPLocConf | ngxHTTPLmtConf | ngxConfTake1,
 	},
+	"js_fetch_ciphers": {
+		ngxHTTPMainConf | ngxHTTPSrvConf | ngxHTTPLocConf | ngxConfTake1,
+		ngxStreamMainConf | ngxStreamSrvConf | ngxConfTake1,
+	},
+	"js_fetch_protocols": {
+		ngxHTTPMainConf | ngxHTTPSrvConf | ngxHTTPLocConf | ngxConf1More,
+		ngxStreamMainConf | ngxStreamSrvConf | ngxConf1More,
+	},
+	"js_fetch_trusted_certificate": {
+		ngxHTTPMainConf | ngxHTTPSrvConf | ngxHTTPLocConf | ngxConfTake1,
+		ngxStreamMainConf | ngxStreamSrvConf | ngxConfTake1,
+	},
+	"js_fetch_verify_depth": {
+		ngxHTTPMainConf | ngxHTTPSrvConf | ngxHTTPLocConf | ngxConfTake1,
+		ngxStreamMainConf | ngxStreamSrvConf | ngxConfTake1,
+	},
 	"js_filter": {
 		ngxStreamMainConf | ngxStreamSrvConf | ngxConfTake1,
 	},
+	"js_header_filter": {
+		ngxHTTPLocConf | ngxHTTPLmtConf | ngxConfTake1,
+	},
+	"js_import": {
+		ngxHTTPMainConf | ngxConfTake1,
+		ngxStreamMainConf | ngxConfTake1,
+	},
 	"js_include": {
 		ngxHTTPMainConf | ngxConfTake1,
 		ngxStreamMainConf | ngxConfTake1,
 	},
 	"js_path": {
 		ngxHTTPMainConf | ngxConfTake1,
+		ngxStreamMainConf | ngxConfTake1,
 	},
 	"js_preread": {
 		ngxStreamMainConf | ngxStreamSrvConf | ngxConfTake1,
@@ -2111,6 +2138,10 @@ var directives = map[string][]uint{
 		ngxHTTPMainConf | ngxConfTake2,
 		ngxStreamMainConf | ngxConfTake2,
 	},
+	"js_var": {
+		ngxHTTPMainConf | ngxConfTake12,
+		ngxStreamMainConf | ngxConfTake12,
+	},
 	"keyval": {
 		ngxHTTPMainConf | ngxConfTake3,
 		ngxStreamMainConf | ngxConfTake3,

analyze_test.go

@@ -112,6 +112,50 @@ func TestAnalyze_auth_jwt(t *testing.T) {
 	}
 }
 
+func TestAnalyze_njs(t *testing.T) {
+	t.Parallel()
+	testcases := map[string]struct {
+		stmt    *Directive
+		ctx     blockCtx
+		wantErr bool
+	}{
+		"js_import ok": {
+			&Directive{
+				Directive: "js_import",
+				Args:      []string{"http.js"},
+				Line:      5,
+			},
+			blockCtx{"http"},
+			false,
+		},
+		"js_import not ok": {
+			&Directive{
+				Directive: "js_import",
+				Args:      []string{"http.js"},
+				Line:      5,
+			},
+			blockCtx{"http", "location"},
+			true,
+		},
+	}
+
+	for name, tc := range testcases {
+		tc := tc
+		t.Run(name, func(t *testing.T) {
+			t.Parallel()
+			err := analyze("nginx.conf", tc.stmt, ";", tc.ctx, &ParseOptions{})
+
+			if !tc.wantErr && err != nil {
+				t.Fatal(err)
+			}
+
+			if tc.wantErr && err == nil {
+				t.Fatal("expected error, got nil")
+			}
+		})
+	}
+}
+
 func TestAnalyze_stream_resolver(t *testing.T) {
 	t.Parallel()
 	testcases := map[string]struct {