Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for Kafka 2.1.0 #465

Merged
merged 4 commits into from
Dec 14, 2018
Merged

Add support for Kafka 2.1.0 #465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b81089a
Add support for Kafka 2.1.0
bai Dec 10, 2018
6898a8d
Add libc-dev to build zstd
bai Dec 10, 2018
b0440f9
Add gcc to build zstd
bai Dec 10, 2018
5260649
Refactor parseKafkaVersion to reduce method complexity (gocyclo)
bai Dec 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM golang:1.11-alpine as builder

ENV DEP_VERSION="0.5.0"
RUN apk add --no-cache git curl && \
RUN apk add --no-cache git curl gcc libc-dev && \
curl -L -s https://github.com/golang/dep/releases/download/v${DEP_VERSION}/dep-linux-amd64 -o $GOPATH/bin/dep && \
chmod +x $GOPATH/bin/dep && \
mkdir -p $GOPATH/src/github.com/linkedin/Burrow
Expand Down
2 changes: 1 addition & 1 deletion Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[[constraint]]
name = "github.com/Shopify/sarama"
version = "1.18.0"
version = "1.20.0"

[[constraint]]
name = "go.uber.org/zap"
Expand Down
62 changes: 34 additions & 28 deletions core/internal/helpers/sarama.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,37 +20,43 @@ import (
"github.com/stretchr/testify/mock"
)

var kafkaVersions = map[string]sarama.KafkaVersion{
"": sarama.V0_10_2_0,
"0.8.0": sarama.V0_8_2_0,
"0.8.1": sarama.V0_8_2_1,
"0.8.2": sarama.V0_8_2_2,
"0.8": sarama.V0_8_2_0,
"0.9.0.0": sarama.V0_9_0_0,
"0.9.0.1": sarama.V0_9_0_1,
"0.9.0": sarama.V0_9_0_0,
"0.9": sarama.V0_9_0_0,
"0.10.0.0": sarama.V0_10_0_0,
"0.10.0.1": sarama.V0_10_0_1,
"0.10.0": sarama.V0_10_0_0,
"0.10.1.0": sarama.V0_10_1_0,
"0.10.1": sarama.V0_10_1_0,
"0.10.2.0": sarama.V0_10_2_0,
"0.10.2.1": sarama.V0_10_2_0,
"0.10.2": sarama.V0_10_2_0,
"0.10": sarama.V0_10_0_0,
"0.11.0.1": sarama.V0_11_0_0,
"0.11.0.2": sarama.V0_11_0_0,
"0.11.0": sarama.V0_11_0_0,
"1.0.0": sarama.V1_0_0_0,
"1.1.0": sarama.V1_1_0_0,
"1.1.1": sarama.V1_1_0_0,
"2.0.0": sarama.V2_0_0_0,
"2.0.1": sarama.V2_0_0_0,
"2.1.0": sarama.V2_1_0_0,
}

func parseKafkaVersion(kafkaVersion string) sarama.KafkaVersion {
switch kafkaVersion {
case "0.8", "0.8.0":
return sarama.V0_8_2_0
case "0.8.1":
return sarama.V0_8_2_1
case "0.8.2":
return sarama.V0_8_2_2
case "0.9", "0.9.0", "0.9.0.0":
return sarama.V0_9_0_0
case "0.9.0.1":
return sarama.V0_9_0_1
case "0.10", "0.10.0", "0.10.0.0":
return sarama.V0_10_0_0
case "0.10.0.1":
return sarama.V0_10_0_1
case "0.10.1", "0.10.1.0":
return sarama.V0_10_1_0
case "", "0.10.2", "0.10.2.0", "0.10.2.1":
return sarama.V0_10_2_0
case "0.11.0", "0.11.0.1", "0.11.0.2":
return sarama.V0_11_0_0
case "1.0.0":
return sarama.V1_0_0_0
case "1.1.0":
return sarama.V1_1_0_0
case "2.0.0":
return sarama.V2_0_0_0
default:
version, ok := kafkaVersions[string(kafkaVersion)]
if !ok {
panic("Unknown Kafka Version: " + kafkaVersion)
}

return version
}

// GetSaramaConfigFromClientProfile takes the name of a client-profile configuration entry and returns a sarama.Config
Expand Down