Skip to content
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

fix(RHINENG-6185) Return current org_id #1583

Merged
merged 1 commit into from
Dec 20, 2023
Merged

fix(RHINENG-6185) Return current org_id #1583

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
5 changes: 3 additions & 2 deletions api/staleness.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from api import json_error_response
from api import metrics
from api.staleness_query import get_staleness_obj
from api.staleness_query import get_sys_default_staleness
from api.staleness_query import get_sys_default_staleness_api
from app import RbacPermission
from app import RbacResourceType
from app.auth import get_current_identity
Expand Down Expand Up @@ -65,7 +65,8 @@ def get_staleness(rbac_filter=None):
@metrics.api_request_time.time()
def get_default_staleness(rbac_filter=None):
try:
staleness = get_sys_default_staleness()
identity = get_current_identity()
staleness = get_sys_default_staleness_api(identity)
staleness = serialize_staleness_response(staleness)

return flask_json_response(staleness, status.HTTP_200_OK)
Expand Down
5 changes: 5 additions & 0 deletions api/staleness_query.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ def get_sys_default_staleness(config=None):
return _build_staleness_sys_default("000000", config)


def get_sys_default_staleness_api(identity, config=None):
org_id = identity.org_id or "00000"
return _build_staleness_sys_default(org_id, config)


def _build_staleness_sys_default(org_id, config=None):
if not config:
config = inventory_config()
Expand Down