
The current executor structure is too dependent on client.Request and client.Config. In order to do an attach from the server, it needs to be possible to create an Executor from crypto/tls#TLSConfig and to bypassing having a client.Request. Changes: * remotecommand.spdyExecutor - handles upgrading a request to SPDY and getting a connection * remotecommand.NewAttach / New - moved to exec / portforward / attach since they handle requests * Remove request.Upgrade() - it's too coupled to SPDY, and can live with the spdyExecutor * Add request.VersionedParams(runtime.Object, runtime.ObjectConvertor) to handle object -> query transform
176 lines
5.0 KiB
Go
176 lines
5.0 KiB
Go
/*
|
|
Copyright 2014 The Kubernetes Authors All rights reserved.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package cmd
|
|
|
|
import (
|
|
"fmt"
|
|
"net/http"
|
|
"net/url"
|
|
"testing"
|
|
|
|
"github.com/spf13/cobra"
|
|
|
|
"k8s.io/kubernetes/pkg/api"
|
|
"k8s.io/kubernetes/pkg/api/testapi"
|
|
client "k8s.io/kubernetes/pkg/client/unversioned"
|
|
"k8s.io/kubernetes/pkg/client/unversioned/fake"
|
|
)
|
|
|
|
type fakePortForwarder struct {
|
|
method string
|
|
url *url.URL
|
|
pfErr error
|
|
}
|
|
|
|
func (f *fakePortForwarder) ForwardPorts(method string, url *url.URL, config *client.Config, ports []string, stopChan <-chan struct{}) error {
|
|
f.method = method
|
|
f.url = url
|
|
return f.pfErr
|
|
}
|
|
|
|
func TestPortForward(t *testing.T) {
|
|
version := testapi.Default.Version()
|
|
|
|
tests := []struct {
|
|
name, version, podPath, pfPath, container string
|
|
pod *api.Pod
|
|
pfErr bool
|
|
}{
|
|
{
|
|
name: "pod portforward",
|
|
version: version,
|
|
podPath: "/api/" + version + "/namespaces/test/pods/foo",
|
|
pfPath: "/api/" + version + "/namespaces/test/pods/foo/portforward",
|
|
pod: execPod(),
|
|
},
|
|
{
|
|
name: "pod portforward error",
|
|
version: version,
|
|
podPath: "/api/" + version + "/namespaces/test/pods/foo",
|
|
pfPath: "/api/" + version + "/namespaces/test/pods/foo/portforward",
|
|
pod: execPod(),
|
|
pfErr: true,
|
|
},
|
|
}
|
|
for _, test := range tests {
|
|
f, tf, codec := NewAPIFactory()
|
|
tf.Client = &fake.RESTClient{
|
|
Codec: codec,
|
|
Client: fake.HTTPClientFunc(func(req *http.Request) (*http.Response, error) {
|
|
switch p, m := req.URL.Path, req.Method; {
|
|
case p == test.podPath && m == "GET":
|
|
body := objBody(codec, test.pod)
|
|
return &http.Response{StatusCode: 200, Body: body}, nil
|
|
default:
|
|
// Ensures no GET is performed when deleting by name
|
|
t.Errorf("%s: unexpected request: %#v\n%#v", test.name, req.URL, req)
|
|
return nil, nil
|
|
}
|
|
}),
|
|
}
|
|
tf.Namespace = "test"
|
|
tf.ClientConfig = &client.Config{Version: test.version}
|
|
ff := &fakePortForwarder{}
|
|
if test.pfErr {
|
|
ff.pfErr = fmt.Errorf("pf error")
|
|
}
|
|
cmd := &cobra.Command{}
|
|
cmd.Flags().StringP("pod", "p", "", "Pod name")
|
|
err := RunPortForward(f, cmd, []string{"foo", ":5000", ":1000"}, ff)
|
|
|
|
if test.pfErr && err != ff.pfErr {
|
|
t.Errorf("%s: Unexpected exec error: %v", test.name, err)
|
|
}
|
|
if !test.pfErr && err != nil {
|
|
t.Errorf("%s: Unexpected error: %v", test.name, err)
|
|
}
|
|
if test.pfErr {
|
|
continue
|
|
}
|
|
|
|
if ff.url.Path != test.pfPath {
|
|
t.Errorf("%s: Did not get expected path for portforward request", test.name)
|
|
}
|
|
if ff.method != "POST" {
|
|
t.Errorf("%s: Did not get method for attach request: %s", test.name, ff.method)
|
|
}
|
|
|
|
}
|
|
}
|
|
|
|
func TestPortForwardWithPFlag(t *testing.T) {
|
|
version := testapi.Default.Version()
|
|
|
|
tests := []struct {
|
|
name, version, podPath, pfPath, container string
|
|
pod *api.Pod
|
|
pfErr bool
|
|
}{
|
|
{
|
|
name: "pod portforward",
|
|
version: version,
|
|
podPath: "/api/" + version + "/namespaces/test/pods/foo",
|
|
pfPath: "/api/" + version + "/namespaces/test/pods/foo/portforward",
|
|
pod: execPod(),
|
|
},
|
|
{
|
|
name: "pod portforward error",
|
|
version: version,
|
|
podPath: "/api/" + version + "/namespaces/test/pods/foo",
|
|
pfPath: "/api/" + version + "/namespaces/test/pods/foo/portforward",
|
|
pod: execPod(),
|
|
pfErr: true,
|
|
},
|
|
}
|
|
for _, test := range tests {
|
|
f, tf, codec := NewAPIFactory()
|
|
tf.Client = &fake.RESTClient{
|
|
Codec: codec,
|
|
Client: fake.HTTPClientFunc(func(req *http.Request) (*http.Response, error) {
|
|
switch p, m := req.URL.Path, req.Method; {
|
|
case p == test.podPath && m == "GET":
|
|
body := objBody(codec, test.pod)
|
|
return &http.Response{StatusCode: 200, Body: body}, nil
|
|
default:
|
|
// Ensures no GET is performed when deleting by name
|
|
t.Errorf("%s: unexpected request: %#v\n%#v", test.name, req.URL, req)
|
|
return nil, nil
|
|
}
|
|
}),
|
|
}
|
|
tf.Namespace = "test"
|
|
tf.ClientConfig = &client.Config{Version: test.version}
|
|
ff := &fakePortForwarder{}
|
|
if test.pfErr {
|
|
ff.pfErr = fmt.Errorf("pf error")
|
|
}
|
|
cmd := &cobra.Command{}
|
|
podPtr := cmd.Flags().StringP("pod", "p", "", "Pod name")
|
|
*podPtr = "foo"
|
|
err := RunPortForward(f, cmd, []string{":5000", ":1000"}, ff)
|
|
if test.pfErr && err != ff.pfErr {
|
|
t.Errorf("%s: Unexpected exec error: %v", test.name, err)
|
|
}
|
|
if !test.pfErr && ff.url.Path != test.pfPath {
|
|
t.Errorf("%s: Did not get expected path for portforward request", test.name)
|
|
}
|
|
if !test.pfErr && err != nil {
|
|
t.Errorf("%s: Unexpected error: %v", test.name, err)
|
|
}
|
|
}
|
|
}
|