Skip to content

chore(agent/agentssh): extract EnvInfoer #16603

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 4 commits into from
Feb 19, 2025
+91 −11
Merged

chore(agent/agentssh): extract EnvInfoer #16603

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7b28cfa
chore(agent/agentssh): extract CreateCommandDeps
johnstcn Feb 18, 2025
251d1d2
make fmt
johnstcn Feb 18, 2025
1259518
EnvInfoer is so Go
johnstcn Feb 18, 2025
c5f45e4
add test for custom implementation
johnstcn Feb 18, 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
add test for custom implementation
  • Loading branch information
@johnstcn
johnstcn committed Feb 18, 2025
commit c5f45e48d1f51f44a542f5c627a8cfb7253641fe
34 changes: 34 additions & 0 deletions agent/agentssh/agentssh_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"context"
"fmt"
"net"
"os/user"
"runtime"
"strings"
"sync"
Expand Down Expand Up @@ -102,6 +103,39 @@ func TestNewServer_ExecuteShebang(t *testing.T) {
require.NoError(t, err)
require.Equal(t, "test\n", string(output))
})
t.Run("CustomEnvInfoer", func(t *testing.T) {
t.Parallel()
ei := &fakeEnvInfoer{
CurrentUserFn: func() (u *user.User, err error) {
return nil, assert.AnError
},
}
_, err := s.CreateCommand(ctx, `whatever`, nil, ei)
require.ErrorIs(t, err, assert.AnError)
})
}

type fakeEnvInfoer struct {
CurrentUserFn func() (*user.User, error)
EnvironFn func() []string
UserHomeDirFn func() (string, error)
UserShellFn func(string) (string, error)
}

func (f *fakeEnvInfoer) CurrentUser() (u *user.User, err error) {
return f.CurrentUserFn()
}

func (f *fakeEnvInfoer) Environ() []string {
return f.EnvironFn()
}

func (f *fakeEnvInfoer) UserHomeDir() (string, error) {
return f.UserHomeDirFn()
}

func (f *fakeEnvInfoer) UserShell(u string) (string, error) {
return f.UserShellFn(u)
}

func TestNewServer_CloseActiveConnections(t *testing.T) {
Expand Down
Loading