Thanks to visit codestin.com
Credit goes to github.com

Skip to content

fix: passthrough subsystem env vars #51

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

Merged
merged 1 commit into from
Aug 8, 2023
Merged

fix: passthrough subsystem env vars #51

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
38 changes: 35 additions & 3 deletions cli/docker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"os"
"path"
"path/filepath"
"sort"
"strconv"
"strings"

Expand Down Expand Up @@ -368,7 +369,7 @@ func runDockerCVM(ctx context.Context, log slog.Logger, client dockerutil.Docker
}
}

envs := defaultContainerEnvs(flags.agentToken)
envs := defaultContainerEnvs(ctx, flags.agentToken)

innerEnvsTokens := strings.Split(flags.innerEnvs, ",")
envs = append(envs, filterElements(xunix.Environ(ctx), innerEnvsTokens...)...)
Expand Down Expand Up @@ -780,10 +781,41 @@ func parseMounts(containerMounts string) ([]xunix.Mount, error) {

// defaultContainerEnvs returns environment variables that should always
// be passed to the inner container.
func defaultContainerEnvs(agentToken string) []string {
func defaultContainerEnvs(ctx context.Context, agentToken string) []string {
const agentSubsystemEnv = "CODER_AGENT_SUBSYSTEM"
env := xunix.Environ(ctx)
existingSubsystem := ""
for _, e := range env {
if strings.HasPrefix(e, agentSubsystemEnv+"=") {
existingSubsystem = strings.TrimPrefix(e, agentSubsystemEnv+"=")
break
}
}

// We should append to the existing agent subsystem if it exists.
agentSubsystem := "envbox"
if existingSubsystem != "" {
split := strings.Split(existingSubsystem, ",")
split = append(split, "envbox")

tidy := make([]string, 0, len(split))
seen := make(map[string]struct{})
for _, s := range split {
s := strings.TrimSpace(s)
if _, ok := seen[s]; s == "" || ok {
continue
}
seen[s] = struct{}{}
tidy = append(tidy, s)
}

sort.Strings(tidy)
agentSubsystem = strings.Join(tidy, ",")
}

return []string{
fmt.Sprintf("%s=%s", EnvAgentToken, agentToken),
fmt.Sprintf("%s=%s", "CODER_AGENT_SUBSYSTEM", "envbox"),
fmt.Sprintf("%s=%s", "CODER_AGENT_SUBSYSTEM", agentSubsystem),
}
}

Expand Down
4 changes: 3 additions & 1 deletion cli/docker_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ func TestDocker(t *testing.T) {

expectedEnvs = []string{
"CODER_AGENT_TOKEN=hi",
"CODER_AGENT_SUBSYSTEM=envbox",
"CODER_AGENT_SUBSYSTEM=envbox,exectrace", // sorted
"FOO=bar",
"CODER_VAR=baz",
"bar=123",
Expand All @@ -152,6 +152,8 @@ func TestDocker(t *testing.T) {
"USA=yay",
"HOME=/root",
"PATH=/usr/bin:/sbin:/bin",
// Envbox should add to this.
"CODER_AGENT_SUBSYSTEM=exectrace",
// Don't include the wildcards.
}, expectedEnvs...))
)
Expand Down