feat!: Remove the hidden flag verify from argo submit (#7158)

Signed-off-by: Alex Collins <alex_collins@intuit.com>
argoproj · Nov 4, 2021 · a6ce659 · a6ce659
1 parent 9d3c980
commit a6ce659
Show file tree

Hide file tree

Showing 31 changed files with 6 additions and 192 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -1,6 +1,7 @@
 # https://golangci-lint.run/usage/quick-start/
 run:
-  timeout: 4m
+  concurrency: 4
+  timeout: 5m
   skip-dirs:
     - dist
     - docs

diff --git a/cmd/argo/commands/submit.go b/cmd/argo/commands/submit.go
@@ -26,7 +26,6 @@ type cliSubmitOpts struct {
 	output        string // --output
 	wait          bool   // --wait
 	watch         bool   // --watch
-	verify        bool   // --verify
 	log           bool   // --log
 	strict        bool   // --strict
 	priority      *int32 // --priority
@@ -91,8 +90,6 @@ func NewSubmitCommand() *cobra.Command {
 	command.Flags().StringVarP(&cliSubmitOpts.output, "output", "o", "", "Output format. One of: name|json|yaml|wide")
 	command.Flags().BoolVarP(&cliSubmitOpts.wait, "wait", "w", false, "wait for the workflow to complete")
 	command.Flags().BoolVar(&cliSubmitOpts.watch, "watch", false, "watch the workflow until it completes")
-	command.Flags().BoolVar(&cliSubmitOpts.verify, "verify", false, "verify completed workflows by running the Python code in the workflows.argoproj.io/verify.py annotation")
-	errors.CheckError(command.Flags().MarkHidden("verify"))
 	command.Flags().BoolVar(&cliSubmitOpts.log, "log", false, "log the workflow until it completes")
 	command.Flags().BoolVar(&cliSubmitOpts.strict, "strict", true, "perform strict workflow validation")
 	command.Flags().Int32Var(&priority, "priority", 0, "workflow priority")
@@ -272,7 +269,4 @@ func waitWatchOrLog(ctx context.Context, serviceClient workflowpkg.WorkflowServi
 			watchWorkflow(ctx, serviceClient, namespace, workflow, cliSubmitOpts.getArgs)
 		}
 	}
-	if cliSubmitOpts.verify {
-		verifyWorkflows(ctx, serviceClient, namespace, workflowNames)
-	}
 }
diff --git a/cmd/argo/commands/verify.go b/cmd/argo/commands/verify.go
diff --git a/docs/upgrading.md b/docs/upgrading.md
@@ -27,6 +27,10 @@ HTTPArtifact without a scheme will now defaults to https instead of http
 
 user need to explicitly include a http prefix if they want to retrieve HTTPArtifact through http
 
+### chore!: Remove the hidden flag `--verify` from `argo submit`.
+
+The hidden flag `--verify` has been removed from `argo submit`. This is a internal testing flag we don't need anymore.
+
 ## Upgrading to v3.2
 
 ### [e5b131a33](https://github.com/argoproj/argo-workflows/commit/e5b131a33) feat: Add template node to pod name. Fixes #1319 (#6712)

diff --git a/examples/conditional-artifacts.yaml b/examples/conditional-artifacts.yaml
@@ -13,8 +13,6 @@ metadata:
       Based on the `when` condition one of step will not execute. The main template's output artifact named "result"
       will be set to the executed step's output.
     workflows.argoproj.io/version: '>= 3.1.0'
-    workflows.argoproj.io/verify.py: |
-      assert status["phase"] == "Succeeded"
 spec:
   entrypoint: main
   templates:

diff --git a/examples/conditional-parameters.yaml b/examples/conditional-parameters.yaml
@@ -13,8 +13,6 @@ metadata:
       Based on that condition, one of step will not be executed. The step template's output parameter will be
       set from the executed step's output.
     workflows.argoproj.io/version: '>= 3.1.0'
-    workflows.argoproj.io/verify.py: |
-      assert status["phase"] == "Succeeded"
 spec:
   entrypoint: main
   templates:

diff --git a/examples/container-set-template/graph-workflow.yaml b/examples/container-set-template/graph-workflow.yaml
@@ -9,8 +9,6 @@ metadata:
     workflows.argoproj.io/description: |
       This workflow demonstrates running a graph of tasks within containers in a single pod.
     workflows.argoproj.io/version: ">= 3.1.0"
-    workflows.argoproj.io/verify.py: |
-      assert status["phase"] == "Succeeded"
 spec:
   entrypoint: main
   templates:

diff --git a/examples/container-set-template/outputs-result-workflow.yaml b/examples/container-set-template/outputs-result-workflow.yaml
@@ -11,8 +11,6 @@ metadata:
 
       Specifially, you must have a container named "main".
     workflows.argoproj.io/version: ">= 3.1.0"
-    workflows.argoproj.io/verify.py: |
-      assert status["phase"] == "Succeeded"
 spec:
   entrypoint: main
   templates:

diff --git a/examples/container-set-template/parallel-workflow.yaml b/examples/container-set-template/parallel-workflow.yaml
@@ -8,8 +8,6 @@ metadata:
     workflows.argoproj.io/description: |
       This workflow demonstrates running a parallel containers within a single pod.
     workflows.argoproj.io/version: ">= 3.1.0"
-    workflows.argoproj.io/verify.py: |
-      assert status["phase"] == "Succeeded"
 spec:
   entrypoint: main
   templates:

diff --git a/examples/container-set-template/sequence-workflow.yaml b/examples/container-set-template/sequence-workflow.yaml
@@ -9,8 +9,6 @@ metadata:
     workflows.argoproj.io/description: |
       This workflow demonstrates running a sequence of containers within a single pod.
     workflows.argoproj.io/version: ">= 3.1.0"
-    workflows.argoproj.io/verify.py: |
-      assert status["phase"] == "Succeeded"
 spec:
   entrypoint: main
   templates:

diff --git a/examples/container-set-template/workspace-workflow.yaml b/examples/container-set-template/workspace-workflow.yaml
@@ -10,8 +10,6 @@ metadata:
       This workflow demonstrates using a workspace to share files between containers. This also allows containers not
       called "main" to create output artifacts.
     workflows.argoproj.io/version: ">= 3.1.0"
-    workflows.argoproj.io/verify.py: |
-      assert status["phase"] == "Succeeded"
 spec:
   entrypoint: main
   templates:

diff --git a/examples/dag-conditional-artifacts.yaml b/examples/dag-conditional-artifacts.yaml
@@ -13,8 +13,6 @@ metadata:
       Based on the condition one of steps may not execute. The step template output's artifact will be set to the
       executed step's output artifacts.
     workflows.argoproj.io/version: '>= 3.1.0'
-    workflows.argoproj.io/verify.py: |
-      assert status["phase"] == "Succeeded"
 spec:
   entrypoint: main
   templates:

diff --git a/examples/dag-conditional-parameters.yaml b/examples/dag-conditional-parameters.yaml
@@ -13,8 +13,6 @@ metadata:
       Based on this condition one of task may not execute. The template's output parameter will be set to the
       executed taks's output result.
     workflows.argoproj.io/version: '>= 3.1.0'
-    workflows.argoproj.io/verify.py: |
-      assert status["phase"] == "Succeeded"
 spec:
   entrypoint: main
   templates:

diff --git a/examples/dag-inline-workflow.yaml b/examples/dag-inline-workflow.yaml
@@ -8,8 +8,6 @@ metadata:
     workflows.argoproj.io/description: |
       This example demonstrates running a DAG with inline templates.
     workflows.argoproj.io/version: ">= 3.2.0"
-    workflows.argoproj.io/verify.py: |
-      assert status["phase"] == "Succeeded"
 spec:
   entrypoint: main
   templates:

diff --git a/examples/data-transformations.yaml b/examples/data-transformations.yaml
@@ -10,8 +10,6 @@ metadata:
       This workflow demonstrates using a data template to list in an S3 bucket
       and then process those log files.
     workflows.argoproj.io/version: ">= 3.1.0"
-    workflows.argoproj.io/verify.py: |
-      assert status["phase"] == "Succeeded"
 spec:
   entrypoint: data-transformations
   templates:

diff --git a/examples/exit-handler-with-artifacts.yaml b/examples/exit-handler-with-artifacts.yaml
@@ -8,8 +8,6 @@ metadata:
     workflows.argoproj.io/description: |
       onExitTemplate enables workflow to pass the arguments (parameters/Artifacts) to exit handler template.
     workflows.argoproj.io/version: '>= 3.1.0'
-    workflows.argoproj.io/verify.py: |
-      assert status["phase"] == "Succeeded"
 spec:
   entrypoint: main
   templates:

diff --git a/examples/exit-handler-with-param.yaml b/examples/exit-handler-with-param.yaml
@@ -8,8 +8,6 @@ metadata:
     workflows.argoproj.io/description: |
       onExitTemplate enables workflow to pass the arguments (parameters/Artifacts) to exit handler template.
     workflows.argoproj.io/version: '>= 3.1.0'
-    workflows.argoproj.io/verify.py: |
-      assert status["phase"] == "Succeeded"
 spec:
   entrypoint: main
   templates:

diff --git a/examples/expression-tag-template-workflow.yaml b/examples/expression-tag-template-workflow.yaml
@@ -7,10 +7,6 @@ metadata:
   annotations:
     # available in v3.1.0
     workflows.argoproj.io/version: ">= 3.1.0"
-    workflows.argoproj.io/verify.py: |
-      assert status["phase"] == "Succeeded"
-      assert nodes["task-0(0:3)"]["phase"] == "Succeeded"
-      assert nodes["task-0(0:3)"]["outputs"]["parameters"][0]["value"] == "hello 30 @ 2021\n"
 spec:
   entrypoint: main
   templates:

diff --git a/examples/global-parameters-from-configmap-referenced-as-local-variable.yaml b/examples/global-parameters-from-configmap-referenced-as-local-variable.yaml
@@ -9,8 +9,6 @@ metadata:
       This example demonstrates global parameter from configmap can be referenced as template local variable.
       Note that the "simple-parameters" ConfigMap (defined in examples/configmaps/simple-parameters-configmap.yaml)
       needs to be created first before submitting this workflow.
-    workflows.argoproj.io/verify.py: |
-      assert status["phase"] == "Succeeded"
 spec:
   serviceAccountName: argo
   entrypoint: whalesay

diff --git a/examples/global-parameters-from-configmap.yaml b/examples/global-parameters-from-configmap.yaml
@@ -9,8 +9,6 @@ metadata:
       This example demonstrates loading global parameter values from configmap.
       Note that the "simple-parameters" ConfigMap (defined in examples/configmaps/simple-parameters-configmap.yaml)
       needs to be created first before submitting this workflow.
-    workflows.argoproj.io/verify.py: |
-      assert status["phase"] == "Succeeded"
 spec:
   serviceAccountName: argo
   entrypoint: whalesay

diff --git a/examples/http-hello-world.yaml b/examples/http-hello-world.yaml
@@ -8,8 +8,6 @@ metadata:
     workflows.argoproj.io/description: |
       Http template will demostrate http template functionality
     workflows.argoproj.io/version: '>= 3.2.0'
-    workflows.argoproj.io/verify.py: |
-      assert status["phase"] == "Succeeded"
 spec:
   entrypoint: main
   templates:

diff --git a/examples/k8s-owner-reference.yaml b/examples/k8s-owner-reference.yaml
@@ -13,8 +13,6 @@ metadata:
       to other resource types.
 
       https://kubernetes.io/docs/concepts/workloads/controllers/garbage-collection/
-    workflows.argoproj.io/verify.py: |
-      assert status["phase"] == "Succeeded"
 spec:
   entrypoint: main
   templates:

diff --git a/examples/k8s-patch-basic.yaml b/examples/k8s-patch-basic.yaml
@@ -7,8 +7,6 @@ metadata:
   annotations:
     workflows.argoproj.io/description: |
       This example shows a standard patch with the default mergeStrategy
-    workflows.argoproj.io/verify.py: |
-      assert status["phase"] == "Succeeded"
 spec:
   entrypoint: main
   templates:

diff --git a/examples/k8s-patch.yaml b/examples/k8s-patch.yaml
@@ -7,8 +7,6 @@ metadata:
   annotations:
     workflows.argoproj.io/description: |
       This example shows a more advanced patch with json mergeStrategy
-    workflows.argoproj.io/verify.py: |
-      assert status["phase"] == "Succeeded"
 spec:
   entrypoint: main
   templates:

diff --git a/examples/selected-executor-workflow.yaml b/examples/selected-executor-workflow.yaml
@@ -18,11 +18,6 @@ metadata:
 
     # this workflow will only run on workflows version v3.0.0
     workflows.argoproj.io/version: ">= 3.0.0"
-
-    # this workflow will success because contrary to the default emissary executor,
-    # the pns executor doesn't require an explicit command defined
-    workflows.argoproj.io/verify.py: |
-      assert status["phase"] == "Succeeded"
 spec:
   entrypoint: main
   templates:

diff --git a/examples/steps-inline-workflow.yaml b/examples/steps-inline-workflow.yaml
@@ -8,8 +8,6 @@ metadata:
     workflows.argoproj.io/description: |
       This workflow demonstrates running a steps with inline templates.
     workflows.argoproj.io/version: ">= 3.2.0"
-    workflows.argoproj.io/verify.py: |
-      assert status["phase"] == "Succeeded"
 spec:
   entrypoint: main
   templates:

diff --git a/go.mod b/go.mod
@@ -23,7 +23,6 @@ require (
 	github.com/gavv/httpexpect/v2 v2.2.0
 	github.com/go-openapi/jsonreference v0.19.5
 	github.com/go-openapi/spec v0.20.2
-	github.com/go-python/gpython v0.0.3
 	github.com/go-sql-driver/mysql v1.6.0
 	github.com/gogo/protobuf v1.3.2
 	github.com/golang/protobuf v1.5.2

diff --git a/go.sum b/go.sum
@@ -425,8 +425,6 @@ github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2K
 github.com/go-openapi/validate v0.19.3/go.mod h1:90Vh6jjkTn+OT1Eefm0ZixWNFjhtOH7vS9k0lo6zwJo=
 github.com/go-openapi/validate v0.19.5/go.mod h1:8DJv2CVJQ6kGNpFW6eV9N3JviE1C85nY1c2z52x1Gk4=
 github.com/go-openapi/validate v0.19.10/go.mod h1:RKEZTUWDkxKQxN2jDT7ZnZi2bhZlbNMAuKvKB+IaGx8=
-github.com/go-python/gpython v0.0.3 h1:QNFZ0h540Lajx7Pi/os06XzzdYUQG+2sV7IvPo/Mvmg=
-github.com/go-python/gpython v0.0.3/go.mod h1:bmk0l57W/7Cs67MMnz4U28SoYyvz5NTMYyJvUqytJhs=
 github.com/go-redis/redis v6.15.8+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA=
 github.com/go-resty/resty/v2 v2.3.0/go.mod h1:UpN9CgLZNsv4e9XG50UU8xdI0F43UQ4HmxLBDwaroHU=
 github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
@@ -558,12 +556,10 @@ github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3i
 github.com/googleapis/gnostic v0.5.1 h1:A8Yhf6EtqTv9RMsU6MQTyrtV1TjWlR6xU9BsZIwuTCM=
 github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2cUuW7uA/OeU=
 github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8=
-github.com/gopherjs/gopherjs v0.0.0-20180825215210-0210a2f0f73c/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00 h1:l5lAOZEym3oK3SQ2HBHWsJUfbNBiTXJDeW2QDxw9AQ0=
 github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
-github.com/gopherjs/gopherwasm v1.0.0/go.mod h1:SkZ8z7CWBz5VXbhJel8TxCmAcsQqzgWGR/8nMhyhZSI=
 github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
 github.com/gorilla/handlers v1.4.2 h1:0QniY0USkHQ1RGCLfKxeNHK9bkDHGRYGNDFBCS+YARg=
 github.com/gorilla/handlers v1.4.2/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
@@ -873,7 +869,6 @@ github.com/pelletier/go-toml v1.8.0/go.mod h1:D6yutnOGMveHEPV7VQOuvI/gXY61bv+9bA
 github.com/pelletier/go-toml v1.9.3 h1:zeC5b1GviRUyKYd6OJPvBU/mcVDVoL1OhT17FCt5dSQ=
 github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
-github.com/peterh/liner v1.1.0/go.mod h1:CRroGNssyjTd/qIG2FyxByd2S8JEAZXBl4qUrZf8GS0=
 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
 github.com/pierrec/lz4 v2.4.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
 github.com/pierrec/lz4 v2.5.0+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=

diff --git a/util/python/conversion.go b/util/python/conversion.go
diff --git a/util/python/python.go b/util/python/python.go