External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-14 23:47:28 -02:30
Code Issues Packages Projects Releases Wiki Activity

Update logic in send method to recognize password field in upgraded webhook notifications

Browse Source
This commit is contained in:
beeankha
2019-06-25 10:46:05 -04:00
parent 2b74b6f9b6
commit 0a0b09b394
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx/main/models/notifications.py
View File

@@ -118,9 +118,10 @@ class NotificationTemplate(CommonModelNameNotUnique):
def send(self, subject, body): def send(self, subject, body):
for field in filter(lambda x: self.notification_class.init_parameters[x]['type'] == "password", for field in filter(lambda x: self.notification_class.init_parameters[x]['type'] == "password",
self.notification_class.init_parameters): self.notification_class.init_parameters):
self.notification_configuration[field] = decrypt_field(self, if field in self.notification_configuration:
'notification_configuration', self.notification_configuration[field] = decrypt_field(self,
subfield=field) 'notification_configuration',
subfield=field)
recipients = self.notification_configuration.pop(self.notification_class.recipient_parameter) recipients = self.notification_configuration.pop(self.notification_class.recipient_parameter)
if not isinstance(recipients, list): if not isinstance(recipients, list):
recipients = [recipients] recipients = [recipients]

4
docs/notification_system.md
View File

@@ -218,13 +218,13 @@ https://gist.github.com/matburt/73bfbf85c2443f39d272
The link below shows how to define an endpoint and parse headers and json content. It doesn't show how to configure Flask for HTTPS, but is fairly straightforward: The link below shows how to define an endpoint and parse headers and json content. It doesn't show how to configure Flask for HTTPS, but is fairly straightforward:
http://flask.pocoo.org/snippets/111/ http://flask.pocoo.org/snippets/111/
You can also link an httpbin service to the development environment for testing webhooks using: You can also link an `httpbin` service to the development environment for testing webhooks using:
``` ```
make docker-compose-notifications make docker-compose-notifications
``` ```
This will create an `httpbin` service reachable from the awx container at `http://httpbin/post`, `http://httpbin/put`, etc. Outside of the container, you can reach the service at `http://localhost:8204`. This will create an `httpbin` service reachable from the AWX container at `http://httpbin/post`, `http://httpbin/put`, etc. Outside of the container, you can reach the service at `http://localhost:8204`.
## Grafana ## Grafana