Merge pull request #466 from NHSDigital/apm-4806-api-catalogue-fix-and-workaround

APM-4806: Fix for pagination, and workaround to disable API catalogue entry creation in NHSD-NONPROD

Author: alexhawdon

ansible/collections/ansible_collections/nhsd/apigee/plugins/module_utils/utils.py

@@ -100,11 +100,27 @@ def get_all_apidocs(organization, access_token, task_vars=None, refresh=False):
         task_vars = {}
     apidocs = task_vars.get("APIGEE_APIDOCS")
     if refresh or not apidocs:
-        apidocs_request = get(constants.portal_uri(organization), access_token)
-        if apidocs_request.get("failed"):
-            return apidocs_request
-        apidocs = apidocs_request["response"]["body"]["data"]
-        task_vars.update({"APIGEE_APIDOCS": apidocs})
+        all_results = []
+
+        params = {
+            "pageSize" : 100
+        }
+        scan = True
+
+        while scan:
+            apidocs_request = get(constants.portal_uri(organization), access_token, params=params)
+            if apidocs_request.get("failed"):
+                return apidocs_request
+
+            next_page_token = apidocs_request["response"]["body"]["next_page_token"]
+            all_results += apidocs_request["response"]["body"]["data"]
+
+            if next_page_token != "":
+                params["pageToken"] = next_page_token
+            else:
+                scan = False
+
+        task_vars.update({"APIGEE_APIDOCS": all_results})
     return task_vars
 
 

ansible/collections/ansible_collections/nhsd/apigee/roles/deploy_manifest/tasks/main.yml

@@ -72,4 +72,4 @@
   # See comment on product loop control. (I believe APIDocs
   # actually can reference products that don't exist. But this is
   # cleaner.)
-  when: item.edgeAPIProductName | regex_search('^' + SERVICE_NAME + '-' + PULL_REQUEST | default(APIGEE_ENVIRONMENT))
+  when: APIGEE_ORGANIZATION == 'nhsd-prod' and item.edgeAPIProductName | regex_search('^' + SERVICE_NAME + '-' + PULL_REQUEST | default(APIGEE_ENVIRONMENT))