wip delete fails on notfound

j3ffml · j3ffml · commit bfacc9245d77 · 2015-05-27T09:44:09.000-07:00
diff --git a/pkg/kubectl/cmd/delete.go b/pkg/kubectl/cmd/delete.go
@@ -23,7 +23,6 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl"
 	cmdutil "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/resource"
@@ -73,6 +72,7 @@ func NewCmdDelete(f *cmdutil.Factory, out io.Writer) *cobra.Command {
 	kubectl.AddJsonFilenameFlag(cmd, &filenames, usage)
 	cmd.Flags().StringP("selector", "l", "", "Selector (label query) to filter on")
 	cmd.Flags().Bool("all", false, "[-all] to select all the specified resources")
+	cmd.Flags().Bool("ignore-not-found", false, "Treat \"resource not found\" as success")
 	cmd.Flags().Bool("cascade", true, "If true, cascade the delete resources managed by this resource (e.g. Pods created by a ReplicationController).  Default true.")
 	cmd.Flags().Int("grace-period", -1, "Period of time in seconds given to the resource to terminate gracefully. Ignored if negative.")
 	return cmd
@@ -107,7 +107,7 @@ func RunDelete(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, args []str
 
 func ReapResult(r *resource.Result, f *cmdutil.Factory, out io.Writer, isDefaultDelete bool, gracePeriod int) error {
 	found := 0
-	err := r.IgnoreErrors(errors.IsNotFound).Visit(func(info *resource.Info) error {
+	err := r.Visit(func(info *resource.Info) error {
 		found++
 		reaper, err := f.Reaper(info.Mapping)
 		if err != nil {
@@ -138,7 +138,7 @@ func ReapResult(r *resource.Result, f *cmdutil.Factory, out io.Writer, isDefault
 
 func DeleteResult(r *resource.Result, out io.Writer) error {
 	found := 0
-	err := r.IgnoreErrors(errors.IsNotFound).Visit(func(info *resource.Info) error {
+	err := r.Visit(func(info *resource.Info) error {
 		found++
 		return deleteResource(info, out)
 	})
diff --git a/pkg/kubectl/cmd/delete_test.go b/pkg/kubectl/cmd/delete_test.go
@@ -18,13 +18,16 @@ package cmd
 
 import (
 	"bytes"
+	"fmt"
 	"net/http"
 	"strings"
 	"testing"
 
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
 )
 
 func TestDeleteObjectByTuple(t *testing.T) {
@@ -120,7 +123,7 @@ func TestDeleteObject(t *testing.T) {
 	}
 }
 
-func TestDeleteObjectIgnoreNotFound(t *testing.T) {
+func TestDeleteObjectNotFound(t *testing.T) {
 	f, tf, codec := NewAPIFactory()
 	tf.Printer = &testPrinter{}
 	tf.Client = &client.FakeRESTClient{
@@ -143,7 +146,8 @@ func TestDeleteObjectIgnoreNotFound(t *testing.T) {
 	cmd.Flags().Set("cascade", "false")
 	cmd.Run(cmd, []string{})
 
-	if buf.String() != "" {
+	err := errors.NewNotFound("replicationcontrollers", "redis-master")
+	if buf.String() != fmt.Sprintf("Error from server: %s", err.Error()) {
 		t.Errorf("unexpected output: %s", buf.String())
 	}
 }
@@ -174,9 +178,17 @@ func TestDeleteMultipleObject(t *testing.T) {
 	cmd.Flags().Set("filename", "../../../examples/guestbook/redis-master-controller.json")
 	cmd.Flags().Set("filename", "../../../examples/guestbook/frontend-service.json")
 	cmd.Flags().Set("cascade", "false")
-	cmd.Run(cmd, []string{})
 
-	if buf.String() != "replicationcontrollers/redis-master\nservices/frontend\n" {
+	var filenames *util.StringList
+	fname := cmd.Flags().Lookup("filename").Value
+	filenames = util.StringList(*fname)
+	err := RunDelete(f, buf, cmd, []string{}, filenames)
+	if err == nil {
+		t.Errorf("unexpected output: %s", buf.String())
+	}
+	// cmd.Run(cmd, []string{})
+
+	if buf.String() != fmt.Sprintf("replicationcontrollers/redis-master\nservices/frontend\nError from server: %s", err.Error()) {
 		t.Errorf("unexpected output: %s", buf.String())
 	}
 }
