From fea7f914d2e52d96f574f1b93a170628d76b9899 Mon Sep 17 00:00:00 2001 From: Jeff Bradberry Date: Thu, 26 Sep 2019 15:18:38 -0400 Subject: [PATCH] Avoid the use of CredentialType.kind --- awx/api/serializers.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/awx/api/serializers.py b/awx/api/serializers.py index 4d60f9f660..42a4ed5f34 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -2831,15 +2831,15 @@ class JobTemplateMixin(object): webhook_service = attrs.get('webhook_service', getattr(self.instance, 'webhook_service', None)) webhook_credential = attrs.get('webhook_credential', getattr(self.instance, 'webhook_credential', None)) - if webhook_credential and webhook_credential.credential_type.kind != 'token': - raise serializers.ValidationError({ - 'webhook_credential': _("Must be a Personal Access Token."), - }) - if webhook_credential: + if not webhook_credential.credential_type.namespace.endswith('_token'): + raise serializers.ValidationError({ + 'webhook_credential': _("Must be a Personal Access Token."), + }) + msg = {'webhook_credential': _("Must match the selected webhook service.")} if webhook_service: - if webhook_credential.kind != '{}_token'.format(webhook_service): + if webhook_credential.credential_type.namespace != '{}_token'.format(webhook_service): raise serializers.ValidationError(msg) else: raise serializers.ValidationError(msg)