[FAB-7873] Update sarama kafka client to v1.15.0

- even more forgiving kafka version parsing - removed default Kafka.Version from orderer.yaml - kept default value of Kafka.Version in orderer binary as 0.10.2.0 (future changeset to move this to 1.0.0 once kafka image has been updated) Change-Id: I9220fccd6ebb03529458367c21dd0256483abb8c Signed-off-by: Luis Sanchez <sanchezl@us.ibm.com>
hyperledger · Jan 24, 2018 · 90df55d · 90df55d
1 parent 88fd880
commit 90df55d
Show file tree

Hide file tree

Showing 19 changed files with 410 additions and 78 deletions.
diff --git a/common/viperutil/config_test.go b/common/viperutil/config_test.go
@@ -101,7 +101,8 @@ func TestKafkaVersionDecode(t *testing.T) {
 		{"1", sarama.V1_0_0_0, false},
 		{"1.0", sarama.V1_0_0_0, false},
 		{"1.0.0", sarama.V1_0_0_0, false},
-		{"1.0.1", sarama.V1_0_0_0, true},
+		{"1.0.1", sarama.V1_0_0_0, false},
+		{"2.0.0", sarama.V1_0_0_0, false},
 		{"Malformed", sarama.KafkaVersion{}, true},
 	}
 

diff --git a/common/viperutil/config_util.go b/common/viperutil/config_util.go
@@ -260,7 +260,7 @@ func init() {
 	kafkaVersionConstraints[sarama.V0_10_1_0], _ = version.NewConstraint(">=0.10.1.0,<0.10.2.0")
 	kafkaVersionConstraints[sarama.V0_10_2_0], _ = version.NewConstraint(">=0.10.2.0,<0.11.0.0")
 	kafkaVersionConstraints[sarama.V0_11_0_0], _ = version.NewConstraint(">=0.11.0.0,<1.0.0")
-	kafkaVersionConstraints[sarama.V1_0_0_0], _ = version.NewConstraint(">=1.0.0,<1.0.1")
+	kafkaVersionConstraints[sarama.V1_0_0_0], _ = version.NewConstraint(">=1.0.0")
 }
 
 func kafkaVersionDecodeHook() mapstructure.DecodeHookFunc {

diff --git a/sampleconfig/orderer.yaml b/sampleconfig/orderer.yaml
@@ -246,7 +246,7 @@ Kafka:
 
     # Kafka protocol version used to communicate with the Kafka cluster brokers
     # (defaults to 0.10.2.0 if not specified)
-    Version: 0.10.2.0
+    Version:
 
 ################################################################################
 #

diff --git a/vendor/github.com/Shopify/sarama/CHANGELOG.md b/vendor/github.com/Shopify/sarama/CHANGELOG.md
diff --git a/vendor/github.com/Shopify/sarama/broker.go b/vendor/github.com/Shopify/sarama/broker.go
diff --git a/vendor/github.com/Shopify/sarama/create_partitions_request.go b/vendor/github.com/Shopify/sarama/create_partitions_request.go
diff --git a/vendor/github.com/Shopify/sarama/create_partitions_response.go b/vendor/github.com/Shopify/sarama/create_partitions_response.go
diff --git a/vendor/github.com/Shopify/sarama/dev.yml b/vendor/github.com/Shopify/sarama/dev.yml