Update logic for dealing with open filesystems

broadinstitute · Aug 1, 2022 · 2b41d87 · jgainerdewar · Aug 1, 2022 · 2b41d87
1 parent bf4c1b7
commit 2b41d87
Showing 1 changed file with 10 additions and 12 deletions.
diff --git a/filesystems/blob/src/main/scala/cromwell/filesystems/blob/BlobPathBuilder.scala b/filesystems/blob/src/main/scala/cromwell/filesystems/blob/BlobPathBuilder.scala
@@ -68,18 +68,16 @@ class BlobPathBuilder(credential: AzureSasCredential, container: String, endpoin
   def build(string: String): Try[BlobPath] = {
     validateBlobPath(string, container, endpoint) match {
       case ValidBlobPath(path) =>
-        Try {
-          val fileSystem = Try {
-            FileSystems.getFileSystem(new URI("azb://?endpoint=" + endpoint))
-          } recover {
-            // If no filesystem already exists, this will create a new connection, with the provided configs
-            case _: FileSystemNotFoundException => FileSystems.newFileSystem(new URI("azb://?endpoint=" + endpoint), fileSystemConfig.asJava)
-          }
-
-          val blobStoragePath = fileSystem.map(_.getPath(path))
-          // If there is a remaining issue reaching the filesystem, this will rethrow the exception
-          blobStoragePath.map(BlobPath(_, endpoint, container)).get
-        }
+          for {
+            fileSystem <- Try {
+              FileSystems.getFileSystem(new URI("azb://?endpoint=" + endpoint))
+            } recover {
+              // If no filesystem already exists, this will create a new connection, with the provided configs
+              case _: FileSystemNotFoundException => FileSystems.newFileSystem(new URI("azb://?endpoint=" + endpoint), fileSystemConfig.asJava)
+            }
+            nioPath <- Try {fileSystem.getPath(path)}
+            blobPath <- Try {BlobPath(nioPath, endpoint, container)}
+          } yield blobPath
       case UnparsableBlobPath(errorMessage: Throwable) => Failure(errorMessage)
     }
   }