diff --git a/src/main/resources/swagger/api-docs.yaml b/src/main/resources/swagger/api-docs.yaml index f3c0b2d0f..50688d53e 100755 --- a/src/main/resources/swagger/api-docs.yaml +++ b/src/main/resources/swagger/api-docs.yaml @@ -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 diff --git a/src/main/scala/org/broadinstitute/dsde/firecloud/model/ModelJsonProtocol.scala b/src/main/scala/org/broadinstitute/dsde/firecloud/model/ModelJsonProtocol.scala index 739aac337..0dcb3b478 100644 --- a/src/main/scala/org/broadinstitute/dsde/firecloud/model/ModelJsonProtocol.scala +++ b/src/main/scala/org/broadinstitute/dsde/firecloud/model/ModelJsonProtocol.scala @@ -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) diff --git a/src/main/scala/org/broadinstitute/dsde/firecloud/model/Workspace.scala b/src/main/scala/org/broadinstitute/dsde/firecloud/model/Workspace.scala index 70fce1e09..55275c4a3 100644 --- a/src/main/scala/org/broadinstitute/dsde/firecloud/model/Workspace.scala +++ b/src/main/scala/org/broadinstitute/dsde/firecloud/model/Workspace.scala @@ -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( diff --git a/src/test/scala/org/broadinstitute/dsde/firecloud/mock/MockWorkspaceServer.scala b/src/test/scala/org/broadinstitute/dsde/firecloud/mock/MockWorkspaceServer.scala index 99374ef49..a77fccb57 100644 --- a/src/test/scala/org/broadinstitute/dsde/firecloud/mock/MockWorkspaceServer.scala +++ b/src/test/scala/org/broadinstitute/dsde/firecloud/mock/MockWorkspaceServer.scala @@ -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,