Change the output of import commands to return arrays

xtreme-shane-lattanzio · xtreme-shane-lattanzio · commit acb1d854e983 · 2023-10-11T15:19:20.000-04:00
diff --git a/pkg/commands/builder/create.go b/pkg/commands/builder/create.go
@@ -6,6 +6,7 @@ package builder
 import (
 	"context"
 	"fmt"
+	"k8s.io/apimachinery/pkg/runtime"
 
 	"github.com/pivotal/kpack/pkg/apis/build/v1alpha2"
 	"github.com/spf13/cobra"
@@ -144,7 +145,9 @@ func create(ctx context.Context, name string, flags CommandFlags, ch *commands.C
 		}
 	}
 
-	err = ch.PrintObj(bldr)
+	bldrArray := []runtime.Object{bldr}
+
+	err = ch.PrintObjs(bldrArray)
 	if err != nil {
 		return err
 	}
diff --git a/pkg/commands/builder/patch.go b/pkg/commands/builder/patch.go
@@ -6,6 +6,7 @@ package builder
 import (
 	"context"
 	"fmt"
+	"k8s.io/apimachinery/pkg/runtime"
 
 	"github.com/pivotal/kpack/pkg/apis/build/v1alpha2"
 	"github.com/spf13/cobra"
@@ -125,7 +126,9 @@ func patch(ctx context.Context, bldr *v1alpha2.Builder, flags CommandFlags, ch *
 		}
 	}
 
-	if err = ch.PrintObj(updatedBldr); err != nil {
+	updatedBldrArray := []runtime.Object{updatedBldr}
+
+	if err = ch.PrintObjs(updatedBldrArray); err != nil {
 		return err
 	}
 
diff --git a/pkg/commands/buildpack/create.go b/pkg/commands/buildpack/create.go
@@ -2,6 +2,7 @@ package buildpack
 
 import (
 	"context"
+	"k8s.io/apimachinery/pkg/runtime"
 
 	buildv1alpha2 "github.com/pivotal/kpack/pkg/apis/build/v1alpha2"
 	corev1alpha1 "github.com/pivotal/kpack/pkg/apis/core/v1alpha1"
@@ -101,7 +102,9 @@ func create(ctx context.Context, name string, flags CommandFlags, ch *commands.C
 		}
 	}
 
-	err = ch.PrintObj(bp)
+	bpArray := []runtime.Object{bp}
+
+	err = ch.PrintObjs(bpArray)
 	if err != nil {
 		return err
 	}
diff --git a/pkg/commands/buildpack/patch.go b/pkg/commands/buildpack/patch.go
@@ -5,6 +5,7 @@ package buildpack
 
 import (
 	"context"
+	"k8s.io/apimachinery/pkg/runtime"
 
 	"github.com/pivotal/kpack/pkg/apis/build/v1alpha2"
 	"github.com/spf13/cobra"
@@ -90,7 +91,9 @@ func patch(ctx context.Context, bp *v1alpha2.Buildpack, flags CommandFlags, ch *
 		}
 	}
 
-	if err = ch.PrintObj(updatedBp); err != nil {
+	updatedBpArray := []runtime.Object{updatedBp}
+
+	if err = ch.PrintObjs(updatedBpArray); err != nil {
 		return err
 	}
 
diff --git a/pkg/commands/clusterbuilder/create.go b/pkg/commands/clusterbuilder/create.go
@@ -6,11 +6,11 @@ package clusterbuilder
 import (
 	"context"
 	"fmt"
-
 	"github.com/pivotal/kpack/pkg/apis/build/v1alpha2"
 	"github.com/spf13/cobra"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/dynamic"
 
 	"github.com/vmware-tanzu/kpack-cli/pkg/builder"
@@ -153,7 +153,9 @@ func create(ctx context.Context, name string, flags CommandFlags, ch *commands.C
 		}
 	}
 
-	err = ch.PrintObj(cb)
+	cbArray := []runtime.Object{cb}
+
+	err = ch.PrintObjs(cbArray)
 	if err != nil {
 		return err
 	}
diff --git a/pkg/commands/clusterbuilder/patch.go b/pkg/commands/clusterbuilder/patch.go
@@ -6,6 +6,7 @@ package clusterbuilder
 import (
 	"context"
 	"fmt"
+	"k8s.io/apimachinery/pkg/runtime"
 
 	"github.com/pivotal/kpack/pkg/apis/build/v1alpha2"
 	"github.com/spf13/cobra"
@@ -115,7 +116,9 @@ func patch(ctx context.Context, cb *v1alpha2.ClusterBuilder, flags CommandFlags,
 		}
 	}
 
-	if err = ch.PrintObj(updatedCb); err != nil {
+	updatedCbArray := []runtime.Object{updatedCb}
+
+	if err = ch.PrintObjs(updatedCbArray); err != nil {
 		return err
 	}
 
diff --git a/pkg/commands/clusterbuildpack/create.go b/pkg/commands/clusterbuildpack/create.go
@@ -2,6 +2,7 @@ package clusterbuildpack
 
 import (
 	"context"
+	"k8s.io/apimachinery/pkg/runtime"
 
 	buildv1alpha2 "github.com/pivotal/kpack/pkg/apis/build/v1alpha2"
 	corev1alpha1 "github.com/pivotal/kpack/pkg/apis/core/v1alpha1"
@@ -98,7 +99,9 @@ func create(ctx context.Context, name string, flags CommandFlags, ch *commands.C
 		}
 	}
 
-	err = ch.PrintObj(bp)
+	bpArray := []runtime.Object{bp}
+
+	err = ch.PrintObjs(bpArray)
 	if err != nil {
 		return err
 	}
diff --git a/pkg/commands/clusterbuildpack/patch.go b/pkg/commands/clusterbuildpack/patch.go
@@ -5,6 +5,7 @@ package clusterbuildpack
 
 import (
 	"context"
+	"k8s.io/apimachinery/pkg/runtime"
 
 	"github.com/pivotal/kpack/pkg/apis/build/v1alpha2"
 	"github.com/spf13/cobra"
@@ -79,7 +80,9 @@ func patch(ctx context.Context, cbp *v1alpha2.ClusterBuildpack, flags CommandFla
 		}
 	}
 
-	if err = ch.PrintObj(updatedCbp); err != nil {
+	updatedCbpArray := []runtime.Object{updatedCbp}
+
+	if err = ch.PrintObjs(updatedCbpArray); err != nil {
 		return err
 	}
 
diff --git a/pkg/commands/clusterstack/create.go b/pkg/commands/clusterstack/create.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/spf13/cobra"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/dynamic"
 
 	"github.com/vmware-tanzu/kpack-cli/pkg/clusterstack"
@@ -93,7 +94,9 @@ func create(ctx context.Context, name, buildImageRef, runImageRef string, factor
 		}
 	}
 
-	if err = ch.PrintObj(stack); err != nil {
+	stackArray := []runtime.Object{stack}
+
+	if err = ch.PrintObjs(stackArray); err != nil {
 		return err
 	}
 
diff --git a/pkg/commands/clusterstack/patch.go b/pkg/commands/clusterstack/patch.go
@@ -6,6 +6,7 @@ package clusterstack
 import (
 	"context"
 	"io"
+	"k8s.io/apimachinery/pkg/runtime"
 
 	"github.com/google/go-containerregistry/pkg/authn"
 	v1 "github.com/google/go-containerregistry/pkg/v1"
@@ -116,7 +117,9 @@ func patch(ctx context.Context, keychain authn.Keychain, stack *v1alpha2.Cluster
 		}
 	}
 
-	if err = ch.PrintObj(updatedStack); err != nil {
+	updatedStackArray := []runtime.Object{updatedStack}
+
+	if err = ch.PrintObjs(updatedStackArray); err != nil {
 		return err
 	}
 
diff --git a/pkg/commands/clusterstore/add.go b/pkg/commands/clusterstore/add.go
@@ -5,13 +5,14 @@ package clusterstore
 
 import (
 	"context"
+	"k8s.io/apimachinery/pkg/types"
 
 	"github.com/pivotal/kpack/pkg/apis/build/v1alpha2"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/dynamic"
 
 	"github.com/vmware-tanzu/kpack-cli/pkg/clusterstore"
@@ -108,7 +109,9 @@ func update(ctx context.Context, store *v1alpha2.ClusterStore, buildpackages []s
 		}
 	}
 
-	if err = ch.PrintObj(updatedStore); err != nil {
+	updatedStoreArray := []runtime.Object{updatedStore}
+
+	if err = ch.PrintObjs(updatedStoreArray); err != nil {
 		return err
 	}
 
diff --git a/pkg/commands/clusterstore/create.go b/pkg/commands/clusterstore/create.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/spf13/cobra"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/dynamic"
 
 	"github.com/vmware-tanzu/kpack-cli/pkg/clusterstore"
@@ -91,7 +92,9 @@ func create(ctx context.Context, name string, buildpackages []string, factory *c
 		}
 	}
 
-	if err = ch.PrintObj(newStore); err != nil {
+	newStoreArray := []runtime.Object{newStore}
+
+	if err = ch.PrintObjs(newStoreArray); err != nil {
 		return err
 	}
 
diff --git a/pkg/commands/clusterstore/remove.go b/pkg/commands/clusterstore/remove.go
@@ -9,6 +9,7 @@ import (
 	"github.com/vmware-tanzu/kpack-cli/pkg/clusterstore"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/dynamic"
 
@@ -77,7 +78,9 @@ kp clusterstore remove my-store -b buildpackage@1.0.0 -b other-buildpackage@2.0.
 				}
 			}
 
-			if err = ch.PrintObj(updatedStore); err != nil {
+			updatedStoreArray := []runtime.Object{updatedStore}
+
+			if err = ch.PrintObjs(updatedStoreArray); err != nil {
 				return err
 			}
 
diff --git a/pkg/commands/command_helper.go b/pkg/commands/command_helper.go
@@ -13,6 +13,7 @@ import (
 	"github.com/pivotal/kpack/pkg/apis/build/v1alpha2"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
+
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -117,19 +118,21 @@ func (ch CommandHelper) ShowTimestamp() bool {
 }
 
 func (ch CommandHelper) PrintObjs(objs []runtime.Object) error {
+	if !ch.output {
+		return nil
+	}
 	for _, obj := range objs {
-		if err := ch.PrintObj(obj); err != nil {
-			return err
-		}
+		ch.checkKind(obj)
 	}
-	return nil
-}
+	err := ch.objPrinter.PrintObject(objs, ch.outWriter)
 
-func (ch CommandHelper) PrintObj(obj runtime.Object) error {
-	if !ch.output {
-		return nil
+	if err != nil {
+		return err
 	}
+	return nil
+}
 
+func (ch CommandHelper) checkKind(obj runtime.Object) error {
 	oGVK := obj.GetObjectKind().GroupVersionKind()
 	if oGVK.Version == "" || oGVK.Kind == "" {
 		nGVK, ok := ch.typeToGVK[reflect.TypeOf(obj)]
@@ -138,9 +141,7 @@ func (ch CommandHelper) PrintObj(obj runtime.Object) error {
 		}
 		obj.GetObjectKind().SetGroupVersionKind(nGVK)
 	}
-	err := ch.objPrinter.PrintObject(obj, ch.outWriter)
-	obj.GetObjectKind().SetGroupVersionKind(oGVK)
-	return err
+	return nil
 }
 
 func (ch CommandHelper) PrintChangeResult(change bool, format string, args ...interface{}) error {
diff --git a/pkg/commands/image/create.go b/pkg/commands/image/create.go
@@ -9,6 +9,7 @@ import (
 	"github.com/pivotal/kpack/pkg/apis/build/v1alpha2"
 	"github.com/spf13/cobra"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
 
 	"github.com/vmware-tanzu/kpack-cli/pkg/commands"
 	"github.com/vmware-tanzu/kpack-cli/pkg/image"
@@ -139,7 +140,9 @@ func create(ctx context.Context, name, tag string, factory *image.Factory, ch *c
 		}
 	}
 
-	err = ch.PrintObj(img)
+	imgArray := []runtime.Object{img}
+
+	err = ch.PrintObjs(imgArray)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/commands/image/patch.go b/pkg/commands/image/patch.go
@@ -6,6 +6,7 @@ package image
 import (
 	"context"
 	"fmt"
+	"k8s.io/apimachinery/pkg/runtime"
 
 	"github.com/pivotal/kpack/pkg/apis/build/v1alpha2"
 	"github.com/spf13/cobra"
@@ -156,7 +157,9 @@ func patch(ctx context.Context, img *v1alpha2.Image, factory *image.Factory, ch
 		}
 	}
 
-	if err = ch.PrintObj(updatedImage); err != nil {
+	updatedImageArray := []runtime.Object{updatedImage}
+
+	if err = ch.PrintObjs(updatedImageArray); err != nil {
 		return hasPatch, nil, err
 	}
 
diff --git a/pkg/commands/import/import_test.go b/pkg/commands/import/import_test.go
diff --git a/pkg/commands/lifecycle/patch.go b/pkg/commands/lifecycle/patch.go
diff --git a/pkg/commands/secret/create.go b/pkg/commands/secret/create.go
diff --git a/pkg/k8s/resource_printer.go b/pkg/k8s/resource_printer.go

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ package builder`
`6`	`6`	`import (`
`7`	`7`	`"context"`
`8`	`8`	`"fmt"`
	`9`	`+ "k8s.io/apimachinery/pkg/runtime"`
`9`	`10`
`10`	`11`	`"github.com/pivotal/kpack/pkg/apis/build/v1alpha2"`
`11`	`12`	`"github.com/spf13/cobra"`
`@@ -144,7 +145,9 @@ func create(ctx context.Context, name string, flags CommandFlags, ch *commands.C`
`144`	`145`	`}`
`145`	`146`	`}`
`146`	`147`
`147`		`- err = ch.PrintObj(bldr)`
	`148`	`+ bldrArray := []runtime.Object{bldr}`
	`149`	`+`
	`150`	`+ err = ch.PrintObjs(bldrArray)`
`148`	`151`	`if err != nil {`
`149`	`152`	`return err`
`150`	`153`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ package buildpack`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"context"`
	`5`	`+ "k8s.io/apimachinery/pkg/runtime"`
`5`	`6`
`6`	`7`	`buildv1alpha2 "github.com/pivotal/kpack/pkg/apis/build/v1alpha2"`
`7`	`8`	`corev1alpha1 "github.com/pivotal/kpack/pkg/apis/core/v1alpha1"`
`@@ -101,7 +102,9 @@ func create(ctx context.Context, name string, flags CommandFlags, ch *commands.C`
`101`	`102`	`}`
`102`	`103`	`}`
`103`	`104`
`104`		`- err = ch.PrintObj(bp)`
	`105`	`+ bpArray := []runtime.Object{bp}`
	`106`	`+`
	`107`	`+ err = ch.PrintObjs(bpArray)`
`105`	`108`	`if err != nil {`
`106`	`109`	`return err`
`107`	`110`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ package buildpack`
`5`	`5`
`6`	`6`	`import (`
`7`	`7`	`"context"`
	`8`	`+ "k8s.io/apimachinery/pkg/runtime"`
`8`	`9`
`9`	`10`	`"github.com/pivotal/kpack/pkg/apis/build/v1alpha2"`
`10`	`11`	`"github.com/spf13/cobra"`
`@@ -90,7 +91,9 @@ func patch(ctx context.Context, bp v1alpha2.Buildpack, flags CommandFlags, ch `
`90`	`91`	`}`
`91`	`92`	`}`
`92`	`93`
`93`		`- if err = ch.PrintObj(updatedBp); err != nil {`
	`94`	`+ updatedBpArray := []runtime.Object{updatedBp}`
	`95`	`+`
	`96`	`+ if err = ch.PrintObjs(updatedBpArray); err != nil {`
`94`	`97`	`return err`
`95`	`98`	`}`
`96`	`99`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ package clusterbuilder`
`6`	`6`	`import (`
`7`	`7`	`"context"`
`8`	`8`	`"fmt"`
	`9`	`+ "k8s.io/apimachinery/pkg/runtime"`
`9`	`10`
`10`	`11`	`"github.com/pivotal/kpack/pkg/apis/build/v1alpha2"`
`11`	`12`	`"github.com/spf13/cobra"`
`@@ -115,7 +116,9 @@ func patch(ctx context.Context, cb *v1alpha2.ClusterBuilder, flags CommandFlags,`
`115`	`116`	`}`
`116`	`117`	`}`
`117`	`118`
`118`		`- if err = ch.PrintObj(updatedCb); err != nil {`
	`119`	`+ updatedCbArray := []runtime.Object{updatedCb}`
	`120`	`+`
	`121`	`+ if err = ch.PrintObjs(updatedCbArray); err != nil {`
`119`	`122`	`return err`
`120`	`123`	`}`
`121`	`124`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ package clusterbuildpack`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"context"`
	`5`	`+ "k8s.io/apimachinery/pkg/runtime"`
`5`	`6`
`6`	`7`	`buildv1alpha2 "github.com/pivotal/kpack/pkg/apis/build/v1alpha2"`
`7`	`8`	`corev1alpha1 "github.com/pivotal/kpack/pkg/apis/core/v1alpha1"`
`@@ -98,7 +99,9 @@ func create(ctx context.Context, name string, flags CommandFlags, ch *commands.C`
`98`	`99`	`}`
`99`	`100`	`}`
`100`	`101`
`101`		`- err = ch.PrintObj(bp)`
	`102`	`+ bpArray := []runtime.Object{bp}`
	`103`	`+`
	`104`	`+ err = ch.PrintObjs(bpArray)`
`102`	`105`	`if err != nil {`
`103`	`106`	`return err`
`104`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ package clusterbuildpack`
`5`	`5`
`6`	`6`	`import (`
`7`	`7`	`"context"`
	`8`	`+ "k8s.io/apimachinery/pkg/runtime"`
`8`	`9`
`9`	`10`	`"github.com/pivotal/kpack/pkg/apis/build/v1alpha2"`
`10`	`11`	`"github.com/spf13/cobra"`
`@@ -79,7 +80,9 @@ func patch(ctx context.Context, cbp *v1alpha2.ClusterBuildpack, flags CommandFla`
`79`	`80`	`}`
`80`	`81`	`}`
`81`	`82`
`82`		`- if err = ch.PrintObj(updatedCbp); err != nil {`
	`83`	`+ updatedCbpArray := []runtime.Object{updatedCbp}`
	`84`	`+`
	`85`	`+ if err = ch.PrintObjs(updatedCbpArray); err != nil {`
`83`	`86`	`return err`
`84`	`87`	`}`
`85`	`88`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ import (`
`8`	`8`
`9`	`9`	`"github.com/spf13/cobra"`
`10`	`10`	`metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"`
	`11`	`+ "k8s.io/apimachinery/pkg/runtime"`
`11`	`12`	`"k8s.io/client-go/dynamic"`
`12`	`13`
`13`	`14`	`"github.com/vmware-tanzu/kpack-cli/pkg/clusterstack"`
`@@ -93,7 +94,9 @@ func create(ctx context.Context, name, buildImageRef, runImageRef string, factor`
`93`	`94`	`}`
`94`	`95`	`}`
`95`	`96`
`96`		`- if err = ch.PrintObj(stack); err != nil {`
	`97`	`+ stackArray := []runtime.Object{stack}`
	`98`	`+`
	`99`	`+ if err = ch.PrintObjs(stackArray); err != nil {`
`97`	`100`	`return err`
`98`	`101`	`}`
`99`	`102`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ package clusterstack`
`6`	`6`	`import (`
`7`	`7`	`"context"`
`8`	`8`	`"io"`
	`9`	`+ "k8s.io/apimachinery/pkg/runtime"`
`9`	`10`
`10`	`11`	`"github.com/google/go-containerregistry/pkg/authn"`
`11`	`12`	`v1 "github.com/google/go-containerregistry/pkg/v1"`
`@@ -116,7 +117,9 @@ func patch(ctx context.Context, keychain authn.Keychain, stack *v1alpha2.Cluster`
`116`	`117`	`}`
`117`	`118`	`}`
`118`	`119`
`119`		`- if err = ch.PrintObj(updatedStack); err != nil {`
	`120`	`+ updatedStackArray := []runtime.Object{updatedStack}`
	`121`	`+`
	`122`	`+ if err = ch.PrintObjs(updatedStackArray); err != nil {`
`120`	`123`	`return err`
`121`	`124`	`}`
`122`	`125`