BT-724 Fix BlobPathBuilder failing on retrieving existing filesystem

filesystems/blob/src/main/scala/cromwell/filesystems/blob/BlobPathBuilder.scala

@@ -10,11 +10,13 @@ import cromwell.filesystems.blob.BlobPathBuilder._
 
 import java.net.MalformedURLException
 import java.net.URI
+import java.nio.file.FileSystemNotFoundException
 import java.nio.file.FileSystems
 import scala.jdk.CollectionConverters._
 import scala.language.postfixOps
 import scala.util.Failure
 import scala.util.Try
+import java.nio.file.FileSystem
 
 object BlobPathBuilder {
 
@@ -64,14 +66,20 @@ class BlobPathBuilder(credential: AzureSasCredential, container: String, endpoin
   val fileSystemConfig: Map[String, Object] = Map((AzureFileSystem.AZURE_STORAGE_SAS_TOKEN_CREDENTIAL, credential),
                                                   (AzureFileSystem.AZURE_STORAGE_FILE_STORES, container))
 
+  def retrieveFilesystem(): Try[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)
+    }
+  }
+
   def build(string: String): Try[BlobPath] = {
     validateBlobPath(string, container, endpoint) match {
-      case ValidBlobPath(path) =>
-        Try {
-          val fileSystem = FileSystems.newFileSystem(new URI("azb://?endpoint=" + endpoint), fileSystemConfig.asJava)
-          val blobStoragePath = fileSystem.getPath(path)
-          BlobPath(blobStoragePath, endpoint, container)
-        }
+      case ValidBlobPath(path) => for {
+            fileSystem <- retrieveFilesystem()
+            nioPath <- Try(fileSystem.getPath(path))
+            blobPath = BlobPath(nioPath, endpoint, container)
+          } yield blobPath
       case UnparsableBlobPath(errorMessage: Throwable) => Failure(errorMessage)
     }
   }

filesystems/blob/src/test/scala/cromwell/filesystems/blob/BlobPathBuilderSpec.scala

@@ -62,4 +62,15 @@ class BlobPathBuilderSpec extends AnyFlatSpec with Matchers{
     val fileText = (is.readAllBytes.map(_.toChar)).mkString
     fileText should include ("This is my test file!!!! Did it work?")
   }
+
+  ignore should "build duplicate blob paths in the same filesystem" in {
+    val endpoint = BlobPathBuilderSpec.buildEndpoint("coaexternalstorage")
+    val store = "inputs"
+    val evalPath = "/test/inputFile.txt"
+    val sas = "{SAS TOKEN HERE}"
+    val testString = endpoint + "/" + store + evalPath
+    val blobPath1: BlobPath = new BlobPathBuilder(new AzureSasCredential(sas), store, endpoint) build testString getOrElse fail()
+    val blobPath2: BlobPath = new BlobPathBuilder(new AzureSasCredential(sas), store, endpoint) build testString getOrElse fail()
+    blobPath1 should equal(blobPath2)
+  }
 }