Merge branch 'ADZ-3280_product_cleanup' into ADZ-3283_handle_company_apps

Author: sophieclayton12-nhs

ansible/filter_plugins/apigee_helpers.py

@@ -25,11 +25,21 @@ def apigee_apps_to_product_map(apps_list: List[dict], product_filter: str = None
                 if api_product not in result:
                     result[api_product] = []
 
+                company_exists = "companyName" in app.keys()
+                developer_exists = "developerId" in app.keys()
+                if developer_exists and not company_exists:
+                    owner = app["developerId"]
+                elif company_exists and not developer_exists:
+                    owner = app["companyName"]
+                else:
+                    raise RuntimeError(f"Invalid owner for app {app['appId']}")
+
                 result[api_product].append(
                     dict(
                         appId=app["appId"],
                         appName=app["name"],
-                        developerId=app["developerId"],
+                        owner=owner,
+                        ownerEndpoint="companies" if company_exists else "developers",
                         consumerKey=cred["consumerKey"],
                         apiproduct=api_product
                      )

ansible/roles/remove-old-pr-products/tasks/main.yml

@@ -1,16 +1,4 @@
 
-- name: "get developers"
-  uri:
-    url: "{{ developers_uri }}?expand=true"
-    headers:
-      Authorization: "Bearer {{ APIGEE_ACCESS_TOKEN }}"
-    return_content: yes
-  register: get_developers
-
-- name: "map developers"
-  set_fact:
-    dev_id_to_email: "{{ get_developers.json.developer | dict_list_to_map('developerId', 'email') }}"
-
 - name: "get apps"
   uri:
     url: "{{ apps_uri }}?expand=true"

ansible/roles/remove-old-pr-products/tasks/remove-product.yml

@@ -42,7 +42,7 @@
 - block:
   - name: "remove product apps {{ product_slug }}"
     uri:
-      url: "{{ developers_uri }}/{{ dev_id_to_email[item.developerId] }}/apps/{{ item.appName | urlencode }}/keys/{{ item.consumerKey }}/apiproducts/{{ product_slug }}"
+      url: "{{ org_uri }}/{{ item.ownerEndpoint }}/{{ item.owner | urlencode }}/apps/{{ item.appName | urlencode }}/keys/{{ item.consumerKey }}/apiproducts/{{ product_slug }}"
       method: DELETE
       headers:
         Authorization: "Bearer {{ APIGEE_ACCESS_TOKEN }}"

ansible/roles/remove-old-pr-products/vars/main.yml

@@ -1,5 +1,4 @@
 org_uri: "https://api.enterprise.apigee.com/v1/organizations/{{ APIGEE_ORGANIZATION }}"
 products_uri: "{{ org_uri }}/apiproducts"
 apps_uri: "{{ org_uri }}/apps"
-developers_uri: "{{ org_uri }}/developers"
 retain_hours:  "{{ (lookup('env', 'retain_hours') or 72) }}"

ansible/roles/remove-target-products/tasks/main.yml

@@ -1,14 +1,3 @@
-- name: "get developers"
-  uri:
-    url: "{{ developers_uri }}?expand=true"
-    headers:
-      Authorization: "Bearer {{ APIGEE_ACCESS_TOKEN }}"
-    return_content: yes
-  register: get_developers
-
-- name: "map developers"
-  set_fact:
-    dev_id_to_email: "{{ get_developers.json.developer | dict_list_to_map('developerId', 'email') }}"
 
 - name: "get apps"
   uri:

ansible/roles/remove-target-products/tasks/remove-product.yml

@@ -13,7 +13,7 @@
 - block:
   - name: "remove product apps {{ product_slug }}"
     uri:
-      url: "{{ developers_uri }}/{{ dev_id_to_email[item.developerId] }}/apps/{{ item.appName | urlencode }}/keys/{{ item.consumerKey }}/apiproducts/{{ product_slug }}"
+      url: "{{ org_uri }}/{{ item.ownerEndpoint }}/{{ item.owner | urlencode }}/apps/{{ item.appName | urlencode }}/keys/{{ item.consumerKey }}/apiproducts/{{ product_slug }}"
       method: DELETE
       headers:
         Authorization: "Bearer {{ APIGEE_ACCESS_TOKEN }}"

ansible/roles/remove-target-products/vars/main.yml

@@ -1,5 +1,4 @@
 org_uri: "https://api.enterprise.apigee.com/v1/organizations/{{ APIGEE_ORG }}"
 products_uri: "{{ org_uri }}/apiproducts"
 apps_uri: "{{ org_uri }}/apps"
-developers_uri: "{{ org_uri }}/developers"
 force_remove_from_apps: "{{ lookup('env', 'force_remove_from_apps') }}"