From f8444d0d86077ac510385223f4b7bcb573cce442 Mon Sep 17 00:00:00 2001
From: Vlad Gorodetsky <v@gor.io>
Date: Tue, 27 Apr 2021 15:12:54 +0300
Subject: [PATCH] Add support for Kafka 2.8.0

---
 .github/workflows/ci.yml |  2 +-
 Makefile                 |  2 +-
 README.md                |  2 +-
 functional_test.go       | 10 ++++------
 utils.go                 |  4 +++-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 86d7b85d7..d806f18f3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
       fail-fast: false
       matrix:
         go-version: [1.15.x, 1.16.x]
-        kafka-version: [2.6.1, 2.7.0]
+        kafka-version: [2.7.1, 2.8.0]
         platform: [ubuntu-latest]
 
     env:
diff --git a/Makefile b/Makefile
index a8436bece..4714d7798 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ get:
 	$(GO) mod tidy
 
 update:
-	$(GO) get -u -v all
+	$(GO) get -u -v ./...
 	$(GO) mod verify
 	$(GO) mod tidy
 
diff --git a/README.md b/README.md
index 93b932161..f2beb7393 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ You might also want to look at the [Frequently Asked Questions](https://github.c
 Sarama provides a "2 releases + 2 months" compatibility guarantee: we support
 the two latest stable releases of Kafka and Go, and we provide a two month
 grace period for older releases. This means we currently officially support
-Go 1.14 through 1.16, and Kafka 2.6 through 2.7, although older releases are
+Go 1.15 through 1.16, and Kafka 2.6 through 2.8, although older releases are
 still likely to work.
 
 Sarama follows semantic versioning and provides API stability via the gopkg.in service.
diff --git a/functional_test.go b/functional_test.go
index 429370109..b0dce10fe 100644
--- a/functional_test.go
+++ b/functional_test.go
@@ -119,12 +119,10 @@ func prepareDockerTestEnvironment(ctx context.Context, env *testEnvironment) err
 	// found here: https://docs.confluent.io/current/installation/versions-interoperability.html
 	var confluentPlatformVersion string
 	switch env.KafkaVersion {
-	case "2.7.0":
-		confluentPlatformVersion = "6.0.1"
-	case "2.6.1":
-		confluentPlatformVersion = "6.0.1"
-	case "2.5.1":
-		confluentPlatformVersion = "5.5.0"
+	case "2.8.0":
+		confluentPlatformVersion = "6.1.1"
+	case "2.7.1":
+		confluentPlatformVersion = "6.1.1"
 	default:
 		return fmt.Errorf("don't know what confluent platform version to use for kafka %s", env.KafkaVersion)
 	}
diff --git a/utils.go b/utils.go
index de4d7a102..76daaf8fe 100644
--- a/utils.go
+++ b/utils.go
@@ -163,6 +163,7 @@ var (
 	V2_5_0_0  = newKafkaVersion(2, 5, 0, 0)
 	V2_6_0_0  = newKafkaVersion(2, 6, 0, 0)
 	V2_7_0_0  = newKafkaVersion(2, 7, 0, 0)
+	V2_8_0_0  = newKafkaVersion(2, 8, 0, 0)
 
 	SupportedVersions = []KafkaVersion{
 		V0_8_2_0,
@@ -191,9 +192,10 @@ var (
 		V2_5_0_0,
 		V2_6_0_0,
 		V2_7_0_0,
+		V2_8_0_0,
 	}
 	MinVersion     = V0_8_2_0
-	MaxVersion     = V2_7_0_0
+	MaxVersion     = V2_8_0_0
 	DefaultVersion = V1_0_0_0
 )