Merge pull request #7 from linuxfoundation/adesilva/import-fixes

fix: correct data references and update M2M authentication config

Author: asithade

playbooks/committees/base_committees/buf_committees.yaml

@@ -48,7 +48,7 @@ buf_committees:
         name: Technical Oversight Committee
         description: >-
           The Technical Oversight Committee for the Big Umbrella Foundation (BUF).
-        category: Technical Oversight Committee/Technical Advisory Committee
+        category: Technical Oversight Committee
         public: true
         enable_voting: true
         business_email_required: true

playbooks/projects/base_projects/3_umbrellas.yaml

@@ -49,7 +49,7 @@ sample_umbrella_iubp:
     url: {{ environ.PROJECTS_URL | default("http://lfx-v2-project-service.lfx.svc.cluster.local:8080/projects") }}
     method: POST
     headers:
-      Authorization: Bearer {{ environ.PROJECTS_TOKEN | default("-") }}
+      Authorization: !jwt bearer=true,aud=lfx-v2-project-service,principal=clients@m2m_helper
   steps:
     - json:
         slug: industry-umbrella-branded-projects-iubp

playbooks/projects/root_project_access/global_groups.yaml

@@ -29,7 +29,7 @@ global_groups:
               object: "team:project_super_admins"
             # A M2M principal from lfx-v2-helm's values.yaml
             # (authelia.authelia_client_generation.clients).
-            - user: "user:clients@m2m_test"
+            - user: "user:clients@lfx_m2m"
               relation: member
               object: "team:project_super_admins"
             # Attach the global group with the above members to the ROOT

playbooks/v1_meetings/umbrella_board_meeting/board_meeting.yaml

@@ -429,8 +429,8 @@ buf_board_past_meeting_{{ past_meeting_index }}_recording_access_update:
   steps:
     - json:
         # Only include the fields needed for access control
-        id: !ref buf_board_past_meeting_{{ past_meeting_index }}_recording_create.steps[0].json.data.meeting_and_occurrence_id
-        meeting_and_occurrence_id: !ref buf_board_past_meeting_{{ past_meeting_index }}_recording_create.steps[0].json.data.meeting_and_occurrence_id
+        id: !ref buf_board_past_meeting_{{ past_meeting_index }}_recording_create.steps[0].json.data.id
+        meeting_and_occurrence_id: !ref buf_board_past_meeting_{{ past_meeting_index }}_recording_create.steps[0].json.data.id
         recording_access: public
         participants:
           {% for i in range(board_member_count) %}
@@ -517,8 +517,8 @@ buf_board_past_meeting_{{ past_meeting_index }}_transcript_access_update:
   steps:
     - json:
         # Only include the fields needed for access control
-        id: !ref buf_board_past_meeting_{{ past_meeting_index }}_transcript_create.steps[0].json.data.meeting_and_occurrence_id
-        meeting_and_occurrence_id: !ref buf_board_past_meeting_{{ past_meeting_index }}_transcript_create.steps[0].json.data.meeting_and_occurrence_id
+        id: !ref buf_board_past_meeting_{{ past_meeting_index }}_transcript_create.steps[0].json.data.id
+        meeting_and_occurrence_id: !ref buf_board_past_meeting_{{ past_meeting_index }}_transcript_create.steps[0].json.data.id
         transcript_access: public
         participants:
           {% for i in range(board_member_count) %}
@@ -647,7 +647,7 @@ buf_board_past_meeting_{{ past_meeting_index }}_participants_create:
           org: !ref "buf_board_members.steps[{{ i }}].json.organization.name"
           committee_role: !ref "buf_board_members.steps[{{ i }}].json.role.name"
           org_is_project_member: !ref "buf_board_meeting_committee_participants_create.steps[{{ i }}].json.data.org_is_project_member"
-          registrant_id: !ref "buf_board_meeting_committee_participants_create.steps[{{ i }}].json.data.registrant_id"
+          registrant_id: !ref "buf_board_meeting_committee_participants_create.steps[{{ i }}].json.data.id"
           invitee_id: {{ fake.uuid4() }}
           email: !ref "buf_board_members.steps[{{ i }}].json.email"
           first_name: !ref "buf_board_members.steps[{{ i }}].json.first_name"