feat(agent): wire up agentssh server to allow exec into container#16638
Merged
Conversation
d096ac4 to
56cb9e9
Compare
56cb9e9 to
db9df4b
Compare
db9df4b to
36707f9
Compare
johnstcn
commented
Feb 25, 2025
Comment on lines
-701
to
-739
| // EnvInfoer encapsulates external information required by CreateCommand. | ||
| type EnvInfoer interface { | ||
| // CurrentUser returns the current user. | ||
| CurrentUser() (*user.User, error) | ||
| // Environ returns the environment variables of the current process. | ||
| Environ() []string | ||
| // UserHomeDir returns the home directory of the current user. | ||
| UserHomeDir() (string, error) | ||
| // UserShell returns the shell of the given user. | ||
| UserShell(username string) (string, error) | ||
| } | ||
|
|
||
| type systemEnvInfoer struct{} | ||
|
|
||
| var defaultEnvInfoer EnvInfoer = &systemEnvInfoer{} | ||
|
|
||
| // DefaultEnvInfoer returns a default implementation of | ||
| // EnvInfoer. This reads information using the default Go | ||
| // implementations. | ||
| func DefaultEnvInfoer() EnvInfoer { | ||
| return defaultEnvInfoer | ||
| } | ||
|
|
||
| func (systemEnvInfoer) CurrentUser() (*user.User, error) { | ||
| return user.Current() | ||
| } | ||
|
|
||
| func (systemEnvInfoer) Environ() []string { | ||
| return os.Environ() | ||
| } | ||
|
|
||
| func (systemEnvInfoer) UserHomeDir() (string, error) { | ||
| return userHomeDir() | ||
| } | ||
|
|
||
| func (systemEnvInfoer) UserShell(username string) (string, error) { | ||
| return usershell.Get(username) | ||
| } | ||
|
|
Member
Author
There was a problem hiding this comment.
review: moved to usershell package
Comment on lines
-131
to
-143
| func (*DockerEnvInfoer) Environ() []string { | ||
| // Return a clone of the environment so that the caller can't modify it | ||
| return os.Environ() | ||
| } | ||
|
|
||
| func (*DockerEnvInfoer) UserHomeDir() (string, error) { | ||
| // We default the working directory of the command to the user's home | ||
| // directory. Since this came from inside the container, we cannot guarantee | ||
| // that this exists on the host. Return the "real" home directory of the user | ||
| // instead. | ||
| return os.UserHomeDir() | ||
| } | ||
|
|
Member
Author
There was a problem hiding this comment.
review: we now use the embedded usershell.SystemEnvInfo instead
dannykopping
approved these changes
Feb 25, 2025
mafredri
reviewed
Feb 25, 2025
mafredri
left a comment
Member
There was a problem hiding this comment.
Looks great 👍🏻, minor nits/suggestions inline.
| slog.F("before", append([]string{name}, args...)), | ||
| slog.F("after", append([]string{modifiedName}, modifiedArgs...)), | ||
| ) | ||
| cmd := s.Execer.PTYCommandContext(ctx, modifiedName, modifiedArgs...) |
Member
There was a problem hiding this comment.
Didn't we also have a docker execer? Did we end up not implementing that change, and are only relying on env infoer now? Or are we modifying commands from multiple angles? If former, all good, if latter, I'm wondering if we could unify the concepts (perhaps infoer can be applied on the execer level or vice-versa).
Member
Author
There was a problem hiding this comment.
That's all in the envinfoer now.
|
|
||
| // HomeDir returns the home directory of the current user, giving | ||
| // priority to the $HOME environment variable. | ||
| func HomeDir() (string, error) { |
Member
There was a problem hiding this comment.
Is this still useful as a separate function or should we just require usage of envinfoer?
Member
Author
There was a problem hiding this comment.
I'd like to unexport it and require going through envinfoer, but trying to keep the scope of refactorings small here.
Member
Author
There was a problem hiding this comment.
I'm going to mark it as deprecated for now, we can remove it later.
Co-authored-by: Mathias Fredriksson <mafredri@gmail.com> Co-authored-by: Danny Kopping <danny@coder.com>
mafredri
approved these changes
Feb 25, 2025
mafredri
left a comment
Member
There was a problem hiding this comment.
Just one minor suggestion, but otherwise this is great 👍🏻
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Relates to #16419
Builds on top of #16623 and wires up the ReconnectingPTY server. This does nothing to wire up the web terminal yet but the added test demonstrates the functionality working.
Other changes:
SystemEnvInfointerface to theagent/usershellpackage to address follow-up from feat(agent/agentcontainers): add ContainerEnvInfoer #16623 (comment)usershellinfo.Getas deprecated. Consumers should use theEnvInfoerinterface instead.