Addressing review comments

Passing the cfg pointer in the function and creating the initial
config from the main test loop

config_test.go

@@ -36,66 +36,54 @@ func TestEmptyClientIDConfigValidates(t *testing.T) {
 func TestNetConfigValidates(t *testing.T) {
 	tests := []struct {
 		name string
-		cfg  func() *Config // resorting to using a function as a param because of internal composite structs
+		cfg  func(*Config) // resorting to using a function as a param because of internal composite structs
 		err  string
 	}{
 		{
 			"OpenRequests",
-			func() *Config {
-				cfg := NewConfig()
+			func(cfg *Config) {
 				cfg.Net.MaxOpenRequests = 0
-				return cfg
 			},
 			"Net.MaxOpenRequests must be > 0"},
 		{"DialTimeout",
-			func() *Config {
-				cfg := NewConfig()
+			func(cfg *Config) {
 				cfg.Net.DialTimeout = 0
-				return cfg
 			},
 			"Net.DialTimeout must be > 0"},
 		{"ReadTimeout",
-			func() *Config {
-				cfg := NewConfig()
+			func(cfg *Config) {
 				cfg.Net.ReadTimeout = 0
-				return cfg
 			},
 			"Net.ReadTimeout must be > 0"},
 		{"WriteTimeout",
-			func() *Config {
-				cfg := NewConfig()
+			func(cfg *Config) {
 				cfg.Net.WriteTimeout = 0
-				return cfg
 			},
 			"Net.WriteTimeout must be > 0"},
 		{"KeepAlive",
-			func() *Config {
-				cfg := NewConfig()
+			func(cfg *Config) {
 				cfg.Net.KeepAlive = -1
-				return cfg
 			},
 			"Net.KeepAlive must be >= 0"},
 		{"SASL.User",
-			func() *Config {
-				cfg := NewConfig()
+			func(cfg *Config) {
 				cfg.Net.SASL.Enable = true
 				cfg.Net.SASL.User = ""
-				return cfg
 			},
 			"Net.SASL.User must not be empty when SASL is enabled"},
 		{"SASL.Password",
-			func() *Config {
-				cfg := NewConfig()
+			func(cfg *Config) {
 				cfg.Net.SASL.Enable = true
 				cfg.Net.SASL.User = "user"
 				cfg.Net.SASL.Password = ""
-				return cfg
 			},
 			"Net.SASL.Password must not be empty when SASL is enabled"},
 	}
 
 	for i, test := range tests {
-		if err := test.cfg().Validate(); string(err.(ConfigurationError)) != test.err {
+		c := NewConfig()
+		test.cfg(c)
+		if err := c.Validate(); string(err.(ConfigurationError)) != test.err {
 			t.Errorf("[%d]:[%s] Expected %s, Got %s\n", i, test.name, test.err, err)
 		}
 	}
@@ -104,35 +92,31 @@ func TestNetConfigValidates(t *testing.T) {
 func TestMetadataConfigValidates(t *testing.T) {
 	tests := []struct {
 		name string
-		cfg  func() *Config // resorting to using a function as a param because of internal composite structs
+		cfg  func(*Config) // resorting to using a function as a param because of internal composite structs
 		err  string
 	}{
 		{
 			"Retry.Max",
-			func() *Config {
-				cfg := NewConfig()
+			func(cfg *Config) {
 				cfg.Metadata.Retry.Max = -1
-				return cfg
 			},
 			"Metadata.Retry.Max must be >= 0"},
 		{"Retry.Backoff",
-			func() *Config {
-				cfg := NewConfig()
+			func(cfg *Config) {
 				cfg.Metadata.Retry.Backoff = -1
-				return cfg
 			},
 			"Metadata.Retry.Backoff must be >= 0"},
 		{"RefreshFrequency",
-			func() *Config {
-				cfg := NewConfig()
+			func(cfg *Config) {
 				cfg.Metadata.RefreshFrequency = -1
-				return cfg
 			},
 			"Metadata.RefreshFrequency must be >= 0"},
 	}
 
 	for i, test := range tests {
-		if err := test.cfg().Validate(); string(err.(ConfigurationError)) != test.err {
+		c := NewConfig()
+		test.cfg(c)
+		if err := c.Validate(); string(err.(ConfigurationError)) != test.err {
 			t.Errorf("[%d]:[%s] Expected %s, Got %s\n", i, test.name, test.err, err)
 		}
 	}
@@ -141,92 +125,72 @@ func TestMetadataConfigValidates(t *testing.T) {
 func TestProducerConfigValidates(t *testing.T) {
 	tests := []struct {
 		name string
-		cfg  func() *Config // resorting to using a function as a param because of internal composite structs
+		cfg  func(*Config) // resorting to using a function as a param because of internal composite structs
 		err  string
 	}{
 		{
 			"MaxMessageBytes",
-			func() *Config {
-				cfg := NewConfig()
+			func(cfg *Config) {
 				cfg.Producer.MaxMessageBytes = 0
-				return cfg
 			},
 			"Producer.MaxMessageBytes must be > 0"},
 		{"RequiredAcks",
-			func() *Config {
-				cfg := NewConfig()
+			func(cfg *Config) {
 				cfg.Producer.RequiredAcks = -2
-				return cfg
 			},
 			"Producer.RequiredAcks must be >= -1"},
 		{"Timeout",
-			func() *Config {
-				cfg := NewConfig()
+			func(cfg *Config) {
 				cfg.Producer.Timeout = 0
-				return cfg
 			},
 			"Producer.Timeout must be > 0"},
 		{"Partitioner",
-			func() *Config {
-				cfg := NewConfig()
+			func(cfg *Config) {
 				cfg.Producer.Partitioner = nil
-				return cfg
 			},
 			"Producer.Partitioner must not be nil"},
 		{"Flush.Bytes",
-			func() *Config {
-				cfg := NewConfig()
+			func(cfg *Config) {
 				cfg.Producer.Flush.Bytes = -1
-				return cfg
 			},
 			"Producer.Flush.Bytes must be >= 0"},
 		{"Flush.Messages",
-			func() *Config {
-				cfg := NewConfig()
+			func(cfg *Config) {
 				cfg.Producer.Flush.Messages = -1
-				return cfg
 			},
 			"Producer.Flush.Messages must be >= 0"},
 		{"Flush.Frequency",
-			func() *Config {
-				cfg := NewConfig()
+			func(cfg *Config) {
 				cfg.Producer.Flush.Frequency = -1
-				return cfg
 			},
 			"Producer.Flush.Frequency must be >= 0"},
 		{"Flush.MaxMessages",
-			func() *Config {
-				cfg := NewConfig()
+			func(cfg *Config) {
 				cfg.Producer.Flush.MaxMessages = -1
-				return cfg
 			},
 			"Producer.Flush.MaxMessages must be >= 0"},
 		{"Flush.MaxMessages with Producer.Flush.Messages",
-			func() *Config {
-				cfg := NewConfig()
+			func(cfg *Config) {
 				cfg.Producer.Flush.MaxMessages = 1
 				cfg.Producer.Flush.Messages = 2
-				return cfg
 			},
 			"Producer.Flush.MaxMessages must be >= Producer.Flush.Messages when set"},
 		{"Flush.Retry.Max",
-			func() *Config {
-				cfg := NewConfig()
+			func(cfg *Config) {
 				cfg.Producer.Retry.Max = -1
-				return cfg
 			},
 			"Producer.Retry.Max must be >= 0"},
 		{"Flush.Retry.Backoff",
-			func() *Config {
-				cfg := NewConfig()
+			func(cfg *Config) {
 				cfg.Producer.Retry.Backoff = -1
-				return cfg
 			},
 			"Producer.Retry.Backoff must be >= 0"},
 	}
 
 	for i, test := range tests {
-		if err := test.cfg().Validate(); string(err.(ConfigurationError)) != test.err {
+		c := NewConfig()
+		test.cfg(c)
+		if err := c.Validate(); string(err.(ConfigurationError)) != test.err {
 			t.Errorf("[%d]:[%s] Expected %s, Got %s\n", i, test.name, test.err, err)
 		}
 	}