diff --git a/pom.xml b/pom.xml index 4cf1007..680d2f9 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.icgc.argo workflow-management - 2.10.0 + 2.11.0 workflow-management ARGO Workflow Management diff --git a/src/main/java/org/icgc/argo/workflow_management/service/NextflowService.java b/src/main/java/org/icgc/argo/workflow_management/service/NextflowService.java index 4b10893..d14e1e8 100644 --- a/src/main/java/org/icgc/argo/workflow_management/service/NextflowService.java +++ b/src/main/java/org/icgc/argo/workflow_management/service/NextflowService.java @@ -339,7 +339,7 @@ private CmdKubeRun createCmd(@NonNull Launcher launcher, @NonNull RunParams para // should pull latest code before running? // does not prevent us running a specific version (revision), // does enforce pulling of that branch/hash before running) - cmdParams.put("latest", workflowEngineParams.getLatest(), v -> parseBoolean((String) v)); + cmdParams.put("latest", workflowEngineParams.getLatest()); // Process options (default docker container to run for process if not specified) if (nonNull(workflowEngineParams.getDefaultContainer())) { diff --git a/src/main/java/org/icgc/argo/workflow_management/wes/controller/model/RunsRequest.java b/src/main/java/org/icgc/argo/workflow_management/wes/controller/model/RunsRequest.java index 75d94f1..14aa475 100644 --- a/src/main/java/org/icgc/argo/workflow_management/wes/controller/model/RunsRequest.java +++ b/src/main/java/org/icgc/argo/workflow_management/wes/controller/model/RunsRequest.java @@ -42,10 +42,7 @@ public class RunsRequest { private Map workflowParams = new HashMap<>(); private WorkflowEngineParams workflowEngineParams = new WorkflowEngineParams(); - private Map workflowType; - private String[] workflowTypeVersion; + private String workflowType; + private String workflowTypeVersion; private Map tags; - - // we will not be accepting this (at least to start) - private String[] workflowAttachment; } diff --git a/src/main/java/org/icgc/argo/workflow_management/wes/controller/model/WorkflowEngineParams.java b/src/main/java/org/icgc/argo/workflow_management/wes/controller/model/WorkflowEngineParams.java index 927608f..2a71395 100644 --- a/src/main/java/org/icgc/argo/workflow_management/wes/controller/model/WorkflowEngineParams.java +++ b/src/main/java/org/icgc/argo/workflow_management/wes/controller/model/WorkflowEngineParams.java @@ -40,5 +40,5 @@ public class WorkflowEngineParams { private String launchDir; private String projectDir; private String workDir; - private String latest; + private Boolean latest; } diff --git a/src/main/resources/schema.graphql b/src/main/resources/schema.graphql index 2057ce6..539b7ad 100644 --- a/src/main/resources/schema.graphql +++ b/src/main/resources/schema.graphql @@ -11,17 +11,16 @@ input WorkflowEngineParams { launchDir: String projectDir: String workDir: String - latest: String + latest: Boolean } input RunsRequest { workflowUrl: String! workflowEngineParams: WorkflowEngineParams workflowParams: JSON - workflowType: JSON - workflowTypeVersion: [String] + workflowType: String + workflowTypeVersion: String tags: JSON - workflowAttachment: [String] }