fix tests

Signed-off-by: Yee Hing Tong <[email protected]>
flyteorg · Feb 1, 2024 · 021290d · 021290d
1 parent e0e712d
commit 021290d
Show file tree

Hide file tree

Showing 48 changed files with 201 additions and 199 deletions.
diff --git a/flytepropeller/events/eventsink_test.go b/flytepropeller/events/eventsink_test.go
@@ -75,13 +75,13 @@ func TestFileEvent(t *testing.T) {
 	assert.NoError(t, err)
 
 	expected := []string{
-		"[--WF EVENT--] project:\"FlyteTest\" domain:\"FlyteStaging\" name:\"Name\" , " +
+		"[--WF EVENT--] project:\"FlyteTest\"  domain:\"FlyteStaging\"  name:\"Name\", " +
 			"Phase: SUCCEEDED, OccuredAt: " + ptypes.TimestampString(now),
-		"[--NODE EVENT--] node_id:\"node1\" execution_id:<project:\"FlyteTest\" " +
-			"domain:\"FlyteStaging\" name:\"Name\" > , Phase: RUNNING, OccuredAt: " + ptypes.TimestampString(now),
-		"[--TASK EVENT--] resource_type:TASK project:\"FlyteTest\" domain:\"FlyteStaging\" " +
-			"name:\"Name\" ,node_id:\"node1\" execution_id:<project:\"FlyteTest\" domain:\"FlyteStaging\" " +
-			"name:\"Name\" > , Phase: FAILED, OccuredAt: " + ptypes.TimestampString(now),
+		"[--NODE EVENT--] node_id:\"node1\"  execution_id:{project:\"FlyteTest\" " +
+			" domain:\"FlyteStaging\"  name:\"Name\"}, Phase: RUNNING, OccuredAt: " + ptypes.TimestampString(now),
+		"[--TASK EVENT--] resource_type:TASK  project:\"FlyteTest\"  domain:\"FlyteStaging\" " +
+			" name:\"Name\",node_id:\"node1\"  execution_id:{project:\"FlyteTest\"  domain:\"FlyteStaging\" " +
+			" name:\"Name\"}, Phase: FAILED, OccuredAt: " + ptypes.TimestampString(now),
 	}
 
 	actual, err := readLinesFromFile(file)

diff --git a/...est/testdata/snacks-core/k8s/002_core.containerization.multi_images.my_workflow_2_wf.yaml b/...est/testdata/snacks-core/k8s/002_core.containerization.multi_images.my_workflow_2_wf.yaml
@@ -75,7 +75,7 @@ spec:
       kind: task
       name: svm_trainer
       resources: {}
-      task: 'resource_type:TASK name:"core.containerization.multi_images.svm_trainer" '
+      task: resource_type:TASK  name:"core.containerization.multi_images.svm_trainer"
     n1:
       id: n1
       inputBindings:
@@ -102,7 +102,7 @@ spec:
       kind: task
       name: svm_predictor
       resources: {}
-      task: 'resource_type:TASK name:"core.containerization.multi_images.svm_predictor" '
+      task: resource_type:TASK  name:"core.containerization.multi_images.svm_predictor"
     start-node:
       id: start-node
       kind: start
@@ -121,7 +121,7 @@ spec:
 status:
   phase: 0
 tasks:
-  'resource_type:TASK name:"core.containerization.multi_images.svm_predictor" ':
+  resource_type:TASK  name:"core.containerization.multi_images.svm_predictor":
     container:
       args:
       - pyflyte-execute
@@ -185,7 +185,7 @@ tasks:
         type: FLYTE_SDK
         version: 0.32.6
     type: python-task
-  'resource_type:TASK name:"core.containerization.multi_images.svm_trainer" ':
+  resource_type:TASK  name:"core.containerization.multi_images.svm_trainer":
     container:
       args:
       - pyflyte-execute

diff --git a/...mpiler/test/testdata/snacks-core/k8s/010_core.containerization.raw_container.wf_2_wf.yaml b/...mpiler/test/testdata/snacks-core/k8s/010_core.containerization.raw_container.wf_2_wf.yaml
@@ -125,7 +125,7 @@ spec:
       kind: task
       name: ellipse-area-metadata-shell
       resources: {}
-      task: 'resource_type:TASK name:"ellipse-area-metadata-shell" '
+      task: resource_type:TASK  name:"ellipse-area-metadata-shell"
     n1:
       id: n1
       inputBindings:
@@ -142,7 +142,7 @@ spec:
       kind: task
       name: ellipse-area-metadata-python
       resources: {}
-      task: 'resource_type:TASK name:"ellipse-area-metadata-python" '
+      task: resource_type:TASK  name:"ellipse-area-metadata-python"
     n2:
       id: n2
       inputBindings:
@@ -159,7 +159,7 @@ spec:
       kind: task
       name: ellipse-area-metadata-r
       resources: {}
-      task: 'resource_type:TASK name:"ellipse-area-metadata-r" '
+      task: resource_type:TASK  name:"ellipse-area-metadata-r"
     n3:
       id: n3
       inputBindings:
@@ -176,7 +176,7 @@ spec:
       kind: task
       name: ellipse-area-metadata-haskell
       resources: {}
-      task: 'resource_type:TASK name:"ellipse-area-metadata-haskell" '
+      task: resource_type:TASK  name:"ellipse-area-metadata-haskell"
     n4:
       id: n4
       inputBindings:
@@ -193,7 +193,7 @@ spec:
       kind: task
       name: ellipse-area-metadata-julia
       resources: {}
-      task: 'resource_type:TASK name:"ellipse-area-metadata-julia" '
+      task: resource_type:TASK  name:"ellipse-area-metadata-julia"
     n5:
       id: n5
       inputBindings:
@@ -250,7 +250,7 @@ spec:
       kind: task
       name: report_all_calculated_areas
       resources: {}
-      task: 'resource_type:TASK name:"core.containerization.raw_container.report_all_calculated_areas" '
+      task: resource_type:TASK  name:"core.containerization.raw_container.report_all_calculated_areas"
     start-node:
       id: start-node
       kind: start
@@ -259,7 +259,7 @@ spec:
 status:
   phase: 0
 tasks:
-  'resource_type:TASK name:"core.containerization.raw_container.report_all_calculated_areas" ':
+  resource_type:TASK  name:"core.containerization.raw_container.report_all_calculated_areas":
     container:
       args:
       - pyflyte-execute
@@ -333,7 +333,7 @@ tasks:
         type: FLYTE_SDK
         version: 0.32.6
     type: python-task
-  'resource_type:TASK name:"ellipse-area-metadata-haskell" ':
+  resource_type:TASK  name:"ellipse-area-metadata-haskell":
     container:
       command:
       - ./calculate-ellipse-area
@@ -379,7 +379,7 @@ tasks:
         type: FLYTE_SDK
         version: 0.32.6
     type: raw-container
-  'resource_type:TASK name:"ellipse-area-metadata-julia" ':
+  resource_type:TASK  name:"ellipse-area-metadata-julia":
     container:
       command:
       - julia
@@ -426,7 +426,7 @@ tasks:
         type: FLYTE_SDK
         version: 0.32.6
     type: raw-container
-  'resource_type:TASK name:"ellipse-area-metadata-python" ':
+  resource_type:TASK  name:"ellipse-area-metadata-python":
     container:
       command:
       - python
@@ -473,7 +473,7 @@ tasks:
         type: FLYTE_SDK
         version: 0.32.6
     type: raw-container
-  'resource_type:TASK name:"ellipse-area-metadata-r" ':
+  resource_type:TASK  name:"ellipse-area-metadata-r":
     container:
       command:
       - Rscript
@@ -521,7 +521,7 @@ tasks:
         type: FLYTE_SDK
         version: 0.32.6
     type: raw-container
-  'resource_type:TASK name:"ellipse-area-metadata-shell" ':
+  resource_type:TASK  name:"ellipse-area-metadata-shell":
     container:
       command:
       - ./calculate-ellipse-area.sh

diff --git a/...stdata/snacks-core/k8s/015_core.containerization.use_secrets.my_secret_workflow_2_wf.yaml b/...stdata/snacks-core/k8s/015_core.containerization.use_secrets.my_secret_workflow_2_wf.yaml
@@ -107,19 +107,19 @@ spec:
       kind: task
       name: secret_task
       resources: {}
-      task: 'resource_type:TASK name:"core.containerization.use_secrets.secret_task" '
+      task: resource_type:TASK  name:"core.containerization.use_secrets.secret_task"
     n1:
       id: n1
       kind: task
       name: user_info_task
       resources: {}
-      task: 'resource_type:TASK name:"core.containerization.use_secrets.user_info_task" '
+      task: resource_type:TASK  name:"core.containerization.use_secrets.user_info_task"
     n2:
       id: n2
       kind: task
       name: secret_file_task
       resources: {}
-      task: 'resource_type:TASK name:"core.containerization.use_secrets.secret_file_task" '
+      task: resource_type:TASK  name:"core.containerization.use_secrets.secret_file_task"
     start-node:
       id: start-node
       kind: start
@@ -170,7 +170,7 @@ spec:
 status:
   phase: 0
 tasks:
-  'resource_type:TASK name:"core.containerization.use_secrets.secret_file_task" ':
+  resource_type:TASK  name:"core.containerization.use_secrets.secret_file_task":
     container:
       args:
       - pyflyte-execute
@@ -225,7 +225,7 @@ tasks:
         key: user_secret
         mountRequirement: ENV_VAR
     type: python-task
-  'resource_type:TASK name:"core.containerization.use_secrets.secret_task" ':
+  resource_type:TASK  name:"core.containerization.use_secrets.secret_task":
     container:
       args:
       - pyflyte-execute
@@ -276,7 +276,7 @@ tasks:
       - group: user-info
         key: user_secret
     type: python-task
-  'resource_type:TASK name:"core.containerization.use_secrets.user_info_task" ':
+  resource_type:TASK  name:"core.containerization.use_secrets.user_info_task":
     container:
       args:
       - pyflyte-execute

diff --git a/.../test/testdata/snacks-core/k8s/019_core.control_flow.chain_tasks.chain_tasks_wf_2_wf.yaml b/.../test/testdata/snacks-core/k8s/019_core.control_flow.chain_tasks.chain_tasks_wf_2_wf.yaml
@@ -75,13 +75,13 @@ spec:
       kind: task
       name: write
       resources: {}
-      task: 'resource_type:TASK name:"core.control_flow.chain_tasks.write" '
+      task: resource_type:TASK  name:"core.control_flow.chain_tasks.write"
     n1:
       id: n1
       kind: task
       name: read
       resources: {}
-      task: 'resource_type:TASK name:"core.control_flow.chain_tasks.read" '
+      task: resource_type:TASK  name:"core.control_flow.chain_tasks.read"
     start-node:
       id: start-node
       kind: start
@@ -101,7 +101,7 @@ spec:
 status:
   phase: 0
 tasks:
-  'resource_type:TASK name:"core.control_flow.chain_tasks.read" ':
+  resource_type:TASK  name:"core.control_flow.chain_tasks.read":
     container:
       args:
       - pyflyte-execute
@@ -149,7 +149,7 @@ tasks:
         type: FLYTE_SDK
         version: 0.32.6
     type: python-task
-  'resource_type:TASK name:"core.control_flow.chain_tasks.write" ':
+  resource_type:TASK  name:"core.control_flow.chain_tasks.write":
     container:
       args:
       - pyflyte-execute

diff --git a/...compiler/test/testdata/snacks-core/k8s/022_core.control_flow.checkpoint.example_2_wf.yaml b/...compiler/test/testdata/snacks-core/k8s/022_core.control_flow.checkpoint.example_2_wf.yaml
@@ -82,7 +82,7 @@ spec:
       resources: {}
       retry:
         minAttempts: 4
-      task: 'resource_type:TASK name:"core.control_flow.checkpoint.use_checkpoint" '
+      task: resource_type:TASK  name:"core.control_flow.checkpoint.use_checkpoint"
     start-node:
       id: start-node
       kind: start
@@ -101,7 +101,7 @@ spec:
 status:
   phase: 0
 tasks:
-  'resource_type:TASK name:"core.control_flow.checkpoint.use_checkpoint" ':
+  resource_type:TASK  name:"core.control_flow.checkpoint.use_checkpoint":
     container:
       args:
       - pyflyte-execute

diff --git a/...piler/test/testdata/snacks-core/k8s/026_core.control_flow.conditions.multiplier_2_wf.yaml b/...piler/test/testdata/snacks-core/k8s/026_core.control_flow.conditions.multiplier_2_wf.yaml
@@ -117,7 +117,7 @@ spec:
       kind: task
       name: double
       resources: {}
-      task: 'resource_type:TASK name:"core.control_flow.conditions.double" '
+      task: resource_type:TASK  name:"core.control_flow.conditions.double"
     n0-n1:
       id: n0-n1
       inputBindings:
@@ -129,7 +129,7 @@ spec:
       kind: task
       name: square
       resources: {}
-      task: 'resource_type:TASK name:"core.control_flow.conditions.square" '
+      task: resource_type:TASK  name:"core.control_flow.conditions.square"
     start-node:
       id: start-node
       kind: start
@@ -148,7 +148,7 @@ spec:
 status:
   phase: 0
 tasks:
-  'resource_type:TASK name:"core.control_flow.conditions.double" ':
+  resource_type:TASK  name:"core.control_flow.conditions.double":
     container:
       args:
       - pyflyte-execute
@@ -199,7 +199,7 @@ tasks:
         type: FLYTE_SDK
         version: 0.32.6
     type: python-task
-  'resource_type:TASK name:"core.control_flow.conditions.square" ':
+  resource_type:TASK  name:"core.control_flow.conditions.square":
     container:
       args:
       - pyflyte-execute

diff --git a/...ler/test/testdata/snacks-core/k8s/028_core.control_flow.conditions.multiplier_2_2_wf.yaml b/...ler/test/testdata/snacks-core/k8s/028_core.control_flow.conditions.multiplier_2_2_wf.yaml
@@ -139,7 +139,7 @@ spec:
       kind: task
       name: double
       resources: {}
-      task: 'resource_type:TASK name:"core.control_flow.conditions.double" '
+      task: resource_type:TASK  name:"core.control_flow.conditions.double"
     n0-n1:
       id: n0-n1
       inputBindings:
@@ -151,7 +151,7 @@ spec:
       kind: task
       name: square
       resources: {}
-      task: 'resource_type:TASK name:"core.control_flow.conditions.square" '
+      task: resource_type:TASK  name:"core.control_flow.conditions.square"
     start-node:
       id: start-node
       kind: start
@@ -170,7 +170,7 @@ spec:
 status:
   phase: 0
 tasks:
-  'resource_type:TASK name:"core.control_flow.conditions.double" ':
+  resource_type:TASK  name:"core.control_flow.conditions.double":
     container:
       args:
       - pyflyte-execute
@@ -221,7 +221,7 @@ tasks:
         type: FLYTE_SDK
         version: 0.32.6
     type: python-task
-  'resource_type:TASK name:"core.control_flow.conditions.square" ':
+  resource_type:TASK  name:"core.control_flow.conditions.square":
     container:
       args:
       - pyflyte-execute

diff --git a/...ler/test/testdata/snacks-core/k8s/030_core.control_flow.conditions.multiplier_3_2_wf.yaml b/...ler/test/testdata/snacks-core/k8s/030_core.control_flow.conditions.multiplier_3_2_wf.yaml
@@ -145,7 +145,7 @@ spec:
       kind: task
       name: double
       resources: {}
-      task: 'resource_type:TASK name:"core.control_flow.conditions.double" '
+      task: resource_type:TASK  name:"core.control_flow.conditions.double"
     n0-n1:
       id: n0-n1
       inputBindings:
@@ -157,7 +157,7 @@ spec:
       kind: task
       name: square
       resources: {}
-      task: 'resource_type:TASK name:"core.control_flow.conditions.square" '
+      task: resource_type:TASK  name:"core.control_flow.conditions.square"
     n1:
       id: n1
       inputBindings:
@@ -169,7 +169,7 @@ spec:
       kind: task
       name: double
       resources: {}
-      task: 'resource_type:TASK name:"core.control_flow.conditions.double" '
+      task: resource_type:TASK  name:"core.control_flow.conditions.double"
     start-node:
       id: start-node
       kind: start
@@ -188,7 +188,7 @@ spec:
 status:
   phase: 0
 tasks:
-  'resource_type:TASK name:"core.control_flow.conditions.double" ':
+  resource_type:TASK  name:"core.control_flow.conditions.double":
     container:
       args:
       - pyflyte-execute
@@ -239,7 +239,7 @@ tasks:
         type: FLYTE_SDK
         version: 0.32.6
     type: python-task
-  'resource_type:TASK name:"core.control_flow.conditions.square" ':
+  resource_type:TASK  name:"core.control_flow.conditions.square":
     container:
       args:
       - pyflyte-execute