fix(jobs): handle optional null artifact inputs

Artifact inputs can be optional and null. If this is the case we should not populate default arguments with them. re pollination/pollination-server#146
pollination · Jun 3, 2021 · 61c2fbf · 61c2fbf
1 parent 17f972c
commit 61c2fbf
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/queenbee/job/job.py b/queenbee/job/job.py
@@ -66,17 +66,20 @@ def populate_default_arguments(self, inputs: List[DAGInputs]):
                         found_argument = True
 
                 if not found_argument and not recipe_input.required:
-                    if recipe_input.is_artifact:
+                    argument = None
+                    if recipe_input.is_artifact and \
+                            recipe_input.default is not None:
                         argument = JobPathArgument(
                             name=recipe_input.name,
                             source=recipe_input.default,
                         )
-                    else:
+                    elif recipe_input.is_parameter:
                         argument = JobArgument(
                             name=recipe_input.name,
                             value=recipe_input.default,
                         )
-                    combination.append(argument)
+                    if argument is not None:
+                        combination.append(argument)
 
     def validate_arguments(self, inputs: List[DAGInputs]):
         errors = []

diff --git a/tests/job/job_test.py b/tests/job/job_test.py
@@ -33,6 +33,14 @@ def optional_artifact_input():
     )
 
 
+@pytest.fixture
+def optional_artifact_input_with_no_default():
+    return DAGPathInput(
+        name='optional-artifact-input-no-default',
+        required=False,
+    )
+
+
 @pytest.fixture
 def required_artifact_input():
     return DAGPathInput(
@@ -47,8 +55,13 @@ def required_inputs(required_parameter_input, required_artifact_input):
 
 
 @pytest.fixture
-def optional_inputs(optional_parameter_input, optional_artifact_input):
-    return [optional_parameter_input, optional_artifact_input]
+def optional_inputs(optional_parameter_input, optional_artifact_input,
+                    optional_artifact_input_with_no_default):
+    return [
+        optional_parameter_input,
+        optional_artifact_input,
+        optional_artifact_input_with_no_default
+    ]
 
 
 @pytest.fixture