Fixed Id realted lint errors (#1380)

admin_test.go

@@ -666,7 +666,7 @@ func TestDescribeConsumerGroup(t *testing.T) {
 
 	seedBroker.SetHandlerByMap(map[string]MockResponse{
 		"DescribeGroupsRequest": NewMockDescribeGroupsResponse(t).AddGroupDescription(expectedGroupID, &GroupDescription{
-			GroupId: expectedGroupID,
+			GroupID: expectedGroupID,
 		}),
 		"MetadataRequest": NewMockMetadataResponse(t).
 			SetController(seedBroker.BrokerID()).
@@ -691,8 +691,8 @@ func TestDescribeConsumerGroup(t *testing.T) {
 		t.Fatalf("Expected 1 result, got %v", len(result))
 	}
 
-	if result[0].GroupId != expectedGroupID {
-		t.Fatalf("Expected groupID %v, got %v", expectedGroupID, result[0].GroupId)
+	if result[0].GroupID != expectedGroupID {
+		t.Fatalf("Expected groupID %v, got %v", expectedGroupID, result[0].GroupID)
 	}
 
 	err = admin.Close()

consumer_group.go

@@ -213,8 +213,8 @@ func (c *consumerGroup) newSession(ctx context.Context, topics []string, handler
 	}
 	switch join.Err {
 	case ErrNoError:
-		c.memberID = join.MemberId
-	case ErrUnknownMemberId, ErrIllegalGeneration: // reset member ID and retry immediately
+		c.memberID = join.MemberID
+	case ErrUnknownMemberID, ErrIllegalGeneration: // reset member ID and retry immediately
 		c.memberID = ""
 		return c.newSession(ctx, topics, handler, retries)
 	case ErrNotCoordinatorForConsumer: // retry after backoff with coordinator refresh
@@ -235,7 +235,7 @@ func (c *consumerGroup) newSession(ctx context.Context, topics []string, handler
 
 	// Prepare distribution plan if we joined as the leader
 	var plan BalanceStrategyPlan
-	if join.LeaderId == join.MemberId {
+	if join.LeaderID == join.MemberID {
 		members, err := join.GetMembers()
 		if err != nil {
 			return nil, err
@@ -248,14 +248,14 @@ func (c *consumerGroup) newSession(ctx context.Context, topics []string, handler
 	}
 
 	// Sync consumer group
-	sync, err := c.syncGroupRequest(coordinator, plan, join.GenerationId)
+	sync, err := c.syncGroupRequest(coordinator, plan, join.GenerationID)
 	if err != nil {
 		_ = coordinator.Close()
 		return nil, err
 	}
 	switch sync.Err {
 	case ErrNoError:
-	case ErrUnknownMemberId, ErrIllegalGeneration: // reset member ID and retry immediately
+	case ErrUnknownMemberID, ErrIllegalGeneration: // reset member ID and retry immediately
 		c.memberID = ""
 		return c.newSession(ctx, topics, handler, retries)
 	case ErrNotCoordinatorForConsumer: // retry after backoff with coordinator refresh
@@ -288,13 +288,13 @@ func (c *consumerGroup) newSession(ctx context.Context, topics []string, handler
 		}
 	}
 
-	return newConsumerGroupSession(ctx, c, claims, join.MemberId, join.GenerationId, handler)
+	return newConsumerGroupSession(ctx, c, claims, join.MemberID, join.GenerationID, handler)
 }
 
 func (c *consumerGroup) joinGroupRequest(coordinator *Broker, topics []string) (*JoinGroupResponse, error) {
 	req := &JoinGroupRequest{
-		GroupId:        c.groupID,
-		MemberId:       c.memberID,
+		GroupID:        c.groupID,
+		MemberID:       c.memberID,
 		SessionTimeout: int32(c.config.Consumer.Group.Session.Timeout / time.Millisecond),
 		ProtocolType:   "consumer",
 	}
@@ -317,9 +317,9 @@ func (c *consumerGroup) joinGroupRequest(coordinator *Broker, topics []string) (
 
 func (c *consumerGroup) syncGroupRequest(coordinator *Broker, plan BalanceStrategyPlan, generationID int32) (*SyncGroupResponse, error) {
 	req := &SyncGroupRequest{
-		GroupId:      c.groupID,
-		MemberId:     c.memberID,
-		GenerationId: generationID,
+		GroupID:      c.groupID,
+		MemberID:     c.memberID,
+		GenerationID: generationID,
 	}
 	for memberID, topics := range plan {
 		err := req.AddGroupAssignmentMember(memberID, &ConsumerGroupMemberAssignment{
@@ -334,9 +334,9 @@ func (c *consumerGroup) syncGroupRequest(coordinator *Broker, plan BalanceStrate
 
 func (c *consumerGroup) heartbeatRequest(coordinator *Broker, memberID string, generationID int32) (*HeartbeatResponse, error) {
 	req := &HeartbeatRequest{
-		GroupId:      c.groupID,
-		MemberId:     memberID,
-		GenerationId: generationID,
+		GroupID:      c.groupID,
+		MemberID:     memberID,
+		GenerationID: generationID,
 	}
 
 	return coordinator.Heartbeat(req)
@@ -374,8 +374,8 @@ func (c *consumerGroup) leave() error {
 	}
 
 	resp, err := coordinator.LeaveGroup(&LeaveGroupRequest{
-		GroupId:  c.groupID,
-		MemberId: c.memberID,
+		GroupID:  c.groupID,
+		MemberID: c.memberID,
 	})
 	if err != nil {
 		_ = coordinator.Close()
@@ -387,7 +387,7 @@ func (c *consumerGroup) leave() error {
 
 	// Check response
 	switch resp.Err {
-	case ErrRebalanceInProgress, ErrUnknownMemberId, ErrNoError:
+	case ErrRebalanceInProgress, ErrUnknownMemberID, ErrNoError:
 		return nil
 	default:
 		return resp.Err
@@ -691,7 +691,7 @@ func (s *consumerGroupSession) heartbeatLoop() {
 		switch resp.Err {
 		case ErrNoError:
 			retries = s.parent.config.Metadata.Retry.Max
-		case ErrRebalanceInProgress, ErrUnknownMemberId, ErrIllegalGeneration:
+		case ErrRebalanceInProgress, ErrUnknownMemberID, ErrIllegalGeneration:
 			return
 		default:
 			s.parent.handleError(err, "", -1)

consumer_test.go

@@ -265,7 +265,7 @@ func TestConsumerLeaderRefreshError(t *testing.T) {
 }
 
 func TestConsumerLeaderRefreshErrorWithBackoffFunc(t *testing.T) {
-	var calls int32 = 0
+	var calls int32
 
 	config := NewConfig()
 	config.Net.ReadTimeout = 100 * time.Millisecond

describe_groups_response.go

@@ -49,7 +49,7 @@ func (r *DescribeGroupsResponse) requiredVersion() KafkaVersion {
 
 type GroupDescription struct {
 	Err          KError
-	GroupId      string
+	GroupID      string
 	State        string
 	ProtocolType string
 	Protocol     string
@@ -59,7 +59,7 @@ type GroupDescription struct {
 func (gd *GroupDescription) encode(pe packetEncoder) error {
 	pe.putInt16(int16(gd.Err))
 
-	if err := pe.putString(gd.GroupId); err != nil {
+	if err := pe.putString(gd.GroupID); err != nil {
 		return err
 	}
 	if err := pe.putString(gd.State); err != nil {
@@ -76,8 +76,8 @@ func (gd *GroupDescription) encode(pe packetEncoder) error {
 		return err
 	}
 
-	for memberId, groupMemberDescription := range gd.Members {
-		if err := pe.putString(memberId); err != nil {
+	for memberID, groupMemberDescription := range gd.Members {
+		if err := pe.putString(memberID); err != nil {
 			return err
 		}
 		if err := groupMemberDescription.encode(pe); err != nil {
@@ -96,7 +96,7 @@ func (gd *GroupDescription) decode(pd packetDecoder) (err error) {
 
 	gd.Err = KError(kerr)
 
-	if gd.GroupId, err = pd.getString(); err != nil {
+	if gd.GroupID, err = pd.getString(); err != nil {
 		return
 	}
 	if gd.State, err = pd.getString(); err != nil {
@@ -119,13 +119,13 @@ func (gd *GroupDescription) decode(pd packetDecoder) (err error) {
 
 	gd.Members = make(map[string]*GroupMemberDescription)
 	for i := 0; i < n; i++ {
-		memberId, err := pd.getString()
+		memberID, err := pd.getString()
 		if err != nil {
 			return err
 		}
 
-		gd.Members[memberId] = new(GroupMemberDescription)
-		if err := gd.Members[memberId].decode(pd); err != nil {
+		gd.Members[memberID] = new(GroupMemberDescription)
+		if err := gd.Members[memberID].decode(pd); err != nil {
 			return err
 		}
 	}
@@ -134,14 +134,14 @@ func (gd *GroupDescription) decode(pd packetDecoder) (err error) {
 }
 
 type GroupMemberDescription struct {
-	ClientId         string
+	ClientID         string
 	ClientHost       string
 	MemberMetadata   []byte
 	MemberAssignment []byte
 }
 
 func (gmd *GroupMemberDescription) encode(pe packetEncoder) error {
-	if err := pe.putString(gmd.ClientId); err != nil {
+	if err := pe.putString(gmd.ClientID); err != nil {
 		return err
 	}
 	if err := pe.putString(gmd.ClientHost); err != nil {
@@ -158,7 +158,7 @@ func (gmd *GroupMemberDescription) encode(pe packetEncoder) error {
 }
 
 func (gmd *GroupMemberDescription) decode(pd packetDecoder) (err error) {
-	if gmd.ClientId, err = pd.getString(); err != nil {
+	if gmd.ClientID, err = pd.getString(); err != nil {
 		return
 	}
 	if gmd.ClientHost, err = pd.getString(); err != nil {

describe_groups_response_test.go

@@ -53,8 +53,8 @@ func TestDescribeGroupsResponse(t *testing.T) {
 	if group0.Err != ErrNoError {
 		t.Error("Unxpected groups[0].Err, found", group0.Err)
 	}
-	if group0.GroupId != "foo" {
-		t.Error("Unxpected groups[0].GroupId, found", group0.GroupId)
+	if group0.GroupID != "foo" {
+		t.Error("Unxpected groups[0].GroupId, found", group0.GroupID)
 	}
 	if group0.State != "bar" {
 		t.Error("Unxpected groups[0].State, found", group0.State)
@@ -68,8 +68,8 @@ func TestDescribeGroupsResponse(t *testing.T) {
 	if len(group0.Members) != 1 {
 		t.Error("Unxpected groups[0].Members, found", group0.Members)
 	}
-	if group0.Members["id"].ClientId != "sarama" {
-		t.Error("Unxpected groups[0].Members[id].ClientId, found", group0.Members["id"].ClientId)
+	if group0.Members["id"].ClientID != "sarama" {
+		t.Error("Unxpected groups[0].Members[id].ClientId, found", group0.Members["id"].ClientID)
 	}
 	if group0.Members["id"].ClientHost != "localhost" {
 		t.Error("Unxpected groups[0].Members[id].ClientHost, found", group0.Members["id"].ClientHost)

errors.go

@@ -108,8 +108,8 @@ const (
 	ErrInvalidRequiredAcks                KError = 21
 	ErrIllegalGeneration                  KError = 22
 	ErrInconsistentGroupProtocol          KError = 23
-	ErrInvalidGroupId                     KError = 24
-	ErrUnknownMemberId                    KError = 25
+	ErrInvalidGroupID                     KError = 24
+	ErrUnknownMemberID                    KError = 25
 	ErrInvalidSessionTimeout              KError = 26
 	ErrRebalanceInProgress                KError = 27
 	ErrInvalidCommitOffsetSize            KError = 28
@@ -217,9 +217,9 @@ func (err KError) Error() string {
 		return "kafka server: The provided generation id is not the current generation."
 	case ErrInconsistentGroupProtocol:
 		return "kafka server: The provider group protocol type is incompatible with the other members."
-	case ErrInvalidGroupId:
+	case ErrInvalidGroupID:
 		return "kafka server: The provided group id was empty."
-	case ErrUnknownMemberId:
+	case ErrUnknownMemberID:
 		return "kafka server: The provided member is not known in the current generation."
 	case ErrInvalidSessionTimeout:
 		return "kafka server: The provided session timeout is outside the allowed range."

heartbeat_request.go

@@ -1,19 +1,19 @@
 package sarama
 
 type HeartbeatRequest struct {
-	GroupId      string
-	GenerationId int32
-	MemberId     string
+	GroupID      string
+	GenerationID int32
+	MemberID     string
 }
 
 func (r *HeartbeatRequest) encode(pe packetEncoder) error {
-	if err := pe.putString(r.GroupId); err != nil {
+	if err := pe.putString(r.GroupID); err != nil {
 		return err
 	}
 
-	pe.putInt32(r.GenerationId)
+	pe.putInt32(r.GenerationID)
 
-	if err := pe.putString(r.MemberId); err != nil {
+	if err := pe.putString(r.MemberID); err != nil {
 		return err
 	}
 
@@ -21,13 +21,13 @@ func (r *HeartbeatRequest) encode(pe packetEncoder) error {
 }
 
 func (r *HeartbeatRequest) decode(pd packetDecoder, version int16) (err error) {
-	if r.GroupId, err = pd.getString(); err != nil {
+	if r.GroupID, err = pd.getString(); err != nil {
 		return
 	}
-	if r.GenerationId, err = pd.getInt32(); err != nil {
+	if r.GenerationID, err = pd.getInt32(); err != nil {
 		return
 	}
-	if r.MemberId, err = pd.getString(); err != nil {
+	if r.MemberID, err = pd.getString(); err != nil {
 		return
 	}
 

heartbeat_request_test.go

@@ -14,8 +14,8 @@ func TestHeartbeatRequest(t *testing.T) {
 	var request *HeartbeatRequest
 
 	request = new(HeartbeatRequest)
-	request.GroupId = "foo"
-	request.GenerationId = 66051
-	request.MemberId = "baz"
+	request.GroupID = "foo"
+	request.GenerationID = 66051
+	request.MemberID = "baz"
 	testRequest(t, "basic", request, basicHeartbeatRequest)
 }

join_group_request.go

@@ -26,24 +26,24 @@ func (p *GroupProtocol) encode(pe packetEncoder) (err error) {
 
 type JoinGroupRequest struct {
 	Version               int16
-	GroupId               string
+	GroupID               string
 	SessionTimeout        int32
 	RebalanceTimeout      int32
-	MemberId              string
+	MemberID              string
 	ProtocolType          string
 	GroupProtocols        map[string][]byte // deprecated; use OrderedGroupProtocols
 	OrderedGroupProtocols []*GroupProtocol
 }
 
 func (r *JoinGroupRequest) encode(pe packetEncoder) error {
-	if err := pe.putString(r.GroupId); err != nil {
+	if err := pe.putString(r.GroupID); err != nil {
 		return err
 	}
 	pe.putInt32(r.SessionTimeout)
 	if r.Version >= 1 {
 		pe.putInt32(r.RebalanceTimeout)
 	}
-	if err := pe.putString(r.MemberId); err != nil {
+	if err := pe.putString(r.MemberID); err != nil {
 		return err
 	}
 	if err := pe.putString(r.ProtocolType); err != nil {
@@ -83,7 +83,7 @@ func (r *JoinGroupRequest) encode(pe packetEncoder) error {
 func (r *JoinGroupRequest) decode(pd packetDecoder, version int16) (err error) {
 	r.Version = version
 
-	if r.GroupId, err = pd.getString(); err != nil {
+	if r.GroupID, err = pd.getString(); err != nil {
 		return
 	}
 
@@ -97,7 +97,7 @@ func (r *JoinGroupRequest) decode(pd packetDecoder, version int16) (err error) {
 		}
 	}
 
-	if r.MemberId, err = pd.getString(); err != nil {
+	if r.MemberID, err = pd.getString(); err != nil {
 		return
 	}
 

join_group_request_test.go

@@ -35,7 +35,7 @@ var (
 
 func TestJoinGroupRequest(t *testing.T) {
 	request := new(JoinGroupRequest)
-	request.GroupId = "TestGroup"
+	request.GroupID = "TestGroup"
 	request.SessionTimeout = 100
 	request.ProtocolType = "consumer"
 	testRequest(t, "V0: no protocols", request, joinGroupRequestV0_NoProtocols)
@@ -43,9 +43,9 @@ func TestJoinGroupRequest(t *testing.T) {
 
 func TestJoinGroupRequestV0_OneProtocol(t *testing.T) {
 	request := new(JoinGroupRequest)
-	request.GroupId = "TestGroup"
+	request.GroupID = "TestGroup"
 	request.SessionTimeout = 100
-	request.MemberId = "OneProtocol"
+	request.MemberID = "OneProtocol"
 	request.ProtocolType = "consumer"
 	request.AddGroupProtocol("one", []byte{0x01, 0x02, 0x03})
 	packet := testRequestEncode(t, "V0: one protocol", request, joinGroupRequestV0_OneProtocol)
@@ -56,9 +56,9 @@ func TestJoinGroupRequestV0_OneProtocol(t *testing.T) {
 
 func TestJoinGroupRequestDeprecatedEncode(t *testing.T) {
 	request := new(JoinGroupRequest)
-	request.GroupId = "TestGroup"
+	request.GroupID = "TestGroup"
 	request.SessionTimeout = 100
-	request.MemberId = "OneProtocol"
+	request.MemberID = "OneProtocol"
 	request.ProtocolType = "consumer"
 	request.GroupProtocols = make(map[string][]byte)
 	request.GroupProtocols["one"] = []byte{0x01, 0x02, 0x03}
@@ -70,10 +70,10 @@ func TestJoinGroupRequestDeprecatedEncode(t *testing.T) {
 func TestJoinGroupRequestV1(t *testing.T) {
 	request := new(JoinGroupRequest)
 	request.Version = 1
-	request.GroupId = "TestGroup"
+	request.GroupID = "TestGroup"
 	request.SessionTimeout = 100
 	request.RebalanceTimeout = 200
-	request.MemberId = "OneProtocol"
+	request.MemberID = "OneProtocol"
 	request.ProtocolType = "consumer"
 	request.AddGroupProtocol("one", []byte{0x01, 0x02, 0x03})
 	packet := testRequestEncode(t, "V1", request, joinGroupRequestV1)

join_group_response.go

@@ -4,10 +4,10 @@ type JoinGroupResponse struct {
 	Version       int16
 	ThrottleTime  int32
 	Err           KError
-	GenerationId  int32
+	GenerationID  int32
 	GroupProtocol string
-	LeaderId      string
-	MemberId      string
+	LeaderID      string
+	MemberID      string
 	Members       map[string][]byte
 }
 
@@ -28,15 +28,15 @@ func (r *JoinGroupResponse) encode(pe packetEncoder) error {
 		pe.putInt32(r.ThrottleTime)
 	}
 	pe.putInt16(int16(r.Err))
-	pe.putInt32(r.GenerationId)
+	pe.putInt32(r.GenerationID)
 
 	if err := pe.putString(r.GroupProtocol); err != nil {
 		return err
 	}
-	if err := pe.putString(r.LeaderId); err != nil {
+	if err := pe.putString(r.LeaderID); err != nil {
 		return err
 	}
-	if err := pe.putString(r.MemberId); err != nil {
+	if err := pe.putString(r.MemberID); err != nil {
 		return err
 	}
 
@@ -44,8 +44,8 @@ func (r *JoinGroupResponse) encode(pe packetEncoder) error {
 		return err
 	}
 
-	for memberId, memberMetadata := range r.Members {
-		if err := pe.putString(memberId); err != nil {
+	for memberID, memberMetadata := range r.Members {
+		if err := pe.putString(memberID); err != nil {
 			return err
 		}
 
@@ -73,7 +73,7 @@ func (r *JoinGroupResponse) decode(pd packetDecoder, version int16) (err error)
 
 	r.Err = KError(kerr)
 
-	if r.GenerationId, err = pd.getInt32(); err != nil {
+	if r.GenerationID, err = pd.getInt32(); err != nil {
 		return
 	}
 
@@ -81,11 +81,11 @@ func (r *JoinGroupResponse) decode(pd packetDecoder, version int16) (err error)
 		return
 	}
 
-	if r.LeaderId, err = pd.getString(); err != nil {
+	if r.LeaderID, err = pd.getString(); err != nil {
 		return
 	}
 
-	if r.MemberId, err = pd.getString(); err != nil {
+	if r.MemberID, err = pd.getString(); err != nil {
 		return
 	}
 
@@ -99,7 +99,7 @@ func (r *JoinGroupResponse) decode(pd packetDecoder, version int16) (err error)
 
 	r.Members = make(map[string][]byte)
 	for i := 0; i < n; i++ {
-		memberId, err := pd.getString()
+		memberID, err := pd.getString()
 		if err != nil {
 			return err
 		}
@@ -109,7 +109,7 @@ func (r *JoinGroupResponse) decode(pd packetDecoder, version int16) (err error)
 			return err
 		}
 
-		r.Members[memberId] = memberMetadata
+		r.Members[memberID] = memberMetadata
 	}
 
 	return nil

join_group_response_test.go

@@ -63,14 +63,14 @@ func TestJoinGroupResponseV0(t *testing.T) {
 	if response.Err != ErrNoError {
 		t.Error("Decoding Err failed: no error expected but found", response.Err)
 	}
-	if response.GenerationId != 66051 {
-		t.Error("Decoding GenerationId failed, found:", response.GenerationId)
+	if response.GenerationID != 66051 {
+		t.Error("Decoding GenerationId failed, found:", response.GenerationID)
 	}
-	if response.LeaderId != "foo" {
-		t.Error("Decoding LeaderId failed, found:", response.LeaderId)
+	if response.LeaderID != "foo" {
+		t.Error("Decoding LeaderId failed, found:", response.LeaderID)
 	}
-	if response.MemberId != "bar" {
-		t.Error("Decoding MemberId failed, found:", response.MemberId)
+	if response.MemberID != "bar" {
+		t.Error("Decoding MemberId failed, found:", response.MemberID)
 	}
 	if len(response.Members) != 0 {
 		t.Error("Decoding Members failed, found:", response.Members)
@@ -81,14 +81,14 @@ func TestJoinGroupResponseV0(t *testing.T) {
 	if response.Err != ErrInconsistentGroupProtocol {
 		t.Error("Decoding Err failed: ErrInconsistentGroupProtocol expected but found", response.Err)
 	}
-	if response.GenerationId != 0 {
-		t.Error("Decoding GenerationId failed, found:", response.GenerationId)
+	if response.GenerationID != 0 {
+		t.Error("Decoding GenerationId failed, found:", response.GenerationID)
 	}
-	if response.LeaderId != "" {
-		t.Error("Decoding LeaderId failed, found:", response.LeaderId)
+	if response.LeaderID != "" {
+		t.Error("Decoding LeaderId failed, found:", response.LeaderID)
 	}
-	if response.MemberId != "" {
-		t.Error("Decoding MemberId failed, found:", response.MemberId)
+	if response.MemberID != "" {
+		t.Error("Decoding MemberId failed, found:", response.MemberID)
 	}
 	if len(response.Members) != 0 {
 		t.Error("Decoding Members failed, found:", response.Members)
@@ -99,14 +99,14 @@ func TestJoinGroupResponseV0(t *testing.T) {
 	if response.Err != ErrNoError {
 		t.Error("Decoding Err failed: ErrNoError expected but found", response.Err)
 	}
-	if response.GenerationId != 66051 {
-		t.Error("Decoding GenerationId failed, found:", response.GenerationId)
+	if response.GenerationID != 66051 {
+		t.Error("Decoding GenerationId failed, found:", response.GenerationID)
 	}
-	if response.LeaderId != "foo" {
-		t.Error("Decoding LeaderId failed, found:", response.LeaderId)
+	if response.LeaderID != "foo" {
+		t.Error("Decoding LeaderId failed, found:", response.LeaderID)
 	}
-	if response.MemberId != "foo" {
-		t.Error("Decoding MemberId failed, found:", response.MemberId)
+	if response.MemberID != "foo" {
+		t.Error("Decoding MemberId failed, found:", response.MemberID)
 	}
 	if len(response.Members) != 1 {
 		t.Error("Decoding Members failed, found:", response.Members)
@@ -122,17 +122,17 @@ func TestJoinGroupResponseV1(t *testing.T) {
 	if response.Err != ErrNoError {
 		t.Error("Decoding Err failed: no error expected but found", response.Err)
 	}
-	if response.GenerationId != 66051 {
-		t.Error("Decoding GenerationId failed, found:", response.GenerationId)
+	if response.GenerationID != 66051 {
+		t.Error("Decoding GenerationId failed, found:", response.GenerationID)
 	}
 	if response.GroupProtocol != "protocol" {
 		t.Error("Decoding GroupProtocol failed, found:", response.GroupProtocol)
 	}
-	if response.LeaderId != "foo" {
-		t.Error("Decoding LeaderId failed, found:", response.LeaderId)
+	if response.LeaderID != "foo" {
+		t.Error("Decoding LeaderId failed, found:", response.LeaderID)
 	}
-	if response.MemberId != "bar" {
-		t.Error("Decoding MemberId failed, found:", response.MemberId)
+	if response.MemberID != "bar" {
+		t.Error("Decoding MemberId failed, found:", response.MemberID)
 	}
 	if response.Version != 1 {
 		t.Error("Decoding Version failed, found:", response.Version)
@@ -151,17 +151,17 @@ func TestJoinGroupResponseV2(t *testing.T) {
 	if response.Err != ErrNoError {
 		t.Error("Decoding Err failed: no error expected but found", response.Err)
 	}
-	if response.GenerationId != 66051 {
-		t.Error("Decoding GenerationId failed, found:", response.GenerationId)
+	if response.GenerationID != 66051 {
+		t.Error("Decoding GenerationId failed, found:", response.GenerationID)
 	}
 	if response.GroupProtocol != "protocol" {
 		t.Error("Decoding GroupProtocol failed, found:", response.GroupProtocol)
 	}
-	if response.LeaderId != "foo" {
-		t.Error("Decoding LeaderId failed, found:", response.LeaderId)
+	if response.LeaderID != "foo" {
+		t.Error("Decoding LeaderId failed, found:", response.LeaderID)
 	}
-	if response.MemberId != "bar" {
-		t.Error("Decoding MemberId failed, found:", response.MemberId)
+	if response.MemberID != "bar" {
+		t.Error("Decoding MemberId failed, found:", response.MemberID)
 	}
 	if response.Version != 2 {
 		t.Error("Decoding Version failed, found:", response.Version)

leave_group_request.go

@@ -1,15 +1,15 @@
 package sarama
 
 type LeaveGroupRequest struct {
-	GroupId  string
-	MemberId string
+	GroupID  string
+	MemberID string
 }
 
 func (r *LeaveGroupRequest) encode(pe packetEncoder) error {
-	if err := pe.putString(r.GroupId); err != nil {
+	if err := pe.putString(r.GroupID); err != nil {
 		return err
 	}
-	if err := pe.putString(r.MemberId); err != nil {
+	if err := pe.putString(r.MemberID); err != nil {
 		return err
 	}
 
@@ -17,10 +17,10 @@ func (r *LeaveGroupRequest) encode(pe packetEncoder) error {
 }
 
 func (r *LeaveGroupRequest) decode(pd packetDecoder, version int16) (err error) {
-	if r.GroupId, err = pd.getString(); err != nil {
+	if r.GroupID, err = pd.getString(); err != nil {
 		return
 	}
-	if r.MemberId, err = pd.getString(); err != nil {
+	if r.MemberID, err = pd.getString(); err != nil {
 		return
 	}
 

leave_group_request_test.go

@@ -13,7 +13,7 @@ func TestLeaveGroupRequest(t *testing.T) {
 	var request *LeaveGroupRequest
 
 	request = new(LeaveGroupRequest)
-	request.GroupId = "foo"
-	request.MemberId = "bar"
+	request.GroupID = "foo"
+	request.MemberID = "bar"
 	testRequest(t, "basic", request, basicLeaveGroupRequest)
 }

leave_group_response_test.go

@@ -18,7 +18,7 @@ func TestLeaveGroupResponse(t *testing.T) {
 
 	response = new(LeaveGroupResponse)
 	testVersionDecodable(t, "with error", response, leaveGroupResponseWithError, 0)
-	if response.Err != ErrUnknownMemberId {
+	if response.Err != ErrUnknownMemberID {
 		t.Error("Decoding error failed: ErrUnknownMemberId expected but found", response.Err)
 	}
 }

list_groups_response.go

@@ -11,8 +11,8 @@ func (r *ListGroupsResponse) encode(pe packetEncoder) error {
 	if err := pe.putArrayLength(len(r.Groups)); err != nil {
 		return err
 	}
-	for groupId, protocolType := range r.Groups {
-		if err := pe.putString(groupId); err != nil {
+	for groupID, protocolType := range r.Groups {
+		if err := pe.putString(groupID); err != nil {
 			return err
 		}
 		if err := pe.putString(protocolType); err != nil {
@@ -41,7 +41,7 @@ func (r *ListGroupsResponse) decode(pd packetDecoder, version int16) error {
 
 	r.Groups = make(map[string]string)
 	for i := 0; i < n; i++ {
-		groupId, err := pd.getString()
+		groupID, err := pd.getString()
 		if err != nil {
 			return err
 		}
@@ -50,7 +50,7 @@ func (r *ListGroupsResponse) decode(pd packetDecoder, version int16) error {
 			return err
 		}
 
-		r.Groups[groupId] = protocolType
+		r.Groups[groupID] = protocolType
 	}
 
 	return nil

mockresponses.go

@@ -121,7 +121,7 @@ func (m *MockDescribeGroupsResponse) For(reqBody versionedDecoder) encoder {
 			// Mimic real kafka - if a group doesn't exist, return
 			// an entry with state "Dead"
 			response.Groups = append(response.Groups, &GroupDescription{
-				GroupId: requestedGroup,
+				GroupID: requestedGroup,
 				State:   "Dead",
 			})
 		}

offset_manager.go

@@ -123,9 +123,8 @@ func (om *offsetManager) Close() error {
 func (om *offsetManager) computeBackoff(retries int) time.Duration {
 	if om.conf.Metadata.Retry.BackoffFunc != nil {
 		return om.conf.Metadata.Retry.BackoffFunc(retries, om.conf.Metadata.Retry.Max)
-	} else {
-		return om.conf.Metadata.Retry.Backoff
 	}
+	return om.conf.Metadata.Retry.Backoff
 }
 
 func (om *offsetManager) fetchInitialOffset(topic string, partition int32, retries int) (int64, string, error) {

sync_group_request.go

@@ -1,28 +1,28 @@
 package sarama
 
 type SyncGroupRequest struct {
-	GroupId          string
-	GenerationId     int32
-	MemberId         string
+	GroupID          string
+	GenerationID     int32
+	MemberID         string
 	GroupAssignments map[string][]byte
 }
 
 func (r *SyncGroupRequest) encode(pe packetEncoder) error {
-	if err := pe.putString(r.GroupId); err != nil {
+	if err := pe.putString(r.GroupID); err != nil {
 		return err
 	}
 
-	pe.putInt32(r.GenerationId)
+	pe.putInt32(r.GenerationID)
 
-	if err := pe.putString(r.MemberId); err != nil {
+	if err := pe.putString(r.MemberID); err != nil {
 		return err
 	}
 
 	if err := pe.putArrayLength(len(r.GroupAssignments)); err != nil {
 		return err
 	}
-	for memberId, memberAssignment := range r.GroupAssignments {
-		if err := pe.putString(memberId); err != nil {
+	for memberID, memberAssignment := range r.GroupAssignments {
+		if err := pe.putString(memberID); err != nil {
 			return err
 		}
 		if err := pe.putBytes(memberAssignment); err != nil {
@@ -34,13 +34,13 @@ func (r *SyncGroupRequest) encode(pe packetEncoder) error {
 }
 
 func (r *SyncGroupRequest) decode(pd packetDecoder, version int16) (err error) {
-	if r.GroupId, err = pd.getString(); err != nil {
+	if r.GroupID, err = pd.getString(); err != nil {
 		return
 	}
-	if r.GenerationId, err = pd.getInt32(); err != nil {
+	if r.GenerationID, err = pd.getInt32(); err != nil {
 		return
 	}
-	if r.MemberId, err = pd.getString(); err != nil {
+	if r.MemberID, err = pd.getString(); err != nil {
 		return
 	}
 
@@ -54,7 +54,7 @@ func (r *SyncGroupRequest) decode(pd packetDecoder, version int16) (err error) {
 
 	r.GroupAssignments = make(map[string][]byte)
 	for i := 0; i < n; i++ {
-		memberId, err := pd.getString()
+		memberID, err := pd.getString()
 		if err != nil {
 			return err
 		}
@@ -63,7 +63,7 @@ func (r *SyncGroupRequest) decode(pd packetDecoder, version int16) (err error) {
 			return err
 		}
 
-		r.GroupAssignments[memberId] = memberAssignment
+		r.GroupAssignments[memberID] = memberAssignment
 	}
 
 	return nil
@@ -81,20 +81,20 @@ func (r *SyncGroupRequest) requiredVersion() KafkaVersion {
 	return V0_9_0_0
 }
 
-func (r *SyncGroupRequest) AddGroupAssignment(memberId string, memberAssignment []byte) {
+func (r *SyncGroupRequest) AddGroupAssignment(memberID string, memberAssignment []byte) {
 	if r.GroupAssignments == nil {
 		r.GroupAssignments = make(map[string][]byte)
 	}
 
-	r.GroupAssignments[memberId] = memberAssignment
+	r.GroupAssignments[memberID] = memberAssignment
 }
 
-func (r *SyncGroupRequest) AddGroupAssignmentMember(memberId string, memberAssignment *ConsumerGroupMemberAssignment) error {
+func (r *SyncGroupRequest) AddGroupAssignmentMember(memberID string, memberAssignment *ConsumerGroupMemberAssignment) error {
 	bin, err := encode(memberAssignment, nil)
 	if err != nil {
 		return err
 	}
 
-	r.AddGroupAssignment(memberId, bin)
+	r.AddGroupAssignment(memberID, bin)
 	return nil
 }

sync_group_request_test.go

@@ -24,15 +24,15 @@ func TestSyncGroupRequest(t *testing.T) {
 	var request *SyncGroupRequest
 
 	request = new(SyncGroupRequest)
-	request.GroupId = "foo"
-	request.GenerationId = 66051
-	request.MemberId = "baz"
+	request.GroupID = "foo"
+	request.GenerationID = 66051
+	request.MemberID = "baz"
 	testRequest(t, "empty", request, emptySyncGroupRequest)
 
 	request = new(SyncGroupRequest)
-	request.GroupId = "foo"
-	request.GenerationId = 66051
-	request.MemberId = "baz"
+	request.GroupID = "foo"
+	request.GenerationID = 66051
+	request.MemberID = "baz"
 	request.AddGroupAssignment("baz", []byte("foo"))
 	testRequest(t, "populated", request, populatedSyncGroupRequest)
 }