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
1 change: 0 additions & 1 deletion src/main/resources/reference.conf
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ workspace {
alterGroupMembershipPath="/groups/%s/%s/%s"
createGroup="/groups/%s"
overwriteGroupMembershipPath="/groups/%s/%s"
submissionQueueStatusPath="/submissions/queueStatus"
executionEngineVersionPath="/version/executionEngine"
notificationsPath="/notifications"
}
Expand Down
46 changes: 0 additions & 46 deletions src/main/resources/swagger/api-docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2764,29 +2764,6 @@ paths:
x-passthrough: true
x-passthrough-target: calhoun
x-codegen-request-body-name: notebook
/api/submissions/queueStatus:
get:
tags:
- Submissions
summary: workflow queue status
description: List workflow counts by queueing state
operationId: workflowQueueStatus
deprecated: true
responses:
200:
description: Successful Request
content:
application/json:
schema:
$ref: '#/components/schemas/WorkflowQueueStatusResponse'
500:
description: Rawls Internal Error
content:
application/json:
schema:
$ref: '#/components/schemas/ErrorReport'
x-passthrough: true
x-passthrough-target: rawls
/api/template:
post:
tags:
Expand Down Expand Up @@ -9066,29 +9043,6 @@ components:
type: string
description: The id of this workflow
description: The cost of a workflow, if available
WorkflowQueueStatusResponse:
required:
- estimatedQueueTimeMS
- workflowCountsByStatus
- workflowsBeforeNextUserWorkflow
type: object
properties:
estimatedQueueTimeMS:
type: integer
description: estimated milliseconds until the current queue is submitted
format: int64
workflowsBeforeNextUserWorkflow:
type: integer
description: the number of workflows in the queue ahead of the user's first
workflow
format: int32
workflowCountsByStatus:
type: object
additionalProperties:
type: integer
format: int32
description: Map[String,Int]
description: Information about the status of workflows and the workflow queue
WorkflowStatus:
type: string
description: workflow status
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,25 +52,13 @@ object FireCloudConfig {
val authUrl = baseUrl + authPrefix
val workspacesPath = workspace.getString("workspacesPath")
val workspacesUrl = authUrl + workspacesPath
val workspacesV2Path = workspace.getString("workspacesV2Path")
val workspacesV2Url = authUrl + workspacesV2Path
val entitiesPath = workspace.getString("entitiesPath")
val entityQueryPath = workspace.getString("entityQueryPath")
val workspacesEntitiesCopyPath = workspace.getString("workspacesEntitiesCopyPath")
def workspacesEntitiesCopyUrl(linkExistingEntities: Boolean) =
authUrl + workspacesEntitiesCopyPath + "?linkExistingEntities=%s".format(linkExistingEntities)
val submissionsCountPath = workspace.getString("submissionsCountPath")
val submissionsPath = workspace.getString("submissionsPath")
val submissionsIdPath = workspace.getString("submissionsIdPath")
val submissionsWorkflowIdPath = workspace.getString("submissionsWorkflowIdPath")
val submissionsWorkflowIdOutputsPath = workspace.getString("submissionsWorkflowIdOutputsPath")
val createGroupPath = workspace.getString("createGroup")
val submissionQueueStatusPath = workspace.getString("submissionQueueStatusPath")
val submissionQueueStatusUrl = authUrl + submissionQueueStatusPath
val executionEngineVersionPath = workspace.getString("executionEngineVersionPath")
val executionEngineVersionUrl = baseUrl + executionEngineVersionPath
val notificationsPath = workspace.getString("notificationsPath")
val notificationsUrl = authUrl + notificationsPath
val defaultPageSize = rawls.getInt("defaultPageSize")

def entityPathFromWorkspace(namespace: String, name: String) = authUrl + entitiesPath.format(namespace, name)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,18 +128,6 @@ object MockWorkspaceServer {

// Submissions responses

MockWorkspaceServer.workspaceServer
.when(
request()
.withMethod("GET")
.withPath("/api/submissions/queueStatus")
)
.respond(
response()
.withHeaders(header)
.withStatusCode(OK.intValue)
)

MockWorkspaceServer.workspaceServer
.when(
request()
Expand Down
Loading