wrap errors with makeError

Author: petedannemann

alterclientquotas.go

@@ -50,11 +50,9 @@ type AlterClientQuotaOps struct {
 }
 
 type AlterClientQuotaResponseQuotas struct {
-	// The error code, or `0` if the quota alteration succeeded.
-	ErrorCode int16
-
-	// The error message, or `nil` if the quota alteration succeeded.
-	ErrorMessage string
+	// Error is set to a non-nil value including the code and message if a top-level
+	// error was encountered when doing the update.
+	Error error
 
 	// The altered quota entities.
 	Entities []AlterClientQuotaEntity
@@ -120,9 +118,8 @@ func (c *Client) AlterClientQuotas(ctx context.Context, req *AlterClientQuotasRe
 		}
 
 		responseEntries[responseEntryIdx] = AlterClientQuotaResponseQuotas{
-			ErrorCode:    responseEntry.ErrorCode,
-			ErrorMessage: responseEntry.ErrorMessage,
-			Entities:     responseEntities,
+			Error:    makeError(responseEntry.ErrorCode, responseEntry.ErrorMessage),
+			Entities: responseEntities,
 		}
 	}
 	ret := &AlterClientQuotasResponse{

alterclientquotas_test.go

@@ -52,7 +52,7 @@ func TestClientAlterClientQuotas(t *testing.T) {
 		Throttle: 0,
 		Entries: []AlterClientQuotaResponseQuotas{
 			{
-				ErrorCode: 0,
+				Error: makeError(0, ""),
 				Entities: []AlterClientQuotaEntity{
 					{
 						EntityName: entityName,
@@ -80,8 +80,8 @@ func TestClientAlterClientQuotas(t *testing.T) {
 	}
 
 	expectedDescribeResp := DescribeClientQuotasResponse{
-		Throttle:  0,
-		ErrorCode: 0,
+		Throttle: 0,
+		Error:    makeError(0, ""),
 		Entries: []DescribeClientQuotasResponseQuotas{
 			{
 				Entities: []DescribeClientQuotasEntity{

describeclientquotas.go

@@ -40,11 +40,9 @@ type DescribeClientQuotasResponse struct {
 	// The amount of time that the broker throttled the request.
 	Throttle time.Duration `kafka:"min=v0,max=v1"`
 
-	// The error code, or `0` if the quota description succeeded.
-	ErrorCode int16 `kafka:"min=v0,max=v1"`
-
-	// The error message, or `null` if the quota description succeeded.
-	ErrorMessage string `kafka:"min=v0,max=v1,nullable"`
+	// Error is set to a non-nil value including the code and message if a top-level
+	// error was encountered when doing the update.
+	Error error
 
 	// List of describe client quota responses.
 	Entries []DescribeClientQuotasResponseQuotas `kafka:"min=v0,max=v1"`