Make ask_mapping a simple class property

from PR feedback of saved launchtime configurations

awx/api/serializers.py

@@ -3096,7 +3096,7 @@ class WorkflowJobTemplateNodeSerializer(LaunchConfigurationBaseSerializer):
 
     def validate(self, attrs):
         deprecated_fields = {}
-        if 'credential' in attrs:
+        if 'credential' in attrs:  # TODO: remove when v2 API is deprecated
             deprecated_fields['credential'] = attrs.pop('credential')
         view = self.context.get('view')
         if self.instance is None and ('workflow_job_template' not in attrs or
@@ -3120,7 +3120,7 @@ class WorkflowJobTemplateNodeSerializer(LaunchConfigurationBaseSerializer):
         errors.pop('variables_needed_to_start', None)
         if errors:
             raise serializers.ValidationError(errors)
-        if 'credential' in deprecated_fields:
+        if 'credential' in deprecated_fields:  # TODO: remove when v2 API is deprecated
             cred = deprecated_fields['credential']
             attrs['credential'] = cred
             if cred is not None:
@@ -3130,7 +3130,7 @@ class WorkflowJobTemplateNodeSerializer(LaunchConfigurationBaseSerializer):
                     raise PermissionDenied()
         return attrs
 
-    def create(self, validated_data):
+    def create(self, validated_data):  # TODO: remove when v2 API is deprecated
         deprecated_fields = {}
         if 'credential' in validated_data:
             deprecated_fields['credential'] = validated_data.pop('credential')
@@ -3140,7 +3140,7 @@ class WorkflowJobTemplateNodeSerializer(LaunchConfigurationBaseSerializer):
                 obj.credentials.add(deprecated_fields['credential'])
         return obj
 
-    def update(self, obj, validated_data):
+    def update(self, obj, validated_data):  # TODO: remove when v2 API is deprecated
         deprecated_fields = {}
         if 'credential' in validated_data:
             deprecated_fields['credential'] = validated_data.pop('credential')
@@ -3438,7 +3438,7 @@ class JobLaunchSerializer(BaseSerializer):
 
     def get_defaults(self, obj):
         defaults_dict = {}
-        for field_name in JobTemplate.ask_mapping.keys():
+        for field_name in JobTemplate.get_ask_mapping().keys():
             if field_name == 'inventory':
                 defaults_dict[field_name] = dict(
                     name=getattrd(obj, '%s.name' % field_name, None),
@@ -3467,7 +3467,7 @@ class JobLaunchSerializer(BaseSerializer):
     def validate(self, attrs):
         template = self.context.get('template')
 
-        template._is_manual_launch = True  # TODO: hopefully remove this
+        template._is_manual_launch = True  # signal to make several error types non-blocking
         accepted, rejected, errors = template._accept_or_ignore_job_kwargs(**attrs)
         self._ignored_fields = rejected
 
@@ -3493,13 +3493,12 @@ class JobLaunchSerializer(BaseSerializer):
         passwords = attrs.get('credential_passwords', {})  # get from original attrs
         passwords_lacking = []
         for cred in launch_credentials:
-            if cred.passwords_needed:
-                for p in cred.passwords_needed:
-                    if p not in passwords:
-                        passwords_lacking.append(p)
-                    else:
-                        accepted.setdefault('credential_passwords', {})
-                        accepted['credential_passwords'][p] = passwords[p]
+            for p in cred.passwords_needed:
+                if p not in passwords:
+                    passwords_lacking.append(p)
+                else:
+                    accepted.setdefault('credential_passwords', {})
+                    accepted['credential_passwords'][p] = passwords[p]
         if len(passwords_lacking):
             errors['passwords_needed_to_start'] = passwords_lacking
 

awx/api/views.py

@@ -616,22 +616,25 @@ class LaunchConfigCredentialsBase(SubListAttachDetachAPIView):
     def is_valid_relation(self, parent, sub, created=False):
         if not parent.unified_job_template:
             return {"msg": _("Cannot assign credential when related template is null.")}
-        elif self.relationship not in parent.unified_job_template.ask_mapping:
-            return {"msg": _("Related template cannot accept credentials on launch.")}
+
+        ask_mapping = parent.unified_job_template.get_ask_mapping()
+
+        if self.relationship not in ask_mapping:
+            return {"msg": _("Related template cannot accept {} on launch.").format(self.relationship)}
         elif sub.passwords_needed:
             return {"msg": _("Credential that requires user input on launch "
                              "cannot be used in saved launch configuration.")}
 
-        ask_field_name = parent.unified_job_template.ask_mapping[self.relationship]
+        ask_field_name = ask_mapping[self.relationship]
 
         if not getattr(parent, ask_field_name):
             return {"msg": _("Related template is not configured to accept credentials on launch.")}
         elif sub.unique_hash() in [cred.unique_hash() for cred in parent.credentials.all()]:
-            return {"msg": _("This launch configuration already provides a {credential_type} credential.".format(
-                credential_type=sub.unique_hash(display=True)))}
+            return {"msg": _("This launch configuration already provides a {credential_type} credential.").format(
+                credential_type=sub.unique_hash(display=True))}
         elif sub.pk in parent.unified_job_template.credentials.values_list('pk', flat=True):
-            return {"msg": _("Related template already uses {credential_type} credential.".format(
-                credential_type=sub.name))}
+            return {"msg": _("Related template already uses {credential_type} credential.").format(
+                credential_type=sub.name)}
 
         # None means there were no validation errors
         return None
@@ -2752,7 +2755,7 @@ class JobTemplateLaunch(RetrieveAPIView):
                 extra_vars.setdefault(v, u'')
             if extra_vars:
                 data['extra_vars'] = extra_vars
-            modified_ask_mapping = JobTemplate.ask_mapping.copy()
+            modified_ask_mapping = JobTemplate.get_ask_mapping()
             modified_ask_mapping.pop('extra_vars')
             for field, ask_field_name in modified_ask_mapping.items():
                 if not getattr(obj, ask_field_name):
@@ -2823,7 +2826,7 @@ class JobTemplateLaunch(RetrieveAPIView):
                     # If user gave extra_credentials, special case to use exactly
                     # the given list without merging with JT credentials
                     if key == 'extra_credentials' and prompted_value:
-                        obj._deprecated_credential_launch = True
+                        obj._deprecated_credential_launch = True  # signal to not merge credentials
                     new_credentials.extend(prompted_value)
 
             # combine the list of "new" and the filtered list of "old"
@@ -2840,14 +2843,12 @@ class JobTemplateLaunch(RetrieveAPIView):
 
     def post(self, request, *args, **kwargs):
         obj = self.get_object()
-        print request.data
 
         try:
             modern_data, ignored_fields = self.modernize_launch_payload(
                 data=request.data, obj=obj
             )
         except ParseError as exc:
-            print ' args ' + str(exc.args)
             return Response(exc.detail, status=status.HTTP_400_BAD_REQUEST)
 
         serializer = self.serializer_class(data=modern_data, context={'template': obj})