Skip to content

Commit 19b9a5a

Browse files
birdayzbirdayz
committed
switch to latest upstream sarama
our admin changes are now included :)
1 parent 067380a commit 19b9a5a

File tree

544 files changed

+249240
-373
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

544 files changed

+249240
-373
lines changed

‎cmd/kaf/consume.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010

1111
"text/tabwriter"
1212

13-
"github.com/birdayz/sarama"
14-
"github.com/hokaccha/go-prettyjson"
13+
"github.com/Shopify/sarama"
14+
prettyjson "github.com/hokaccha/go-prettyjson"
1515
"github.com/spf13/cobra"
1616
)
1717

‎cmd/kaf/group.go

+37-21
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@ import (
1515

1616
"sync"
1717

18-
sarama "github.com/birdayz/sarama"
19-
"github.com/infinimesh/kaf"
18+
"github.com/Shopify/sarama"
2019
"github.com/spf13/cobra"
20+
21+
"github.com/infinimesh/kaf"
2122
)
2223

2324
func init() {
@@ -38,8 +39,7 @@ const (
3839
tabwriterFlags = 0
3940
)
4041

41-
var groupCmd = &cobra.Command{
42-
Use: "group",
42+
var groupCmd = &cobra.Command{Use: "group",
4343
Short: "Display information about consumer groups.",
4444
}
4545

@@ -80,25 +80,36 @@ var groupLsCmd = &cobra.Command{
8080
}
8181

8282
found := false
83-
for _, group := range groupList {
84-
if len(args) > 0 {
85-
if group == args[0] {
86-
found = true
87-
} else {
88-
continue
89-
}
90-
}
91-
92-
detail, err := admin.DescribeConsumerGroup(group)
93-
if err != nil {
94-
panic(err)
95-
}
83+
// for _, group := range groupList {
84+
// if len(args) > 0 {
85+
// if group == args[0] {
86+
// found = true
87+
// } else {
88+
// continue
89+
// }
90+
// }
91+
92+
// detail, err := admin.DescribeConsumerGroup(group)
93+
// if err != nil {
94+
// panic(err)
95+
// }
96+
97+
// state := detail.State
98+
// consumers := len(detail.Members)
99+
100+
// fmt.Fprintf(w, "%v\t%v\t%v\t\n", group, state, consumers)
101+
// found = true
102+
// }
103+
104+
groupDescs, err := admin.DescribeConsumerGroups(groupList)
105+
if err != nil {
106+
panic(err)
107+
}
96108

109+
for _, detail := range groupDescs {
97110
state := detail.State
98111
consumers := len(detail.Members)
99-
100-
fmt.Fprintf(w, "%v\t%v\t%v\t\n", group, state, consumers)
101-
found = true
112+
fmt.Fprintf(w, "%v\t%v\t%v\t\n", detail.GroupId, state, consumers)
102113
}
103114

104115
if found || len(args) == 0 {
@@ -123,11 +134,16 @@ var groupDescribeCmd = &cobra.Command{
123134
panic(err)
124135
}
125136

126-
group, err := admin.DescribeConsumerGroup(args[0])
137+
groups, err := admin.DescribeConsumerGroups([]string{args[0]})
127138
if err != nil {
128139
panic(err)
129140
}
130141

142+
if len(groups) == 0 {
143+
panic("Did not receive expected describe consumergroup result")
144+
}
145+
group := groups[0]
146+
131147
if group.State == "Dead" {
132148
fmt.Printf("Group %v not found.\n", args[0])
133149
return

‎cmd/kaf/kaf.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ import (
55

66
"os"
77

8-
sarama "github.com/birdayz/sarama"
9-
"github.com/infinimesh/kaf"
8+
"github.com/Shopify/sarama"
109
"github.com/spf13/cobra"
10+
11+
"github.com/infinimesh/kaf"
1112
)
1213

1314
var cfgFile string

‎cmd/kaf/produce.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"io/ioutil"
66
"os"
77

8-
sarama "github.com/birdayz/sarama"
8+
"github.com/Shopify/sarama"
99
"github.com/spf13/cobra"
1010
)
1111

‎cmd/kaf/topic.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"sort"
77
"text/tabwriter"
88

9-
sarama "github.com/birdayz/sarama"
9+
"github.com/Shopify/sarama"
1010
"github.com/spf13/cobra"
1111
)
1212

‎go.mod

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
module github.com/infinimesh/kaf
22

33
require (
4+
github.com/DataDog/zstd v1.3.5 // indirect
5+
github.com/Shopify/sarama v1.20.2-0.20190215145417-6a7bac87a052
46
github.com/Shopify/toxiproxy v2.1.3+incompatible // indirect
5-
github.com/birdayz/sarama v1.18.1-0.20181002235130-f4ecd70fafef
67
github.com/chzyer/logex v1.1.10 // indirect
78
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect
89
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 // indirect

‎go.sum

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1+
github.com/DataDog/zstd v1.3.5 h1:DtpNbljikUepEPD16hD4LvIcmhnhdLTiW/5pHgbmp14=
2+
github.com/DataDog/zstd v1.3.5/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo=
3+
github.com/Shopify/sarama v1.20.1 h1:Bb0h3I++r4eX333Y0uZV2vwUXepJbt6ig05TUU1qt9I=
4+
github.com/Shopify/sarama v1.20.1/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
5+
github.com/Shopify/sarama v1.20.2-0.20190215145417-6a7bac87a052 h1:VC2i78PjcLvo3mVXBXupPYsq3a4Ev/xQ8sB+SNr43TU=
6+
github.com/Shopify/sarama v1.20.2-0.20190215145417-6a7bac87a052/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
17
github.com/Shopify/toxiproxy v2.1.3+incompatible h1:awiJqUYH4q4OmoBiRccJykjd7B+w0loJi2keSna4X/M=
28
github.com/Shopify/toxiproxy v2.1.3+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
3-
github.com/birdayz/sarama v1.18.1-0.20181002235130-f4ecd70fafef h1:rVSyBkgpXt+FxoIQ68iRh/aBfCYaPjyYuJI2joSVoxM=
4-
github.com/birdayz/sarama v1.18.1-0.20181002235130-f4ecd70fafef/go.mod h1:b5a7snSTcZdb6pJI1mc6FVHchD3/YiOt+85VDpLfArg=
59
github.com/chzyer/logex v1.1.10 h1:Swpa1K6QvQznwJRcfTfQJmTE72DqScAa40E+fbHEXEE=
610
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
711
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e h1:fY5BOSpyZCqRo5OhCuC+XN+r/bBCmeuuJtjz+bCNIf8=

‎vendor/github.com/DataDog/zstd/.travis.yml

+30
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/DataDog/zstd/LICENSE

+27
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/DataDog/zstd/README.md

+120
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/DataDog/zstd/ZSTD_LICENSE

+30
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)