From: Peter Amstutz <peter.amstutz@curii.com>
Date: Fri, 4 Nov 2022 01:49:53 +0000 (-0400)
Subject: 19688: Recognize plain workflow uuid without arvwf: prefix
X-Git-Tag: 2.5.0~40^2~7
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/d4fb93d5adb02b5508e004fb328d532ce5b9f4bd

19688: Recognize plain workflow uuid without arvwf: prefix

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>
---

diff --git a/sdk/cwl/arvados_cwl/__init__.py b/sdk/cwl/arvados_cwl/__init__.py
index 79bcee58ee..6e33ca537e 100644
--- a/sdk/cwl/arvados_cwl/__init__.py
+++ b/sdk/cwl/arvados_cwl/__init__.py
@@ -36,6 +36,7 @@ from arvados.api import OrderedJsonModel
 from .perf import Perf
 from ._version import __version__
 from .executor import ArvCwlExecutor
+from .fsaccess import workflow_uuid_pattern
 
 # These aren't used directly in this file but
 # other code expects to import them from here
@@ -359,7 +360,7 @@ def main(args=sys.argv[1:],
         # unit tests.
         stdout = None
 
-    if arvargs.submit and arvargs.workflow.startswith("arvwf:"):
+    if arvargs.submit and (arvargs.workflow.startswith("arvwf:") or workflow_uuid_pattern.match(arvargs.workflow)):
         executor.loadingContext.do_validate = False
         executor.fast_submit = True