Bugfix

Author: fabriziofiorucci

src/V3_CreateConfig.py

@@ -58,11 +58,11 @@ def createconfig(declaration: ConfigDeclaration, apiversion: str, runfromautosyn
 
     try:
         # Pydantic JSON validation
-        ConfigDeclaration(**declaration.dict())
+        ConfigDeclaration(**declaration.model_dump())
     except ValidationError as e:
         print(f'Invalid declaration {e}')
 
-    d = declaration.dict()
+    d = declaration.model_dump()
     decltype = d['output']['type']
 
     if 'http' in d['declaration']:
@@ -172,7 +172,7 @@ def createconfig(declaration: ConfigDeclaration, apiversion: str, runfromautosyn
     httpConf = j2_env.get_template(NcgConfig.config['templates']['httpconf']).render(
         declaration=d['declaration']['http'], ncgconfig=NcgConfig.config) if 'http' in d['declaration'] else ''
     streamConf = j2_env.get_template(NcgConfig.config['templates']['streamconf']).render(
-        declaration=d['declaration']['layer4'], ncgconfig=NcgConfig.config) if 'layer' in d['declaration'] else ''
+        declaration=d['declaration']['layer4'], ncgconfig=NcgConfig.config) if 'layer4' in d['declaration'] else ''
 
     b64HttpConf = str(base64.urlsafe_b64encode(httpConf.encode("utf-8")), "utf-8")
     b64StreamConf = str(base64.urlsafe_b64encode(streamConf.encode("utf-8")), "utf-8")
@@ -557,7 +557,7 @@ def patch_config(declaration: ConfigDeclaration, configUid: str, apiversion: str
         )
 
     # The declaration sections to be patched
-    declarationToPatch = declaration.dict()
+    declarationToPatch = declaration.model_dump()
 
     # The currently applied declaration
     status_code, currentDeclaration = get_declaration(configUid=configUid)
@@ -582,40 +582,40 @@ def patch_config(declaration: ConfigDeclaration, configUid: str, apiversion: str
     if 'declaration' in declarationToPatch:
         # HTTP
         d_upstreams = Contrib.MiscUtils.getDictKey(declarationToPatch, 'declaration.http.upstreams')
-        if d_upstreams is not None:
+        if d_upstreams:
             # HTTP upstream patch
             for u in d_upstreams:
-                # print(f"Patching HTTP upstream [{u['name']}]")
+                #print(f"Patching HTTP upstream [{u['name']}]")
                 currentDeclaration = Contrib.DeclarationPatcher.patchHttpUpstream(
                     sourceDeclaration=currentDeclaration, patchedHttpUpstream=u)
 
         d_servers = Contrib.MiscUtils.getDictKey(declarationToPatch, 'declaration.http.servers')
-        if d_servers is not None:
+        if d_servers:
             # HTTP servers patch
             for s in d_servers:
-                # print(f"Patching HTTP server [{s['name']}]")
+                #print(f"Patching HTTP server [{s['name']}]")
                 currentDeclaration = Contrib.DeclarationPatcher.patchHttpServer(
                     sourceDeclaration=currentDeclaration, patchedHttpServer=s)
 
         # Stream / Layer4
         d_upstreams = Contrib.MiscUtils.getDictKey(declarationToPatch, 'declaration.layer4.upstreams')
-        if d_upstreams is not None:
+        if d_upstreams:
             # Stream upstream patch
             for u in d_upstreams:
-                # print(f"Patching Stream upstream [{u['name']}]")
+                #print(f"Patching Stream upstream [{u['name']}]")
                 currentDeclaration = Contrib.DeclarationPatcher.patchStreamUpstream(
                     sourceDeclaration=currentDeclaration, patchedStreamUpstream=u)
 
         d_servers = Contrib.MiscUtils.getDictKey(declarationToPatch, 'declaration.layer4.servers')
-        if d_servers is not None:
+        if d_servers:
             # Stream servers patch
             for s in d_servers:
-                # print(f"Patching Stream server [{s['name']}]")
+                #print(f"Patching Stream server [{s['name']}]")
                 currentDeclaration = Contrib.DeclarationPatcher.patchStreamServer(
                     sourceDeclaration=currentDeclaration, patchedStreamServer=s)
 
     # Apply the updated declaration
-    configDeclaration = ConfigDeclaration.parse_raw(json.dumps(currentDeclaration))
+    configDeclaration = ConfigDeclaration.model_validate_json(json.dumps(currentDeclaration))
 
     r = createconfig(declaration=configDeclaration, apiversion=apiversion,
                      runfromautosync=True, configUid=configUid)

src/V3_NginxConfigDeclaration.py

@@ -389,6 +389,11 @@ class Declaration(BaseModel, extra=Extra.forbid):
     http: Optional[Http] = {}
 
 
+class APIGateway(BaseModel, extra=Extra.forbid):
+    openapi_schema: Optional[str] = ""
+
+
 class ConfigDeclaration(BaseModel, extra=Extra.forbid):
     output: Output
-    declaration: Optional[Declaration] = {}
+    declaration: Optional[Declaration] = {}
+    apigateway: Optional[APIGateway] = {}

src/main.py

@@ -10,27 +10,27 @@
 import schedule
 import uvicorn
 from fastapi import FastAPI
-from fastapi.requests import Request
 from fastapi.responses import PlainTextResponse, Response, JSONResponse
+from openapi_parser import parse as openAPIparse
+from pydantic import BaseModel, BaseConfig, create_model
 
 # NGINX Declarative API modules
 import NcgConfig
 import NcgRedis
 import V3_CreateConfig
 import V3_NginxConfigDeclaration
 
-# pydantic models
-
 cfg = NcgConfig.NcgConfig(configFile="../etc/config.toml")
 redis = NcgRedis.NcgRedis(host=cfg.config['redis']['host'], port=cfg.config['redis']['port'])
+BaseConfig.arbitrary_types_allowed = True
 
 app = FastAPI(
     title=cfg.config['main']['banner'],
     version=cfg.config['main']['version'],
     contact={"name": "GitHub", "url": cfg.config['main']['url']}
 )
 
-
+# GitOps autosync scheduler
 def runScheduler():
     while True:
         schedule.run_pending()
@@ -59,7 +59,7 @@ def post_config_v3(d: V3_NginxConfigDeclaration.ConfigDeclaration, response: Res
     return JSONResponse(content=response, status_code=output['status_code'], headers=headers)
 
 
-# Modify eclaration using v3 API
+# Modify declaration using v3 API
 @app.patch("/v3/config/{configuid}", status_code=200, response_class=PlainTextResponse)
 def patch_config_v3(d: V3_NginxConfigDeclaration.ConfigDeclaration, response: Response, configuid: str):
     return V3_CreateConfig.patch_config(declaration=d, configUid=configuid, apiversion='v3')
@@ -136,13 +136,6 @@ def delete_config(configuid: str = ""):
     )
 
 
-# Import OpenAPI schema - beta
-@app.post("/v3/openapi", status_code=200, response_class=JSONResponse)
-def post_openapi_v3(request: Request):
-    openAPISchema = request.json()
-    print(openAPISchema)
-
-
 if __name__ == '__main__':
     print(f"{cfg.config['main']['banner']} {cfg.config['main']['version']}")