Merge pull request #3878 from ansible/fix-5062

fix a bug that breaks webhook launches when a survey is in use
This commit is contained in:
Ryan Petrello
2019-10-22 13:35:30 -04:00
committed by GitHub

View File

@@ -1,6 +1,5 @@
from hashlib import sha1 from hashlib import sha1
import hmac import hmac
import json
import logging import logging
import urllib.parse import urllib.parse
@@ -151,13 +150,13 @@ class WebhookReceiverBase(APIView):
'webhook_credential': obj.webhook_credential, 'webhook_credential': obj.webhook_credential,
'webhook_guid': event_guid, 'webhook_guid': event_guid,
}, },
'extra_vars': json.dumps({ 'extra_vars': {
'tower_webhook_event_type': event_type, 'tower_webhook_event_type': event_type,
'tower_webhook_event_guid': event_guid, 'tower_webhook_event_guid': event_guid,
'tower_webhook_event_ref': event_ref, 'tower_webhook_event_ref': event_ref,
'tower_webhook_status_api': status_api, 'tower_webhook_status_api': status_api,
'tower_webhook_payload': request.data, 'tower_webhook_payload': request.data,
}) }
} }
new_job = obj.create_unified_job(**kwargs) new_job = obj.create_unified_job(**kwargs)