Commit 7f6f85bd authored by Clayton Coleman's avatar Clayton Coleman

Fix attach, which was broken during the refactor

The new e2e test catches the break in attach (no e2e test exposed this codepath before).
parent e9a465d6
...@@ -202,8 +202,14 @@ func (p *AttachOptions) Run() error { ...@@ -202,8 +202,14 @@ func (p *AttachOptions) Run() error {
Resource("pods"). Resource("pods").
Name(pod.Name). Name(pod.Name).
Namespace(pod.Namespace). Namespace(pod.Namespace).
SubResource("attach"). SubResource("attach")
Param("container", p.GetContainerName(pod)) req.VersionedParams(&api.PodAttachOptions{
Container: p.GetContainerName(pod),
Stdin: stdin != nil,
Stdout: p.Out != nil,
Stderr: p.Err != nil,
TTY: tty,
}, api.Scheme)
return p.Attach.Attach("POST", req.URL(), p.Config, stdin, p.Out, p.Err, tty) return p.Attach.Attach("POST", req.URL(), p.Config, stdin, p.Out, p.Err, tty)
} }
......
...@@ -186,6 +186,9 @@ func TestAttach(t *testing.T) { ...@@ -186,6 +186,9 @@ func TestAttach(t *testing.T) {
if ex.method != "POST" { if ex.method != "POST" {
t.Errorf("%s: Did not get method for attach request: %s", test.name, ex.method) t.Errorf("%s: Did not get method for attach request: %s", test.name, ex.method)
} }
if ex.url.Query().Get("container") != "bar" {
t.Errorf("%s: Did not have query parameters: %s", test.name, ex.url.Query())
}
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment