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

Jump to bottom

Add useReferenceDisks as passthrough for SubmissionRequest [CROM-6662] #813

Merged
merged 2 commits into from
Nov 19, 2020
Merged

Add useReferenceDisks as passthrough for SubmissionRequest [CROM-6662] #813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f253663
Add useReferenceDisks as passthrough for SubmissionRequest
breilly2 Nov 12, 2020
bdbc512
oops
breilly2 Nov 12, 2020
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
3 changes: 3 additions & 0 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 @@ -8553,6 +8553,9 @@ components:
type: boolean
description: Whether or not to delete intermediate output files when the
workflow completes. See Cromwell docs for more information.
useReferenceDisks:
type: boolean
description: Whether or not to use pre-built disks for common genome references
workflowFailureMode:
type: string
description: What happens after a task fails. Choose from ContinueWhilePossible
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/org/broadinstitute/dsde/firecloud/model/ModelJsonProtocol.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ object ModelJsonProtocol extends WorkspaceJsonSupport with SprayJsonSupport {

implicit val impEntityMetadata = jsonFormat3(EntityMetadata)
implicit val impModelSchema = jsonFormat1(EntityModel)
implicit val impSubmissionRequest = jsonFormat8(SubmissionRequest)
implicit val impSubmissionRequest = jsonFormat9(SubmissionRequest)

implicit val impEntityUpdateDefinition = jsonFormat3(EntityUpdateDefinition)

Expand Down
1 change: 1 addition & 0 deletions src/main/scala/org/broadinstitute/dsde/firecloud/model/Workspace.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ case class SubmissionRequest(
expression: Option[String],
useCallCache: Option[Boolean],
deleteIntermediateOutputFiles: Option[Boolean],
useReferenceDisks: Option[Boolean],
workflowFailureMode: Option[String])

case class RawlsGroupMemberList(
Expand Down
6 changes: 4 additions & 2 deletions src/test/scala/org/broadinstitute/dsde/firecloud/mock/MockWorkspaceServer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,10 @@ object MockWorkspaceServer {
expression = Option(randomAlpha()),
useCallCache = Option(randomBoolean()),
deleteIntermediateOutputFiles = Option(randomBoolean()),
useReferenceDisks = Option(randomBoolean()),
workflowFailureMode = Option(randomElement(List("ContinueWhilePossible", "NoNewCalls")))
)
)

val mockInvalidSubmission = SubmissionRequest(
methodConfigurationNamespace = Option.empty,
methodConfigurationName = Option.empty,
Expand All @@ -73,6 +74,7 @@ object MockWorkspaceServer {
expression = Option.empty,
useCallCache = Option.empty,
deleteIntermediateOutputFiles = Option.empty,
useReferenceDisks = Option.empty,
workflowFailureMode = Option.empty
)

Expand Down