Skip to content

Commit

Permalink
fix(RHINENG-6185) Return current org_id (#1583)
Browse files Browse the repository at this point in the history
GET `default` endpoint now returns current org_id

Signed-off-by: Fellipe Henrique <[email protected]>
  • Loading branch information
fellipeh authored Dec 20, 2023
1 parent af39861 commit 395dc1d
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
5 changes: 3 additions & 2 deletions api/staleness.py
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
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

0 comments on commit 395dc1d

Please sign in to comment.