minor fixes

Signed-off-by: Rashmi Gottipati <[email protected]>

Author: rashmigottipati

internal/cmd/internal/olmv1/catalog_update.go

@@ -2,7 +2,6 @@ package olmv1
 
 import (
 	"github.com/spf13/cobra"
-	"github.com/spf13/pflag"
 
 	"github.com/operator-framework/kubectl-operator/internal/cmd/internal/log"
 	v1action "github.com/operator-framework/kubectl-operator/internal/pkg/v1/action"
@@ -14,28 +13,31 @@ func NewCatalogUpdateCmd(cfg *action.Configuration) *cobra.Command {
 	i := v1action.NewCatalogUpdate(cfg)
 	i.Logf = log.Printf
 
+	var priority int32
+	var pollInterval int
+	var labels map[string]string
+
 	cmd := &cobra.Command{
 		Use:   "catalog <catalog>",
 		Short: "Update a catalog",
 		Args:  cobra.ExactArgs(1),
 		Run: func(cmd *cobra.Command, args []string) {
 			i.CatalogName = args[0]
+			i.Priority = &priority
+			i.PollIntervalMinutes = &pollInterval
+			i.Labels = labels
 			_, err := i.Run(cmd.Context())
 			if err != nil {
 				log.Fatalf("failed to update catalog: %v", err)
 			}
 			log.Printf("catalog %q updated", i.CatalogName)
 		},
 	}
-	bindCatalogUpdateFlags(cmd.Flags(), i)
+	cmd.Flags().Int32Var(&priority, "priority", 0, "priority determines the likelihood of a catalog being selected in conflict scenarios")
+	cmd.Flags().IntVar(&pollInterval, "source-poll-interval-minutes", 5, "catalog source polling interval [in minutes]. Set to 0 or -1 to remove the polling interval.")
+	cmd.Flags().StringToStringVar(&labels, "labels", map[string]string{}, "labels that will be added to the catalog")
+	cmd.Flags().StringVar(&i.AvailabilityMode, "availability-mode", "", "available means that the catalog should be active and serving data")
+	cmd.Flags().StringVar(&i.ImageRef, "image", "", "Image reference for the catalog source. Leave unset to retain the current image.")
 
 	return cmd
 }
-
-func bindCatalogUpdateFlags(fs *pflag.FlagSet, i *v1action.CatalogUpdate) {
-	fs.Int32Var(i.Priority, "priority", 1, "priority determines the likelihood of a catalog being selected in conflict scenarios")
-	fs.IntVar(i.PollIntervalMinutes, "source-poll-interval-minutes", 5, "catalog source polling interval [in minutes]. Set to 0 or -1 to remove the polling interval.")
-	fs.StringToStringVar(&i.Labels, "labels", map[string]string{}, "labels that will be added to the catalog")
-	fs.StringVar(&i.AvailabilityMode, "availability-mode", "", "available means that the catalog should be active and serving data")
-	fs.StringVar(&i.ImageRef, "image", "", "Image reference for the catalog source. Leave unset to retain the current image.")
-}

internal/pkg/v1/action/catalog_update.go

@@ -27,11 +27,8 @@ type CatalogUpdate struct {
 
 func NewCatalogUpdate(config *action.Configuration) *CatalogUpdate {
 	return &CatalogUpdate{
-		config:              config,
-		Logf:                func(string, ...interface{}) {},
-		Priority:            new(int32),
-		PollIntervalMinutes: new(int),
-		Labels:              make(map[string]string),
+		config: config,
+		Logf:   func(string, ...interface{}) {},
 	}
 }