chore: Move container mounts to parameter (#1147)

Author: sambuc

internal/remote/firecrest/controller.go

@@ -648,11 +648,11 @@ func addSessionMountsToScript(sessionScript string, fileSystems *[]FileSystem, s
 		mounts = append(mounts, fmt.Sprintf("%s:/secrets:ro", secretsPath))
 	}
 
-	// Format mount list for the environment.toml file
+	// Format mount list
 	for i := range mounts {
-		mounts[i] = fmt.Sprintf("    \"%s\",", mounts[i])
+		mounts[i] = fmt.Sprintf("\"%s\"", mounts[i])
 	}
-	mountsStr := fmt.Sprintf("mounts = [\n%s\n]", strings.Join(mounts, "\n"))
+	mountsStr := fmt.Sprintf("--container-mounts=%s", strings.Join(mounts, ","))
 	return strings.Replace(sessionScript, "#{{SESSION_MOUNTS_PLACEHOLDER}}", mountsStr, 1)
 }
 

internal/remote/firecrest/controller_test.go

@@ -70,7 +70,13 @@ func TestRenderSessionScriptStatic(t *testing.T) {
 	assert.Contains(t, sessionScriptFinal, "#SBATCH --partition=my-partition")
 
 	// Check the mounts
-	mountsRegExp := regexp.MustCompile(`mounts(?:\s*)=(?:\s*)[[]([^]]*)]`)
+	// From `srun --help`:
+	//      --container-mounts=SRC:DST[:FLAGS][,SRC:DST...]
+	//                              [pyxis] bind mount[s] inside the container. Mount
+	//                              flags are separated with "+", e.g. "ro+rprivate"
+	flagsRegExp := `:(?:ro|rprivate)(?:[+](?:ro|rprivate))*`
+	mountRegExp := `"[^:,"]+:[^:,"]+(?:` + flagsRegExp + `)?"`
+	mountsRegExp := regexp.MustCompile(`--container-mounts=(` + mountRegExp + `(?:,` + mountRegExp + `)*)`)
 	matches := mountsRegExp.FindStringSubmatch(sessionScriptFinal)
 	assert.Len(t, matches, 2)
 	foundMounts := matches[1]

internal/remote/firecrest/session_script.sh

@@ -143,14 +143,13 @@ fi
 # Create the environment.toml file to run the session
 EDF_FILE="${SESSION_DIR}/environment.toml"
 cat <<EOF >"${EDF_FILE}"
-#{{SESSION_MOUNTS_PLACEHOLDER}}
-
 [annotations]
 com.hooks.cxi.enabled = "false"
 EOF
 
 srun_param_container_image="--container-image ${REMOTE_SESSION_IMAGE}"
 srun_param_workdir="--container-workdir ${SESSION_WORK_DIR}"
+srun_param_mounts=#{{SESSION_MOUNTS_PLACEHOLDER}}
 
 export RENKU_MOUNT_DIR="${SESSION_WORK_DIR}"
 export RENKU_WORKING_DIR="${SESSION_WORK_DIR}"
@@ -252,6 +251,7 @@ srun \
     --environment "${EDF_FILE}" \
     ${srun_param_container_image} \
     ${srun_param_workdir} \
+    ${srun_param_mounts} \
     --no-container-entrypoint sh /etc/rc \
     & pid=$!
 wait