Merge branch 'master' into APM-000-fix-version-parsing

Author: harryhmc

ansible/collections/ansible_collections/nhsd/apigee/plugins/action/add_jwks_resource_url_to_app.py

@@ -1,6 +1,3 @@
-import requests
-import json
-import bisect
 import copy
 
 from ansible_collections.nhsd.apigee.plugins.module_utils.models.ansible.add_jwks_resource_url import (
@@ -13,7 +10,6 @@
 from ansible_collections.nhsd.apigee.plugins.module_utils import constants
 
 ATTRIBUTE_NAME = "jwks-resource-url"
-DEVELOPER_DETAILS = "APIGEE_DEVELOPER_DETAILS"
 
 
 class ActionModule(ApigeeAction):
@@ -39,49 +35,24 @@ def run(self, tmp=None, task_vars=None):
         after["attributes"].append(jwks_attribute)
         after["attributes"] = sorted(after["attributes"], key=lambda attr: attr["name"])
 
-        developer_details = task_vars.get(DEVELOPER_DETAILS)
-        if not developer_details:
-            developer_details = []
-            params = {"expand": True}
-            url = (
-                constants.APIGEE_BASE_URL
-                + f"organizations/{args.organization}/developers"
-            )
-            while True:
-                resp = utils.get(url, args.access_token, params=params)
-                if resp.get("failed"):
-                    return resp
-                devs = resp["response"]["body"]["developer"]
-                developer_details.extend(devs)
-                if len(devs) == 1000:
-                    # last developer's ID as startKey will be included
-                    # in next request, so pop now to de-dupe.
-                    last_dev = developer_details.pop()
-                    params["startKey"] = last_dev["developerId"]
-                else:
-                    break
-
-        try:
-            developer_id = args._app_data["developerId"]
-            developer_ids = [d["developerId"] for d in developer_details]
-            i = bisect.bisect_left(developer_ids, developer_id)
-            if i == len(developer_details):
-                raise RuntimeError(f"Unable to find developer with id {developer_id}")
-        except RuntimeError as e:
-            return {"failed": True, "error": str(e)}
-        
-        developer = developer_details[i]
-
         delta = utils.delta(before, after)
         result = {
             "changed": bool(delta),
-            "app": after,
-            "developer": developer,
-            "ansible_facts": {DEVELOPER_DETAILS: developer_details},
+            "app": after
         }
 
+        company_exists = "companyName" in args._app_data.keys()
+        developer_exists = "developerId" in args._app_data.keys()
+        if developer_exists and not company_exists:
+            owner = args._app_data["developerId"]
+        elif company_exists and not developer_exists:
+            owner = args._app_data["companyName"]
+        else:
+            return {"failed": True, "error": f"Invalid owner for app {args._app_data['appId']}"}
+
+        owner_endpoint = "companies" if company_exists else "developers"
         app_name = args._app_data["name"]
-        app_path = f"organizations/{args.organization}/developers/{developer['email']}/apps/{app_name}/attributes"
+        app_path = f"organizations/{args.organization}/{owner_endpoint}/{owner}/apps/{app_name}/attributes"
 
         if diff_mode:
             result["diff"] = [

ansible/collections/ansible_collections/nhsd/apigee/plugins/action/deploy_api_catalog_item.py

@@ -1,5 +1,3 @@
-import typing
-
 APIGEE_BASE_URL = "https://api.enterprise.apigee.com/v1/"
 APIGEE_DAPI_URL = "https://apigee.com/dapi/api/"
 
@@ -13,16 +11,3 @@
     ],
     "nhsd-prod": ["dev", "int", "sandbox", "prod"],
 }
-
-
-def portal_uri(org: typing.Literal["nhsd-nonprod", "nhsd-prod"]) -> str:
-    portal_ids = {
-        "nhsd-nonprod": "nhsd-nonprod-developerportal",
-        "nhsd-prod": "nhsd-prod-developerportal",
-    }
-    if org not in portal_ids:
-        raise ValueError(f"Invalid organization name {org}")
-    return f"https://apigee.com/portals/api/sites/{portal_ids[org]}/apidocs"
-
-
-

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

@@ -59,11 +59,4 @@ def apply_namespace(cls, manifest, values):
             for spec in env.specs:
                 spec.name = spec.name.replace(old, new, 1)
 
-            for entry in env.api_catalog:
-                entry.edgeAPIProductName = entry.edgeAPIProductName.replace(
-                    old, new, 1
-                )
-                entry.title =  f"[{display}] {entry.title}"
-                entry.specId = entry.specId.replace(old, new, 1)
-
         return manifest

ansible/collections/ansible_collections/nhsd/apigee/plugins/module_utils/models/ansible/apply_pull_request_namespace.py

@@ -1,8 +1,5 @@
 import typing
 import pydantic
-from ansible_collections.nhsd.apigee.plugins.module_utils.models.apigee.apidoc import (
-    ApigeeApidoc,
-)
 from ansible_collections.nhsd.apigee.plugins.module_utils.models.apigee.spec import (
     ApigeeSpec,
 )
@@ -16,7 +13,6 @@ class ManifestApigeeEnvironment(pydantic.BaseModel):
     name: LITERAL_APIGEE_ENVIRONMENTS
     products: typing.List[ApigeeProduct] = []
     specs: typing.List[ApigeeSpec] = []
-    api_catalog: typing.List[ApigeeApidoc] = []
 
     @pydantic.validator("products", "specs")
     def names_unique(cls, values):
@@ -25,22 +21,6 @@ def names_unique(cls, values):
             raise ValueError("Names are not unique")
         return values
 
-    @pydantic.validator("api_catalog")
-    def catalog_references(cls, api_catalog, values):
-        spec_names = [spec.name for spec in values.get("specs", [])]
-        product_names = [product.name for product in values.get("products", [])]
-
-        for item in api_catalog:
-            if item.edgeAPIProductName not in product_names:
-                raise ValueError(
-                    f"edgeAPIProductName {item.edgeAPIProductName} not in list of products in this environment"
-                )
-            if item.specId and item.specId not in spec_names:
-                raise ValueError(
-                    f"specId {item.specId} not in list of specs in this environment"
-                )
-        return api_catalog
-
     @pydantic.validator("products", pre=True)
     def set_single_environment(cls, products, values):
         """

ansible/collections/ansible_collections/nhsd/apigee/plugins/module_utils/models/ansible/deploy_api_catalog_item.py

@@ -4,7 +4,7 @@
 
 from ansible_collections.nhsd.apigee.plugins.module_utils.paas import api_registry
 
-SCHEMA_VERSION = "1.1.6"
+SCHEMA_VERSION = "1.1.8"
 
 _REGISTRY_DATA = {}