Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AN-226] Cromwell Google Batch API workspace setting #1503

Merged
merged 4 commits into from
Dec 10, 2024
Merged

[AN-226] Cromwell Google Batch API workspace setting #1503

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
94974ad
Update Rawls model version
sam-schu Nov 26, 2024
6debafc
Update Swagger docs
sam-schu Nov 26, 2024
1968a10
Update model version number
sam-schu Dec 9, 2024
c96cbb8
Merge branch 'develop' into sts_AN-225_batch_api_workspace_setting
sam-schu Dec 9, 2024
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
View file
Open in desktop
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
View file
Open in desktop
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