Merge pull request grepplabs#167 from grepplabs/kafka-3.7

kafka 3.7
Klarrio · May 14, 2024 · 1839a88 · 1839a88
2 parents 5676da6 + 938a1f4
commit 1839a88
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 11 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -14,7 +14,7 @@ jobs:
       - name: Setup go
         uses: actions/setup-go@v4
         with:
-          go-version: '1.20'
+          go-version: '1.22'
           check-latest: true
       - run: go version
       - name: Run build

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -22,7 +22,7 @@ jobs:
       - name: Setup go
         uses: actions/setup-go@v4
         with:
-          go-version: '1.20'
+          go-version: '1.22'
           check-latest: true
       - run: go version
       - name: Run build and test

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM golang:1.20-alpine3.17 as builder
+FROM --platform=$BUILDPLATFORM golang:1.22-alpine3.19 as builder
 RUN apk add alpine-sdk ca-certificates
 
 ARG TARGETOS
@@ -21,7 +21,7 @@ RUN mkdir -p build && \
     go build -mod=vendor -o build/kafka-proxy \
     -ldflags "${LDFLAGS}" .
 
-FROM --platform=$BUILDPLATFORM alpine:3.17
+FROM --platform=$BUILDPLATFORM alpine:3.19
 RUN apk add --no-cache ca-certificates libcap
 RUN adduser \
         --disabled-password \

diff --git a/Dockerfile.all b/Dockerfile.all
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM golang:1.20-alpine3.17 as builder
+FROM --platform=$BUILDPLATFORM golang:1.22-alpine3.19 as builder
 RUN apk add alpine-sdk ca-certificates
 
 ARG TARGETOS
@@ -27,7 +27,7 @@ RUN mkdir -p build && \
     go build -mod=vendor -o build/unsecured-jwt-provider -ldflags "${LDFLAGS}" cmd/plugin-unsecured-jwt-provider/main.go && \
     go build -mod=vendor -o build/oidc-provider -ldflags "${LDFLAGS}" cmd/plugin-oidc-provider/main.go
 
-FROM --platform=$BUILDPLATFORM alpine:3.17
+FROM --platform=$BUILDPLATFORM alpine:3.19
 RUN apk add --no-cache ca-certificates libcap
 RUN adduser \
         --disabled-password \

diff --git a/Makefile b/Makefile
@@ -10,7 +10,7 @@ VERSION       ?= $(shell git describe --tags --always --dirty)
 GOPKGS         = $(shell go list ./... | grep -v /vendor/)
 BUILD_FLAGS   ?=
 LDFLAGS       ?= -X github.com/grepplabs/kafka-proxy/config.Version=$(VERSION) -w -s
-TAG           ?= "v0.3.8"
+TAG           ?= "v0.3.9"
 GOOS          ?= $(if $(TARGETOS),$(TARGETOS),linux)
 GOARCH        ?= $(if $(TARGETARCH),$(TARGETARCH),amd64)
 GOARM         ?= $(TARGETVARIANT)

diff --git a/README.md b/README.md
@@ -39,19 +39,19 @@ As not every Kafka release adds new messages/versions which are relevant to the
 |                     | from 0.11.0   |
 | 0.2.9               | to 2.8.0      |
 | 0.3.1               | to 3.4.0      |
-
+| 0.3.9               | to 3.7.0      |
 
 ### Install binary release
 
 1. Download the latest release
 
    Linux
 
-        curl -Ls https://github.com/grepplabs/kafka-proxy/releases/download/v0.3.8/kafka-proxy-v0.3.8-linux-amd64.tar.gz | tar xz
+        curl -Ls https://github.com/grepplabs/kafka-proxy/releases/download/v0.3.9/kafka-proxy-v0.3.9-linux-amd64.tar.gz | tar xz
 
    macOS
 
-        curl -Ls https://github.com/grepplabs/kafka-proxy/releases/download/v0.3.8/kafka-proxy-v0.3.8-darwin-amd64.tar.gz | tar xz
+        curl -Ls https://github.com/grepplabs/kafka-proxy/releases/download/v0.3.9/kafka-proxy-v0.3.9-darwin-amd64.tar.gz | tar xz
 
 2. Move the binary in to your PATH.
 

diff --git a/proxy/processor_default.go b/proxy/processor_default.go
@@ -41,7 +41,7 @@ func (handler *DefaultRequestHandler) handleRequest(dst DeadlineWriter, src Dead
 	logrus.Debugf("Kafka request key %v, version %v, length %v", requestKeyVersion.ApiKey, requestKeyVersion.ApiVersion, requestKeyVersion.Length)
 
 	if requestKeyVersion.ApiKey < minRequestApiKey || requestKeyVersion.ApiKey > maxRequestApiKey {
-		return true, fmt.Errorf("api key %d is invalid", requestKeyVersion.ApiKey)
+		return true, fmt.Errorf("api key %d is invalid, possible cause: using plain connection instead of TLS", requestKeyVersion.ApiKey)
 	}
 
 	proxyRequestsTotal.WithLabelValues(ctx.brokerAddress, strconv.Itoa(int(requestKeyVersion.ApiKey)), strconv.Itoa(int(requestKeyVersion.ApiVersion))).Inc()

diff --git a/proxy/protocol/request_key_version.go b/proxy/protocol/request_key_version.go
@@ -346,6 +346,20 @@ func (r *RequestKeyVersion) ResponseHeaderVersion() int16 {
 		return 1
 	case 67: // AllocateProducerIds
 		return 1
+	case 68: // ConsumerGroupHeartbeat
+		return 1
+	case 69: // ConsumerGroupDescribe
+		return 1
+	case 70: // ControllerRegistration
+		return 1
+	case 71: // GetTelemetrySubscriptions
+		return 1
+	case 72: // PushTelemetry
+		return 1
+	case 73: // AssignReplicasToDirs
+		return 1
+	case 74: // ListClientMetricsResources
+		return 1
 	default:
 		// throw new UnsupportedVersionException("Unsupported API key " + apiKey);
 		return -1