From 94974ad2c0ce22d72e31bb89c196c65b280e04e7 Mon Sep 17 00:00:00 2001 From: Sam Schumacher <42777208+sam-schu@users.noreply.github.com> Date: Tue, 26 Nov 2024 16:01:46 -0500 Subject: [PATCH 1/3] Update Rawls model version --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 3b17139a4..2637a89f9 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -48,7 +48,7 @@ object Dependencies { "com.typesafe.scala-logging" %% "scala-logging" % "3.9.5", "org.parboiled" % "parboiled-core" % "1.4.1", - excludeGuava("org.broadinstitute.dsde" %% "rawls-model" % "v0.0.248-SNAP") + excludeGuava("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("com.google.code.findbugs", "jsr305") From 6debafca54b355334ef4b196ed66275bf5ba9765 Mon Sep 17 00:00:00 2001 From: Sam Schumacher <42777208+sam-schu@users.noreply.github.com> Date: Tue, 26 Nov 2024 16:09:24 -0500 Subject: [PATCH 2/3] Update Swagger docs --- src/main/resources/swagger/api-docs.yaml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/resources/swagger/api-docs.yaml b/src/main/resources/swagger/api-docs.yaml index 03d729a14..3c7656582 100755 --- a/src/main/resources/swagger/api-docs.yaml +++ b/src/main/resources/swagger/api-docs.yaml @@ -9588,13 +9588,15 @@ components: - GcpBucketSoftDelete - GcpBucketRequesterPays - SeparateSubmissionFinalOutputs + - UseCromwellGcpBatchBackend config: description: The configuration of the workspace setting oneOf: - $ref: '#/components/schemas/WorkspaceSettingGcpBucketLifecycleConfig' - $ref: '#/components/schemas/WorkspaceSettingGcpBucketSoftDeleteConfig' - $ref: '#/components/schemas/WorkspaceSettingGcpBucketRequesterPaysConfig' - - $ref: '#/components/schemas/WorkspaceSettingSeparateSubmissionFinalOutputs' + - $ref: '#/components/schemas/WorkspaceSettingSeparateSubmissionFinalOutputsConfig' + - $ref: '#/components/schemas/WorkspaceSettingUseCromwellGcpBatchBackendConfig' WorkspaceSettingGcpBucketLifecycleConfig: required: - rules @@ -9653,7 +9655,7 @@ components: enabled: type: boolean description: Enabled status to set for requester pays - WorkspaceSettingSeparateSubmissionFinalOutputs: + WorkspaceSettingSeparateSubmissionFinalOutputsConfig: required: - enabled type: object @@ -9661,6 +9663,14 @@ components: enabled: type: boolean description: Whether submission final outputs should be separated from intermediate outputs + WorkspaceSettingUseCromwellGcpBatchBackendConfig: + required: + - enabled + type: object + properties: + enabled: + type: boolean + description: Whether workflows submitted to Cromwell should be run using Cromwell's GCP Batch backend WorkspaceSubmissionStats: required: - runningSubmissionsCount From 1968a1067d561f2ea33aa2cdaaa2d6cbcfa51657 Mon Sep 17 00:00:00 2001 From: Sam Schumacher <42777208+sam-schu@users.noreply.github.com> Date: Mon, 9 Dec 2024 14:07:51 -0500 Subject: [PATCH 3/3] Update model version number --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 2637a89f9..d3562ae4b 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -48,7 +48,7 @@ object Dependencies { "com.typesafe.scala-logging" %% "scala-logging" % "3.9.5", "org.parboiled" % "parboiled-core" % "1.4.1", - excludeGuava("org.broadinstitute.dsde" %% "rawls-model" % "v0.0.251-SNAP") + excludeGuava("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("com.google.code.findbugs", "jsr305")