Skip to content

Commit

Permalink
Merge pull request RedHatInsights#1380 from petracihalova/django-update
Browse files Browse the repository at this point in the history
[RHCLOUD-36686] Django update
  • Loading branch information
petracihalova authored Dec 10, 2024
2 parents 536c869 + 07d1d90 commit b890db6
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 42 deletions.
2 changes: 1 addition & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ django-environ = "==0.10.0"
djangorestframework = "==3.15.2"
gunicorn = "==22.0.0"
whitenoise = "==6.4.0"
django = "==4.2.16"
django = "==4.2.17"
django-filter = "==22.1"
requests = "==2.32.3"
django-tenants = "==3.5.0"
Expand Down
44 changes: 22 additions & 22 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 14 additions & 14 deletions docs/source/specs/relations-openapi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ paths:
]
}
```
Schema in SpiceDB
```
definition user {}
definition group {
relation member: user | group#member
}
Expand Down Expand Up @@ -76,7 +76,7 @@ paths:
format: uuid
description: |
Example of request body from platform RBAC API
Request
```
POST /groups/0ff698d7-3972-4385-9a15-0fe9cd49f740/roles/
Expand All @@ -89,22 +89,22 @@ paths:
]
}
```
Schema in SpiceDB
```
definition rbac/v1role {
relation role: role
relation binding: role_binding
}
definition user {}
definition role {
}
definition group {
relation member: user | group#member
}
definition role_binding {
relation subject : user | group#member
}
Expand All @@ -113,23 +113,23 @@ paths:
Prerequisites:
```
role_binding:ROLE-UUID#granted@role:ROLE-UUID
rbac/v1role:ROLE-UUID#role@role:ROLE-UUID
// NOTE at this relation has to be checked before we add relation in example section
rbac/v1role:ROLE-UUID#binding@role_binding:ROLE-UUID
```
zed command to check:
```
role_binding:ROLE-UUID#subject@group:94846f2f-cced-474f-b7f3-47e2ec51dd1#member
```
Example of relations in SpiceDB to add a role to a group (in zed format)
```
role_binding:ROLE-UUID#subject@group:0ff698d7-3972-4385-9a15-0fe9cd49f740#member
```
[Authzed playground](https://play.authzed.com/s/NEIiBuig1-Bg/schema)
requestBody:
content:
Expand Down Expand Up @@ -171,14 +171,14 @@ paths:
]
}
```
Schema in SpiceDB
```
definition rbac/v1role {
relation role: role
relation binding: role_binding
}
definition user {}
definition role {
Expand Down
1 change: 0 additions & 1 deletion docs/source/specs/typespec/compile_tsp_spec
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,3 @@
#tsp install
tsp compile main.tsp
cp tsp-output/@typespec/openapi3/openapi.v2.yaml ../v2

2 changes: 1 addition & 1 deletion rbac/internal/specs/openapi.json
Original file line number Diff line number Diff line change
Expand Up @@ -1993,4 +1993,4 @@
}
}
}
}
}
6 changes: 3 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ click-didyoumean==0.3.1; python_full_version >= '3.6.2'
click-plugins==1.1.1
click-repl==0.3.0; python_version >= '3.6'
cryptography==44.0.0; python_version >= '3.7' and python_full_version not in '3.9.0, 3.9.1'
django==4.2.16; python_version >= '3.8'
django==4.2.17; python_version >= '3.8'
django-cors-headers==3.13.0; python_version >= '3.7'
django-environ==0.10.0; python_version >= '3.5' and python_version < '4'
django-extensions==3.2.3; python_version >= '3.6'
Expand All @@ -41,7 +41,7 @@ markupsafe==3.0.2; python_version >= '3.9'
packaging==24.2; python_version >= '3.8'
prometheus-client==0.15.0; python_version >= '3.6'
prompt-toolkit==3.0.48; python_full_version >= '3.7.0'
protobuf==5.29.0; python_version >= '3.8'
protobuf==5.29.1; python_version >= '3.8'
protoc-gen-validate==1.0.4; python_version >= '3.6'
psycopg2==2.9.5; python_version >= '3.6'
psycopg2-binary==2.9.5; python_version >= '3.6'
Expand All @@ -54,7 +54,7 @@ requests==2.32.3; python_version >= '3.8'
s3transfer==0.6.2; python_version >= '3.7'
sentry-sdk==2.8.0; python_version >= '3.6'
setuptools==75.6.0; python_version >= '3.9'
six==1.16.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
six==1.17.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
sqlparse==0.5.0; python_version >= '3.8'
stompest==2.3.0
typing-extensions==4.12.2; python_version < '3.11'
Expand Down

0 comments on commit b890db6

Please sign in to comment.