Merge pull request #151 from icgc-argo/RC/2.11.0

Release 2.11.0
icgc-argo · Jan 22, 2021 · 2020576 · 2020576
2 parents 31e7607 + 34c2a2a
commit 2020576
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 12 deletions.
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
     </parent>
     <groupId>org.icgc.argo</groupId>
     <artifactId>workflow-management</artifactId>
-    <version>2.10.0</version>
+    <version>2.11.0</version>
     <name>workflow-management</name>
     <description>ARGO Workflow Management</description>
 

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
@@ -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
@@ -42,10 +42,7 @@ public class RunsRequest {
   private Map<String, Object> workflowParams = new HashMap<>();
   private WorkflowEngineParams workflowEngineParams = new WorkflowEngineParams();
 
-  private Map<String, Object> workflowType;
-  private String[] workflowTypeVersion;
+  private String workflowType;
+  private String workflowTypeVersion;
   private Map<String, Object> tags;
-
-  // we will not be accepting this (at least to start)
-  private String[] workflowAttachment;
 }
diff --git a/...ain/java/org/icgc/argo/workflow_management/wes/controller/model/WorkflowEngineParams.java b/...ain/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
@@ -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]
 }