Trim extra characters in image.

Trim the space, tab, single quote and double quotes in the image field.
MemVerge · Oct 7, 2023 · 8a09ad8 · 8a09ad8
1 parent a1507e3
commit 8a09ad8
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/plugins/nf-float/src/main/com/memverge/nextflow/FloatGridExecutor.groovy b/plugins/nf-float/src/main/com/memverge/nextflow/FloatGridExecutor.groovy
@@ -323,7 +323,7 @@ class FloatGridExecutor extends AbstractGridExecutor {
 
         validate(task)
 
-        final container = task.getContainer()
+        final container = task.getContainer().strip(" \t\'\"")
         if (!container) {
             throw new AbortOperationException("container is empty. " +
                     "you can specify a default container image " +

diff --git a/plugins/nf-float/src/test/com/memverge/nextflow/FloatGridExecutorTest.groovy b/plugins/nf-float/src/test/com/memverge/nextflow/FloatGridExecutorTest.groovy
@@ -272,6 +272,23 @@ class FloatGridExecutorTest extends FloatBaseTest {
         cmd.join(' ') == submitCmd().join(' ')
     }
 
+    def "trim space and quotes in image"() {
+        given:
+        final exec = newTestExecutor()
+        final task = newTask(exec, new TaskConfig(
+                cpus: cpu,
+                memory: "$mem G",
+                container: "\"' $image\t'\"",
+        ))
+
+        when:
+        final cmd = exec.getSubmitCommandLine(task, Paths.get(script))
+        final expected = submitCmd()
+
+        then:
+        cmd.join(' ') == expected.join(' ')
+    }
+
     def "parse data volume"() {
         given:
         final exec = newTestExecutor()