fix(sdk) separator param. Part of kubeflow#791 (kubeflow#842)

* m: typo in a comment

* remove separator param in loop spec

* update test

sdk/python/kfp_tekton/compiler/_tekton_handler.py

@@ -223,7 +223,7 @@ def _handle_tekton_custom_task(custom_task: dict, workflow: dict, recursive_task
                     'type': 'string'
                 } for sub_param in custom_task[custom_task_key]['loop_sub_args']])
 
-            # add loop special filed
+            # add loop special fields
             custom_task_cr['kind'] = 'PipelineLoop'
             if custom_task[custom_task_key]['spec'].get('parallelism') is not None:
                 custom_task_cr['spec']['parallelism'] = custom_task[custom_task_key]['spec']['parallelism']
@@ -238,6 +238,15 @@ def _handle_tekton_custom_task(custom_task: dict, workflow: dict, recursive_task
                     custom_task_cr = json.loads(
                         json.dumps(custom_task_cr).replace(custom_task_param['value'], '$(params.%s)' % custom_task_param['name']))
 
+            # remove separator from CR params
+            if custom_task[custom_task_key].get('separator') is not None:
+                separator_param = custom_task[custom_task_key]['separator']
+                custom_task_cr['spec']['pipelineSpec']['params'] = [
+                    param
+                    for param in custom_task_cr['spec']['pipelineSpec']['params']
+                    if param['name'] != separator_param
+                ]
+
         # need to process task parameters to replace out of scope results
         # because nested graph cannot refer to task results outside of the sub-pipeline.
         custom_task_cr_task_names = [custom_task_cr_task['name'] for custom_task_cr_task in custom_task_cr['spec']['pipelineSpec']['tasks']]

sdk/python/tests/compiler/testdata/loop_literal_separator.yaml

@@ -52,8 +52,6 @@ spec:
             params:
             - name: loop-item-param-2
               type: string
-            - name: loop-item-param-3
-              type: string
             - name: my_pipe_param
               type: string
             tasks:

sdk/python/tests/compiler/testdata/loop_literal_separator_noninlined.yaml

@@ -31,10 +31,10 @@ metadata:
       "kind": "PipelineLoop", "metadata": {"name": "my-pipeline-for-loop-4"}, "spec":
       {"iterateParam": "loop-item-param-2", "iterateParamStringSeparator": "loop-item-param-3",
       "pipelineSpec": {"params": [{"name": "loop-item-param-2", "type": "string"},
-      {"name": "loop-item-param-3", "type": "string"}, {"name": "my_pipe_param", "type":
-      "string"}], "tasks": [{"name": "my-in-coop1", "params": [{"name": "loop-item-param-2",
-      "value": "$(params.loop-item-param-2)"}, {"name": "my_pipe_param", "value":
-      "$(params.my_pipe_param)"}], "taskSpec": {"metadata": {"annotations": {"pipelines.kubeflow.org/component_spec_digest":
+      {"name": "my_pipe_param", "type": "string"}], "tasks": [{"name": "my-in-coop1",
+      "params": [{"name": "loop-item-param-2", "value": "$(params.loop-item-param-2)"},
+      {"name": "my_pipe_param", "value": "$(params.my_pipe_param)"}], "taskSpec":
+      {"metadata": {"annotations": {"pipelines.kubeflow.org/component_spec_digest":
       "{\"name\": \"my-in-coop1\", \"outputs\": [], \"version\": \"my-in-coop1@sha256=42f0c6a60c7e435441b8afaeb382a771a9741fe3aabb203748fdbd72b25f1628\"}",
       "tekton.dev/template": ""}, "labels": {"pipelines.kubeflow.org/cache_enabled":
       "true", "pipelines.kubeflow.org/generation": "", "pipelines.kubeflow.org/pipelinename":