Merge pull request #1666 from AlanCoding/fix_workflow_vars_again

Ignore workflow survey passwords when not applicable

awx/main/models/unified_jobs.py

@@ -873,8 +873,11 @@ class UnifiedJob(PolymorphicModel, PasswordFieldsModel, CommonModelNameNotUnique
         JobLaunchConfig = self._meta.get_field('launch_config').related_model
         config = JobLaunchConfig(job=self)
         valid_fields = self.unified_job_template.get_ask_mapping().keys()
+        # Special cases allowed for workflows
         if hasattr(self, 'extra_vars'):
             valid_fields.extend(['survey_passwords', 'extra_vars'])
+        else:
+            kwargs.pop('survey_passwords', None)
         for field_name, value in kwargs.items():
             if field_name not in valid_fields:
                 raise Exception('Unrecognized launch config field {}.'.format(field_name))

awx/main/tests/functional/models/test_job_launch_config.py

@@ -48,6 +48,12 @@ class TestConfigCreation:
         config = job.launch_config
         assert set(config.credentials.all()) == set([credential])
 
+    def test_survey_passwords_ignored(self, inventory_source):
+        iu = inventory_source.create_unified_job(
+            survey_passwords={'foo': '$encrypted$'}
+        )
+        assert iu.launch_config.prompts_dict() == {}
+
 
 @pytest.mark.django_db
 class TestConfigReversibility: