10000 feat(agent/agentcontainers): refactor Lister to ContainerCLI and implement new methods by mafredri · Pull Request #18243 · coder/coder · GitHub
[go: up one dir, main page]
Skip to content

feat(agent/agentcontainers): refactor Lister to ContainerCLI and implement new methods #18243

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 2 commits into from
Jun 6, 2025
Merged

feat(agent/agentcontainers): refactor Lister to ContainerCLI and implement new methods #18243

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea0125d
feat(agent/agentcontainers): refactor Lister to ContainerCLI and impl…
mafredri Jun 2, 2025
a5fbf37
amend PR comments
mafredri Jun 6, 2025
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
Prev Previous commit
amend PR comments
  • Loading branch information
@mafredri
mafredri committed Jun 6, 2025
commit a5fbf37450e8c754ac3ee2fddbeffbdfe58d19d2
23 changes: 14 additions & 9 deletions agent/agentcontainers/containers_dockercli_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ func TestIntegrationDockerCLI(t *testing.T) {
arch, err := dcli.DetectArchitecture(ctx, containerName)
require.NoError(t, err, "DetectArchitecture failed")
require.NotEmpty(t, arch, "arch has no content")
require.Equal(t, runtime.GOARCH, arch, "architecture does not match runtime")
require.Equal(t, runtime.GOARCH, arch, "architecture does not match runtime, did you run this test with a remote Docker socket?")

t.Logf("Detected architecture: %s", arch)
})
Expand Down Expand Up @@ -92,21 +92,26 @@ func TestIntegrationDockerCLI(t *testing.T) {
t.Parallel()

// Test ExecAs without specifying user (should use container's default).
want := "hello without user"
got, err := dcli.ExecAs(ctx, containerName, "", "echo", want)
want := "root"
got, err := dcli.ExecAs(ctx, containerName, "", "whoami")
require.NoError(t, err, "ExecAs without user should succeed")
require.Equal(t, want, string(got), "ExecAs without user should output expected string")
t.Logf("ExecAs without user output: %s", got)

// Test ExecAs with root user (should convert "root" to "0").
want = "hello as root"
got, err = dcli.ExecAs(ctx, containerName, "root", "echo", want)
// Test ExecAs with numeric UID (non root).
want = "1000"
_, err = dcli.ExecAs(ctx, containerName, want, "whoami")
require.Error(t, err, "ExecAs with UID 1000 should fail as user does not exist in busybox")
require.Contains(t, err.Error(), "whoami: unknown uid 1000", "ExecAs with UID 1000 should return 'unknown uid' error")

// Test ExecAs with root user (should convert "root" to "0", which still outputs root due to passwd).
want = "root"
got, err = dcli.ExecAs(ctx, containerName, "root", "whoami")
require.NoError(t, err, "ExecAs with root user should succeed")
require.Equal(t, want, string(got), "ExecAs with root user should output expected string")

// Test ExecAs with numeric UID.
want = "hello as uid 0"
got, err = dcli.ExecAs(ctx, containerName, "0", "echo", want)
want = "root"
got, err = dcli.ExecAs(ctx, containerName, "0", "whoami")
require.NoError(t, err, "ExecAs with UID 0 should succeed")
require.Equal(t, want, string(got), "ExecAs with UID 0 should output expected string")

Expand Down
Loading
0