Fix linting

newrelic · Apr 21, 2020 · db7f1e6 · db7f1e6
1 parent efa1523
commit db7f1e6
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 13 deletions.
diff --git a/src/args/args_test.go b/src/args/args_test.go
@@ -34,19 +34,19 @@ func TestParseArgs(t *testing.T) {
 		DefaultJMXHost:             "test-default-host",
 		DefaultJMXPort:             9998,
 		NrJmx:                      "/usr/bin/nrjmx",
-		CollectBrokerTopicData:     true,
-		Producers:                  `[{"name":"producer1", "host":"producerhost","user":"a1","password":"p1","port":9995},{"name":"producer2"}]`,
-		Consumers:                  "[]",
-		TopicMode:                  "Specific",
-		TopicList:                  `["test1", "test2", "test3"]`,
-		TopicBucket:                `1/3`,
-		Timeout:                    1000,
-		ConsumerOffset:             false,
-		ConsumerGroups:             "[]",
-		ConsumerGroupRegex:         ".*",
-		SaslMechanism:              "PLAIN",
-		SaslUsername:               "admin3",
-		SaslPassword:               "secret1",
+		CollectBrokerTopicData: true,
+		Producers:              `[{"name":"producer1", "host":"producerhost","user":"a1","password":"p1","port":9995},{"name":"producer2"}]`,
+		Consumers:              "[]",
+		TopicMode:              "Specific",
+		TopicList:              `["test1", "test2", "test3"]`,
+		TopicBucket:            `1/3`,
+		Timeout:                1000,
+		ConsumerOffset:         false,
+		ConsumerGroups:         "[]",
+		ConsumerGroupRegex:     ".*",
+		SaslMechanism:          "PLAIN",
+		SaslUsername:           "admin3",
+		SaslPassword:           "secret1",
 	}
 
 	expectedArgs := &ParsedArguments{

diff --git a/src/connection/sasl_scram.go b/src/connection/sasl_scram.go
@@ -8,15 +8,20 @@ import (
 	"github.com/xdg/scram"
 )
 
+// SHA256 is a scram.HashGeneratorFcn
 var SHA256 scram.HashGeneratorFcn = func() hash.Hash { return sha256.New() }
+
+// SHA512 is a scram.HashGeneratorFcn
 var SHA512 scram.HashGeneratorFcn = func() hash.Hash { return sha512.New() }
 
+// XDGSCRAMClient implements sarama.SCRAMClient
 type XDGSCRAMClient struct {
 	*scram.Client
 	*scram.ClientConversation
 	scram.HashGeneratorFcn
 }
 
+// Begin is an implementation of sarams.SCRAMClient.Begin()
 func (x *XDGSCRAMClient) Begin(userName, password, authzID string) (err error) {
 	x.Client, err = x.HashGeneratorFcn.NewClient(userName, password, authzID)
 	if err != nil {
@@ -26,11 +31,13 @@ func (x *XDGSCRAMClient) Begin(userName, password, authzID string) (err error) {
 	return nil
 }
 
+// Step is an implementation of sarams.SCRAMClient.Step()
 func (x *XDGSCRAMClient) Step(challenge string) (response string, err error) {
 	response, err = x.ClientConversation.Step(challenge)
 	return
 }
 
+// Done is an implementation of sarams.SCRAMClient.Done()
 func (x *XDGSCRAMClient) Done() bool {
 	return x.ClientConversation.Done()
 }