From baa1adc56627b419f6ff153845e7027cde3e06b0 Mon Sep 17 00:00:00 2001 From: Sam Schumacher <42777208+sam-schu@users.noreply.github.com> Date: Tue, 26 Nov 2024 15:55:32 -0500 Subject: [PATCH 1/5] Update automation dependency --- automation/project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automation/project/Dependencies.scala b/automation/project/Dependencies.scala index 26fccfd035..44d66363cb 100644 --- a/automation/project/Dependencies.scala +++ b/automation/project/Dependencies.scala @@ -57,7 +57,7 @@ object Dependencies { "org.scalatest" %% "scalatest" % "3.2.2" % Test, "org.seleniumhq.selenium" % "selenium-java" % "3.8.1" % Test, "com.typesafe.scala-logging" %% "scala-logging" % "3.9.5", - "org.broadinstitute.dsde" %% "rawls-model" % "v0.0.189-SNAP" + "org.broadinstitute.dsde" %% "rawls-model" % "v0.0.251-SNAP" exclude("com.typesafe.scala-logging", "scala-logging_2.13") exclude("com.typesafe.akka", "akka-stream_2.13") exclude("bio.terra", "workspace-manager-client"), From c45046e2cb0b353874a28b34bd1fa3592325d1da Mon Sep 17 00:00:00 2001 From: Sam Schumacher <42777208+sam-schu@users.noreply.github.com> Date: Tue, 26 Nov 2024 15:56:12 -0500 Subject: [PATCH 2/5] Update model changelog --- model/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/CHANGELOG.md b/model/CHANGELOG.md index 15c71409c5..d856ac2f68 100644 --- a/model/CHANGELOG.md +++ b/model/CHANGELOG.md @@ -8,4 +8,4 @@ Added: - Support 2.13 - ExecutionModel classes moved from core to model -SBT dependency: `"org.broadinstitute.dsde" %% "rawls-model" % "v0.0.189-SNAP"` +SBT dependency: `"org.broadinstitute.dsde" %% "rawls-model" % "v0.0.251-SNAP"` From 5a331aab13114782e1bb6e9f47abaa076da8a76b Mon Sep 17 00:00:00 2001 From: Sam Schumacher <42777208+sam-schu@users.noreply.github.com> Date: Mon, 9 Dec 2024 14:06:58 -0500 Subject: [PATCH 3/5] Update model version number --- automation/project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automation/project/Dependencies.scala b/automation/project/Dependencies.scala index 44d66363cb..daff4aef12 100644 --- a/automation/project/Dependencies.scala +++ b/automation/project/Dependencies.scala @@ -57,7 +57,7 @@ object Dependencies { "org.scalatest" %% "scalatest" % "3.2.2" % Test, "org.seleniumhq.selenium" % "selenium-java" % "3.8.1" % Test, "com.typesafe.scala-logging" %% "scala-logging" % "3.9.5", - "org.broadinstitute.dsde" %% "rawls-model" % "v0.0.251-SNAP" + "org.broadinstitute.dsde" %% "rawls-model" % "v0.0.258-SNAP" exclude("com.typesafe.scala-logging", "scala-logging_2.13") exclude("com.typesafe.akka", "akka-stream_2.13") exclude("bio.terra", "workspace-manager-client"), From 542da396d286ba4b61998e6cee79890d6e9a7005 Mon Sep 17 00:00:00 2001 From: Sam Schumacher <42777208+sam-schu@users.noreply.github.com> Date: Mon, 9 Dec 2024 14:07:13 -0500 Subject: [PATCH 4/5] Update model version number --- model/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/CHANGELOG.md b/model/CHANGELOG.md index d856ac2f68..a84645951d 100644 --- a/model/CHANGELOG.md +++ b/model/CHANGELOG.md @@ -8,4 +8,4 @@ Added: - Support 2.13 - ExecutionModel classes moved from core to model -SBT dependency: `"org.broadinstitute.dsde" %% "rawls-model" % "v0.0.251-SNAP"` +SBT dependency: `"org.broadinstitute.dsde" %% "rawls-model" % "v0.0.258-SNAP"` From 2a7921961869362f801e9c6507154dbe003b8f71 Mon Sep 17 00:00:00 2001 From: Sam Schumacher <42777208+sam-schu@users.noreply.github.com> Date: Mon, 9 Dec 2024 15:34:06 -0500 Subject: [PATCH 5/5] Fix test broken by previous model changes --- .../org/broadinstitute/dsde/test/api/WorkspaceApiSpec.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automation/src/test/scala/org/broadinstitute/dsde/test/api/WorkspaceApiSpec.scala b/automation/src/test/scala/org/broadinstitute/dsde/test/api/WorkspaceApiSpec.scala index d2af295e52..3475e002d7 100644 --- a/automation/src/test/scala/org/broadinstitute/dsde/test/api/WorkspaceApiSpec.scala +++ b/automation/src/test/scala/org/broadinstitute/dsde/test/api/WorkspaceApiSpec.scala @@ -295,7 +295,7 @@ class WorkspaceApiSpec eventually { workspaceResponse( Rawls.workspaces.getWorkspaceDetails(sourceProjectName, workspaceName)(userToken) - ).bucketOptions should contain(WorkspaceBucketOptions(true)) + ).bucketOptions.get should matchPattern { case WorkspaceBucketOptions(true, _) => } } // The user clones the workspace into their project