External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-09 18:37:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

Analytics API: OPTIONS proxy and response links update

Browse Source
This commit is contained in:
Martin Slemr
2023-04-04 15:13:14 +02:00
committed by Hao Liu
parent 0a40b758c3
commit 0fea29ad4d
1 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
awx/api/views/analytics.py
View File

@@ -159,11 +159,22 @@ class AnalyticsGenericView(APIView):
return self._error_response(ERROR_NOT_FOUND, message, remote=True, remote_status_code=status.HTTP_404_NOT_FOUND, status_code=status.HTTP_404_NOT_FOUND) return self._error_response(ERROR_NOT_FOUND, message, remote=True, remote_status_code=status.HTTP_404_NOT_FOUND, status_code=status.HTTP_404_NOT_FOUND)
@staticmethod @staticmethod
def _forward_response(response): def _update_response_links(json_response):
if not json_response.get('links', None):
return
for key, value in json_response['links'].items():
if value:
json_response['links'][key] = value.replace(AUTOMATION_ANALYTICS_API_URL_PATH, f"/api/v2/{AWX_ANALYTICS_API_PREFIX}")
def _forward_response(self, response):
try: try:
content_type = response.headers.get('content-type', '') content_type = response.headers.get('content-type', '')
if content_type.find('application/json') != -1: if content_type.find('application/json') != -1:
return Response(response.json(), status=response.status_code) json_response = response.json()
self._update_response_links(json_response)
return Response(json_response, status=response.status_code)
except Exception as e: except Exception as e:
logger.error(f"Analytics API: Response error: {e}") logger.error(f"Analytics API: Response error: {e}")
@@ -178,7 +189,7 @@ class AnalyticsGenericView(APIView):
rh_user = self._get_rh_user() rh_user = self._get_rh_user()
rh_password = self._get_rh_password() rh_password = self._get_rh_password()
if method not in ["GET", "POST"]: if method not in ["GET", "POST", "OPTIONS"]:
return self._error_response(ERROR_UNSUPPORTED_METHOD, method, remote=False, status_code=status.HTTP_500_INTERNAL_SERVER_ERROR) return self._error_response(ERROR_UNSUPPORTED_METHOD, method, remote=False, status_code=status.HTTP_500_INTERNAL_SERVER_ERROR)
else: else:
response = requests.request( response = requests.request(
@@ -226,6 +237,9 @@ class AnalyticsGenericListView(AnalyticsGenericView):
def post(self, request, format=None): def post(self, request, format=None):
return self._send_to_analytics(request, method="POST") return self._send_to_analytics(request, method="POST")
def options(self, request, format=None):
return self._send_to_analytics(request, method="OPTIONS")
class AnalyticsGenericDetailView(AnalyticsGenericView): class AnalyticsGenericDetailView(AnalyticsGenericView):
def get(self, request, slug, format=None): def get(self, request, slug, format=None):
@@ -234,6 +248,9 @@ class AnalyticsGenericDetailView(AnalyticsGenericView):
def post(self, request, slug, format=None): def post(self, request, slug, format=None):
return self._send_to_analytics(request, method="POST") return self._send_to_analytics(request, method="POST")
def options(self, request, slug, format=None):
return self._send_to_analytics(request, method="OPTIONS")
class AnalyticsAuthorizedView(AnalyticsGenericListView): class AnalyticsAuthorizedView(AnalyticsGenericListView):
name = _("Authorized") name = _("Authorized")