Make GetPrinter take the necessary conversion arguments

This fully encapsulates decisions about conversion within GetPrinter,
which prevents users from accidentally not converting.

pkg/kubectl/cmd/cmd_test.go

@@ -0,0 +1,117 @@
+/*
+Copyright 2014 Google Inc. 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_test
+
+import (
+	"bytes"
+	"fmt"
+	"io"
+	"io/ioutil"
+
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl"
+	. "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
+
+	"github.com/spf13/cobra"
+)
+
+type internalType struct {
+	Kind       string
+	APIVersion string
+
+	Name string
+}
+
+type externalType struct {
+	Kind       string `json:"kind"`
+	APIVersion string `json:"apiVersion"`
+
+	Name string `json:"name"`
+}
+
+func (*internalType) IsAnAPIObject() {}
+func (*externalType) IsAnAPIObject() {}
+
+func newExternalScheme() (*runtime.Scheme, meta.RESTMapper, runtime.Codec) {
+	scheme := runtime.NewScheme()
+	scheme.AddKnownTypeWithName("", "Type", &internalType{})
+	scheme.AddKnownTypeWithName("unlikelyversion", "Type", &externalType{})
+
+	codec := runtime.CodecFor(scheme, "unlikelyversion")
+	mapper := meta.NewDefaultRESTMapper([]string{"unlikelyversion"}, func(version string) (*meta.VersionInterfaces, bool) {
+		return &meta.VersionInterfaces{
+			Codec:            codec,
+			ObjectConvertor:  scheme,
+			MetadataAccessor: meta.NewAccessor(),
+		}, (version == "unlikelyversion")
+	})
+	mapper.Add(scheme, false, "unlikelyversion")
+
+	return scheme, mapper, codec
+}
+
+type testPrinter struct {
+	Obj runtime.Object
+	Err error
+}
+
+func (t *testPrinter) PrintObj(obj runtime.Object, out io.Writer) error {
+	t.Obj = obj
+	fmt.Fprintf(out, "%#v", obj)
+	return t.Err
+}
+
+type testDescriber struct {
+	Name, Namespace string
+	Output          string
+	Err             error
+}
+
+func (t *testDescriber) Describe(namespace, name string) (output string, err error) {
+	t.Namespace, t.Name = namespace, name
+	return t.Output, t.Err
+}
+
+type testFactory struct {
+	Client    kubectl.RESTClient
+	Describer kubectl.Describer
+	Printer   kubectl.ResourcePrinter
+	Err       error
+}
+
+func NewTestFactory() (*Factory, *testFactory, runtime.Codec) {
+	scheme, mapper, codec := newExternalScheme()
+	t := &testFactory{}
+	return &Factory{
+		Mapper: mapper,
+		Typer:  scheme,
+		Client: func(*cobra.Command, *meta.RESTMapping) (kubectl.RESTClient, error) {
+			return t.Client, t.Err
+		},
+		Describer: func(*cobra.Command, *meta.RESTMapping) (kubectl.Describer, error) {
+			return t.Describer, t.Err
+		},
+		Printer: func(cmd *cobra.Command, mapping *meta.RESTMapping, noHeaders bool) (kubectl.ResourcePrinter, error) {
+			return t.Printer, t.Err
+		},
+	}, t, codec
+}
+
+func objBody(codec runtime.Codec, obj runtime.Object) io.ReadCloser {
+	return ioutil.NopCloser(bytes.NewReader([]byte(runtime.EncodeOrDie(codec, obj))))
+}

pkg/kubectl/cmd/describe_test.go

@@ -0,0 +1,50 @@
+/*
+Copyright 2014 Google Inc. 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_test
+
+import (
+	"bytes"
+	"fmt"
+	"net/http"
+	"testing"
+
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
+)
+
+// Verifies that schemas that are not in the master tree of Kubernetes can be retrieved via Get.
+func TestDescribeUnknownSchemaObject(t *testing.T) {
+	d := &testDescriber{Output: "test output"}
+	f, tf, codec := NewTestFactory()
+	tf.Describer = d
+	tf.Client = &client.FakeRESTClient{
+		Codec: codec,
+		Resp:  &http.Response{StatusCode: 200, Body: objBody(codec, &internalType{Name: "foo"})},
+	}
+	buf := bytes.NewBuffer([]byte{})
+
+	cmd := f.NewCmdDescribe(buf)
+	cmd.Flags().String("namespace", "test", "")
+	cmd.Run(cmd, []string{"type", "foo"})
+
+	if d.Name != "foo" || d.Namespace != "test" {
+		t.Errorf("unexpected describer: %#v", d)
+	}
+
+	if buf.String() != fmt.Sprintf("%s\n", d.Output) {
+		t.Errorf("unexpected output: %s", buf.String())
+	}
+}

pkg/kubectl/cmd/get.go

@@ -20,9 +20,9 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
+
 	"github.com/spf13/cobra"
 )
 
@@ -66,27 +66,29 @@ Examples:
 			if len(outputVersion) == 0 {
 				outputVersion = mapping.APIVersion
 			}
-			printer, err := kubectl.GetPrinter(outputVersion, outputFormat, templateFile, defaultPrinter)
+
+			printer, err := kubectl.GetPrinter(outputFormat, templateFile, outputVersion, mapping.ObjectConvertor, defaultPrinter)
 			checkErr(err)
 
 			restHelper := kubectl.NewRESTHelper(client, mapping)
 			obj, err := restHelper.Get(namespace, name, labelSelector)
 			checkErr(err)
 
-			if !GetFlagBool(cmd, "watch-only") {
+			isWatch, isWatchOnly := GetFlagBool(cmd, "watch"), GetFlagBool(cmd, "watch-only")
+
+			// print the current object
+			if !isWatchOnly {
 				if err := printer.PrintObj(obj, out); err != nil {
 					checkErr(fmt.Errorf("Unable to output the provided object: %v", err))
 				}
 			}
 
-			if GetFlagBool(cmd, "watch") || GetFlagBool(cmd, "watch-only") {
-				vi, err := latest.InterfacesFor(outputVersion)
+			// print watched changes
+			if isWatch || isWatchOnly {
+				rv, err := mapping.MetadataAccessor.ResourceVersion(obj)
 				checkErr(err)
 
-				rv, err := vi.MetadataAccessor.ResourceVersion(obj)
-				checkErr(err)
-
-				w, err := restHelper.Watch(namespace, rv, labelSelector, labels.Set{}.AsSelector())
+				w, err := restHelper.Watch(namespace, rv, labelSelector, labels.Everything())
 				checkErr(err)
 
 				kubectl.WatchLoop(w, printer, out)

pkg/kubectl/cmd/get_test.go

@@ -0,0 +1,51 @@
+/*
+Copyright 2014 Google Inc. 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_test
+
+import (
+	"bytes"
+	"fmt"
+	"net/http"
+	"reflect"
+	"testing"
+
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
+)
+
+// Verifies that schemas that are not in the master tree of Kubernetes can be retrieved via Get.
+func TestGetUnknownSchemaObject(t *testing.T) {
+	f, tf, codec := NewTestFactory()
+	tf.Printer = &testPrinter{}
+	tf.Client = &client.FakeRESTClient{
+		Codec: codec,
+		Resp:  &http.Response{StatusCode: 200, Body: objBody(codec, &internalType{Name: "foo"})},
+	}
+	buf := bytes.NewBuffer([]byte{})
+
+	cmd := f.NewCmdGet(buf)
+	cmd.Flags().String("namespace", "test", "")
+	cmd.Run(cmd, []string{"type", "foo"})
+
+	expected := &internalType{Name: "foo"}
+	actual := tf.Printer.(*testPrinter).Obj
+	if !reflect.DeepEqual(expected, actual) {
+		t.Errorf("unexpected object: %#v", actual)
+	}
+	if buf.String() != fmt.Sprintf("%#v", expected) {
+		t.Errorf("unexpected output: %s", buf.String())
+	}
+}