From 62104bba7f84af723bb5bb3788c0fb1d66651fdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Du=C5=A1an=20Andri=C4=87?= Date: Tue, 1 Dec 2020 11:08:00 -0500 Subject: [PATCH 1/3] next snapshot --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4cf1007..23171a7 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.icgc.argo workflow-management - 2.10.0 + 2.11.0-SNAPSHOT workflow-management ARGO Workflow Management From 9ca2a8376846ba39dbaa4a31542432ee5d1ed3a9 Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 21 Jan 2021 16:24:52 -0500 Subject: [PATCH 2/3] update schema and mappings to latest WES spec + fix string/bool (#150) --- .../argo/workflow_management/service/NextflowService.java | 2 +- .../wes/controller/model/RunsRequest.java | 7 ++----- .../wes/controller/model/WorkflowEngineParams.java | 2 +- src/main/resources/schema.graphql | 7 +++---- 4 files changed, 7 insertions(+), 11 deletions(-) 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] } From 34c2a2a1d5c149f4893e56db82052f1f761e27d7 Mon Sep 17 00:00:00 2001 From: Alex Lepsa Date: Fri, 22 Jan 2021 10:38:25 -0500 Subject: [PATCH 3/3] release 2.11.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 23171a7..680d2f9 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.icgc.argo workflow-management - 2.11.0-SNAPSHOT + 2.11.0 workflow-management ARGO Workflow Management