Skip to content

refactor(schema): remove dead membership permission, drop + member from get #1700

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
rohilsurana wants to merge 1 commit into from
+8 −17
Closed

refactor(schema): remove dead membership permission, drop + member from get #1700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions internal/bootstrap/schema/base_schema.zed
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,9 @@ definition app/organization {

// permissions
// org
permission membership = member + owner

permission delete = platform->superuser + granted->app_organization_administer + granted->app_organization_delete + owner
permission update = platform->superuser + granted->app_organization_administer + granted->app_organization_update + owner
permission get = platform->superuser + granted->app_organization_administer + granted->app_organization_get + granted->app_organization_update + owner + member
permission get = platform->superuser + granted->app_organization_administer + granted->app_organization_get + granted->app_organization_update + owner
permission rolemanage = platform->superuser + granted->app_organization_administer + granted->app_organization_rolemanage + owner
permission policymanage = platform->superuser + granted->app_organization_administer + granted->app_organization_policymanage + owner
permission projectlist = platform->superuser + granted->app_organization_administer + granted->app_organization_projectlist + owner
Expand Down Expand Up @@ -76,10 +74,9 @@ definition app/group {
relation owner: app/user | app/serviceuser

// permissions
permission membership = member + owner
permission delete = org->group_delete + granted->app_group_administer + granted->app_group_delete + owner
permission update = org->group_update + granted->app_group_administer + granted->app_group_update + owner
permission get = org->group_get + granted->app_group_administer + granted->app_group_get + member + owner
permission get = org->group_get + granted->app_group_administer + granted->app_group_get + owner
}

definition app/project {
Expand Down
3 changes: 0 additions & 3 deletions internal/bootstrap/schema/schema.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,6 @@ const (
PlatformSudoPermission = "superuser"
PlatformCheckPermission = "check"

// synthetic permission
MembershipPermission = "membership"

// principals
UserPrincipal = "app/user"
ServiceUserPrincipal = "app/serviceuser"
Expand Down
15 changes: 6 additions & 9 deletions internal/bootstrap/testdata/compiled_schema.zed
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@


definition app/group {
// permissions
permission delete = org->group_delete + granted->app_group_administer + granted->app_group_delete + owner
permission get = org->group_get + granted->app_group_administer + granted->app_group_get + member + owner
permission get = org->group_get + granted->app_group_administer + granted->app_group_get + owner
relation granted: app/rolebinding
relation member: app/user

// permissions
permission membership = member + owner

// relations
relation org: app/organization
relation owner: app/user | app/serviceuser
Expand All @@ -32,8 +30,11 @@ definition app/organization {
permission compute_order_update = owner + platform->superuser + granted->app_organization_administer + granted->compute_order_update + pat_granted->app_project_administer + pat_granted->compute_order_update
permission compute_receipt_get = owner + platform->superuser + granted->app_organization_administer + granted->compute_receipt_get + pat_granted->app_project_administer + pat_granted->compute_receipt_get
permission compute_receipt_update = owner + platform->superuser + granted->app_organization_administer + granted->compute_receipt_update + pat_granted->app_project_administer + pat_granted->compute_receipt_update

// permissions
// org
permission delete = platform->superuser + granted->app_organization_administer + granted->app_organization_delete + owner
permission get = platform->superuser + granted->app_organization_administer + granted->app_organization_get + granted->app_organization_update + owner + member
permission get = platform->superuser + granted->app_organization_administer + granted->app_organization_get + granted->app_organization_update + owner
relation granted: app/rolebinding

// synthetic permissions - group
Expand All @@ -45,10 +46,6 @@ definition app/organization {
permission invitationcreate = platform->superuser + granted->app_organization_administer + granted->app_organization_invitationcreate + owner
permission invitationlist = platform->superuser + granted->app_organization_administer + granted->app_organization_invitationlist + owner
relation member: app/user | app/group#member | app/serviceuser

// permissions
// org
permission membership = member + owner
relation owner: app/user | app/serviceuser
relation pat_granted: app/rolebinding

Expand Down
Loading