20250624 - NGINX Instance Manager and App Protect bugfix (#87)

Author: fabriziofiorucci

etc/config.toml

@@ -3,7 +3,7 @@
 # Main variables
 [main]
 banner = "NGINX Declarative API"
-version = "5.3.0"
+version = "5.3.1"
 url = "https://github.com/f5devcentral/NGINX-Declarative-API"
 
 # Templates

src/v5_3/NAPUtils.py

@@ -149,7 +149,7 @@ def checkDeclarationPolicies(declaration: dict):
 
 # For the given declaration creates/updates NGINX App Protect WAF policies on NGINX Instance Manager
 # making sure that they are in sync with what is defined in the JSON declaration
-# Returns a tuple with two dictionaries: all_policy_names_and_versions, all_policy_active_names_and_uids
+# Returns a JSON with status code and content
 def provisionPolicies(nmsUrl: str, nmsUsername: str, nmsPassword: str, declaration: dict):
     # NGINX App Protect policies - each policy supports multiple tagged versions
 
@@ -212,7 +212,8 @@ def provisionPolicies(nmsUrl: str, nmsUsername: str, nmsPassword: str, declarati
 
                         all_policy_names_and_versions[policy_name].append({'tag': tag, 'uid': uid})
 
-    return all_policy_names_and_versions, all_policy_active_names_and_uids
+    return JSONResponse(status_code=200, content={"all_policy_names_and_versions": all_policy_names_and_versions,
+                                                  "all_policy_active_names_and_uids": all_policy_active_names_and_uids})
 
 
 # Publish a NGINX App Protect WAF policy making it active

src/v5_3/NIMOutput.py

@@ -236,9 +236,17 @@ def NIMOutput(d, declaration: ConfigDeclaration, apiversion: str, b64HttpConf: s
                     "headers": {'Content-Type': 'application/json'}}
 
         # Provision NGINX App Protect WAF policies to NGINX Instance Manager
-        provisionedNapPolicies, activePolicyUids = v5_3.NAPUtils.provisionPolicies(
+        ppReply = v5_3.NAPUtils.provisionPolicies(
             nmsUrl=nmsUrl, nmsUsername=nmsUsername, nmsPassword=nmsPassword, declaration=d)
 
+        if ppReply.status_code >= 400:
+            return {"status_code": ppReply.status_code,
+                    "message": {"status_code": ppReply.status_code, "message": {"code": ppReply.status_code, "content": ppReply.content} }}
+
+        napPolicies = json.loads(ppReply.body)
+        provisionedNapPolicies = napPolicies['all_policy_names_and_versions']
+        activePolicyUids = napPolicies['all_policy_active_names_and_uids']
+
         ### / NGINX App Protect policies support
 
         ### Publish staged config to instance group