Use resource package, delete older code

pkg/kubectl/cmd/create.go

@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/resource"
 	"github.com/spf13/cobra"
 )
 
@@ -57,7 +57,7 @@ Examples:
 				checkErr(err)
 			}
 
-			err = kubectl.NewRESTHelper(client, mapping).Create(namespace, true, data)
+			err = resource.NewHelper(client, mapping).Create(namespace, true, data)
 			checkErr(err)
 			fmt.Fprintf(out, "%s\n", name)
 		},

pkg/kubectl/cmd/delete.go

@@ -23,7 +23,7 @@ import (
 	"github.com/golang/glog"
 	"github.com/spf13/cobra"
 
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/resource"
 )
 
 func (f *Factory) NewCmdDelete(out io.Writer) *cobra.Command {
@@ -59,9 +59,9 @@ Examples:
 			checkErr(err)
 			selector := GetFlagString(cmd, "selector")
 			found := 0
-			ResourcesFromArgsOrFile(cmd, args, filename, selector, f.Typer, f.Mapper, f.Client, schema).Visit(func(r *ResourceInfo) error {
+			ResourcesFromArgsOrFile(cmd, args, filename, selector, f.Typer, f.Mapper, f.Client, schema).Visit(func(r *resource.Info) error {
 				found++
-				if err := kubectl.NewRESTHelper(r.Client, r.Mapping).Delete(r.Namespace, r.Name); err != nil {
+				if err := resource.NewHelper(r.Client, r.Mapping).Delete(r.Namespace, r.Name); err != nil {
 					return err
 				}
 				fmt.Fprintf(out, "%s\n", r.Name)

pkg/kubectl/cmd/get.go

@@ -21,7 +21,9 @@ import (
 	"io"
 
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/resource"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
 
 	"github.com/spf13/cobra"
 )
@@ -70,8 +72,13 @@ Examples:
 			printer, err := kubectl.GetPrinter(outputFormat, templateFile, outputVersion, mapping.ObjectConvertor, defaultPrinter)
 			checkErr(err)
 
-			restHelper := kubectl.NewRESTHelper(client, mapping)
-			obj, err := restHelper.Get(namespace, name, labelSelector)
+			restHelper := resource.NewHelper(client, mapping)
+			var obj runtime.Object
+			if len(name) == 0 {
+				obj, err = restHelper.List(namespace, labelSelector)
+			} else {
+				obj, err = restHelper.Get(namespace, name)
+			}
 			checkErr(err)
 
 			isWatch, isWatchOnly := GetFlagBool(cmd, "watch"), GetFlagBool(cmd, "watch-only")

pkg/kubectl/cmd/resource.go

@@ -18,122 +18,19 @@ package cmd
 
 import (
 	"fmt"
-	"log"
 	"strings"
 
-	"github.com/golang/glog"
 	"github.com/spf13/cobra"
 
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/validation"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/resource"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
 )
 
-// ResourceInfo contains temporary info to execute REST call
-type ResourceInfo struct {
-	Client    kubectl.RESTClient
-	Mapping   *meta.RESTMapping
-	Namespace string
-	Name      string
-
-	// Optional, this is the most recent value returned by the server if available
-	runtime.Object
-}
-
-// ResourceVisitor lets clients walk the list of resources
-type ResourceVisitor interface {
-	Visit(func(*ResourceInfo) error) error
-}
-
-type ResourceVisitorList []ResourceVisitor
-
-// Visit implements ResourceVisitor
-func (l ResourceVisitorList) Visit(fn func(r *ResourceInfo) error) error {
-	for i := range l {
-		if err := l[i].Visit(fn); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func NewResourceInfo(client kubectl.RESTClient, mapping *meta.RESTMapping, namespace, name string) *ResourceInfo {
-	return &ResourceInfo{
-		Client:    client,
-		Mapping:   mapping,
-		Namespace: namespace,
-		Name:      name,
-	}
-}
-
-// Visit implements ResourceVisitor
-func (r *ResourceInfo) Visit(fn func(r *ResourceInfo) error) error {
-	return fn(r)
-}
-
-// ResourceSelector is a facade for all the resources fetched via label selector
-type ResourceSelector struct {
-	Client    kubectl.RESTClient
-	Mapping   *meta.RESTMapping
-	Namespace string
-	Selector  labels.Selector
-}
-
-// NewResourceSelector creates a resource selector which hides details of getting items by their label selector.
-func NewResourceSelector(client kubectl.RESTClient, mapping *meta.RESTMapping, namespace string, selector labels.Selector) *ResourceSelector {
-	return &ResourceSelector{
-		Client:    client,
-		Mapping:   mapping,
-		Namespace: namespace,
-		Selector:  selector,
-	}
-}
-
-// Visit implements ResourceVisitor
-func (r *ResourceSelector) Visit(fn func(r *ResourceInfo) error) error {
-	list, err := kubectl.NewRESTHelper(r.Client, r.Mapping).List(r.Namespace, r.Selector)
-	if err != nil {
-		if errors.IsBadRequest(err) || errors.IsNotFound(err) {
-			glog.V(2).Infof("Unable to perform a label selector query on %s with labels %s: %v", r.Mapping.Resource, r.Selector, err)
-			return nil
-		}
-		return err
-	}
-	items, err := runtime.ExtractList(list)
-	if err != nil {
-		return err
-	}
-	accessor := meta.NewAccessor()
-	for i := range items {
-		name, err := accessor.Name(items[i])
-		if err != nil {
-			// items without names cannot be visited
-			glog.V(2).Infof("Found %s with labels %s, but can't access the item by name.", r.Mapping.Resource, r.Selector)
-			continue
-		}
-		item := &ResourceInfo{
-			Client:    r.Client,
-			Mapping:   r.Mapping,
-			Namespace: r.Namespace,
-			Name:      name,
-			Object:    items[i],
-		}
-		if err := fn(item); err != nil {
-			if errors.IsNotFound(err) {
-				glog.V(2).Infof("Found %s named %q, but can't be accessed now: %v", r.Mapping.Resource, name, err)
-				return nil
-			}
-			log.Printf("got error for resource %s: %v", r.Mapping.Resource, err)
-			return err
-		}
-	}
-	return nil
-}
-
 // ResourcesFromArgsOrFile computes a list of Resources by extracting info from filename or args. It will
 // handle label selectors provided.
 func ResourcesFromArgsOrFile(
@@ -144,7 +41,7 @@ func ResourcesFromArgsOrFile(
 	mapper meta.RESTMapper,
 	clientBuilder func(cmd *cobra.Command, mapping *meta.RESTMapping) (kubectl.RESTClient, error),
 	schema validation.Schema,
-) ResourceVisitor {
+) resource.Visitor {
 
 	// handling filename & resource id
 	if len(selector) == 0 {
@@ -152,34 +49,34 @@ func ResourcesFromArgsOrFile(
 		client, err := clientBuilder(cmd, mapping)
 		checkErr(err)
 
-		return NewResourceInfo(client, mapping, namespace, name)
+		return resource.NewInfo(client, mapping, namespace, name)
 	}
 
 	labelSelector, err := labels.ParseSelector(selector)
 	checkErr(err)
 
 	namespace := GetKubeNamespace(cmd)
-	visitors := ResourceVisitorList{}
+	visitors := resource.VisitorList{}
 
 	if len(args) != 1 {
 		usageError(cmd, "Must specify the type of resource")
 	}
 	types := SplitResourceArgument(args[0])
 	for _, arg := range types {
-		resource := kubectl.ExpandResourceShortcut(arg)
-		if len(resource) == 0 {
-			usageError(cmd, "Unknown resource %s", resource)
+		resourceName := kubectl.ExpandResourceShortcut(arg)
+		if len(resourceName) == 0 {
+			usageError(cmd, "Unknown resource %s", resourceName)
 		}
-		version, kind, err := mapper.VersionAndKindForResource(resource)
+		version, kind, err := mapper.VersionAndKindForResource(resourceName)
 		checkErr(err)
 
-		mapping, err := mapper.RESTMapping(version, kind)
+		mapping, err := mapper.RESTMapping(kind, version)
 		checkErr(err)
 
 		client, err := clientBuilder(cmd, mapping)
 		checkErr(err)
 
-		visitors = append(visitors, NewResourceSelector(client, mapping, namespace, labelSelector))
+		visitors = append(visitors, resource.NewSelector(client, mapping, namespace, labelSelector))
 	}
 	return visitors
 }

pkg/kubectl/cmd/update.go

@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/resource"
 	"github.com/spf13/cobra"
 )
 
@@ -52,7 +52,7 @@ Examples:
 			err = CompareNamespaceFromFile(cmd, namespace)
 			checkErr(err)
 
-			err = kubectl.NewRESTHelper(client, mapping).Update(namespace, name, true, data)
+			err = resource.NewHelper(client, mapping).Update(namespace, name, true, data)
 			checkErr(err)
 			fmt.Fprintf(out, "%s\n", name)
 		},