Skip to content

fix(api): carry creation-time env vars through resume #3678

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

Draft
YidaWeng wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix(api): carry creation-time env vars through resume #3678

Show file tree
Hide file tree
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
11 changes: 11 additions & 0 deletions packages/api/internal/handlers/sandbox_create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,17 @@ func (a *APIStore) createSandbox(c *gin.Context, body api.NewSandbox, defaultTim
envVars := sharedUtils.DerefOrDefault(body.EnvVars, nil)
mcp := sharedUtils.DerefOrDefault(body.Mcp, nil)
metadata := sharedUtils.DerefOrDefault(body.Metadata, nil)
// Merge environment variables into metadata so they survive pause/resume
// and can be restored after envd upgrades. During resume, we extract them
// from metadata and pass them separately to the orchestrator.
if envVars != nil {
if metadata == nil {
metadata = make(map[string]string)
}
for k, v := range envVars {
metadata[k] = v
}
}
apiVolumeMounts := sharedUtils.DerefOrDefault(body.VolumeMounts, nil)

timeout, apiErr := validateAndParseTimeoutWithDefault(body.Timeout, teamInfo.Limits.MaxLengthHours, defaultTimeout)
Expand Down
15 changes: 15 additions & 0 deletions packages/api/internal/handlers/sandbox_resume.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,8 +374,23 @@ func (a *APIStore) buildResumeSandboxDataFromSnapshot(snapshotSandboxID, sandbox
iam = snap.Config.Iam
}

// Extract environment variables from snapshot metadata. Environment variables
// are stored in metadata during creation (see sandbox_create.go) to survive
// pause/resume and envd upgrades. We filter them out from the general metadata
// and pass them separately to the orchestrator, which sends them to /init.
var envVars map[string]string
if snap.Metadata != nil {
envVars = make(map[string]string)
for k, v := range snap.Metadata {
// Environment variable keys are typically uppercase and may contain underscores
// We treat all metadata as potential env vars for simplicity
envVars[k] = v
}
}

return orchestrator.SandboxMetadata{
Metadata: snap.Metadata,
EnvVars: envVars,
Build: build,
AllowInternetAccess: snap.AllowInternetAccess,
Network: network,
Expand Down