Update test_notification Template for webhooks

- rename webhook_no_verify_ssl to disable_ssl_verification
This commit is contained in:
zicklam
2019-05-06 19:20:00 +02:00
parent 5b8fba58e8
commit 08d60d0b78
3 changed files with 8 additions and 8 deletions

View File

@@ -15,13 +15,13 @@ logger = logging.getLogger('awx.main.notifications.webhook_backend')
class WebhookBackend(AWXBaseEmailBackend): class WebhookBackend(AWXBaseEmailBackend):
init_parameters = {"url": {"label": "Target URL", "type": "string"}, init_parameters = {"url": {"label": "Target URL", "type": "string"},
"webhook_no_verify_ssl": {"label": "Verify SSL", "type": "bool"}, "disable_ssl_verification": {"label": "Verify SSL", "type": "bool"},
"headers": {"label": "HTTP Headers", "type": "object"}} "headers": {"label": "HTTP Headers", "type": "object"}}
recipient_parameter = "url" recipient_parameter = "url"
sender_parameter = None sender_parameter = None
def __init__(self, headers, webhook_no_verify_ssl=False, fail_silently=False, **kwargs): def __init__(self, headers, disable_ssl_verification=False, fail_silently=False, **kwargs):
self.webhook_no_verify_ssl = webhook_no_verify_ssl self.disable_ssl_verification = disable_ssl_verification
self.headers = headers self.headers = headers
super(WebhookBackend, self).__init__(fail_silently=fail_silently) super(WebhookBackend, self).__init__(fail_silently=fail_silently)
@@ -36,7 +36,7 @@ class WebhookBackend(AWXBaseEmailBackend):
r = requests.post("{}".format(m.recipients()[0]), r = requests.post("{}".format(m.recipients()[0]),
json=m.body, json=m.body,
headers=self.headers, headers=self.headers,
verify=(not self.webhook_no_verify_ssl)) verify=(not self.disable_ssl_verification))
if r.status_code >= 400: if r.status_code >= 400:
logger.error(smart_text(_("Error sending notification webhook: {}").format(r.text))) logger.error(smart_text(_("Error sending notification webhook: {}").format(r.text)))
if not self.fail_silently: if not self.fail_silently:

View File

@@ -28,7 +28,7 @@ def test_basic_parameterization(get, post, user, organization):
description="test webhook", description="test webhook",
organization=organization.id, organization=organization.id,
notification_type="webhook", notification_type="webhook",
notification_configuration=dict(url="http://localhost", notification_configuration=dict(url="http://localhost", disable_ssl_verification=False,
headers={"Test": "Header"})), headers={"Test": "Header"})),
u) u)
assert response.status_code == 201 assert response.status_code == 201
@@ -81,7 +81,7 @@ def test_inherited_notification_templates(get, post, user, organization, project
description="test webhook {}".format(nfiers), description="test webhook {}".format(nfiers),
organization=organization.id, organization=organization.id,
notification_type="webhook", notification_type="webhook",
notification_configuration=dict(url="http://localhost", notification_configuration=dict(url="http://localhost", disable_ssl_verification=False,
headers={"Test": "Header"})), headers={"Test": "Header"})),
u) u)
assert response.status_code == 201 assert response.status_code == 201
@@ -143,7 +143,7 @@ def test_custom_environment_injection(post, user, organization):
description="test webhook", description="test webhook",
organization=organization.id, organization=organization.id,
notification_type="webhook", notification_type="webhook",
notification_configuration=dict(url="https://example.org", notification_configuration=dict(url="https://example.org", disable_ssl_verification=False,
headers={"Test": "Header"})), headers={"Test": "Header"})),
u) u)
assert response.status_code == 201 assert response.status_code == 201

View File

@@ -399,7 +399,7 @@ export default ['i18n', function(i18n) {
subForm: 'typeSubForm', subForm: 'typeSubForm',
ngDisabled: '!(notification_template.summary_fields.user_capabilities.edit || canAdd)' ngDisabled: '!(notification_template.summary_fields.user_capabilities.edit || canAdd)'
}, },
webhook_no_verify_ssl: { disable_ssl_verification: {
label: i18n._('Disable SSL Verification'), label: i18n._('Disable SSL Verification'),
type: 'checkbox', type: 'checkbox',
ngShow: "notification_type.value == 'webhook' ", ngShow: "notification_type.value == 'webhook' ",