Skip to content

Change the output of import commands to return arrays #365

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chenbh merged 2 commits into from
Jan 23, 2024
Merged

Change the output of import commands to return arrays #365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f45aff
Change the output of import commands to return arrays
xtreme-shane-lattanzio Oct 11, 2023
7aa3c91
Maintain yaml logic to not create an array
xtreme-shane-lattanzio Nov 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion pkg/commands/builder/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import (
"context"
"fmt"

"k8s.io/apimachinery/pkg/runtime"
Comment thread
xtreme-shane-lattanzio marked this conversation as resolved.

"github.com/pivotal/kpack/pkg/apis/build/v1alpha2"
"github.com/spf13/cobra"
corev1 "k8s.io/api/core/v1"
Expand Down Expand Up @@ -144,7 +146,8 @@ func create(ctx context.Context, name string, flags CommandFlags, ch *commands.C
}
}

err = ch.PrintObj(bldr)
err = ch.PrintObjs([]runtime.Object{bldr})

if err != nil {
return err
}
Expand Down
5 changes: 4 additions & 1 deletion pkg/commands/builder/patch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
}

Expand Down
5 changes: 4 additions & 1 deletion pkg/commands/buildpack/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
}
Expand Down
5 changes: 4 additions & 1 deletion pkg/commands/buildpack/patch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
}

Expand Down
6 changes: 4 additions & 2 deletions pkg/commands/clusterbuilder/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
}
Expand Down
5 changes: 4 additions & 1 deletion pkg/commands/clusterbuilder/patch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
}

Expand Down
5 changes: 4 additions & 1 deletion pkg/commands/clusterbuildpack/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
}
Expand Down
5 changes: 4 additions & 1 deletion pkg/commands/clusterbuildpack/patch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
}

Expand Down
5 changes: 4 additions & 1 deletion pkg/commands/clusterstack/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
}

Expand Down
5 changes: 4 additions & 1 deletion pkg/commands/clusterstack/patch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
}

Expand Down
7 changes: 5 additions & 2 deletions pkg/commands/clusterstore/add.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
}

Expand Down
5 changes: 4 additions & 1 deletion pkg/commands/clusterstore/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
}

Expand Down
5 changes: 4 additions & 1 deletion pkg/commands/clusterstore/remove.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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
}

Expand Down
23 changes: 14 additions & 9 deletions pkg/commands/command_helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -117,19 +118,25 @@ 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 {
err := ch.checkKind(obj)

if err != nil {
return err
}
}
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)]
Expand All @@ -138,9 +145,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 {
Expand Down
5 changes: 4 additions & 1 deletion pkg/commands/image/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
}
Expand Down
5 changes: 4 additions & 1 deletion pkg/commands/image/patch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
}

Expand Down
Loading