Aligning to Go Style guide as per Google

Author: thejoeker12

httpclient/client.go

@@ -22,21 +22,33 @@ import (
 
 // Master struct/object
 type Client struct {
+	// Config
 	config ClientConfig
-	http   *http.Client
 
-	AuthToken       string
-	AuthTokenExpiry time.Time
-	Sugar           *zap.SugaredLogger
-	Concurrency     *concurrency.ConcurrencyHandler
-	Integration     *APIIntegration
+	// Integration
+	Integration *APIIntegration
+
+	// Executor
+	http *http.Client
+
+	// Logger
+	Sugar *zap.SugaredLogger
+
+	// Concurrency Mananger
+	Concurrency *concurrency.ConcurrencyHandler
 }
 
 // Options/Variables for Client
 type ClientConfig struct {
 	// Interface which implements the APIIntegration patterns. Integration handles all server/endpoint specific configuration, auth and vars.
 	Integration APIIntegration
 
+	// TODO
+	Sugar *zap.SugaredLogger
+
+	// Wether or not empty values will be set or an error thrown for missing items.
+	PopulateDefaultValues bool
+
 	// HideSenitiveData controls if sensitive data will be visible in logs. Debug option which should be True in production use.
 	HideSensitiveData bool `json:"hide_sensitive_data"`
 
@@ -80,18 +92,17 @@ type ClientConfig struct {
 }
 
 // BuildClient creates a new HTTP client with the provided configuration.
-func (c ClientConfig) BuildClient(populateDefaultValues bool, sugar *zap.SugaredLogger) (*Client, error) {
-
-	if sugar == nil {
+func (c ClientConfig) Build() (*Client, error) {
+	if c.Sugar == nil {
 		zapLogger, err := zap.NewProduction()
-		sugar = zapLogger.Sugar()
-
 		if err != nil {
 			return nil, err
 		}
+
+		c.Sugar = zapLogger.Sugar()
 	}
 
-	err := c.validateClientConfig(populateDefaultValues)
+	err := c.validateClientConfig()
 	if err != nil {
 		return nil, fmt.Errorf("invalid configuration: %v", err)
 	}
@@ -101,16 +112,17 @@ func (c ClientConfig) BuildClient(populateDefaultValues bool, sugar *zap.Sugared
 	}
 
 	// TODO refactor redirects
-	if err := redirecthandler.SetupRedirectHandler(httpClient, c.FollowRedirects, c.MaxRedirects, sugar); err != nil {
+	if err := redirecthandler.SetupRedirectHandler(httpClient, c.FollowRedirects, c.MaxRedirects, c.Sugar); err != nil {
 		return nil, fmt.Errorf("Failed to set up redirect handler: %v", err)
 	}
 
+	// TODO refactor concurrency
 	var concurrencyHandler *concurrency.ConcurrencyHandler
 	if c.EnableConcurrencyManagement {
 		concurrencyMetrics := &concurrency.ConcurrencyMetrics{}
 		concurrencyHandler = concurrency.NewConcurrencyHandler(
 			c.MaxConcurrentRequests,
-			sugar,
+			c.Sugar,
 			concurrencyMetrics,
 		)
 	} else {
@@ -121,12 +133,12 @@ func (c ClientConfig) BuildClient(populateDefaultValues bool, sugar *zap.Sugared
 		Integration: &c.Integration,
 		http:        httpClient,
 		config:      c,
-		Sugar:       sugar,
+		Sugar:       c.Sugar,
 		Concurrency: concurrencyHandler,
 	}
 
 	if len(client.config.CustomCookies) > 0 {
-		client.loadCustomCookies(c.CustomCookies)
+		client.loadCustomCookies()
 	}
 
 	return client, nil

httpclient/config_validation.go

@@ -96,9 +96,9 @@ func LoadConfigFromEnv() (*ClientConfig, error) {
 }
 
 // TODO Review validateClientConfig
-func (c ClientConfig) validateClientConfig(populateDefaults bool) error {
+func (c ClientConfig) validateClientConfig() error {
 
-	if populateDefaults {
+	if c.PopulateDefaultValues {
 		c.SetDefaultValuesClientConfig()
 	}
 

httpclient/cookies.go

@@ -1,25 +1,23 @@
 package httpclient
 
 import (
-	"net/http"
 	"net/http/cookiejar"
 	"net/url"
 )
 
-func (c *Client) loadCustomCookies(cookiesList []*http.Cookie) error {
+func (c *Client) loadCustomCookies() error {
 	cookieJar, err := cookiejar.New(nil)
 	if err != nil {
 		return err
 	}
+	c.http.Jar = cookieJar
 
 	cookieUrl, err := url.Parse((*c.Integration).GetFQDN())
-
 	if err != nil {
 		return err
 	}
 
-	c.http.Jar = cookieJar
-	c.http.Jar.SetCookies(cookieUrl, cookiesList)
+	c.http.Jar.SetCookies(cookieUrl, c.config.CustomCookies)
 
 	return nil
 }

httpclient/headers.go

@@ -8,10 +8,10 @@ import (
 )
 
 // CheckDeprecationHeader checks the response headers for the Deprecation header and logs a warning if present.
-func CheckDeprecationHeader(resp *http.Response, sugar *zap.SugaredLogger) {
+func (c *Client) CheckDeprecationHeader(resp *http.Response) {
 	deprecationHeader := resp.Header.Get("Deprecation")
 	if deprecationHeader != "" {
-		sugar.Warn("API endpoint is deprecated",
+		c.Sugar.Warn("API endpoint is deprecated",
 			zap.String("Date", deprecationHeader),
 			zap.String("Endpoint", resp.Request.URL.String()),
 		)

httpclient/request.go

@@ -289,9 +289,7 @@ func (c *Client) doRequest(ctx context.Context, method, endpoint string, body in
 	// 	c.Concurrency.EvaluateAndAdjustConcurrency(resp, duration)
 	// }
 
-	// TODO review LogCookies
-
-	CheckDeprecationHeader(resp, c.Sugar)
+	c.CheckDeprecationHeader(resp)
 
 	c.Sugar.Debug("Request sent successfully", zap.String("method", method), zap.String("endpoint", endpoint), zap.Int("status_code", resp.StatusCode))