describeclientquotas protocol cleanup and tests

Author: petedannemann

protocol/describeclientquotas/describeclientquotas.go

@@ -7,12 +7,8 @@ func init() {
 }
 
 type Request struct {
-	// We need at least one tagged field to indicate that v2+ uses "flexible"
-	// messages.
-	_ struct{} `kafka:"min=v2,max=v2,tag"`
-
 	Components []Component `kafka:"min=v0,max=v1"`
-	Strict     boolean     `kafka:"min=v0,max=v1"`
+	Strict     bool        `kafka:"min=v0,max=v1"`
 }
 
 func (r *Request) ApiKey() protocol.ApiKey { return protocol.DescribeClientQuotas }
@@ -28,10 +24,6 @@ type Component struct {
 }
 
 type Response struct {
-	// We need at least one tagged field to indicate that v2+ uses "flexible"
-	// messages.
-	_ struct{} `kafka:"min=v2,max=v2,tag"`
-
 	ThrottleTimeMs int32            `kafka:"min=v0,max=v1"`
 	ErrorCode      int16            `kafka:"min=v0,max=v1"`
 	ErrorMessage   string           `kafka:"min=v0,max=v1,nullable"`
@@ -40,6 +32,11 @@ type Response struct {
 
 func (r *Response) ApiKey() protocol.ApiKey { return protocol.DescribeClientQuotas }
 
+type Entity struct {
+	EntityType string `kafka:"min=v0,max=v1"`
+	EntityName string `kafka:"min=v0,max=v1,nullable"`
+}
+
 type Value struct {
 	Key   string  `kafka:"min=v0,max=v1"`
 	Value float64 `kafka:"min=v0,max=v1"`

protocol/describeclientquotas/describeclientquotas_test.go

@@ -0,0 +1,83 @@
+package describeclientquotas_test
+
+import (
+	"testing"
+
+	"github.com/segmentio/kafka-go/protocol/describeclientquotas"
+	"github.com/segmentio/kafka-go/protocol/prototest"
+)
+
+const (
+	v0 = 0
+	v1 = 1
+)
+
+func TestDescribeClientQuotasRequest(t *testing.T) {
+	prototest.TestRequest(t, v0, &describeclientquotas.Request{
+		Strict: true,
+		Components: []describeclientquotas.Component{
+			describeclientquotas.Component{
+				EntityType: "client-id",
+				MatchType:  0,
+				Match:      "my-client-id",
+			},
+		},
+	})
+
+	prototest.TestRequest(t, v1, &describeclientquotas.Request{
+		Strict: true,
+		Components: []describeclientquotas.Component{
+			describeclientquotas.Component{
+				EntityType: "client-id",
+				MatchType:  0,
+				Match:      "my-client-id",
+			},
+		},
+	})
+}
+
+func TestDescribeClientQuotasResponse(t *testing.T) {
+	prototest.TestResponse(t, v0, &describeclientquotas.Response{
+		ThrottleTimeMs: 1,
+		ErrorCode:      1,
+		ErrorMessage:   "foo",
+		Entries: []describeclientquotas.ResponseQuotas{
+			describeclientquotas.ResponseQuotas{
+				Entities: []describeclientquotas.Entity{
+					describeclientquotas.Entity{
+						EntityType: "client-id",
+						EntityName: "my-client-id",
+					},
+				},
+				Values: []describeclientquotas.Value{
+					describeclientquotas.Value{
+						Key:   "foo",
+						Value: 1.0,
+					},
+				},
+			},
+		},
+	})
+
+	prototest.TestResponse(t, v1, &describeclientquotas.Response{
+		ThrottleTimeMs: 1,
+		ErrorCode:      1,
+		ErrorMessage:   "foo",
+		Entries: []describeclientquotas.ResponseQuotas{
+			describeclientquotas.ResponseQuotas{
+				Entities: []describeclientquotas.Entity{
+					describeclientquotas.Entity{
+						EntityType: "client-id",
+						EntityName: "my-client-id",
+					},
+				},
+				Values: []describeclientquotas.Value{
+					describeclientquotas.Value{
+						Key:   "foo",
+						Value: 1.0,
+					},
+				},
+			},
+		},
+	})
+}