Skip to content

Commit

Permalink
merge master
Browse files Browse the repository at this point in the history
  • Loading branch information
jbvmio committed Mar 6, 2019
2 parents 6b8fc2c + 887566b commit 878d88a
Show file tree
Hide file tree
Showing 6 changed files with 63 additions and 250 deletions.
249 changes: 0 additions & 249 deletions .commit.log

This file was deleted.

29 changes: 29 additions & 0 deletions cli/cmd/broker/getApiVers.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package broker

import (
"github.com/jbvmio/kafkactl/cli/kafka"
"github.com/jbvmio/kafkactl/cli/x/out"

"github.com/spf13/cobra"
)

var CmdGetApiVers = &cobra.Command{
Use: "apis",
Aliases: []string{"api"},
Short: "Get API Protocol Version Details",
Run: func(cmd *cobra.Command, args []string) {
switch {
case cmd.Flags().Changed("out"):
outFmt, err := cmd.Flags().GetString("out")
if err != nil {
out.Warnf("WARN: %v", err)
}
out.IfErrf(out.Marshal(kafka.GetAPIVersions(), outFmt))
default:
kafka.PrintOut(kafka.GetAPIVersions())
}
},
}

func init() {
}
2 changes: 1 addition & 1 deletion cli/cmd/broker/getBroker.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ var CmdGetBroker = &cobra.Command{
Aliases: []string{"brokers"},
Short: "Get Broker Details",
Run: func(cmd *cobra.Command, args []string) {
switch true {
switch {
case cmd.Flags().Changed("out"):
outFmt, err := cmd.Flags().GetString("out")
if err != nil {
Expand Down
1 change: 1 addition & 0 deletions cli/cmd/get/get.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ func init() {
CmdGet.PersistentFlags().StringVarP(&outFlags.Format, "out", "o", "", "Change Output Format - yaml|json.")

CmdGet.AddCommand(broker.CmdGetBroker)
CmdGet.AddCommand(broker.CmdGetApiVers)
CmdGet.AddCommand(topic.CmdGetTopic)
CmdGet.AddCommand(group.CmdGetGroup)
CmdGet.AddCommand(group.CmdGetMember)
Expand Down
27 changes: 27 additions & 0 deletions cli/kafka/apiversions.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,39 @@
package kafka

import (
"sort"

"github.com/jbvmio/kafkactl/cli/cx"
"github.com/jbvmio/kafkactl/cli/x/out"

kafkactl "github.com/jbvmio/kafka"
)

// APIVersion describes an API Version Key and its Max Version.
type APIVersion struct {
Name string
Key int16
MaxVersion int16
}

func GetAPIVersions() []APIVersion {
var apiVersions []APIVersion
apiVers, err := client.GetAPIVersions()
handleC("Error: %v", err)
for k := range apiVers {
api := APIVersion{
Name: kafkactl.APIDescriptions[k],
Key: k,
MaxVersion: apiVers[k],
}
apiVersions = append(apiVersions, api)
}
sort.Slice(apiVersions, func(i, j int) bool {
return apiVersions[i].Key < apiVersions[j].Key
})
return apiVersions
}

func findKafkaVersion(context *cx.Context) string {
bootStrap, err := kafkactl.ReturnFirstValid(context.Brokers...)
if err != nil {
Expand Down
5 changes: 5 additions & 0 deletions cli/kafka/print.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,11 @@ func PrintOut(i interface{}) {
for _, v := range i {
tbl.AddRow(v.Group, v.Topic, v.TotalLag)
}
case []APIVersion:
tbl = table.New("NAME", "KEY", "MAXVERSION")
for _, v := range i {
tbl.AddRow(v.Name, v.Key, v.MaxVersion)
}
}
tbl.WithHeaderFormatter(headerFmt).WithFirstColumnFormatter(columnFmt)
tbl.Print()
Expand Down

0 comments on commit 878d88a

Please sign in to comment.