Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
21 changes: 0 additions & 21 deletions src/main/resources/swagger/api-docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4360,27 +4360,6 @@ paths:
500:
description: Rawls Internal Error

/api/workspaces/{workspaceNamespace}/{workspaceName}/genomics/operations/{jobId}:
get:
x-passthrough: true
x-passthrough-target: rawls
tags:
- Workspaces
operationId: getGenomicsOperation
summary: |
Retrieve operations info from Google Genomics API
parameters:
- $ref: '#/parameters/workspaceNamespaceParam'
- $ref: '#/parameters/workspaceNameParam'
- $ref: '#/parameters/jobIdParam'
responses:
200:
description: Operations info
404:
description: jobId not found
500:
description: Rawls Internal Error

/cookie-authed/download/b/{bucket}/o/{object}:
get:
x-passthrough: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -297,11 +297,6 @@ trait WorkspaceApiService extends HttpService with FireCloudRequestBuilding
}
}
} ~
path("genomics" / "operations" / Segment) { jobId =>
requireUserInfo() { _ =>
passthrough(s"$workspacePath/genomics/operations/$jobId", HttpMethods.GET)
}
} ~
path("tags") {
requireUserInfo() { userInfo =>
get { requestContext =>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ class WorkspaceApiServiceSpec extends BaseServiceSpec with WorkspaceApiService w
private final val storageCostEstimatePath = s"$workspacesPath/storageCostEstimate"
private final val tagAutocompletePath = s"$workspacesRoot/tags"
private final val executionEngineVersionPath = "/version/executionEngine"
private final val genomicsOperationsPath = s"$workspacesPath/genomics/operations/$jobId"

private def catalogPath(ns:String=workspace.namespace, name:String=workspace.name) =
workspacesRoot + "/%s/%s/catalog".format(ns, name)
Expand Down Expand Up @@ -406,16 +405,6 @@ class WorkspaceApiServiceSpec extends BaseServiceSpec with WorkspaceApiService w
}
}
}

"Passthrough tests on the /workspaces/%s/%s/genomics/operations/%s path" - {
List(HttpMethods.POST, HttpMethods.PATCH, HttpMethods.PUT, HttpMethods.DELETE) foreach { method =>
s"MethodNotAllowed error is returned for $method" in {
new RequestBuilder(method)(genomicsOperationsPath) ~> dummyUserIdHeaders(dummyUserId) ~> sealRoute(workspaceRoutes) ~> check {
status should equal(MethodNotAllowed)
}
}
}
}
}

"WorkspaceService Passthrough Tests" - {
Expand Down Expand Up @@ -576,15 +565,6 @@ class WorkspaceApiServiceSpec extends BaseServiceSpec with WorkspaceApiService w
}
}
}

"Passthrough tests on the /workspaces/%s/%s/genomics/operations/%s path" - {
"OK status is returned for GET" in {
stubRawlsService(HttpMethods.GET, genomicsOperationsPath, OK)
Get(genomicsOperationsPath) ~> dummyUserIdHeaders(dummyUserId) ~> sealRoute(workspaceRoutes) ~> check {
status should equal (OK)
}
}
}
}

"Workspace Non-passthrough Tests" - {
Expand Down