Skip to content

refactor: Add defaults for authZ policy #1621

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

Open
ZohebShaikh wants to merge 2 commits into
base: main
Choose a base branch
from
+9 −16
Open

refactor: Add defaults for authZ policy #1621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fab42ee
refactor: add default values for OPA
ZohebShaikh Aug 8, 2026
a2eb261
Merge branch 'main' into add-defaults-for-policy
ZohebShaikh Aug 11, 2026
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
8 changes: 3 additions & 5 deletions helm/blueapi/config_schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,23 +301,21 @@
"type": "string"
},
"tiled_service_account_check": {
"default": "blueapi/tiled_service_account_for_beamline",
"title": "Tiled Service Account Check",
"type": "string"
},
"submit_task_check": {
"default": "blueapi/write_to_beamline_visit",
"title": "Submit Task Check",
"type": "string"
},
"admin_check": {
"default": "admin/admin",
"title": "Admin Check",
"type": "string"
}
},
"required": [
"tiled_service_account_check",
"submit_task_check",
"admin_check"
],
"title": "OpaConfig",
"type": "object",
"$id": "OpaConfig"
Expand Down
8 changes: 3 additions & 5 deletions helm/blueapi/values.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -714,14 +714,10 @@
"$id": "OpaConfig",
"title": "OpaConfig",
"type": "object",
"required": [
"tiled_service_account_check",
"submit_task_check",
"admin_check"
],
"properties": {
"admin_check": {
"title": "Admin Check",
"default": "admin/admin",
"type": "string"
},
"audience": {
Expand All @@ -739,10 +735,12 @@
},
"submit_task_check": {
"title": "Submit Task Check",
"default": "blueapi/write_to_beamline_visit",
"type": "string"
},
"tiled_service_account_check": {
"title": "Tiled Service Account Check",
"default": "blueapi/tiled_service_account_for_beamline",
"type": "string"
}
},
Expand Down
6 changes: 3 additions & 3 deletions src/blueapi/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,9 +312,9 @@ class Tag(StrEnum):
class OpaConfig(BlueapiBaseModel):
root: HttpUrl = HttpUrl("http://localhost:8181")
audience: str = "account"
tiled_service_account_check: str
submit_task_check: str
admin_check: str
tiled_service_account_check: str = "blueapi/tiled_service_account_for_beamline"
submit_task_check: str = "blueapi/write_to_beamline_visit"
admin_check: str = "admin/admin"


class ApplicationConfig(BlueapiBaseModel):
Expand Down
3 changes: 0 additions & 3 deletions tests/system_tests/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,3 @@ oidc:
client_audience: "ixx-blueapi"
opa:
root: "http://localhost:8181/v1/data/diamond/policy/"
tiled_service_account_check: "blueapi/tiled_service_account_for_beamline"
submit_task_check: "blueapi/write_to_beamline_visit"
admin_check: "admin/admin"