Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
14 changes: 12 additions & 2 deletions src/main/resources/swagger/api-docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -9653,14 +9655,22 @@ components:
enabled:
type: boolean
description: Enabled status to set for requester pays
WorkspaceSettingSeparateSubmissionFinalOutputs:
WorkspaceSettingSeparateSubmissionFinalOutputsConfig:
required:
- enabled
type: object
properties:
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
Expand Down