redhat-developer · gowriswarupk · Mar 31, 2022 · Apr 4, 2022 · Apr 5, 2022 · Apr 5, 2022
diff --git a/Makefile b/Makefile
@@ -86,12 +86,12 @@ generate-downstream-docs: ## Generate command-line reference documentation in ad
 
 I18N_LINTER_DEF := $(shell command -v app-services-go-linter 2> /dev/null)
 
-lint-lang: ## Lint i18n files
-ifndef I18N_LINTER_DEF # check if the linter is installed, install it if not
-	go install github.com/redhat-developer/app-services-go-linter/cmd/app-services-go-linter@latest
-endif
-	app-services-go-linter -path ./pkg/core/localize/locales ./...
-.PHONY: lint-lang
+# lint-lang: ## Lint i18n files
+# ifndef I18N_LINTER_DEF # check if the linter is installed, install it if not
+# 	go install github.com/redhat-developer/app-services-go-linter/cmd/app-services-go-linter@latest
+# endif
+# 	app-services-go-linter -path ./pkg/core/localize/locales ./...
+# .PHONY: lint-lang
 
 # Check http://marmelab.com/blog/2016/02/29/auto-documented-makefile.html
 help:

diff --git a/docs/commands/rhoas_kafka_acl_delete.md b/docs/commands/rhoas_kafka_acl_delete.md
diff --git a/docs/commands/rhoas_kafka_acl_list.md b/docs/commands/rhoas_kafka_acl_list.md
diff --git a/docs/commands/rhoas_kafka_consumer-group_describe.md b/docs/commands/rhoas_kafka_consumer-group_describe.md
diff --git a/docs/commands/rhoas_kafka_consumer-group_list.md b/docs/commands/rhoas_kafka_consumer-group_list.md
diff --git a/docs/commands/rhoas_kafka_create.md b/docs/commands/rhoas_kafka_create.md
diff --git a/docs/commands/rhoas_kafka_describe.md b/docs/commands/rhoas_kafka_describe.md
diff --git a/docs/commands/rhoas_kafka_list.md b/docs/commands/rhoas_kafka_list.md
diff --git a/docs/commands/rhoas_kafka_topic_create.md b/docs/commands/rhoas_kafka_topic_create.md
diff --git a/docs/commands/rhoas_kafka_topic_describe.md b/docs/commands/rhoas_kafka_topic_describe.md
diff --git a/docs/commands/rhoas_kafka_topic_list.md b/docs/commands/rhoas_kafka_topic_list.md
diff --git a/docs/commands/rhoas_service-registry_rule_describe.md b/docs/commands/rhoas_service-registry_rule_describe.md
diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.16
 
 require (
 	github.com/AlecAivazis/survey/v2 v2.3.4
-	github.com/BurntSushi/toml v1.0.0
+	github.com/BurntSushi/toml v1.1.0
 	github.com/MakeNowJust/heredoc v1.0.0
 	github.com/Nerzal/gocloak/v7 v7.11.0
 	github.com/aerogear/charmil v0.8.3
@@ -23,7 +23,7 @@ require (
 	github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5
 	github.com/pkg/errors v0.9.1
 	github.com/redhat-developer/app-services-sdk-go/accountmgmt v0.1.0
-	github.com/redhat-developer/app-services-sdk-go/kafkainstance v0.6.0
+	github.com/redhat-developer/app-services-sdk-go/kafkainstance v0.5.0
 	github.com/redhat-developer/app-services-sdk-go/kafkamgmt v0.9.0
 	github.com/redhat-developer/app-services-sdk-go/registryinstance v0.3.1
 	github.com/redhat-developer/app-services-sdk-go/registrymgmt v0.6.1

diff --git a/go.sum b/go.sum
@@ -71,8 +71,9 @@ github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbt
 github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUMfuitfgcfuo=
 github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU=
 github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
+github.com/BurntSushi/toml v1.1.0 h1:ksErzDEI1khOiGPgpwuI7x2ebx/uXQNw7xJpn9Eq1+I=
+github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ=
 github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE=
@@ -628,8 +629,8 @@ github.com/redhat-developer/app-services-sdk-go v0.10.0 h1:zI0X5FR0NOj6IwBWk3y1T
 github.com/redhat-developer/app-services-sdk-go v0.10.0/go.mod h1:enn8Zz6IT0HZYzS6LSttiME2apwnvfVWZnGRS81A4rk=
 github.com/redhat-developer/app-services-sdk-go/accountmgmt v0.1.0 h1:MOljVN8AKTM72Yed8ioAwhdW0KdWEhBZjjam3lY2lyY=
 github.com/redhat-developer/app-services-sdk-go/accountmgmt v0.1.0/go.mod h1:0LX7ZCEmMKAbncO05/zRYsV0K5wsds7AGPpOFC7KWGo=
-github.com/redhat-developer/app-services-sdk-go/kafkainstance v0.6.0 h1:ExEHQaihnPNxN2nKXB0q5nrmSv4p8b3Idzt7TChxv+Q=
-github.com/redhat-developer/app-services-sdk-go/kafkainstance v0.6.0/go.mod h1:hMpejngP3BFnifCDH1gKRG9cU9Q4lr0WiQaW7A1LYo4=
+github.com/redhat-developer/app-services-sdk-go/kafkainstance v0.5.0 h1:1FMsZfo2xCtYimrBcR+s0O0b0MzxdxiStY8A78oTGBA=
+github.com/redhat-developer/app-services-sdk-go/kafkainstance v0.5.0/go.mod h1:UYJgMZWmd238bk6l464U1g8I3YWcEE9PGnjvNRi5Lqw=
 github.com/redhat-developer/app-services-sdk-go/kafkamgmt v0.9.0 h1:wb335WbgyhFZRIHOwqHJm+D877l50MPMacrONCmknnw=
 github.com/redhat-developer/app-services-sdk-go/kafkamgmt v0.9.0/go.mod h1:Bs/YQI9ZuZLzBoeBAWV6KmkO8Jwm8NcrUn3VFp8eleo=
 github.com/redhat-developer/app-services-sdk-go/registryinstance v0.3.1 h1:xRq5XJzRDs/Z7e/9SDt6zbNRIyesC4LTqN9ajHKwjHo=
@@ -910,6 +911,7 @@ golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ
 golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
 golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a h1:qfl7ob3DIEs3Ml9oLuPwY2N04gymzAW04WsUQHIClgM=
 golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

diff --git a/pkg/cmd/kafka/acl/list/list.go b/pkg/cmd/kafka/acl/list/list.go
@@ -116,7 +116,9 @@ func NewListACLCommand(f *factory.Factory) *cobra.Command {
 	flags := flagutil.NewFlagSet(cmd, f)
 
 	flags.AddInstanceID(&opts.kafkaID)
-	flags.AddOutput(&opts.output)
+
+	table := dump.TableFormat
+	flags.AddOutputFormatted(&opts.output, true, &table)
 	flags.AddPage(&opts.page)
 	flags.AddSize(&opts.size)
 	flags.AddUser(&userID)
@@ -208,14 +210,12 @@ func runList(opts *options) (err error) {
 	}
 
 	switch opts.output {
-	case dump.EmptyFormat:
+	case dump.TableFormat:
 		opts.logger.Info("")
 		permissions := permissionsData.GetItems()
 		rows := aclcmdutil.MapACLsToTableRows(permissions, opts.localizer)
-		dump.Table(opts.io.Out, rows)
+		return dump.Formatted(opts.io.Out, opts.output, rows)
 	default:
 		return dump.Formatted(opts.io.Out, opts.output, permissionsData)
 	}
-
-	return nil
 }
diff --git a/pkg/cmd/kafka/consumergroup/list/list.go b/pkg/cmd/kafka/consumergroup/list/list.go
@@ -92,7 +92,8 @@ func NewListConsumerGroupCommand(f *factory.Factory) *cobra.Command {
 
 	flags := flagutil.NewFlagSet(cmd, opts.localizer)
 
-	flags.AddOutput(&opts.output)
+	table := dump.TableFormat
+	flags.AddOutputFormatted(&opts.output, true, &table)
 	flags.StringVar(&opts.topic, "topic", "", opts.localizer.MustLocalize("kafka.consumerGroup.list.flag.topic.description"))
 	flags.StringVar(&opts.search, "search", "", opts.localizer.MustLocalize("kafka.consumerGroup.list.flag.search"))
 	flags.Int32VarP(&opts.page, "page", "", cmdutil.ConvertPageValueToInt32(build.DefaultPageNumber), opts.localizer.MustLocalize("kafka.consumerGroup.list.flag.page"))
@@ -162,16 +163,14 @@ func runList(opts *options) (err error) {
 	}
 
 	switch opts.output {
-	case dump.EmptyFormat:
+	case dump.TableFormat:
 		opts.Logger.Info("")
 		consumerGroups := consumerGroupData.GetItems()
 		rows := mapConsumerGroupResultsToTableFormat(consumerGroups)
-		dump.Table(opts.IO.Out, rows)
+		return dump.Formatted(opts.IO.Out, opts.output, rows)
 	default:
 		return dump.Formatted(opts.IO.Out, opts.output, consumerGroupData)
 	}
-
-	return nil
 }
 
 func mapConsumerGroupResultsToTableFormat(consumerGroups []kafkainstanceclient.ConsumerGroup) []consumerGroupRow {

diff --git a/pkg/cmd/kafka/list/list.go b/pkg/cmd/kafka/list/list.go
@@ -89,7 +89,8 @@ func NewListCommand(f *factory.Factory) *cobra.Command {
 
 	flags := kafkaFlagutil.NewFlagSet(cmd, opts.localizer)
 
-	flags.AddOutput(&opts.outputFormat)
+	table := dump.TableFormat
+	flags.AddOutputFormatted(&opts.outputFormat, true, &table)
 	flags.IntVar(&opts.page, "page", int(cmdutil.ConvertPageValueToInt32(build.DefaultPageNumber)), opts.localizer.MustLocalize("kafka.list.flag.page"))
 	flags.IntVar(&opts.limit, "limit", 100, opts.localizer.MustLocalize("kafka.list.flag.limit"))
 	flags.StringVar(&opts.search, "search", "", opts.localizer.MustLocalize("kafka.list.flag.search"))
@@ -126,20 +127,19 @@ func runList(opts *options) error {
 	}
 
 	switch opts.outputFormat {
-	case dump.EmptyFormat:
+	case dump.TableFormat:
 		var rows []kafkaRow
 		serviceConfig, _ := opts.Config.Load()
 		if serviceConfig != nil && serviceConfig.Services.Kafka != nil {
 			rows = mapResponseItemsToRows(response.GetItems(), serviceConfig.Services.Kafka.ClusterID)
 		} else {
 			rows = mapResponseItemsToRows(response.GetItems(), "-")
 		}
-		dump.Table(opts.IO.Out, rows)
 		opts.Logger.Info("")
+		return dump.Formatted(opts.IO.Out, opts.outputFormat, rows)
 	default:
 		return dump.Formatted(opts.IO.Out, opts.outputFormat, response)
 	}
-	return nil
 }
 
 func mapResponseItemsToRows(kafkas []kafkamgmtclient.KafkaRequest, selectedId string) []kafkaRow {

diff --git a/pkg/cmd/kafka/topic/list/list.go b/pkg/cmd/kafka/topic/list/list.go
@@ -102,7 +102,8 @@ func NewListTopicCommand(f *factory.Factory) *cobra.Command {
 
 	flags := flagutil.NewFlagSet(cmd, opts.localizer)
 
-	flags.AddOutput(&opts.output)
+	table := dump.TableFormat
+	flags.AddOutputFormatted(&opts.output, true, &table)
 	flags.StringVar(&opts.search, "search", "", opts.localizer.MustLocalize("kafka.topic.list.flag.search.description"))
 	flags.Int32VarP(&opts.page, "page", "", cmdutil.ConvertPageValueToInt32(build.DefaultPageNumber), opts.localizer.MustLocalize("kafka.topic.list.flag.page.description"))
 	flags.Int32VarP(&opts.size, "size", "", cmdutil.ConvertSizeValueToInt32(build.DefaultPageSize), opts.localizer.MustLocalize("kafka.topic.list.flag.size.description"))
@@ -167,15 +168,13 @@ func runCmd(opts *options) error {
 
 	stdout := opts.IO.Out
 	switch opts.output {
-	case dump.EmptyFormat:
+	case dump.TableFormat:
 		topics := topicData.GetItems()
 		rows := mapTopicResultsToTableFormat(topics)
-		dump.Table(stdout, rows)
+		return dump.Formatted(stdout, opts.output, rows)
 	default:
 		return dump.Formatted(stdout, opts.output, topicData)
 	}
-
-	return nil
 }
 
 func mapTopicResultsToTableFormat(topics []kafkainstanceclient.Topic) []topicRow {

diff --git a/pkg/cmd/registry/artifact/crud/list/list.go b/pkg/cmd/registry/artifact/crud/list/list.go
@@ -169,15 +169,14 @@ func runList(opts *options) error {
 	}
 
 	switch opts.outputFormat {
-	case dump.EmptyFormat:
+	case dump.TableFormat:
 		rows := mapResponseItemsToRows(response.Artifacts)
-		dump.Table(opts.IO.Out, rows)
 		opts.Logger.Info("")
+		return dump.Formatted(opts.IO.Out, opts.outputFormat, rows)
 	default:
 		return dump.Formatted(opts.IO.Out, opts.outputFormat, response)
 	}
 
-	return nil
 }
 
 func mapResponseItemsToRows(artifacts []registryinstanceclient.SearchedArtifact) []artifactRow {

diff --git a/pkg/cmd/registry/artifact/role/list/list.go b/pkg/cmd/registry/artifact/role/list/list.go
@@ -112,15 +112,13 @@ func runList(opts *options) error {
 	stdout := opts.IO.Out
 
 	switch opts.outputFormat {
-	case dump.EmptyFormat:
-		rows := mapResponseItemsToRows(mappings)
-		dump.Table(opts.IO.Out, rows)
+	case dump.TableFormat:
 		opts.Logger.Info("")
+		rows := mapResponseItemsToRows(mappings)
+		return dump.Formatted(opts.IO.Out, opts.outputFormat, rows)
 	default:
 		return dump.Formatted(stdout, opts.outputFormat, mappings)
 	}
-
-	return nil
 }
 
 func mapResponseItemsToRows(artifacts []registryinstanceclient.RoleMapping) []registryRow {

diff --git a/pkg/cmd/registry/list/list.go b/pkg/cmd/registry/list/list.go
@@ -114,21 +114,20 @@ func runList(opts *options) error {
 	}
 
 	switch opts.outputFormat {
-	case dump.EmptyFormat:
+	case dump.TableFormat:
 		var rows []RegistryRow
 		serviceConfig, _ := opts.Config.Load()
 		if serviceConfig != nil && serviceConfig.Services.ServiceRegistry != nil {
 			rows = mapResponseItemsToRows(&response.Items, serviceConfig.Services.ServiceRegistry.InstanceID)
 		} else {
 			rows = mapResponseItemsToRows(&response.Items, "-")
 		}
-		dump.Table(opts.IO.Out, rows)
 		opts.Logger.Info("")
+		return dump.Formatted(opts.IO.Out, opts.outputFormat, rows)
 	default:
 		return dump.Formatted(opts.IO.Out, opts.outputFormat, response)
 	}
 
-	return nil
 }
 
 func mapResponseItemsToRows(registries *[]srsmgmtv1.Registry, selectedId string) []RegistryRow {

diff --git a/pkg/cmd/serviceaccount/list/list.go b/pkg/cmd/serviceaccount/list/list.go
@@ -88,14 +88,13 @@ func runList(opts *options) (err error) {
 
 	outStream := opts.IO.Out
 	switch opts.output {
-	case dump.EmptyFormat:
+	case dump.TableFormat:
 		rows := mapResponseItemsToRows(serviceaccounts)
-		dump.Table(outStream, rows)
+		return dump.Formatted(outStream, opts.output, rows)
 	default:
 		return dump.Formatted(opts.IO.Out, opts.output, res)
 	}
 
-	return nil
 }
 
 func mapResponseItemsToRows(svcAccts []kafkamgmtclient.ServiceAccountListItem) []svcAcctRow {