fix: change --all-principals to --all-accounts

Author: rkpattnaik780

.cases/kafka-acl-grant-permissions.sh

@@ -44,7 +44,7 @@ rhoas kafka acl grant-access --producer --user test_user --topic-prefix test_
 
 rhoas kafka acl grant-access --producer --user test_user --topic test_topic
 
-rhoas kafka acl grant-access --producer --all-principals --topic all
+rhoas kafka acl grant-access --producer --all-accounts --topic all
 
 rhoas kafka acl grant-access --consumer --service-account test_prefix --topic-prefix test_ 
 

docs/commands/rhoas_kafka_acl_grant-access.adoc

@@ -33,17 +33,17 @@ type options struct {
 	localizer  localize.Localizer
 	Context    context.Context
 
-	kafkaID       string
-	topic         string
-	user          string
-	svcAccount    string
-	group         string
-	producer      bool
-	consumer      bool
-	topicPrefix   string
-	groupPrefix   string
-	force         bool
-	allPrincipals bool
+	kafkaID     string
+	topic       string
+	user        string
+	svcAccount  string
+	group       string
+	producer    bool
+	consumer    bool
+	topicPrefix string
+	groupPrefix string
+	force       bool
+	allAccounts bool
 }
 
 // NewGrantPermissionsACLCommand creates a series of ACL rules
@@ -97,9 +97,9 @@ func NewGrantPermissionsACLCommand(f *factory.Factory) *cobra.Command {
 	cmd.Flags().BoolVar(&opts.producer, "producer", false, opts.localizer.MustLocalize("kafka.acl.grantPermissions.flag.producer.description"))
 	cmd.Flags().StringVar(&opts.topicPrefix, "topic-prefix", "", opts.localizer.MustLocalize("kafka.acl.common.flag.topicPrefix.description"))
 	cmd.Flags().StringVar(&opts.groupPrefix, "group-prefix", "", opts.localizer.MustLocalize("kafka.acl.common.flag.groupPrefix.description"))
-	cmd.Flags().StringVar(&opts.kafkaID, "instance-id", "", opts.localizer.MustLocalize("kafka.acl.common.flag.instance.id"))
-	cmd.Flags().BoolVar(&opts.allPrincipals, "all-principals", false, opts.localizer.MustLocalize("kafka.acl.common.flag.allPrincipals"))
-	cmd.Flags().BoolVarP(&opts.force, "yes", "y", false, opts.localizer.MustLocalize("kafka.acl.grantPermissions.flag.yes"))
+	cmd.Flags().StringVar(&opts.kafkaID, "instance-id", "", opts.localizer.MustLocalize("kafka.acl.common.flag.instance.id.description"))
+	cmd.Flags().BoolVar(&opts.allAccounts, "all-accounts", false, opts.localizer.MustLocalize("kafka.acl.common.flag.allAccounts.description"))
+	cmd.Flags().BoolVarP(&opts.force, "yes", "y", false, opts.localizer.MustLocalize("kafka.acl.grantPermissions.flag.yes.description"))
 
 	return cmd
 }
@@ -151,7 +151,7 @@ func runGrantPermissions(opts *options) (err error) {
 		userArg = buildPrincipal(opts.user)
 	}
 
-	if opts.allPrincipals {
+	if opts.allAccounts {
 		userArg = buildPrincipal(acl.Wildcard)
 	}
 
@@ -316,7 +316,7 @@ func validateFlagInputCombination(opts *options) error {
 	}
 
 	// check if priincipal is provided
-	if opts.user == "" && opts.svcAccount == "" && !opts.allPrincipals {
+	if opts.user == "" && opts.svcAccount == "" && !opts.allAccounts {
 		return opts.localizer.MustLocalizeError("kafka.acl.grantPermissions.error.noPrincipalsSelected")
 	}
 
@@ -325,8 +325,8 @@ func validateFlagInputCombination(opts *options) error {
 		return opts.localizer.MustLocalizeError("kafka.acl.grantPermissions.error.bothPrincipalsSelected")
 	}
 
-	// user and service account can't be along with "--all-principals" flag
-	if opts.allPrincipals && (opts.svcAccount != "" || opts.user != "") {
+	// user and service account can't be along with "--all-accounts" flag
+	if opts.allAccounts && (opts.svcAccount != "" || opts.user != "") {
 		return opts.localizer.MustLocalizeError("kafka.acl.grantPermissions.allPrinciapls.error.notAllowed")
 	}
 

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

@@ -74,7 +74,7 @@ func NewListACLCommand(f *factory.Factory) *cobra.Command {
 	cmd.Flags().Int32Var(&opts.page, "page", cmdutil.ConvertPageValueToInt32(build.DefaultPageNumber), opts.localizer.MustLocalize("kafka.acl.list.flag.page.description"))
 	cmd.Flags().Int32Var(&opts.size, "size", cmdutil.ConvertSizeValueToInt32(build.DefaultPageSize), opts.localizer.MustLocalize("kafka.acl.list.flag.size.description"))
 	cmd.Flags().StringVarP(&opts.output, "output", "o", dump.EmptyFormat, opts.localizer.MustLocalize("kafka.acl.list.flag.output.description"))
-	cmd.Flags().StringVar(&opts.kafkaID, "instance-id", "", opts.localizer.MustLocalize("kafka.acl.common.flag.instance.id"))
+	cmd.Flags().StringVar(&opts.kafkaID, "instance-id", "", opts.localizer.MustLocalize("kafka.acl.common.flag.instance.id.description"))
 
 	flagutil.EnableOutputFlagCompletion(cmd)
 

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

@@ -59,10 +59,10 @@ $ rhoas kafka acl grant-access --consumer --user user_name --topic-prefix "abc"
 $ rhoas kafka acl grant-access --producer --user user_name --topic-prefix "abc"
 
 # Grant access to all users for consuming messages from topic "my-topic"
-$ rhoas kafka acl grant-access --consumer --all-principals --topic my-topic --group my-group
+$ rhoas kafka acl grant-access --consumer --all-accounts --topic my-topic --group my-group
 
 # Grant access to all users for producing messages to topic "my-topic"
-$ rhoas kafka acl grant-access --producer --all-principals --topic my-topic
+$ rhoas kafka acl grant-access --producer --all-accounts --topic my-topic
 
 # Grant access to principal for produce and consume messages from all topics 
 $ rhoas kafka acl grant-access --producer --consumer --user user_name --topic all --group all
@@ -72,7 +72,7 @@ $ rhoas kafka acl grant-access --producer --consumer --user user_name --topic al
 one = 'flags "--user" and "--service-account" can not be provided simultaneously'
 
 [kafka.acl.grantPermissions.allPrinciapls.error.notAllowed]
-one = 'flags "--user" and "--service-account" can not be provided along with "--all-principals"'
+one = 'flags "--user" and "--service-account" can not be provided along with "--all-accounts"'
 
 [kafka.acl.grantPermissions.error.noPrincipalsSelected]
 one = 'principal is missing, provide "--user" or "--service-account" flag'
@@ -101,10 +101,10 @@ one = 'Prefix name for topics to be selected'
 [kafka.acl.common.flag.groupPrefix.description]
 one = 'Prefix name for groups to be selected'
 
-[kafka.acl.common.flag.allPrincipals]
+[kafka.acl.common.flag.allAccounts.description]
 one = 'Select all users and service accounts as principal'
 
-[kafka.acl.common.flag.instance.id]
+[kafka.acl.common.flag.instance.id.description]
 one = 'ID of the Kafka instance to be used. By default, uses the currently selected instance'
 
 [kafka.acl.grantPermissions.flag.producer.description]
@@ -113,7 +113,7 @@ one = 'Add ACL rules that grant the specified principal access to produce messag
 [kafka.acl.grantPermissions.flag.consumer.description]
 one = 'Add ACL rules that grant the specified principal access to consume messages from topics'
 
-[kafka.acl.grantPermissions.flag.yes]
+[kafka.acl.grantPermissions.flag.yes.description]
 one = 'Skip confirmation to add ACL rules'