External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-04-19 08:50:21 -02:30
Code Issues Packages Projects Releases Wiki Activity

store the public key for HashiVault signing in the plugin metadata

Browse Source
This commit is contained in:
Ryan Petrello
2019-03-01 00:27:03 -05:00
committed by Jake McDermott
parent 2824616ba6
commit 0768c6ac1d
6 changed files with 24 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
awx/api/views/__init__.py
View File

@@ -1440,8 +1440,11 @@ class CredentialExternalTest(SubDetailAPIView):
backend_kwargs[field_name] = value
backend_kwargs.update(request.data.get('metadata', {}))
try:
obj.credential_type.plugin.backend(None, **backend_kwargs)
obj.credential_type.plugin.backend(**backend_kwargs)
return Response({}, status=status.HTTP_202_ACCEPTED)
except requests.exceptions.HTTPError as exc:
message = 'HTTP {}\n{}'.format(exc.response.status_code, exc.response.text)
return Response({'inputs': message}, status=status.HTTP_400_BAD_REQUEST)
except Exception as exc:
return Response({'inputs': str(exc)}, status=status.HTTP_400_BAD_REQUEST)
@@ -1489,8 +1492,11 @@ class CredentialTypeExternalTest(SubDetailAPIView):
backend_kwargs = request.data.get('inputs', {})
backend_kwargs.update(request.data.get('metadata', {}))
try:
obj.plugin.backend(None, **backend_kwargs)
obj.plugin.backend(**backend_kwargs)
return Response({}, status=status.HTTP_202_ACCEPTED)
except requests.exceptions.HTTPError as exc:
message = 'HTTP {}\n{}'.format(exc.response.status_code, exc.response.text)
return Response({'inputs': message}, status=status.HTTP_400_BAD_REQUEST)
except Exception as exc:
return Response({'inputs': str(exc)}, status=status.HTTP_400_BAD_REQUEST)