diff --git a/pkg/cmd/cli/backuplocation/create.go b/pkg/cmd/cli/backuplocation/create.go index d3c12ea47..bb17f9615 100644 --- a/pkg/cmd/cli/backuplocation/create.go +++ b/pkg/cmd/cli/backuplocation/create.go @@ -172,12 +172,12 @@ func (o *CreateOptions) Run(c *cobra.Command, f client.Factory) error { return err } - client, err := f.KubebuilderClient() + kbClient, err := f.KubebuilderClient() if err != nil { return err } - if err := client.Create(context.Background(), backupStorageLocation, &kbclient.CreateOptions{}); err != nil { + if err := kbClient.Create(context.Background(), backupStorageLocation, &kbclient.CreateOptions{}); err != nil { return errors.WithStack(err) } diff --git a/pkg/cmd/cli/backuplocation/get.go b/pkg/cmd/cli/backuplocation/get.go index e6133d492..422459b40 100644 --- a/pkg/cmd/cli/backuplocation/get.go +++ b/pkg/cmd/cli/backuplocation/get.go @@ -19,11 +19,11 @@ package backuplocation import ( "context" - kbclient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/spf13/cobra" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + kbclient "sigs.k8s.io/controller-runtime/pkg/client" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" "github.com/vmware-tanzu/velero/pkg/client" "github.com/vmware-tanzu/velero/pkg/cmd" @@ -40,14 +40,14 @@ func NewGetCommand(f client.Factory, use string) *cobra.Command { err := output.ValidateFlags(c) cmd.CheckError(err) - client, err := f.KubebuilderClient() + kbClient, err := f.KubebuilderClient() cmd.CheckError(err) locations := new(velerov1api.BackupStorageLocationList) if len(args) > 0 { location := &velerov1api.BackupStorageLocation{} for _, name := range args { - err = client.Get(context.Background(), kbclient.ObjectKey{ + err = kbClient.Get(context.Background(), kbclient.ObjectKey{ Namespace: f.Namespace(), Name: name, }, location) @@ -55,7 +55,7 @@ func NewGetCommand(f client.Factory, use string) *cobra.Command { locations.Items = append(locations.Items, *location) } } else { - err := client.List(context.Background(), locations, &kbclient.ListOptions{ + err := kbClient.List(context.Background(), locations, &kbclient.ListOptions{ Namespace: f.Namespace(), }) cmd.CheckError(err)