Add job artifacts and workflow artifact passing

artifacts redact from job when no_log is set
parent no_log artifacts treated as survey passwords

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

@@ -3,8 +3,11 @@
 import pytest
 
 # AWX
-from awx.main.models.workflow import WorkflowJob, WorkflowJobTemplateNode
+from awx.main.models.workflow import WorkflowJob, WorkflowJobNode, WorkflowJobTemplateNode
+from awx.main.models.jobs import Job
+from awx.main.models.projects import ProjectUpdate
 
+@pytest.mark.django_db
 class TestWorkflowJob:
     @pytest.fixture
     def workflow_job(self, workflow_job_template_factory):
@@ -21,7 +24,6 @@ class TestWorkflowJob:
 
         return wfj
 
-    @pytest.mark.django_db
     def test_inherit_job_template_workflow_nodes(self, mocker, workflow_job):
         workflow_job.inherit_job_template_workflow_nodes()
 
@@ -31,4 +33,60 @@ class TestWorkflowJob:
         assert nodes[0].failure_nodes.filter(id=nodes[3].id).exists()
         assert nodes[3].failure_nodes.filter(id=nodes[4].id).exists()
 
+    def test_inherit_ancestor_artifacts_from_job(self, project, mocker):
+        """
+        Assure that nodes along the line of execution inherit artifacts
+        from both jobs ran, and from the accumulation of old jobs
+        """
+        # Related resources
+        wfj = WorkflowJob.objects.create(name='test-wf-job')
+        job = Job.objects.create(name='test-job', artifacts={'b': 43})
+        # Workflow job nodes
+        job_node = WorkflowJobNode.objects.create(workflow_job=wfj, job=job,
+                                                  ancestor_artifacts={'a': 42})
+        queued_node = WorkflowJobNode.objects.create(workflow_job=wfj)
+        # Connect old job -> new job
+        mocker.patch.object(queued_node, 'get_parent_nodes', lambda: [job_node])
+        assert queued_node.get_job_kwargs()['extra_vars'] == {'a': 42, 'b': 43}
+        assert queued_node.ancestor_artifacts == {'a': 42, 'b': 43}
+
+    def test_inherit_ancestor_artifacts_from_project_update(self, project, mocker):
+        """
+        Test that the existence of a project update (no artifacts) does
+        not break the flow of ancestor_artifacts
+        """
+        # Related resources
+        wfj = WorkflowJob.objects.create(name='test-wf-job')
+        update = ProjectUpdate.objects.create(name='test-update', project=project)
+        # Workflow job nodes
+        project_node = WorkflowJobNode.objects.create(workflow_job=wfj, job=update,
+                                                      ancestor_artifacts={'a': 42, 'b': 43})
+        queued_node = WorkflowJobNode.objects.create(workflow_job=wfj)
+        # Connect project update -> new job
+        mocker.patch.object(queued_node, 'get_parent_nodes', lambda: [project_node])
+        assert queued_node.get_job_kwargs()['extra_vars'] == {'a': 42, 'b': 43}
+        assert queued_node.ancestor_artifacts == {'a': 42, 'b': 43}
+
+@pytest.mark.django_db
+class TestWorkflowJobTemplate:
+
+    @pytest.fixture
+    def wfjt(self, workflow_job_template_factory):
+        wfjt = workflow_job_template_factory('test').workflow_job_template
+        nodes = [WorkflowJobTemplateNode.objects.create(workflow_job_template=wfjt) for i in range(0, 3)]
+        nodes[0].success_nodes.add(nodes[1])
+        nodes[1].failure_nodes.add(nodes[2])
+        return wfjt
+
+    def test_node_parentage(self, wfjt):
+        # test success parent
+        wfjt_node = wfjt.workflow_job_template_nodes.all()[1]
+        parent_qs = wfjt_node.get_parent_nodes()
+        assert len(parent_qs) == 1
+        assert parent_qs[0] == wfjt.workflow_job_template_nodes.all()[0]
+        # test failure parent
+        wfjt_node = wfjt.workflow_job_template_nodes.all()[2]
+        parent_qs = wfjt_node.get_parent_nodes()
+        assert len(parent_qs) == 1
+        assert parent_qs[0] == wfjt.workflow_job_template_nodes.all()[1]