Skip to content

chore: Rename path variables for clarity #1163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sambuc wants to merge 1 commit into
base: feat/secrets-and-dc-in-hpc-sessions
Choose a base branch
from
Open

chore: Rename path variables for clarity #1163

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions internal/remote/firecrest/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,37 +240,37 @@ func (c *FirecrestRemoteSessionController) Start(ctx context.Context) error {
slog.Warn("RENKU_BASE_URL_PATH is not defined", "defaultValue", renkuBaseURLPath)
}

scratchPathRenku := path.Join(scratch.Path, userName, "renku")
sessionPath := path.Join(scratchPathRenku, "sessions", renkuProjectPath, strings.TrimPrefix(renkuBaseURLPath, "/sessions"))
srunRenkuPath := path.Join(scratch.Path, userName, "renku")
srunSessionPath := path.Join(srunRenkuPath, "sessions", renkuProjectPath, strings.TrimPrefix(renkuBaseURLPath, "/sessions"))

slog.Info("determined session path", "sessionPath", sessionPath)
slog.Info("determined session path", "sessionPath", srunSessionPath)

// Setup secrets
secretsPath := path.Join(sessionPath, "secrets")
err = c.mkdir(startCtx, secretsPath, true /* createParents */)
srunSecretsPath := path.Join(srunSessionPath, "secrets")
err = c.mkdir(startCtx, srunSecretsPath, true /* createParents */)
if err != nil {
return err
}
// Makes sure that only the session owner can read session files
err = c.chmod(startCtx, sessionPath, "700")
err = c.chmod(startCtx, srunSessionPath, "700")
if err != nil {
return err
}
// TODO: get wstunnel_secret as a config value
wstunnel_secret := os.Getenv("RSC_WSTUNNEL_SECRET")
if wstunnel_secret != "" {
err = c.uploadFile(startCtx, secretsPath, "wstunnel_secret", []byte(wstunnel_secret))
err = c.uploadFile(startCtx, srunSecretsPath, "wstunnel_secret", []byte(wstunnel_secret))
if err != nil {
return err
}
err = c.chmod(startCtx, path.Join(secretsPath, "wstunnel_secret"), "400")
err = c.chmod(startCtx, path.Join(srunSecretsPath, "wstunnel_secret"), "400")
if err != nil {
return err
}
}
// Upload user secrets into secretsPath
userSecretsPath := path.Join(secretsPath, "user")
err = c.uploadSecrets(startCtx, userSecretsPath)
// Upload user secrets
srunUserSecretsPath := path.Join(srunSecretsPath, "user")
err = c.uploadSecrets(startCtx, srunUserSecretsPath)
if err != nil {
return err
}
Expand All @@ -283,7 +283,7 @@ func (c *FirecrestRemoteSessionController) Start(ctx context.Context) error {
}
slog.Info("collected git repositories", "gitRepositories", gitRepositories)
for repo := range gitRepositories {
repoGitDirPath := path.Join(sessionPath, "work", repo, ".git")
repoGitDirPath := path.Join(srunSessionPath, "work", repo, ".git")
err = c.mkdir(startCtx, repoGitDirPath, true /* createParents */)
if err != nil {
return err
Expand Down Expand Up @@ -352,8 +352,8 @@ func (c *FirecrestRemoteSessionController) Start(ctx context.Context) error {
env["GIT_PROXY_HEALTH_PORT"] = fmt.Sprintf("%d", 65481) // git proxy port

// Upload the session script
sessionScriptFinal := c.renderSessionScript(sessionScript, system.FileSystems, userSecretsPath)
err = c.uploadFile(ctx, sessionPath, "session_script.sh", []byte(sessionScriptFinal))
sessionScriptFinal := c.renderSessionScript(sessionScript, system.FileSystems, srunUserSecretsPath)
err = c.uploadFile(ctx, srunSessionPath, "session_script.sh", []byte(sessionScriptFinal))
if err != nil {
return err
}
Expand All @@ -365,8 +365,8 @@ func (c *FirecrestRemoteSessionController) Start(ctx context.Context) error {
}
job := JobDescriptionModel{
Env: &jobEnv,
ScriptPath: ptr.To(path.Join(sessionPath, "session_script.sh")),
WorkingDirectory: sessionPath,
ScriptPath: ptr.To(path.Join(srunSessionPath, "session_script.sh")),
WorkingDirectory: srunSessionPath,
}
// The slurm account can be set by the user as an environment variable
slurmAccount := os.Getenv("USER_ENV_SLURM_ACCOUNT")
Expand Down
Loading