Skip to content

Commit

Permalink
Merge pull request #328 from aserto-dev/manager-relation
Browse files Browse the repository at this point in the history
Flip the "manager" relation in citadel and acmecorp
  • Loading branch information
ronenh committed Apr 23, 2024
2 parents 03109c7 + db71555 commit 8b2c337
Show file tree
Hide file tree
Showing 11 changed files with 1,155 additions and 1,102 deletions.
1,084 changes: 542 additions & 542 deletions assets/acmecorp/acmecorp_relations.json

Large diffs are not rendered by default.

1,084 changes: 542 additions & 542 deletions assets/acmecorp/ds-load/acmecorp.json

Large diffs are not rendered by default.

8 changes: 7 additions & 1 deletion assets/acmecorp/manifest.yaml
Expand Up @@ -17,15 +17,21 @@ types:
### display_name: user#manager ###
manager: user

permissions:
### display_name: user#in_management_chain ###
in_management_chain: manager | manager->in_management_chain


### display_name: Identity ###
identity:
relations:
### display_name: identity#identifier ###
identifier: user


### display_name: Group ###
group:
relations:
### display_name: group#member ###
member: user
member: user | group#member

16 changes: 8 additions & 8 deletions assets/citadel/citadel_relations.json
Expand Up @@ -2,31 +2,31 @@
"relations": [
{
"object_type": "user",
"object_id": "beth@the-smiths.com",
"object_id": "jerry@the-smiths.com",
"relation": "manager",
"subject_type": "user",
"subject_id": "jerry@the-smiths.com"
"subject_id": "beth@the-smiths.com"
},
{
"object_type": "user",
"object_id": "rick@the-citadel.com",
"object_id": "beth@the-smiths.com",
"relation": "manager",
"subject_type": "user",
"subject_id": "beth@the-smiths.com"
"subject_id": "rick@the-citadel.com"
},
{
"object_type": "user",
"object_id": "rick@the-citadel.com",
"object_id": "morty@the-citadel.com",
"relation": "manager",
"subject_type": "user",
"subject_id": "morty@the-citadel.com"
"subject_id": "rick@the-citadel.com"
},
{
"object_type": "user",
"object_id": "rick@the-citadel.com",
"object_id": "summer@the-smiths.com",
"relation": "manager",
"subject_type": "user",
"subject_id": "summer@the-smiths.com"
"subject_id": "rick@the-citadel.com"
},
{
"object_type": "identity",
Expand Down
16 changes: 8 additions & 8 deletions assets/citadel/ds-load/citadel.json
Expand Up @@ -187,31 +187,31 @@
"relations": [
{
"object_type": "user",
"object_id": "beth@the-smiths.com",
"object_id": "jerry@the-smiths.com",
"relation": "manager",
"subject_type": "user",
"subject_id": "jerry@the-smiths.com"
"subject_id": "beth@the-smiths.com"
},
{
"object_type": "user",
"object_id": "rick@the-citadel.com",
"object_id": "beth@the-smiths.com",
"relation": "manager",
"subject_type": "user",
"subject_id": "beth@the-smiths.com"
"subject_id": "rick@the-citadel.com"
},
{
"object_type": "user",
"object_id": "rick@the-citadel.com",
"object_id": "morty@the-citadel.com",
"relation": "manager",
"subject_type": "user",
"subject_id": "morty@the-citadel.com"
"subject_id": "rick@the-citadel.com"
},
{
"object_type": "user",
"object_id": "rick@the-citadel.com",
"object_id": "summer@the-smiths.com",
"relation": "manager",
"subject_type": "user",
"subject_id": "summer@the-smiths.com"
"subject_id": "rick@the-citadel.com"
},
{
"object_type": "identity",
Expand Down
6 changes: 6 additions & 0 deletions assets/citadel/manifest.yaml
Expand Up @@ -17,12 +17,18 @@ types:
### display_name: user#manager ###
manager: user

permissions:
### display_name: user#in_management_chain ###
in_management_chain: manager | manager->in_management_chain


### display_name: Identity ###
identity:
relations:
### display_name: identity#identifier ###
identifier: user


### display_name: Group ###
group:
relations:
Expand Down
8 changes: 8 additions & 0 deletions assets/gdrive/manifest.yaml
Expand Up @@ -17,18 +17,25 @@ types:
### display_name: user#manager ###
manager: user

permissions:
### display_name: user#in_management_chain ###
in_management_chain: manager | manager->in_management_chain


### display_name: Identity ###
identity:
relations:
### display_name: identity#identifier ###
identifier: user


### display_name: Group ###
group:
relations:
### display_name: group#member ###
member: user | group#member


# folder represents a collection of documents and/or other folders
folder:
relations:
Expand All @@ -43,6 +50,7 @@ types:
can_write: editor | can_share | parent->can_write
can_read: viewer | can_write | parent->can_read


# doc represents a document within a folder
doc:
relations:
Expand Down
11 changes: 10 additions & 1 deletion assets/github/manifest.yaml
Expand Up @@ -15,19 +15,27 @@ types:
relations:
manager: user

permissions:
### display_name: user#in_management_chain ###
in_management_chain: manager | manager->in_management_chain


# group represents a collection of users and/or (nested) groups
group:
relations:
member: user | group#member


# identity represents a collection of identities for users
identity:
relations:
identifier: user


team:
relations:
member: user | team#member
member: user | team#member | group#member


organization:
relations:
Expand All @@ -44,6 +52,7 @@ types:
can_write: repo_writer | can_administer
can_read: repo_reader | can_write


repo:
relations:
owner: organization
Expand Down
8 changes: 8 additions & 0 deletions assets/simple-rbac/manifest.yaml
Expand Up @@ -12,16 +12,23 @@ types:
relations:
manager: user

permissions:
### display_name: user#in_management_chain ###
in_management_chain: manager | manager->in_management_chain


# group represents a collection of users and/or (nested) groups
group:
relations:
member: user | group#member


# identity represents a collection of identities for users
identity:
relations:
identifier: user


# resource creator represents a user type that can create new resources
resource-creator:
relations:
Expand All @@ -30,6 +37,7 @@ types:
permissions:
can_create_resource: member


# resource represents a protected resource
resource:
relations:
Expand Down
8 changes: 8 additions & 0 deletions assets/slack/manifest.yaml
Expand Up @@ -16,18 +16,25 @@ types:
### display_name: user#manager ###
manager: user

permissions:
### display_name: user#in_management_chain ###
in_management_chain: manager | manager->in_management_chain


### display_name: Identity ###
identity:
relations:
### display_name: identity#identifier ###
identifier: user


### display_name: Group ###
group:
relations:
### display_name: group#member ###
member: user | group#member


channel:
relations:
parent_workspace: workspace
Expand All @@ -41,6 +48,7 @@ types:
can_comment: commenter | can_write
can_read: can_comment


workspace:
relations:
channels_admin: user
Expand Down
8 changes: 8 additions & 0 deletions assets/todo/manifest.yaml
Expand Up @@ -12,16 +12,23 @@ types:
relations:
manager: user

permissions:
### display_name: user#in_management_chain ###
in_management_chain: manager | manager->in_management_chain


# group represents a collection of users and/or (nested) groups
group:
relations:
member: user | group#member


# identity represents a collection of identities for users
identity:
relations:
identifier: user


# resource creator represents a user type that can create new resources
resource-creator:
relations:
Expand All @@ -30,6 +37,7 @@ types:
permissions:
can_create_resource: member


# resource represents a protected resource
resource:
relations:
Expand Down

0 comments on commit 8b2c337

Please sign in to comment.