Fix errors in workflow surveys found through tests

awx/main/models/jobs.py

@@ -33,7 +33,6 @@ from awx.main.models.notifications import (
     JobNotificationMixin,
 )
 from awx.main.utils import (
-    decrypt_field,
     ignore_inventory_computed_fields,
     parse_yaml_or_json,
 )

awx/main/models/mixins.py

@@ -11,6 +11,7 @@ from jsonfield import JSONField
 from awx.main.models.rbac import (
     Role, RoleAncestorEntry, get_roles_on_resource
 )
+from awx.main.utils import parse_yaml_or_json
 
 
 __all__ = ['ResourceMixin', 'SurveyJobTemplateMixin', 'SurveyJobMixin']

awx/main/tests/unit/models/test_survey_models.py

@@ -4,7 +4,6 @@ import json
 from awx.main.tasks import RunJob
 from awx.main.models import (
     Job,
-    WorkflowJob,
     WorkflowJobTemplate
 )
 

awx/main/utils.py

@@ -5,6 +5,7 @@
 import base64
 import hashlib
 import json
+import yaml
 import logging
 import os
 import re
@@ -490,7 +491,7 @@ def parse_yaml_or_json(vars_str):
     except (ValueError, TypeError):
         try:
             vars_dict = yaml.safe_load(vars_str)
-            assert isinstance(extra_vars, dict)
+            assert isinstance(vars_dict, dict)
         except (yaml.YAMLError, TypeError, AttributeError, AssertionError):
             vars_dict = {}
     return vars_dict