Merge pull request #2282 from opencb/TASK-4268

TASK-4268 - Unable to execute jobs, "--token" param not found
opencb · May 4, 2023 · 763a284 · 763a284
2 parents daa1839 + a99d68a
commit 763a284
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/opencga-app/src/main/java/org/opencb/opencga/app/cli/GeneralCliOptions.java b/opencga-app/src/main/java/org/opencb/opencga/app/cli/GeneralCliOptions.java
@@ -74,7 +74,7 @@ public static class CommonCommandOptions {
                 + "storage-configuration.yml and client-configuration.yml files.", hidden = true)
         public String conf;
 
-        @Parameter(names = {"--opencga-token"}, description = "Token session ID", arity = 1, hidden = true)
+        @Parameter(names = {ParamConstants.OPENCGA_TOKEN_CLI_PARAM}, description = "Token session ID", arity = 1, hidden = true)
         public String token;
 
         @Parameter(names = {"--host"}, description = "Use this server host instead of the default one in the client configuration", arity = 1)

diff --git a/opencga-core/src/main/java/org/opencb/opencga/core/api/ParamConstants.java b/opencga-core/src/main/java/org/opencb/opencga/core/api/ParamConstants.java
@@ -83,6 +83,8 @@ public class ParamConstants {
     public static final String POP_FREQ_1000G = POP_FREQ_1000G_CB_V5;
     public static final String POP_FREQ_GNOMAD_GENOMES = "GNOMAD_GENOMES";
 
+    public static final String OPENCGA_TOKEN_CLI_PARAM = "--opencga-token";
+
     // ---------------------------------------------
     public static final String FORCE = "force";
     public static final String ANNOTATION_DOC_URL = "http://docs.opencb.org/display/opencga/AnnotationSets+1.4.0";

diff --git a/opencga-master/src/main/java/org/opencb/opencga/master/monitor/daemons/ExecutionDaemon.java b/opencga-master/src/main/java/org/opencb/opencga/master/monitor/daemons/ExecutionDaemon.java
@@ -569,8 +569,8 @@ protected int checkPendingJob(Job job) {
 
         // Create cli
         String commandLine = buildCli(internalCli, job);
-        String authenticatedCommandLine = commandLine + " --token " + userToken;
-        String shadedCommandLine = commandLine + " --token " + REDACTED_TOKEN;
+        String authenticatedCommandLine = commandLine + " " + ParamConstants.OPENCGA_TOKEN_CLI_PARAM + " " + userToken;
+        String shadedCommandLine = commandLine + " " + ParamConstants.OPENCGA_TOKEN_CLI_PARAM + " " + REDACTED_TOKEN;
 
         updateParams.setCommandLine(shadedCommandLine);