Skip to content

Commit 2742d82

Browse files
committed
Add "v1" entity relations.
These match the v2 relations unless otherwise noted. Also includes same fix as #66 which I noticed independently while working on this. 🤖 Assisted with [GitHub Copilot](https://github.com/features/copilot) (via vim) Signed-off-by: Eric Searcy <[email protected]>
1 parent a056f68 commit 2742d82

File tree

2 files changed

+73
-7
lines changed

2 files changed

+73
-7
lines changed

charts/lfx-platform/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ apiVersion: v2
55
name: lfx-platform
66
description: LFX Platform v2 Helm chart
77
type: application
8-
version: 0.3.5
8+
version: 0.3.6
99
icon: https://github.com/linuxfoundation/lfx-v2-helm/raw/main/img/lfx-logo-color.svg
1010
dependencies:
1111
- name: traefik

charts/lfx-platform/templates/openfga/model.yaml

Lines changed: 72 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ spec:
1919
- patch: Modifications of define
2020
*/}}
2121
- version:
22-
major: 5
23-
minor: 3
24-
patch: 2
22+
major: 6
23+
minor: 0
24+
patch: 1
2525
authorizationModel: |
2626
model
2727
schema 1.1
@@ -143,7 +143,7 @@ spec:
143143
# should be able to view the recording.
144144
# If it is set to only meeting hosts, then only the meeting hosts should be able
145145
# to view the recording.
146-
define viewer: [user:*] or writer or auditor
146+
define viewer: [user, user:*] or writer or auditor
147147
148148
# The past_meeting_transcript type identifies a transcript of a past meeting.
149149
# Access to a transcript is limited to one of the following groups:
@@ -166,7 +166,7 @@ spec:
166166
# should be able to view the transcript.
167167
# If it is set to only meeting hosts, then only the meeting hosts should be able
168168
# to view the transcript.
169-
define viewer: [user:*] or writer or auditor
169+
define viewer: [user, user:*] or writer or auditor
170170
171171
# The past_meeting_summary type identifies a summary of a past meeting.
172172
# Access to a summary is limited to one of the following groups:
@@ -189,5 +189,71 @@ spec:
189189
# should be able to view the summary.
190190
# If it is set to only meeting hosts, then only the meeting hosts should be able
191191
# to view the summary.
192-
define viewer: [user:*] or writer or auditor
192+
define viewer: [user, user:*] or writer or auditor
193+
194+
# The following v1 meeting types support read-only, indexer-only data
195+
# being synced from LFX v1. At this time, they are *distinct types*
196+
# from the main types above. This encapsulation will make it easier to
197+
# eventually sunset all such v1 tuples when the data is migrated into
198+
# the core data models (as this will result in new UUIDs, new relations
199+
# would have been needed, even if the relation names had been reused
200+
# for the v1 entities).
201+
#
202+
# *All relations are as described in `meeting`, unless otherwise
203+
# noted.*
204+
type v1_meeting
205+
relations
206+
define project: [project]
207+
define committee: [committee]
208+
define auditor: organizer or auditor from project
209+
# No explicit [user] relation for organizer in v1.
210+
define organizer: meeting_coordinator from project or writer from committee or writer from project
211+
define host: [user] or organizer
212+
define participant: [user] or host
213+
define viewer: [user:*] or participant or organizer or auditor
214+
215+
# *All relations are as described in `past_meeting`, unless otherwise noted.*
216+
type v1_past_meeting
217+
relations
218+
define project: [project]
219+
define committee: [committee]
220+
define meeting: [v1_meeting]
221+
define auditor: organizer or auditor from project or auditor from meeting
222+
# No explicit [user] relation for organizer in v1.
223+
define organizer: meeting_coordinator from project or writer from project or organizer
224+
define host: [user] or organizer
225+
define invitee: [user]
226+
define attendee: [user]
227+
define viewer: [user:*] or attendee or invitee or organizer or auditor
228+
229+
# *All relations are as described in `past_meeting_recording`, unless
230+
# otherwise noted.*
231+
type v1_past_meeting_recording
232+
relations
233+
define past_meeting: [v1_past_meeting]
234+
define writer: organizer from past_meeting
235+
define auditor: auditor from past_meeting
236+
define host: host from past_meeting
237+
define participant: invitee from past_meeting or attendee from past_meeting
238+
define viewer: [user, user:*] or writer or auditor
239+
240+
# *All relations are as described in `past_meeting_transcript`, unless
241+
# otherwise noted.*
242+
type v1_past_meeting_transcript
243+
relations
244+
define past_meeting: [v1_past_meeting]
245+
define writer: organizer from past_meeting
246+
define auditor: auditor from past_meeting
247+
define host: host from past_meeting
248+
define participant: invitee from past_meeting or attendee from past_meeting
249+
define viewer: [user, user:*] or writer or auditor
250+
251+
type v1_past_meeting_summary
252+
relations
253+
define past_meeting: [v1_past_meeting]
254+
define writer: organizer from past_meeting
255+
define auditor: auditor from past_meeting
256+
define host: host from past_meeting
257+
define participant: invitee from past_meeting or attendee from past_meeting
258+
define viewer: [user, user:*] or writer or auditor
193259
{{- end }}

0 commit comments

Comments
 (0)