Addressed Pagination and empty Data handling issues in the AWS Systems Manager GetInventory custom connector and AWS-SSM-GetInstancePatches playbook

Solutions/AWS Systems Manager/Playbooks/AWSSystemsManagerPlaybooks/AWS-SSM-GetInstancePatches/readme.md

@@ -58,6 +58,11 @@ Once deployment is complete, authorize each connection.
 #### d. Function App Settings Update Instructions
 Refer to [AWS Systems Manager API Function App Connector](../../CustomConnector/AWS_SSM_FunctionAppConnector/readme.md) documentation for Function App **Application Settings (Access Key ID, Secret Access Key and Region)** update instruction.
 
+#### e. Additional instruction while playbook configuration: 
+When configuring the playbook, ensure that pagination is disabled for GetInventory, as pagination is already handled by the connector.
+
+![alt text](image.png)
+
 #  References
 - [AWS Systems Manager API Documentation](https://docs.aws.amazon.com/systems-manager/latest/APIReference/API_DeleteDocument.html)
 - [AWS Systems Manager User Guide](https://docs.aws.amazon.com/systems-manager/latest/userguide/what-is-systems-manager.html)

Solutions/AWS Systems Manager/Playbooks/CustomConnector/AWS_SSM_FunctionAppConnector/GetInventory/__init__.py

@@ -39,7 +39,7 @@ def main(req: func.HttpRequest) -> func.HttpResponse:
 
     if not (filters and aggregators and result_attributes and next_token and max_results):
         try:
-            req_body = json.loads(req.get_json())
+            req_body = req.get_json() 
         except ValueError:
             pass
         else:
@@ -49,6 +49,7 @@ def main(req: func.HttpRequest) -> func.HttpResponse:
             next_token = req_body.get('NextToken')
             max_results = req_body.get('MaxResults')
 
+    logging.info(f'Parsed Parameters - Filters: {filters}, Aggregators: {aggregators}, ResultAttributes: {result_attributes}, MaxResults: {max_results}')
     # Set parameter dictionary based on the request parameters
     kwargs = {}
     if filters:
@@ -58,7 +59,7 @@ def main(req: func.HttpRequest) -> func.HttpResponse:
     if result_attributes:
         kwargs['DocumentVersion'] = result_attributes
     if next_token:
-        kwargs['DocumentFormat'] = next_token
+        kwargs['NextToken'] = next_token
     if max_results:
         kwargs['MaxResults'] = max_results
 
@@ -72,18 +73,41 @@ def main(req: func.HttpRequest) -> func.HttpResponse:
         )
 
         try:
-            logging.info('Calling function to get AWS SSM Inventory.')
+            logging.info('Pagination handling.')
+
+            all_entities = []
+            next_token = kwargs.get('NextToken')
+            while True:
+                if next_token:
+                    kwargs['NextToken'] = next_token
+                else:
+                    kwargs.pop('NextToken', None)
+
+                logging.info('Calling function to get AWS SSM Inventory.')
+
+                results = ssm_client.get_inventory(**kwargs)
+
+                logging.info('Call to get AWS SSM Inventory successful.')
 
-            results = ssm_client.get_inventory(**kwargs)
+                all_entities.extend(results.get("Entities", []))
+
+                next_token = results.get("NextToken")
+                if not next_token:
+                    break
+
+            logging.info('Pagination handling completed.')
 
-            logging.info('Call to get AWS SSM Inventory successful.')
+            base_url = req.url.split('?')[0]
 
-            # Return the results
+            response = {
+                "value": all_entities,
+                "nextLink": None
+            }
             return func.HttpResponse(
-                json.dumps(results),
-                headers = {"Content-Type": "application/json"},
-                status_code = 200
-            )
+                json.dumps(response),
+                headers={"Content-Type": "application/json"},
+                status_code=200
+            )                                 
 
         except ssm_client.exceptions.InternalServerError as ex:
             logging.error(f"Internal Server Exception: {str(ex)}")
@@ -120,4 +144,4 @@ def main(req: func.HttpRequest) -> func.HttpResponse:
 
     except Exception as ex:
         logging.error(f"Exception Occured: {str(ex)}")
-        return func.HttpResponse("Internal Server Exception", status_code=500)
+        return func.HttpResponse("Internal Server Exception", status_code=500)

Solutions/AWS Systems Manager/ReleaseNotes.md

@@ -1,4 +1,5 @@
 | **Version** | **Date Modified (DD-MM-YYYY)** | **Change History**                                                        |
 |-------------|--------------------------------|---------------------------------------------------------------------------|
+| 3.0.2       | 01-14-2026                     | Fixed AWS-SSM-GetInstancePatches Playbook and updated Function App pagination                                 |
 | 3.0.1       | 29-01-2024                     | App insights to LA change in data connector and repackage                 |