cleanup and testing

Author: petedannemann

protocol/alterclientquotas/alterclientquotas.go

@@ -6,11 +6,8 @@ func init() {
 	protocol.Register(&Request{}, &Response{})
 }
 
+// Detailed API definition: https://kafka.apache.org/protocol#The_Messages_AlterClientQuotas
 type Request struct {
-	// We need at least one tagged field to indicate that v2+ uses "flexible"
-	// messages.
-	_ struct{} `kafka:"min=v2,max=v2,tag"`
-
 	Entries      []Entry `kafka:"min=v0,max=v1"`
 	ValidateOnly bool    `kafka:"min=v0,max=v1"`
 }
@@ -26,16 +23,9 @@ type Entry struct {
 	Ops      []Ops    `kafka:"min=v0,max=v1"`
 }
 
-type EntityType string
-
-const (
-	ClientID EntityType = "client-id"
-	User     EntityType = "user"
-)
-
 type Entity struct {
-	EntityType EntityType `kafka:"min=v0,max=v1"`
-	EntityName string     `kafka:"min=v0,max=v1,nullable"`
+	EntityType string `kafka:"min=v0,max=v1"`
+	EntityName string `kafka:"min=v0,max=v1,nullable"`
 }
 
 type Ops struct {
@@ -45,10 +35,6 @@ type Ops 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"`
 	Results        []ResponseQuotas `kafka:"min=v0,max=v1"`
 }

protocol/alterclientquotas/alterclientquotas_test.go

@@ -0,0 +1,91 @@
+package alterclientquotas_test
+
+import (
+	"testing"
+
+	"github.com/segmentio/kafka-go/protocol/alterclientquotas"
+	"github.com/segmentio/kafka-go/protocol/prototest"
+)
+
+const (
+	v0 = 0
+	v1 = 1
+)
+
+func TestAlterClientQuotasRequest(t *testing.T) {
+	prototest.TestRequest(t, v0, &alterclientquotas.Request{
+		ValidateOnly: true,
+		Entries: []alterclientquotas.Entry{
+			alterclientquotas.Entry{
+				Entities: []alterclientquotas.Entity{
+					alterclientquotas.Entity{
+						EntityType: "client-id",
+						EntityName: "my-client-id",
+					},
+				},
+				Ops: []alterclientquotas.Ops{
+					alterclientquotas.Ops{
+						Key:    "producer_byte_rate",
+						Value:  1.0,
+						Remove: false,
+					},
+				},
+			},
+		},
+	})
+
+	prototest.TestRequest(t, v1, &alterclientquotas.Request{
+		ValidateOnly: true,
+		Entries: []alterclientquotas.Entry{
+			alterclientquotas.Entry{
+				Entities: []alterclientquotas.Entity{
+					alterclientquotas.Entity{
+						EntityType: "client-id",
+						EntityName: "my-client-id",
+					},
+				},
+				Ops: []alterclientquotas.Ops{
+					alterclientquotas.Ops{
+						Key:    "producer_byte_rate",
+						Value:  1.0,
+						Remove: false,
+					},
+				},
+			},
+		},
+	})
+}
+
+func TestAlterClientQuotasResponse(t *testing.T) {
+	prototest.TestResponse(t, v0, &alterclientquotas.Response{
+		ThrottleTimeMs: 500,
+		Results: []alterclientquotas.ResponseQuotas{
+			alterclientquotas.ResponseQuotas{
+				ErrorCode:    1,
+				ErrorMessage: "foo",
+				Entities: []alterclientquotas.Entity{
+					alterclientquotas.Entity{
+						EntityType: "client-id",
+						EntityName: "my-client-id",
+					},
+				},
+			},
+		},
+	})
+
+	prototest.TestResponse(t, v1, &alterclientquotas.Response{
+		ThrottleTimeMs: 500,
+		Results: []alterclientquotas.ResponseQuotas{
+			alterclientquotas.ResponseQuotas{
+				ErrorCode:    1,
+				ErrorMessage: "foo",
+				Entities: []alterclientquotas.Entity{
+					alterclientquotas.Entity{
+						EntityType: "client-id",
+						EntityName: "my-client-id",
+					},
+				},
+			},
+		},
+	})
+}

protocol/prototest/prototest.go

@@ -48,6 +48,8 @@ func deepEqualValue(v1, v2 reflect.Value) bool {
 		return v1.Bool() == v2.Bool()
 	case reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
 		return v1.Int() == v2.Int()
+	case reflect.Float64:
+		return v1.Float() == v2.Float()
 	case reflect.String:
 		return v1.String() == v2.String()
 	case reflect.Struct: