feat(acl list): add flags to filter by resource

pkg/cmd/kafka/acl/admin/admin.go

@@ -103,7 +103,7 @@ func NewAdminACLCommand(f *factory.Factory) *cobra.Command {
 		},
 	}
 
-	fs := flagset.NewFlagSet(cmd, opts.localizer, opts.connection)
+	fs := flagset.NewFlagSet(cmd, opts.localizer, f)
 
 	fs.AddUser(&userID)
 	fs.AddServiceAccount(&serviceAccount)

pkg/cmd/kafka/acl/create/create.go

@@ -65,7 +65,7 @@ func NewCreateCommand(f *factory.Factory) *cobra.Command {
 		},
 	}
 
-	flags := flagutil.NewFlagSet(cmd, opts.Localizer, opts.Connection)
+	flags := flagutil.NewFlagSet(cmd, opts.Localizer, f)
 
 	_ = flags.AddPermissionCreate(&opts.Permission).Required()
 	_ = flags.AddOperationCreate(&opts.Operation).Required()

pkg/cmd/kafka/acl/delete/delete.go

@@ -66,7 +66,7 @@ func NewDeleteCommand(f *factory.Factory) *cobra.Command {
 		},
 	}
 
-	flags := flagutil.NewFlagSet(cmd, opts.Localizer, opts.Connection)
+	flags := flagutil.NewFlagSet(cmd, opts.Localizer, f)
 
 	_ = flags.AddPermissionFilter(&opts.Permission).Required()
 	_ = flags.AddOperationFilter(&opts.Operation).Required()

pkg/cmd/kafka/acl/flagutil/flagset.go

@@ -23,19 +23,17 @@ var ResourceTypeFlagEntries []*localize.TemplateEntry = []*localize.TemplateEntr
 }
 
 type flagSet struct {
-	cmd       *cobra.Command
-	localizer localize.Localizer
-	conn      factory.ConnectionFunc
+	cmd     *cobra.Command
+	factory *factory.Factory
 	*flagutil.FlagSet
 }
 
 // NewFlagSet returns a new flag set with common Kafka ACL flags
-func NewFlagSet(cmd *cobra.Command, localizer localize.Localizer, conn factory.ConnectionFunc) *flagSet {
+func NewFlagSet(cmd *cobra.Command, localizer localize.Localizer, f *factory.Factory) *flagSet {
 	return &flagSet{
-		cmd:       cmd,
-		localizer: localizer,
-		conn:      conn,
-		FlagSet:   flagutil.NewFlagSet(cmd, localizer),
+		cmd:     cmd,
+		factory: f,
+		FlagSet: flagutil.NewFlagSet(cmd, localizer),
 	}
 }
 
@@ -54,7 +52,7 @@ func (fs *flagSet) AddResourceType(resourceType *string) *flagutil.FlagOptions {
 		resourceType,
 		flagName,
 		aclutil.ResourceTypeANY,
-		flagutil.FlagDescription(fs.localizer, "kafka.acl.common.flag.resourceType", resourceTypes...),
+		flagutil.FlagDescription(fs.factory.Localizer, "kafka.acl.common.flag.resourceType", resourceTypes...),
 	)
 
 	_ = fs.cmd.RegisterFlagCompletionFunc(flagName, func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
@@ -79,7 +77,7 @@ func (fs *flagSet) AddOperationFilter(operationType *string) *flagutil.FlagOptio
 		operationType,
 		flagName,
 		"",
-		flagutil.FlagDescription(fs.localizer, "kafka.acl.common.flag.operation.description", operations...),
+		flagutil.FlagDescription(fs.factory.Localizer, "kafka.acl.common.flag.operation.description", operations...),
 	)
 
 	_ = fs.cmd.RegisterFlagCompletionFunc(flagName, func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
@@ -104,7 +102,7 @@ func (fs *flagSet) AddOperationCreate(operationType *string) *flagutil.FlagOptio
 		operationType,
 		flagName,
 		"",
-		flagutil.FlagDescription(fs.localizer, "kafka.acl.common.flag.operation.description", operations...),
+		flagutil.FlagDescription(fs.factory.Localizer, "kafka.acl.common.flag.operation.description", operations...),
 	)
 
 	_ = fs.cmd.RegisterFlagCompletionFunc(flagName, func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
@@ -129,7 +127,7 @@ func (fs *flagSet) AddPermissionFilter(permission *string) *flagutil.FlagOptions
 		permission,
 		flagName,
 		aclutil.PermissionANY,
-		flagutil.FlagDescription(fs.localizer, "kafka.acl.common.flag.permission.description", permissions...),
+		flagutil.FlagDescription(fs.factory.Localizer, "kafka.acl.common.flag.permission.description", permissions...),
 	)
 
 	_ = fs.cmd.RegisterFlagCompletionFunc(flagName, func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
@@ -154,7 +152,7 @@ func (fs *flagSet) AddPermissionCreate(permission *string) *flagutil.FlagOptions
 		permission,
 		flagName,
 		"",
-		flagutil.FlagDescription(fs.localizer, "kafka.acl.common.flag.permission.description", permissions...),
+		flagutil.FlagDescription(fs.factory.Localizer, "kafka.acl.common.flag.permission.description", permissions...),
 	)
 
 	_ = fs.cmd.RegisterFlagCompletionFunc(flagName, func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
@@ -172,8 +170,10 @@ func (fs *flagSet) AddTopic(topic *string) {
 		topic,
 		flagName,
 		"",
-		fs.localizer.MustLocalize("kafka.acl.common.flag.topic.description"),
+		fs.factory.Localizer.MustLocalize("kafka.acl.common.flag.topic.description"),
 	)
+
+	_ = flagutil.RegisterTopicCompletionFunc(fs.cmd, fs.factory)
 }
 
 // AddConsumerGroup adds a flag for setting the consumer group ID
@@ -184,8 +184,10 @@ func (fs *flagSet) AddConsumerGroup(group *string) {
 		group,
 		flagName,
 		"",
-		fs.localizer.MustLocalize("kafka.acl.common.flag.group.description"),
+		fs.factory.Localizer.MustLocalize("kafka.acl.common.flag.group.description"),
 	)
+
+	_ = flagutil.RegisterGroupCompletionFunc(fs.cmd, fs.factory)
 }
 
 // AddTransactionalID adds a flag for setting the consumer group ID
@@ -196,7 +198,7 @@ func (fs *flagSet) AddTransactionalID(id *string) {
 		id,
 		flagName,
 		"",
-		fs.localizer.MustLocalize("kafka.acl.common.flag.transactionalID.description"),
+		fs.factory.Localizer.MustLocalize("kafka.acl.common.flag.transactionalID.description"),
 	)
 }
 
@@ -208,7 +210,7 @@ func (fs *flagSet) AddPrefix(prefix *bool) {
 		prefix,
 		flagName,
 		false,
-		fs.localizer.MustLocalize("kafka.acl.common.flag.prefix.description"),
+		fs.factory.Localizer.MustLocalize("kafka.acl.common.flag.prefix.description"),
 	)
 }
 
@@ -220,7 +222,7 @@ func (fs *flagSet) AddCluster(prefix *bool) {
 		prefix,
 		flagName,
 		false,
-		fs.localizer.MustLocalize("kafka.acl.common.flag.cluster.description"),
+		fs.factory.Localizer.MustLocalize("kafka.acl.common.flag.cluster.description"),
 	)
 }
 
@@ -232,10 +234,10 @@ func (fs *flagSet) AddUser(userID *string) *flagutil.FlagOptions {
 		userID,
 		flagName,
 		"",
-		fs.localizer.MustLocalize("kafka.acl.common.flag.user.description"),
+		fs.factory.Localizer.MustLocalize("kafka.acl.common.flag.user.description"),
 	)
 
-	_ = flagutil.RegisterUserCompletionFunc(fs.cmd, flagName, fs.conn)
+	_ = flagutil.RegisterUserCompletionFunc(fs.cmd, flagName, fs.factory)
 
 	return flagutil.WithFlagOptions(fs.cmd, flagName)
 }
@@ -248,10 +250,10 @@ func (fs *flagSet) AddServiceAccount(serviceAccountID *string) *flagutil.FlagOpt
 		serviceAccountID,
 		flagName,
 		"",
-		fs.localizer.MustLocalize("kafka.acl.common.flag.serviceAccount.description"),
+		fs.factory.Localizer.MustLocalize("kafka.acl.common.flag.serviceAccount.description"),
 	)
 
-	_ = flagutil.RegisterServiceAccountCompletionFunc(fs.cmd, flagName, fs.conn)
+	_ = flagutil.RegisterServiceAccountCompletionFunc(fs.cmd, fs.factory)
 
 	return flagutil.WithFlagOptions(fs.cmd, flagName)
 }
@@ -264,7 +266,7 @@ func (fs *flagSet) AddInstanceID(id *string) {
 		id,
 		flagName,
 		"",
-		fs.localizer.MustLocalize("kafka.common.flag.instanceID.description"),
+		fs.factory.Localizer.MustLocalize("kafka.common.flag.instanceID.description"),
 	)
 }
 
@@ -276,6 +278,6 @@ func (fs *flagSet) AddAllAccounts(allAccounts *bool) {
 		allAccounts,
 		flagName,
 		false,
-		fs.localizer.MustLocalize("kafka.acl.common.flag.allAccounts.description"),
+		fs.factory.Localizer.MustLocalize("kafka.acl.common.flag.allAccounts.description"),
 	)
 }

pkg/cmd/kafka/acl/grant/grant.go

@@ -89,7 +89,7 @@ func NewGrantPermissionsACLCommand(f *factory.Factory) *cobra.Command {
 		},
 	}
 
-	flags := flagutil.NewFlagSet(cmd, opts.localizer, f.Connection)
+	flags := flagutil.NewFlagSet(cmd, opts.localizer, f)
 	flags.AddInstanceID(&opts.kafkaID)
 	flags.AddYes(&opts.force)
 

pkg/cmd/kafka/acl/list/list.go

@@ -112,7 +112,7 @@ func NewListACLCommand(f *factory.Factory) *cobra.Command {
 		},
 	}
 
-	flags := flagutil.NewFlagSet(cmd, opts.localizer, opts.connection)
+	flags := flagutil.NewFlagSet(cmd, opts.localizer, f)
 
 	flags.AddInstanceID(&opts.kafkaID)
 	flags.AddOutput(&opts.output)

pkg/cmd/kafka/consumergroup/delete/delete.go

@@ -10,9 +10,9 @@ import (
 	"github.com/redhat-developer/app-services-cli/internal/config"
 	"github.com/redhat-developer/app-services-cli/pkg/cmd/factory"
 	"github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/flagutil"
-	"github.com/redhat-developer/app-services-cli/pkg/cmdutil"
 	"github.com/redhat-developer/app-services-cli/pkg/connection"
 	"github.com/redhat-developer/app-services-cli/pkg/iostreams"
+	kafkacmdutil "github.com/redhat-developer/app-services-cli/pkg/kafka/cmdutil"
 	"github.com/redhat-developer/app-services-cli/pkg/localize"
 	"github.com/redhat-developer/app-services-cli/pkg/logging"
 )
@@ -76,7 +76,7 @@ func NewDeleteConsumerGroupCommand(f *factory.Factory) *cobra.Command {
 
 	// flag based completions for ID
 	_ = cmd.RegisterFlagCompletionFunc("id", func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-		return cmdutil.FilterValidConsumerGroupIDs(f, toComplete)
+		return kafkacmdutil.FilterValidConsumerGroupIDs(f, toComplete)
 	})
 
 	return cmd

pkg/cmd/kafka/consumergroup/describe/describe.go

@@ -11,19 +11,20 @@ import (
 
 	cgutil "github.com/redhat-developer/app-services-cli/pkg/kafka/consumergroup"
 
-	"github.com/redhat-developer/app-services-cli/pkg/cmdutil"
 	"github.com/redhat-developer/app-services-cli/pkg/localize"
 
 	"github.com/spf13/cobra"
 
 	"github.com/redhat-developer/app-services-cli/internal/config"
+
 	"github.com/redhat-developer/app-services-cli/pkg/cmd/factory"
 	"github.com/redhat-developer/app-services-cli/pkg/cmd/flag"
 	"github.com/redhat-developer/app-services-cli/pkg/cmdutil/flagutil"
 	"github.com/redhat-developer/app-services-cli/pkg/color"
 	"github.com/redhat-developer/app-services-cli/pkg/connection"
 	"github.com/redhat-developer/app-services-cli/pkg/dump"
 	"github.com/redhat-developer/app-services-cli/pkg/iostreams"
+	kafkacmdutil "github.com/redhat-developer/app-services-cli/pkg/kafka/cmdutil"
 )
 
 type options struct {
@@ -97,7 +98,7 @@ func NewDescribeConsumerGroupCommand(f *factory.Factory) *cobra.Command {
 
 	// flag based completions for ID
 	_ = cmd.RegisterFlagCompletionFunc("id", func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-		return cmdutil.FilterValidConsumerGroupIDs(f, toComplete)
+		return kafkacmdutil.FilterValidConsumerGroupIDs(f, toComplete)
 	})
 
 	flagutil.EnableOutputFlagCompletion(cmd)

pkg/cmd/kafka/consumergroup/list/list.go

@@ -13,6 +13,7 @@ import (
 	"github.com/redhat-developer/app-services-cli/pkg/cmd/flag"
 	"github.com/redhat-developer/app-services-cli/pkg/cmdutil"
 	"github.com/redhat-developer/app-services-cli/pkg/cmdutil/flagutil"
+	kafkacmdutil "github.com/redhat-developer/app-services-cli/pkg/kafka/cmdutil"
 
 	"github.com/spf13/cobra"
 
@@ -101,7 +102,7 @@ func NewListConsumerGroupCommand(f *factory.Factory) *cobra.Command {
 	flags.Int32VarP(&opts.size, "size", "", cmdutil.ConvertSizeValueToInt32(build.DefaultPageSize), opts.localizer.MustLocalize("kafka.consumerGroup.list.flag.size"))
 
 	_ = cmd.RegisterFlagCompletionFunc("topic", func(cmd *cobra.Command, _ []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-		return cmdutil.FilterValidTopicNameArgs(f, toComplete)
+		return kafkacmdutil.FilterValidTopicNameArgs(f, toComplete)
 	})
 
 	flagutil.EnableOutputFlagCompletion(cmd)

pkg/cmd/kafka/consumergroup/resetoffset/reset_offset.go

@@ -7,12 +7,12 @@ import (
 	"github.com/redhat-developer/app-services-cli/pkg/icon"
 
 	"github.com/AlecAivazis/survey/v2"
+	kafkacmdutil "github.com/redhat-developer/app-services-cli/pkg/kafka/cmdutil"
 	kafkainstanceclient "github.com/redhat-developer/app-services-sdk-go/kafkainstance/apiv1internal/client"
 	"github.com/spf13/cobra"
 
 	"github.com/redhat-developer/app-services-cli/internal/config"
 	"github.com/redhat-developer/app-services-cli/pkg/cmd/factory"
-	"github.com/redhat-developer/app-services-cli/pkg/cmdutil"
 	"github.com/redhat-developer/app-services-cli/pkg/cmdutil/flagutil"
 	"github.com/redhat-developer/app-services-cli/pkg/connection"
 	"github.com/redhat-developer/app-services-cli/pkg/iostreams"
@@ -107,12 +107,12 @@ func NewResetOffsetConsumerGroupCommand(f *factory.Factory) *cobra.Command {
 
 	// flag based completions for ID
 	_ = cmd.RegisterFlagCompletionFunc("id", func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-		return cmdutil.FilterValidConsumerGroupIDs(f, toComplete)
+		return kafkacmdutil.FilterValidConsumerGroupIDs(f, toComplete)
 	})
 
 	// flag based completions for topic
 	_ = cmd.RegisterFlagCompletionFunc("topic", func(cmd *cobra.Command, _ []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-		return cmdutil.FilterValidTopicNameArgs(f, toComplete)
+		return kafkacmdutil.FilterValidTopicNameArgs(f, toComplete)
 	})
 
 	flagutil.EnableOutputFlagCompletion(cmd)

pkg/cmd/kafka/topic/delete/delete.go

@@ -7,8 +7,8 @@ import (
 	"github.com/AlecAivazis/survey/v2"
 
 	"github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/flagutil"
-	"github.com/redhat-developer/app-services-cli/pkg/cmdutil"
 	"github.com/redhat-developer/app-services-cli/pkg/connection"
+	kafkacmdutil "github.com/redhat-developer/app-services-cli/pkg/kafka/cmdutil"
 	"github.com/redhat-developer/app-services-cli/pkg/localize"
 
 	"github.com/redhat-developer/app-services-cli/pkg/iostreams"
@@ -82,7 +82,7 @@ func NewDeleteTopicCommand(f *factory.Factory) *cobra.Command {
 	_ = cmd.MarkFlagRequired("name")
 
 	_ = cmd.RegisterFlagCompletionFunc("name", func(cmd *cobra.Command, _ []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-		return cmdutil.FilterValidTopicNameArgs(f, toComplete)
+		return kafkacmdutil.FilterValidTopicNameArgs(f, toComplete)
 	})
 	flags.AddYes(&opts.force)
 

pkg/cmd/kafka/topic/describe/describe.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"net/http"
 
-	"github.com/redhat-developer/app-services-cli/pkg/cmdutil"
 	"github.com/redhat-developer/app-services-cli/pkg/connection"
+	kafkacmdutil "github.com/redhat-developer/app-services-cli/pkg/kafka/cmdutil"
 	"github.com/redhat-developer/app-services-cli/pkg/localize"
 
 	"github.com/redhat-developer/app-services-cli/pkg/cmd/flag"
@@ -84,7 +84,7 @@ func NewDescribeTopicCommand(f *factory.Factory) *cobra.Command {
 
 	flags.StringVar(&opts.name, "name", "", opts.localizer.MustLocalize("kafka.topic.common.flag.output.description"))
 	_ = cmd.RegisterFlagCompletionFunc("name", func(cmd *cobra.Command, _ []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-		return cmdutil.FilterValidTopicNameArgs(f, toComplete)
+		return kafkacmdutil.FilterValidTopicNameArgs(f, toComplete)
 	})
 	_ = cmd.MarkFlagRequired("name")
 

pkg/cmd/kafka/topic/update/update.go

@@ -7,8 +7,8 @@ import (
 
 	"github.com/AlecAivazis/survey/v2"
 
-	"github.com/redhat-developer/app-services-cli/pkg/cmdutil"
 	"github.com/redhat-developer/app-services-cli/pkg/connection"
+	kafkacmdutil "github.com/redhat-developer/app-services-cli/pkg/kafka/cmdutil"
 	"github.com/redhat-developer/app-services-cli/pkg/localize"
 
 	"github.com/redhat-developer/app-services-cli/pkg/cmdutil/flagutil"
@@ -158,7 +158,7 @@ func NewUpdateTopicCommand(f *factory.Factory) *cobra.Command {
 
 	flags.StringVar(&opts.name, "name", "", opts.localizer.MustLocalize("kafka.topic.common.flag.name.description"))
 	_ = cmd.RegisterFlagCompletionFunc("name", func(cmd *cobra.Command, _ []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-		return cmdutil.FilterValidTopicNameArgs(f, toComplete)
+		return kafkacmdutil.FilterValidTopicNameArgs(f, toComplete)
 	})
 	_ = cmd.MarkFlagRequired("name")
 

pkg/cmd/kafka/update/update.go

@@ -119,7 +119,7 @@ func NewUpdateCommand(f *factory.Factory) *cobra.Command {
 	flags.StringVar(&opts.name, "name", "", opts.localizer.MustLocalize("kafka.update.flag.name"))
 
 	_ = kafkacmdutil.RegisterNameFlagCompletionFunc(cmd, f)
-	_ = flagutil.RegisterUserCompletionFunc(cmd, "owner", f.Connection)
+	_ = flagutil.RegisterUserCompletionFunc(cmd, "owner", f)
 
 	return cmd
 }