NLB-6875: update R34 Directives

Author: Naveen-Gopu-F5

analyze.go

@@ -82,22 +82,22 @@ const (
 	ngxConfTake1234 = ngxConfTake123 | ngxConfTake4
 
 	// bit masks for different directive locations.
-	ngxDirectConf     = 0x00010000 // main file (not used)
-	ngxMgmtMainConf   = 0x00020000 // mgmt // unique bitmask that may not match NGINX source
-	ngxMainConf       = 0x00040000 // main context
-	ngxEventConf      = 0x00080000 // events
-	ngxMailMainConf   = 0x00100000 // mail
-	ngxMailSrvConf    = 0x00200000 // mail > server
-	ngxStreamMainConf = 0x00400000 // stream
-	ngxStreamSrvConf  = 0x00800000 // stream > server
-	ngxStreamUpsConf  = 0x01000000 // stream > upstream
-	ngxHTTPMainConf   = 0x02000000 // http
-	ngxHTTPSrvConf    = 0x04000000 // http > server
-	ngxHTTPLocConf    = 0x08000000 // http > location
-	ngxHTTPUpsConf    = 0x10000000 // http > upstream
-	ngxHTTPSifConf    = 0x20000000 // http > server > if
-	ngxHTTPLifConf    = 0x40000000 // http > location > if
-	ngxHTTPLmtConf    = 0x80000000 // http > location > limit_except
+	ngxDirectConf     = 0x000010000 // main file (not used)
+	ngxMgmtMainConf   = 0x000020000 // mgmt // unique bitmask that may not match NGINX source
+	ngxMainConf       = 0x000040000 // main context
+	ngxEventConf      = 0x000080000 // events
+	ngxMailMainConf   = 0x000100000 // mail
+	ngxMailSrvConf    = 0x000200000 // mail > server
+	ngxStreamMainConf = 0x000400000 // stream
+	ngxStreamSrvConf  = 0x000800000 // stream > server
+	ngxStreamUpsConf  = 0x001000000 // stream > upstream
+	ngxHTTPMainConf   = 0x002000000 // http
+	ngxHTTPSrvConf    = 0x004000000 // http > server
+	ngxHTTPLocConf    = 0x008000000 // http > location
+	ngxHTTPUpsConf    = 0x010000000 // http > upstream
+	ngxHTTPSifConf    = 0x020000000 // http > server > if
+	ngxHTTPLifConf    = 0x040000000 // http > location > if
+	ngxHTTPLmtConf    = 0x080000000 // http > location > limit_except
 	ngxHTTPOIDCConf   = 0x100000000 // http > oidc_provider
 )
 

analyze_nplus_latest_directives.gen.go

@@ -6,7 +6,6 @@
         "health_check_header",
         "body",
         "body_size",
-        "proxy",
         "http2_pool_size",
         "post_action",
         "pcre_buffer",
@@ -36,7 +35,8 @@
         "post_acceptex",
         "open_file_cache_events",
         "gzip_no_buffer",
-        "deployment_context"
+        "deployment_context",
+        "proxy_location"
     ],
     "override":{
         "if":[[ "ngxHTTPSrvConf", "ngxHTTPLocConf", "ngxConfBlock", "ngxConfExpr", "ngxConf1More"]],
@@ -85,7 +85,8 @@
             ["ngxHTTPMainConf", "ngxHTTPSrvConf", "ngxConfTake1"],
             ["ngxMailMainConf", "ngxMailSrvConf", "ngxConfTake1"],
             ["ngxMgmtMainConf", "ngxConfTake1"],
-            ["ngxStreamMainConf", "ngxStreamSrvConf", "ngxConfTake1"]
+            ["ngxStreamMainConf", "ngxStreamSrvConf", "ngxConfTake1"],
+            ["ngxHTTPOIDCConf", "ngxConfTake1"]
         ],
         "ssl_name": [["ngxMgmtMainConf", "ngxConfTake1"]],
         "ssl_password_file": [
@@ -105,7 +106,8 @@
             ["ngxHTTPMainConf", "ngxHTTPSrvConf", "ngxConfTake1"],
             ["ngxMailMainConf", "ngxMailSrvConf", "ngxConfTake1"],
             ["ngxMgmtMainConf", "ngxConfTake1"],
-            ["ngxStreamMainConf", "ngxStreamSrvConf", "ngxConfTake1"]
+            ["ngxStreamMainConf", "ngxStreamSrvConf", "ngxConfTake1"],
+            ["ngxHTTPOIDCConf", "ngxConfTake1"]
         ],
         "ssl_verify": [["ngxMgmtMainConf", "ngxConfFlag"]],
         "ssl_verify_depth": [
@@ -119,7 +121,24 @@
         "enforce_initial_report": [["ngxMgmtMainConf","ngxConfFlag"]],
         "license_token": [["ngxMgmtMainConf","ngxConfTake1"]],
         "state_path": [["ngxMgmtMainConf","ngxConfTake1"]],
-        "zone_sync": [["ngxStreamSrvConf","ngxConfNoArgs"]]
+        "zone_sync": [["ngxStreamSrvConf","ngxConfNoArgs"]],
+        "proxy":[
+            ["ngxMailMainConf","ngxMailSrvConf","ngxConfFlag"],
+            ["ngxMgmtMainConf","ngxConfTake1"]
+        ],
+        "proxy_username": [["ngxMgmtMainConf","ngxConfTake1"]],
+        "proxy_password": [["ngxMgmtMainConf","ngxConfTake1"]],
+        "client_id": [["ngxHTTPOIDCConf", "ngxConfTake1"]],
+        "client_secret": [["ngxHTTPOIDCConf", "ngxConfTake1"]],
+        "issuer": [["ngxHTTPOIDCConf", "ngxConfTake1"]],
+        "config_url": [["ngxHTTPOIDCConf", "ngxConfTake1"]],
+        "cookie_name": [["ngxHTTPOIDCConf", "ngxConfTake1"]],
+        "extra_auth_args": [["ngxHTTPOIDCConf", "ngxConfTake1"]],
+        "redirect_uri": [["ngxHTTPOIDCConf", "ngxConfTake1"]],
+        "scope": [["ngxHTTPOIDCConf", "ngxConfTake1"]],
+        "session_store": [["ngxHTTPOIDCConf", "ngxConfTake1"]],
+        "session_timeout": [["ngxHTTPOIDCConf", "ngxConfTake1"]]
+
     },
     "matchFuncComment":"MatchNginxPlusLatest contains directives in latest version of Nginx Plus source code(including GEOIP, Perl, and XSLT)"
 }