Merge branch 'ADZ-3281-get-developer-emails' into ADZ-3283_handle_company_apps

Author: Lee Richardson

ansible/filter_plugins/apigee_helpers.py

@@ -83,28 +83,34 @@ def apigee_remove_proxy_from_product(product: dict, proxy_to_remove):
     return product
 
 
-def apigee_teams_map(teams: List[dict]):
+def apigee_team_to_admin(team):
+    return next((attr.get('value') for attr in team['attributes'] if attr['name'] == 'ADMIN_EMAIL'), None)
+
+
+def apigee_teams_map(team_members: List[dict], teams: List[dict]):
+    from collections import defaultdict
+    joined = defaultdict(dict)
+    for item in team_members + teams:
+        joined[item['name']].update(item)
+    full_teams = list(joined.values())
 
     return {
-        f"{team['id']}@devteam.apigee.io": {
-            "contact": team['pointOfContact'],
-            "members": list(mem['userId'] for mem in team.get('memberships', []))
+        team['name']: {
+            "contact": apigee_team_to_admin(team),
+            "members": team['members']
         }
-        for team in teams
+        for team in full_teams
     }
 
 
 def apigee_teams_to_point_of_contact(teams: List[dict]):
-
-    return {
-        f"{team['id']}@devteam.apigee.io": team['pointOfContact'] for team in teams
-    }
+    return {apigee_team_to_admin(team) for team in teams}
 
 
 def apigee_teams_to_members(teams: List[dict]):
 
     return {
-        f"{team['id']}@devteam.apigee.io": list(mem['userId'] for mem in team.get('memberships', [])) for team in teams
+        team['owner']: team.get('members', []) for team in teams
     }
 
 
@@ -126,18 +132,16 @@ def apigee_product_developers(
             result[product_name] = []
 
         for app in apps:
-            developer = dev_id_to_email[app["developerId"]]
-
-            team = teams_map.get(developer, {})
-
             entry = {
-                "app": app["appName"],
-                "developer": developer
+                "app": app["appName"]
             }
 
-            if team:
+            if app['ownerEndpoint'] == 'companies':
+                team = teams_map.get(app.get("owner"), {})
                 entry['developer'] = team['contact']
                 entry['team'] = team['members']
+            else:
+                entry['developer'] = dev_id_to_email[app["owner"]]
 
             result[product_name].append(entry)
 
@@ -147,10 +151,6 @@ def apigee_product_developers(
 
     return result
 
-    # return {
-    #     f"{team['id']}@devteam.apigee.io": list(mem['userId'] for mem in team.get('memberships', [])) for team in teams
-    # }
-
 
 class FilterModule:
 

ansible/get-developer-emails.yml

@@ -1,4 +1,4 @@
-- name: remove old pr portal apis
+- name: get developer emails
   hosts: 127.0.0.1
   connection: local
   gather_facts: yes

ansible/roles/get-developer-emails/tasks/main.yml

@@ -45,15 +45,28 @@
 
 - name: get teams
   uri:
-    url: "https://apigee.com/consumers/api/providers/{{ audience_id }}/teams"
+    url: "{{ companies_uri }}?expand=true"
     headers:
       Authorization: "Bearer {{ APIGEE_ACCESS_TOKEN }}"
     return_content: yes
   register: get_teams
 
+- name: get team members
+  uri:
+    url: "{{ companies_uri }}/{{ item | replace(' ', '%20') }}/developers"
+    headers:
+      Authorization: "Bearer {{ APIGEE_ACCESS_TOKEN }}"
+    return_content: yes
+  register: get_team_members
+  loop: "{{ get_teams.json.company | map(attribute='name') }}"
+
+- name: setup developer team members map
+  set_fact:
+    team_members_map: "{{ get_team_members | json_query('results[*].{members: json.developer, name: item}') }}"
+
 - name: setup developer teams map
   set_fact:
-    teams_map: "{{ get_teams.json.data | apigee_teams_map }}"
+    teams_map: "{{ get_team_members | json_query('results[*].{members: json.developer[*].email, name: item}') | apigee_teams_map(teams=get_teams.json.company) }}"
 
 - name: "get apps"
   uri:

ansible/roles/get-developer-emails/vars/main.yml

@@ -2,6 +2,7 @@ org_uri: "https://api.enterprise.apigee.com/v1/organizations/{{ APIGEE_ORGANIZAT
 products_uri: "{{ org_uri }}/apiproducts"
 apps_uri: "{{ org_uri }}/apps"
 developers_uri: "{{ org_uri }}/developers"
+companies_uri: "{{ org_uri }}/companies"
 retain_hours:  "{{ (lookup('env', 'retain_hours') or 72) }}"
 product_filter: "{{ lookup('env', 'PRODUCT_FILTER') }}"
 portals_base_uri: "https://apigee.com/portals/api/sites"