Merge pull request #64 from nginxinc/ps-dev-geoip2

Allow parsing of geoip2 module

Author: puneetsarna

analyze.go

@@ -546,6 +546,10 @@ var directives = map[string][]uint{
 		ngxHTTPMainConf | ngxConfBlock | ngxConfTake12,
 		ngxStreamMainConf | ngxConfBlock | ngxConfTake12,
 	},
+	"geoip2": {
+		ngxHTTPMainConf | ngxConfBlock | ngxConfTake1,
+		ngxStreamMainConf | ngxConfBlock | ngxConfTake1,
+	},
 	"geoip_city": {
 		ngxHTTPMainConf | ngxConfTake12,
 		ngxStreamMainConf | ngxConfTake12,

analyze_map.go

@@ -38,6 +38,9 @@ var mapBodies = map[string]mapParameterMasks{
 	"split_clients": {
 		defaultMasks: ngxConfTake1,
 	},
+	"geoip2": {
+		defaultMasks: ngxConf1More,
+	},
 }
 
 // analyzeMapBody validates the body of a map-like directive. Map-like directives are block directives

analyze_map_test.go

@@ -165,6 +165,16 @@ func TestAnalyzeMapBody(t *testing.T) {
 			term:    ";",
 			wantErr: &ParseError{What: "invalid number of parameters", BlockCtx: "split_clients"},
 		},
+		"valid geoip2": {
+			mapDirective: "geoip2",
+			parameter: &Directive{
+				Directive: "$geoip2_data_continent_code",
+				Args:      []string{"continent", "code"},
+				Line:      5,
+				Block:     Directives{},
+			},
+			term: ";",
+		},
 		"missing semicolon": {
 			mapDirective: "map",
 			parameter: &Directive{