From b1ca0d8cf71dd6dfd7596b26ecdaf5b264aa68c0 Mon Sep 17 00:00:00 2001 From: Christian Freitas Date: Thu, 28 Jul 2022 15:47:29 -0400 Subject: [PATCH 01/11] BT-710 Add configs for BlobPathBuilderFactory --- core/src/main/resources/reference.conf | 12 +++++++ .../blob/BlobPathBuilderFactory.scala | 9 ++++-- .../blob/BlobPathBuilderFactorySpec.scala | 32 +++++++++++++++++++ 3 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 filesystems/blob/src/test/scala/cromwell/filesystems/blob/BlobPathBuilderFactorySpec.scala diff --git a/core/src/main/resources/reference.conf b/core/src/main/resources/reference.conf index c58eda5bc9f..4e5452033bd 100644 --- a/core/src/main/resources/reference.conf +++ b/core/src/main/resources/reference.conf @@ -321,6 +321,18 @@ google { # They can be enabled individually in the engine.filesystems stanza and in the config.filesystems stanza of backends # There is a default built-in local filesystem that can also be referenced as "local" as well. filesystems { + blob { + class = "cromwell.filesystems.blob.BlobPathBuilderFactory" + instance { + sas-token = "{SAS TOKEN HERE}" + store = "inputs" + endpoint = "coaexternalstorage" + workspaceId = "{PLACEHOLDER}" + } + global { + workspace-manager-url = "{PLACEHOLDER}" + } + } drs { class = "cromwell.filesystems.drs.DrsPathBuilderFactory" # Use to share a unique global object across all instances of the factory diff --git a/filesystems/blob/src/main/scala/cromwell/filesystems/blob/BlobPathBuilderFactory.scala b/filesystems/blob/src/main/scala/cromwell/filesystems/blob/BlobPathBuilderFactory.scala index ca5e24fe3d7..6cf8036ef43 100644 --- a/filesystems/blob/src/main/scala/cromwell/filesystems/blob/BlobPathBuilderFactory.scala +++ b/filesystems/blob/src/main/scala/cromwell/filesystems/blob/BlobPathBuilderFactory.scala @@ -11,10 +11,13 @@ import scala.concurrent.ExecutionContext import scala.concurrent.Future final case class BlobPathBuilderFactory(globalConfig: Config, instanceConfig: Config) extends PathBuilderFactory { + val sasToken: String = instanceConfig.getString("filesystems.blob.instance.sas-token") + val container: String = instanceConfig.getString("filesystems.blob.instance.store") + val endpoint: String = instanceConfig.getString("filesystems.blob.instance.endpoint") + val workspaceId: String = instanceConfig.getString("filesystems.blob.instance.workspaceId") + val workspaceManagerURL = globalConfig.getString("filesystems.blob.global.workspace-manager-url") + override def withOptions(options: WorkflowOptions)(implicit as: ActorSystem, ec: ExecutionContext): Future[BlobPathBuilder] = { - val sasToken: String = instanceConfig.getString("sasToken") - val container: String = instanceConfig.getString("store") - val endpoint: String = instanceConfig.getString("endpoint") Future { new BlobPathBuilder(new AzureSasCredential(sasToken), container, endpoint) } diff --git a/filesystems/blob/src/test/scala/cromwell/filesystems/blob/BlobPathBuilderFactorySpec.scala b/filesystems/blob/src/test/scala/cromwell/filesystems/blob/BlobPathBuilderFactorySpec.scala new file mode 100644 index 00000000000..2e7d9a982fb --- /dev/null +++ b/filesystems/blob/src/test/scala/cromwell/filesystems/blob/BlobPathBuilderFactorySpec.scala @@ -0,0 +1,32 @@ +package cromwell.filesystems.blob + +import com.typesafe.config.ConfigFactory +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers + +class BlobPathBuilderFactorySpec extends AnyFlatSpec with Matchers { + + it should "parse configs for a functioning factory" in { + val endpoint = BlobPathBuilderSpec.buildEndpoint("coaexternalstorage") + val store = "inputs" + val sasToken = "{SAS TOKEN HERE}" + val workspaceId = "mockWorkspaceId" + val workspaceManagerURL = "https://test.ws.org" + val instanceConfig = ConfigFactory.parseString( + s""" + |filesystems.blob.instance { + | sas-token = "$sasToken" + | store = "$store" + | endpoint = "$endpoint" + | workspaceId = "$workspaceId" + |} + """.stripMargin) + val globalConfig = ConfigFactory.parseString(s"""filesystems.blob.global.workspace-manager-url = "$workspaceManagerURL" """) + val factory = BlobPathBuilderFactory(globalConfig, instanceConfig) + factory.container should equal(store) + factory.endpoint should equal(endpoint) + factory.sasToken should equal(sasToken) + factory.workspaceId should equal(sasToken) + factory.workspaceManagerURL should equal(workspaceManagerURL) + } +} From 75c265ae8408d1e304951d518d242924d7c4ae1f Mon Sep 17 00:00:00 2001 From: Christian Freitas Date: Thu, 28 Jul 2022 16:06:07 -0400 Subject: [PATCH 02/11] Corrected test assertions --- .../cromwell/filesystems/blob/BlobPathBuilderFactorySpec.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/filesystems/blob/src/test/scala/cromwell/filesystems/blob/BlobPathBuilderFactorySpec.scala b/filesystems/blob/src/test/scala/cromwell/filesystems/blob/BlobPathBuilderFactorySpec.scala index 2e7d9a982fb..98539063c75 100644 --- a/filesystems/blob/src/test/scala/cromwell/filesystems/blob/BlobPathBuilderFactorySpec.scala +++ b/filesystems/blob/src/test/scala/cromwell/filesystems/blob/BlobPathBuilderFactorySpec.scala @@ -26,7 +26,7 @@ class BlobPathBuilderFactorySpec extends AnyFlatSpec with Matchers { factory.container should equal(store) factory.endpoint should equal(endpoint) factory.sasToken should equal(sasToken) - factory.workspaceId should equal(sasToken) + factory.workspaceId should equal(workspaceId) factory.workspaceManagerURL should equal(workspaceManagerURL) } } From 0c1da99d9444de3913811262f909b86179bd0b63 Mon Sep 17 00:00:00 2001 From: Christian Freitas Date: Mon, 1 Aug 2022 10:24:46 -0400 Subject: [PATCH 03/11] Use ficus and correct config variable paths --- core/src/main/resources/reference.conf | 6 +++--- .../filesystems/blob/BlobPathBuilderFactory.scala | 11 ++++++----- .../blob/BlobPathBuilderFactorySpec.scala | 12 +++++------- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/core/src/main/resources/reference.conf b/core/src/main/resources/reference.conf index 4e5452033bd..b5c691d453f 100644 --- a/core/src/main/resources/reference.conf +++ b/core/src/main/resources/reference.conf @@ -324,9 +324,9 @@ filesystems { blob { class = "cromwell.filesystems.blob.BlobPathBuilderFactory" instance { - sas-token = "{SAS TOKEN HERE}" - store = "inputs" - endpoint = "coaexternalstorage" + sas-token = "{PLACEHOLDER}" + store = "{PLACEHOLDER}" + endpoint = "{PLACEHOLDER}" workspaceId = "{PLACEHOLDER}" } global { diff --git a/filesystems/blob/src/main/scala/cromwell/filesystems/blob/BlobPathBuilderFactory.scala b/filesystems/blob/src/main/scala/cromwell/filesystems/blob/BlobPathBuilderFactory.scala index 6cf8036ef43..99aee1010f6 100644 --- a/filesystems/blob/src/main/scala/cromwell/filesystems/blob/BlobPathBuilderFactory.scala +++ b/filesystems/blob/src/main/scala/cromwell/filesystems/blob/BlobPathBuilderFactory.scala @@ -6,16 +6,17 @@ import com.typesafe.config.Config import cromwell.core.WorkflowOptions import cromwell.core.path.PathBuilderFactory import cromwell.filesystems.blob.BlobPathBuilder +import net.ceedubs.ficus.Ficus._ import scala.concurrent.ExecutionContext import scala.concurrent.Future final case class BlobPathBuilderFactory(globalConfig: Config, instanceConfig: Config) extends PathBuilderFactory { - val sasToken: String = instanceConfig.getString("filesystems.blob.instance.sas-token") - val container: String = instanceConfig.getString("filesystems.blob.instance.store") - val endpoint: String = instanceConfig.getString("filesystems.blob.instance.endpoint") - val workspaceId: String = instanceConfig.getString("filesystems.blob.instance.workspaceId") - val workspaceManagerURL = globalConfig.getString("filesystems.blob.global.workspace-manager-url") + val sasToken: String = instanceConfig.as[String]("sas-token") + val container: String = instanceConfig.as[String]("store") + val endpoint: String = instanceConfig.as[String]("endpoint") + val workspaceId: String = instanceConfig.as[String]("workspace-id") + val workspaceManagerURL = globalConfig.as[String]("workspace-manager-url") override def withOptions(options: WorkflowOptions)(implicit as: ActorSystem, ec: ExecutionContext): Future[BlobPathBuilder] = { Future { diff --git a/filesystems/blob/src/test/scala/cromwell/filesystems/blob/BlobPathBuilderFactorySpec.scala b/filesystems/blob/src/test/scala/cromwell/filesystems/blob/BlobPathBuilderFactorySpec.scala index 98539063c75..96c926d374b 100644 --- a/filesystems/blob/src/test/scala/cromwell/filesystems/blob/BlobPathBuilderFactorySpec.scala +++ b/filesystems/blob/src/test/scala/cromwell/filesystems/blob/BlobPathBuilderFactorySpec.scala @@ -14,14 +14,12 @@ class BlobPathBuilderFactorySpec extends AnyFlatSpec with Matchers { val workspaceManagerURL = "https://test.ws.org" val instanceConfig = ConfigFactory.parseString( s""" - |filesystems.blob.instance { - | sas-token = "$sasToken" - | store = "$store" - | endpoint = "$endpoint" - | workspaceId = "$workspaceId" - |} + |sas-token = "$sasToken" + |store = "$store" + |endpoint = "$endpoint" + |workspace-id = "$workspaceId" """.stripMargin) - val globalConfig = ConfigFactory.parseString(s"""filesystems.blob.global.workspace-manager-url = "$workspaceManagerURL" """) + val globalConfig = ConfigFactory.parseString(s"""workspace-manager-url = "$workspaceManagerURL" """) val factory = BlobPathBuilderFactory(globalConfig, instanceConfig) factory.container should equal(store) factory.endpoint should equal(endpoint) From c34078b03173522b05d27ddf9f73d59b932ebfc9 Mon Sep 17 00:00:00 2001 From: Christian Freitas Date: Mon, 1 Aug 2022 15:36:38 -0400 Subject: [PATCH 04/11] Try to fix instance configs --- core/src/main/resources/reference.conf | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/core/src/main/resources/reference.conf b/core/src/main/resources/reference.conf index b5c691d453f..b406b192715 100644 --- a/core/src/main/resources/reference.conf +++ b/core/src/main/resources/reference.conf @@ -323,12 +323,10 @@ google { filesystems { blob { class = "cromwell.filesystems.blob.BlobPathBuilderFactory" - instance { - sas-token = "{PLACEHOLDER}" - store = "{PLACEHOLDER}" - endpoint = "{PLACEHOLDER}" - workspaceId = "{PLACEHOLDER}" - } + sas-token = "{PLACEHOLDER}" + store = "{PLACEHOLDER}" + endpoint = "{PLACEHOLDER}" + workspaceId = "{PLACEHOLDER}" global { workspace-manager-url = "{PLACEHOLDER}" } From 6789acf5c5de2962b138ef5289a80604897e163e Mon Sep 17 00:00:00 2001 From: Christian Freitas Date: Tue, 2 Aug 2022 11:37:19 -0400 Subject: [PATCH 05/11] Use singleton config for workspace-manager-url --- core/src/main/resources/reference.conf | 17 ++++++++++++----- .../blob/BlobPathBuilderFactory.scala | 5 +++-- .../blob/BlobPathBuilderFactorySpec.scala | 5 +++-- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/core/src/main/resources/reference.conf b/core/src/main/resources/reference.conf index b406b192715..bf5c67fe84f 100644 --- a/core/src/main/resources/reference.conf +++ b/core/src/main/resources/reference.conf @@ -323,12 +323,11 @@ google { filesystems { blob { class = "cromwell.filesystems.blob.BlobPathBuilderFactory" - sas-token = "{PLACEHOLDER}" - store = "{PLACEHOLDER}" - endpoint = "{PLACEHOLDER}" - workspaceId = "{PLACEHOLDER}" global { - workspace-manager-url = "{PLACEHOLDER}" + class = "cromwell.filesystems.blob.BlobFileSystemConfig" + config { + workspace-manager-url = "{PLACEHOLDER}" + } } } drs { @@ -443,9 +442,17 @@ engine { http { enabled: true } + blob { + sas-token = "{PLACEHOLDER}" + store = "{PLACEHOLDER}" + endpoint = "{PLACEHOLDER}" + workspaceId = "{PLACEHOLDER}" + enabled: false + } } } + languages { default: WDL WDL { diff --git a/filesystems/blob/src/main/scala/cromwell/filesystems/blob/BlobPathBuilderFactory.scala b/filesystems/blob/src/main/scala/cromwell/filesystems/blob/BlobPathBuilderFactory.scala index 99aee1010f6..5e639084f24 100644 --- a/filesystems/blob/src/main/scala/cromwell/filesystems/blob/BlobPathBuilderFactory.scala +++ b/filesystems/blob/src/main/scala/cromwell/filesystems/blob/BlobPathBuilderFactory.scala @@ -11,12 +11,13 @@ import net.ceedubs.ficus.Ficus._ import scala.concurrent.ExecutionContext import scala.concurrent.Future -final case class BlobPathBuilderFactory(globalConfig: Config, instanceConfig: Config) extends PathBuilderFactory { +final case class BlobFileSystemConfig(config: Config) +final case class BlobPathBuilderFactory(globalConfig: Config, instanceConfig: Config, singletonConfig: BlobFileSystemConfig) extends PathBuilderFactory { val sasToken: String = instanceConfig.as[String]("sas-token") val container: String = instanceConfig.as[String]("store") val endpoint: String = instanceConfig.as[String]("endpoint") val workspaceId: String = instanceConfig.as[String]("workspace-id") - val workspaceManagerURL = globalConfig.as[String]("workspace-manager-url") + val workspaceManagerURL = singletonConfig.config.as[String]("workspace-manager-url") override def withOptions(options: WorkflowOptions)(implicit as: ActorSystem, ec: ExecutionContext): Future[BlobPathBuilder] = { Future { diff --git a/filesystems/blob/src/test/scala/cromwell/filesystems/blob/BlobPathBuilderFactorySpec.scala b/filesystems/blob/src/test/scala/cromwell/filesystems/blob/BlobPathBuilderFactorySpec.scala index 96c926d374b..8c9b2345c69 100644 --- a/filesystems/blob/src/test/scala/cromwell/filesystems/blob/BlobPathBuilderFactorySpec.scala +++ b/filesystems/blob/src/test/scala/cromwell/filesystems/blob/BlobPathBuilderFactorySpec.scala @@ -19,8 +19,9 @@ class BlobPathBuilderFactorySpec extends AnyFlatSpec with Matchers { |endpoint = "$endpoint" |workspace-id = "$workspaceId" """.stripMargin) - val globalConfig = ConfigFactory.parseString(s"""workspace-manager-url = "$workspaceManagerURL" """) - val factory = BlobPathBuilderFactory(globalConfig, instanceConfig) + val singletonConfig = ConfigFactory.parseString(s"""workspace-manager-url = "$workspaceManagerURL" """) + val globalConfig = ConfigFactory.parseString("""""") + val factory = BlobPathBuilderFactory(globalConfig, instanceConfig, new BlobFileSystemConfig(singletonConfig)) factory.container should equal(store) factory.endpoint should equal(endpoint) factory.sasToken should equal(sasToken) From 717bfa58344b02252d89afb94a413dce0dc968d1 Mon Sep 17 00:00:00 2001 From: Christian Freitas Date: Tue, 2 Aug 2022 14:13:47 -0400 Subject: [PATCH 06/11] Modify test to include new blob filesystem --- .../cromwell/webservice/routes/wes/ServiceInfoSpec.scala | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/engine/src/test/scala/cromwell/webservice/routes/wes/ServiceInfoSpec.scala b/engine/src/test/scala/cromwell/webservice/routes/wes/ServiceInfoSpec.scala index b4d775f7389..a36e07c4ae9 100644 --- a/engine/src/test/scala/cromwell/webservice/routes/wes/ServiceInfoSpec.scala +++ b/engine/src/test/scala/cromwell/webservice/routes/wes/ServiceInfoSpec.scala @@ -3,7 +3,8 @@ package cromwell.webservice.routes.wes import akka.actor.Props import akka.http.scaladsl.testkit.ScalatestRouteTest import akka.util.Timeout -import cromwell.languages.config.{CromwellLanguages, LanguageConfiguration} +import cromwell.languages.config.CromwellLanguages +import cromwell.languages.config.LanguageConfiguration import cromwell.webservice.routes.CromwellApiService import cromwell.webservice.routes.CromwellApiServiceSpec.MockWorkflowStoreActor import org.scalatest.flatspec.AsyncFlatSpec @@ -24,7 +25,7 @@ class ServiceInfoSpec extends AsyncFlatSpec with ScalatestRouteTest with Matcher val expectedResponse = WesStatusInfoResponse(Map("CWL" -> Set("v1.0"), "WDL" -> Set("draft-2", "1.0", "biscayne")), List("1.0"), - Set("ftp", "s3", "drs", "gcs", "http"), + Set("ftp", "s3", "drs", "gcs", "http", "blob"), Map("Cromwell" -> CromwellApiService.cromwellVersion), List(), Map(WesState.Running -> 5, WesState.Queued -> 3, WesState.Canceling -> 2), From e57eca5c6b89dc1476a0a838cf45f0f3cb8234d8 Mon Sep 17 00:00:00 2001 From: Christian Freitas Date: Tue, 2 Aug 2022 16:13:04 -0400 Subject: [PATCH 07/11] Update reference.conf variable naming --- core/src/main/resources/reference.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/resources/reference.conf b/core/src/main/resources/reference.conf index bf5c67fe84f..cd865c86395 100644 --- a/core/src/main/resources/reference.conf +++ b/core/src/main/resources/reference.conf @@ -446,7 +446,7 @@ engine { sas-token = "{PLACEHOLDER}" store = "{PLACEHOLDER}" endpoint = "{PLACEHOLDER}" - workspaceId = "{PLACEHOLDER}" + workspace-id = "{PLACEHOLDER}" enabled: false } } From f1bb4b054ac3320ce8bfccef86279a76c854efbb Mon Sep 17 00:00:00 2001 From: Christian Freitas Date: Wed, 3 Aug 2022 10:13:40 -0400 Subject: [PATCH 08/11] Remove blob as supported filesystem --- core/src/main/resources/reference.conf | 16 ---------------- .../webservice/routes/wes/ServiceInfoSpec.scala | 2 +- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/core/src/main/resources/reference.conf b/core/src/main/resources/reference.conf index cd865c86395..7cae45f5e0a 100644 --- a/core/src/main/resources/reference.conf +++ b/core/src/main/resources/reference.conf @@ -321,15 +321,6 @@ google { # They can be enabled individually in the engine.filesystems stanza and in the config.filesystems stanza of backends # There is a default built-in local filesystem that can also be referenced as "local" as well. filesystems { - blob { - class = "cromwell.filesystems.blob.BlobPathBuilderFactory" - global { - class = "cromwell.filesystems.blob.BlobFileSystemConfig" - config { - workspace-manager-url = "{PLACEHOLDER}" - } - } - } drs { class = "cromwell.filesystems.drs.DrsPathBuilderFactory" # Use to share a unique global object across all instances of the factory @@ -442,13 +433,6 @@ engine { http { enabled: true } - blob { - sas-token = "{PLACEHOLDER}" - store = "{PLACEHOLDER}" - endpoint = "{PLACEHOLDER}" - workspace-id = "{PLACEHOLDER}" - enabled: false - } } } diff --git a/engine/src/test/scala/cromwell/webservice/routes/wes/ServiceInfoSpec.scala b/engine/src/test/scala/cromwell/webservice/routes/wes/ServiceInfoSpec.scala index a36e07c4ae9..48a164dcce5 100644 --- a/engine/src/test/scala/cromwell/webservice/routes/wes/ServiceInfoSpec.scala +++ b/engine/src/test/scala/cromwell/webservice/routes/wes/ServiceInfoSpec.scala @@ -25,7 +25,7 @@ class ServiceInfoSpec extends AsyncFlatSpec with ScalatestRouteTest with Matcher val expectedResponse = WesStatusInfoResponse(Map("CWL" -> Set("v1.0"), "WDL" -> Set("draft-2", "1.0", "biscayne")), List("1.0"), - Set("ftp", "s3", "drs", "gcs", "http", "blob"), + Set("ftp", "s3", "drs", "gcs", "http"), Map("Cromwell" -> CromwellApiService.cromwellVersion), List(), Map(WesState.Running -> 5, WesState.Queued -> 3, WesState.Canceling -> 2), From 16bdb3a6280d29d6475eea7e19f4e18fdcc685ac Mon Sep 17 00:00:00 2001 From: Christian Freitas Date: Wed, 3 Aug 2022 11:13:40 -0400 Subject: [PATCH 09/11] Fix imports for brackets --- .../scala/cromwell/webservice/routes/wes/ServiceInfoSpec.scala | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/engine/src/test/scala/cromwell/webservice/routes/wes/ServiceInfoSpec.scala b/engine/src/test/scala/cromwell/webservice/routes/wes/ServiceInfoSpec.scala index 48a164dcce5..b4d775f7389 100644 --- a/engine/src/test/scala/cromwell/webservice/routes/wes/ServiceInfoSpec.scala +++ b/engine/src/test/scala/cromwell/webservice/routes/wes/ServiceInfoSpec.scala @@ -3,8 +3,7 @@ package cromwell.webservice.routes.wes import akka.actor.Props import akka.http.scaladsl.testkit.ScalatestRouteTest import akka.util.Timeout -import cromwell.languages.config.CromwellLanguages -import cromwell.languages.config.LanguageConfiguration +import cromwell.languages.config.{CromwellLanguages, LanguageConfiguration} import cromwell.webservice.routes.CromwellApiService import cromwell.webservice.routes.CromwellApiServiceSpec.MockWorkflowStoreActor import org.scalatest.flatspec.AsyncFlatSpec From 3daa8952c701102423df354b0d34112352a61258 Mon Sep 17 00:00:00 2001 From: Christian Freitas Date: Wed, 3 Aug 2022 11:20:39 -0400 Subject: [PATCH 10/11] Remove new line in refernce.conf --- core/src/main/resources/reference.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/core/src/main/resources/reference.conf b/core/src/main/resources/reference.conf index 7cae45f5e0a..c58eda5bc9f 100644 --- a/core/src/main/resources/reference.conf +++ b/core/src/main/resources/reference.conf @@ -436,7 +436,6 @@ engine { } } - languages { default: WDL WDL { From 5b9082109c7ad00df2abe05ea394cad9a23063a7 Mon Sep 17 00:00:00 2001 From: Christian Freitas Date: Wed, 3 Aug 2022 11:32:34 -0400 Subject: [PATCH 11/11] Clean up test --- .../cromwell/filesystems/blob/BlobPathBuilderSpec.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/filesystems/blob/src/test/scala/cromwell/filesystems/blob/BlobPathBuilderSpec.scala b/filesystems/blob/src/test/scala/cromwell/filesystems/blob/BlobPathBuilderSpec.scala index 454b8f5adaf..dd619c7b567 100644 --- a/filesystems/blob/src/test/scala/cromwell/filesystems/blob/BlobPathBuilderSpec.scala +++ b/filesystems/blob/src/test/scala/cromwell/filesystems/blob/BlobPathBuilderSpec.scala @@ -47,10 +47,10 @@ class BlobPathBuilderSpec extends AnyFlatSpec with Matchers{ } ignore should "build a blob path from a test string and read a file" in { - val endpoint = BlobPathBuilderSpec.buildEndpoint("coaexternalstorage") + val endpoint = BlobPathBuilderSpec.buildEndpoint("teststorageaccount") val endpointHost = BlobPathBuilder.parseURI(endpoint).getHost - val store = "inputs" - val evalPath = "/test/inputFile.txt" + val store = "testContainer" + val evalPath = "/test/file.txt" val sas = "{SAS TOKEN HERE}" val testString = endpoint + "/" + store + evalPath val blobPath: BlobPath = new BlobPathBuilder(new AzureSasCredential(sas), store, endpoint) build testString getOrElse fail()