NLB-6350: revert analyze test

Author: xynicole

analyze_test.go

@@ -45,7 +45,7 @@ func TestAnalyze(t *testing.T) {
 			// the state directive should only be in the "good" contexts
 			if _, ok := goodMap[key]; !ok {
 				actx := blockCtx(strings.Split(key, ">"))
-				if err := analyze(fname, stmt, ";", actx, &ParseOptions{DirectiveSources: []MatchFunc{MatchNginxPlusR33}}); err == nil {
+				if err := analyze(fname, stmt, ";", actx, &ParseOptions{}); err == nil {
 					t.Fatalf("expected error to not be nil: %v", err)
 				} else if e, ok := err.(*ParseError); !ok {
 					t.Fatalf("error was not a ParseError: %v", err)
@@ -106,7 +106,7 @@ func TestAnalyze_auth_jwt(t *testing.T) {
 		tc := tc
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
-			err := analyze("nginx.conf", tc.stmt, ";", tc.ctx, &ParseOptions{DirectiveSources: []MatchFunc{MatchNginxPlusR33}})
+			err := analyze("nginx.conf", tc.stmt, ";", tc.ctx, &ParseOptions{})
 
 			if !tc.wantErr && err != nil {
 				t.Fatal(err)
@@ -159,7 +159,7 @@ func TestAnalyze_auth_jwt_require(t *testing.T) {
 		tc := tc
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
-			err := analyze("nginx.conf", tc.stmt, ";", tc.ctx, &ParseOptions{DirectiveSources: []MatchFunc{MatchNginxPlusR33}})
+			err := analyze("nginx.conf", tc.stmt, ";", tc.ctx, &ParseOptions{})
 
 			if !tc.wantErr && err != nil {
 				t.Fatal(err)
@@ -531,7 +531,7 @@ func TestAnalyze_zone_sync(t *testing.T) {
 		tc := tc
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
-			err := analyze("nginx.conf", tc.stmt, ";", tc.ctx, &ParseOptions{DirectiveSources: []MatchFunc{MatchNginxPlusR33}})
+			err := analyze("nginx.conf", tc.stmt, ";", tc.ctx, &ParseOptions{})
 			if !tc.wantErr && err != nil {
 				t.Fatal(err)
 			}
@@ -2338,7 +2338,7 @@ func TestAnalyze_mgmt(t *testing.T) {
 		tc := tc
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
-			err := analyze("nginx.conf", tc.stmt, ";", tc.ctx, &ParseOptions{DirectiveSources: []MatchFunc{MatchNginxPlusR33}})
+			err := analyze("nginx.conf", tc.stmt, ";", tc.ctx, &ParseOptions{})
 			if !tc.wantErr && err != nil {
 				t.Fatal(err)
 			}
@@ -2593,7 +2593,6 @@ func TestAnalyze_directiveSources_defaultBehavior(t *testing.T) {
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 			err := analyze("nginx.conf", tc.stmt, ";", tc.ctx, &ParseOptions{
-				DirectiveSources:         []MatchFunc{MatchNginxPlusR33},
 				ErrorOnUnknownDirectives: true,
 			})
 
@@ -2618,7 +2617,7 @@ func TestAnalyze_limit_req_zone(t *testing.T) {
 		"limit_req_zone_4_args_nplus_latest": {
 			args:    []string{"$binary_remote_addr", "zone=one:10m", "rate=1r/s", "sync"},
 			sources: []MatchFunc{MatchNginxPlusLatest},
-			wantErr: true,
+			wantErr: false,
 		},
 		"limit_req_zone_3_args_nplus_latest": {
 			args:    []string{"$binary_remote_addr", "zone=one:10m", "rate=1r/s"},
@@ -2637,7 +2636,7 @@ func TestAnalyze_limit_req_zone(t *testing.T) {
 		},
 		"limit_req_zone_4_args_default_sources": {
 			args:    []string{"$binary_remote_addr", "zone=one:10m", "rate=1r/s", "sync"},
-			wantErr: true,
+			wantErr: false,
 		},
 		"limit_req_zone_3_args_default_sources": {
 			args:    []string{"$binary_remote_addr", "zone=one:10m", "rate=1r/s"},