Minor fixes

Author: fabriziofiorucci

src/V5_4_CreateConfig.py

@@ -607,34 +607,17 @@ def createconfig(declaration: ConfigDeclaration, apiversion: str, runfromautosyn
 
                         status, apiGatewayConfigDeclaration, openAPISchemaJSON = v5_4.APIGateway.createAPIGateway(locationDeclaration = loc, authProfiles = loc['apigateway']['openapi_schema']['authentication'])
 
-                        if status!=200:
-                            return {"status_code": 412,
-                                    "message": {"status_code": status, "message":
-                                        {"code": status,
-                                         "content": f"OpenAPI schema fetch failed for {loc['apigateway']['openapi_schema']['content']}"}}}
-
                         # API Gateway configuration template rendering
                         if apiGatewayConfigDeclaration:
-                            # API Gateway server / locations file
                             apiGatewaySnippet = j2_env.get_template(NcgConfig.config['templates']['apigwconf']).render(
-                                declaration=apiGatewayConfigDeclaration, server=server['names'][0], enabledVisibility=apiGwVisibilityIntegrations, ncgconfig=NcgConfig.config)
+                                declaration=apiGatewayConfigDeclaration, enabledVisibility=apiGwVisibilityIntegrations, ncgconfig=NcgConfig.config)
                             apiGatewaySnippetb64 = base64.b64encode(bytes(apiGatewaySnippet, 'utf-8')).decode('utf-8')
 
                             newAuxFile = {'contents': apiGatewaySnippetb64, 'name': NcgConfig.config['nms']['apigw_dir'] +
                                                                             '/' + server['names'][0] +
                                                                             loc['uri'] + ".conf" }
                             auxFiles['files'].append(newAuxFile)
 
-                            # API Gateway maps file for parameters enforcement
-                            apiGatewayMapsSnippet = j2_env.get_template(NcgConfig.config['templates']['apigwmapsconf']).render(
-                                declaration=apiGatewayConfigDeclaration, server=server['names'][0], ncgconfig=NcgConfig.config)
-                            apiGatewayMapsSnippetb64 = base64.b64encode(bytes(apiGatewayMapsSnippet, 'utf-8')).decode('utf-8')
-
-                            newAuxFile = {'contents': apiGatewayMapsSnippetb64, 'name': NcgConfig.config['nms']['apigw_maps_dir'] +
-                                                                            '/' + server['names'][0] +
-                                                                            loc['uri'].replace('/', '_') + ".conf" }
-                            auxFiles['files'].append(newAuxFile)
-
                     # API Gateway Developer portal provisioning
                     if loc['apigateway'] and loc['apigateway']['developer_portal'] and 'enabled' in loc['apigateway']['developer_portal'] and loc['apigateway']['developer_portal']['enabled'] == True:
 
@@ -912,4 +895,4 @@ def get_declaration(configUid: str):
     if cfg is None:
         return 404, ""
 
-    return 200, pickle.loads(cfg).dict()
+    return 200, pickle.loads(cfg).dict()

src/V5_5_CreateConfig.py

@@ -22,7 +22,7 @@
 import v5_5.NIMOutput
 import v5_5.NGINXOneOutput
 
-# NGINX App Protect helper functions
+# F5 WAF for NGINX helper functions
 import v5_5.NIMNAPUtils
 import v5_5.NIMUtils
 
@@ -837,7 +837,7 @@ def patch_config(declaration: ConfigDeclaration, configUid: str, apiversion: str
     # Handle policy updates
     d_policies = v5_5.MiscUtils.getDictKey(declarationToPatch, 'output.nms.policies')
     if d_policies is not None:
-        # NGINX App Protect WAF policy updates
+        # F5 WAF for NGINX policy updates
         for p in d_policies:
             currentDeclaration = v5_5.DeclarationPatcher.patchNAPPolicies(
                 sourceDeclaration=currentDeclaration, patchedNAPPolicies=p)
@@ -912,4 +912,4 @@ def get_declaration(configUid: str):
     if cfg is None:
         return 404, ""
 
-    return 200, pickle.loads(cfg).dict()
+    return 200, pickle.loads(cfg).dict()