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

[DO NOT MERGE] Convert entity to strict entity in export methodconfig endpoint #823

Closed
wants to merge 2 commits into from
Closed

[DO NOT MERGE] Convert entity to strict entity in export methodconfig endpoint #823

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9bf76b6
convert entity to strict entity
MatthewBemis Dec 14, 2020
9631b2d
add TODO
MatthewBemis Dec 15, 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
14 changes: 9 additions & 5 deletions src/main/scala/org/broadinstitute/dsde/firecloud/webservice/WorkspaceApiService.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import org.slf4j.{Logger, LoggerFactory}
import spray.json.DefaultJsonProtocol._

import scala.concurrent.ExecutionContext
import scala.concurrent.duration._

trait WorkspaceApiService extends FireCloudRequestBuilding with FireCloudDirectives with StandardUserInfoDirectives {

Expand Down Expand Up @@ -98,11 +99,14 @@ trait WorkspaceApiService extends FireCloudRequestBuilding with FireCloudDirecti
} ~
post {
requireUserInfo() { _ =>
entity(as[MethodConfiguration]) { methodConfig =>
if (!methodConfig.outputs.exists { param => param._2.value.startsWith("this.library:") || param._2.value.startsWith("workspace.library:")})
passthrough(workspacePath + "/methodconfigs", HttpMethods.GET, HttpMethods.POST)
else
complete(StatusCodes.Forbidden, ErrorReport("Methods and configurations can not create or modify library attributes"))
//TODO: pull timeout from config
toStrictEntity(10.seconds) {
entity(as[MethodConfiguration]) { methodConfig =>
if (!methodConfig.outputs.exists { param => param._2.value.startsWith("this.library:") || param._2.value.startsWith("workspace.library:") })
passthrough(workspacePath + "/methodconfigs", HttpMethods.GET, HttpMethods.POST)
else
complete(StatusCodes.Forbidden, ErrorReport("Methods and configurations can not create or modify library attributes"))
}
}
}
}
Expand Down