18238: Make backwards compatible when StorageClasses is not in config
authorPeter Amstutz <peter.amstutz@curii.com>
Fri, 1 Oct 2021 14:02:40 +0000 (10:02 -0400)
committerWard Vandewege <ward@curii.com>
Wed, 6 Oct 2021 12:59:52 +0000 (08:59 -0400)
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>

sdk/cwl/arvados_cwl/executor.py

index edb9d5b523c09bee4aa43f16705e27f2f15194d9..db1db28162583899d13e8248a3fc639dd639198c 100644 (file)
@@ -549,7 +549,7 @@ The 'jobs' API is no longer supported.
         if runtimeContext.submit_request_uuid and self.work_api != "containers":
             raise Exception("--submit-request-uuid requires containers API, but using '{}' api".format(self.work_api))
 
-        default_storage_classes = ",".join([k for k,v in self.api.config()["StorageClasses"].items() if v.get("Default") is True])
+        default_storage_classes = ",".join([k for k,v in self.api.config().get("StorageClasses", {"default": {"Default": True}}).items() if v.get("Default") is True])
         if runtimeContext.storage_classes == "default":
             runtimeContext.storage_classes = default_storage_classes
         if runtimeContext.intermediate_storage_classes == "default":