Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit9780c67

Browse files
committed
fixup! feat(cli): add capability for SSH command to connect to a running container
1 parente599cef commit9780c67

File tree

2 files changed

+11
-19
lines changed

2 files changed

+11
-19
lines changed

‎agent/agentssh/agentssh.go

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -469,27 +469,19 @@ func (s *Server) sessionStart(logger slog.Logger, session ssh.Session, env []str
469469
}
470470

471471
// plumb in envinfoer here to modify command for container exec?
472-
cmd,err:=s.CreateCommand(ctx,session.RawCommand(),env,nil)
473-
iferr!=nil {
474-
s.metrics.sessionErrors.WithLabelValues(magicTypeLabel,ptyLabel,"create_command").Add(1)
475-
returnerr
476-
}
477-
472+
varei usershell.EnvInfoer
473+
varerrerror
478474
ifs.config.ExperimentalContainersEnabled&&container!="" {
479-
ei,err:=agentcontainers.EnvInfo(ctx,s.Execer,container,containerUser)
475+
ei,err=agentcontainers.EnvInfo(ctx,s.Execer,container,containerUser)
480476
iferr!=nil {
481477
s.metrics.sessionErrors.WithLabelValues(magicTypeLabel,ptyLabel,"container_env_info").Add(1)
482478
returnerr
483479
}
484-
modifiedCmd,modifiedArgs:=ei.ModifyCommand(cmd.Path,cmd.Args...)
485-
ifmodifiedCmd!=cmd.Path||slices.Compare(modifiedArgs,cmd.Args)!=0 {
486-
logger.Debug(ctx,"modified command for container",
487-
slog.F("before",append([]string{cmd.Path},cmd.Args...)),
488-
slog.F("after",append([]string{modifiedCmd},modifiedArgs...)),
489-
)
490-
cmd.Path=modifiedCmd
491-
cmd.Args=modifiedArgs
492-
}
480+
}
481+
cmd,err:=s.CreateCommand(ctx,session.RawCommand(),env,ei)
482+
iferr!=nil {
483+
s.metrics.sessionErrors.WithLabelValues(magicTypeLabel,ptyLabel,"create_command").Add(1)
484+
returnerr
493485
}
494486

495487
ifssh.AgentRequested(session) {

‎cli/ssh_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1928,9 +1928,9 @@ Expire-Date: 0
19281928

19291929
funcTestSSH_Container(t*testing.T) {
19301930
t.Parallel()
1931-
//if runtime.GOOS != "linux" {
1932-
//t.Skip("Skipping test on non-Linux platform")
1933-
//}
1931+
ifruntime.GOOS!="linux" {
1932+
t.Skip("Skipping test on non-Linux platform")
1933+
}
19341934

19351935
client,workspace,agentToken:=setupWorkspaceForAgent(t)
19361936
ctx:=testutil.Context(t,testutil.WaitLong)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp