(MAINT) Fix linter issues

Author: Dave Johnston

client/client.go

@@ -65,7 +65,7 @@ func NewCfClient(sdkKey string, options ...ConfigOption) (*CfClient, error) {
 		sdkKey:        sdkKey,
 		config:        config,
 		authenticated: make(chan struct{}),
-		initialized: make(chan bool),
+		initialized:   make(chan bool),
 	}
 	ctx, client.cancelFunc = context.WithCancel(context.Background())
 
@@ -94,14 +94,16 @@ func NewCfClient(sdkKey string, options ...ConfigOption) (*CfClient, error) {
 	return client, nil
 }
 
+// IsInitialized determines if the client is ready to be used.  This is true if it has both authenticated
+// and successfully retrived flags.  If it takes longer than 30 seconds the call will timeout and return an error.
 func (c *CfClient) IsInitialized() (bool, error) {
 	select {
 	case <-c.initialized:
 		return true, nil
-	case <-time.After(30*time.Second):
+	case <-time.After(30 * time.Second):
 		break
 	}
-	return false, fmt.Errorf("Timeout waiting to initialize\n")
+	return false, fmt.Errorf("timeout waiting to initialize")
 }
 
 func (c *CfClient) retrieve(ctx context.Context) {
@@ -126,7 +128,7 @@ func (c *CfClient) retrieve(ctx context.Context) {
 		}
 	}()
 	wg.Wait()
-	c.initialized<-true
+	c.initialized <- true
 	c.config.Logger.Info("Sync run finished")
 }
 
@@ -165,7 +167,6 @@ func (c *CfClient) authenticate(ctx context.Context) {
 	c.mux.RLock()
 	defer c.mux.RUnlock()
 
-
 	// dont check err just retry
 	httpClient, err := rest.NewClientWithResponses(c.config.url, rest.WithHTTPClient(c.config.httpClient))
 	if err != nil {
@@ -497,4 +498,4 @@ func checkPreRequisite(client *CfClient, featureConfig *evaluation.FeatureConfig
 	}
 
 	return result
-}
+}

client/client_test.go

@@ -2,22 +2,23 @@ package client_test
 
 import (
 	"encoding/json"
+	"net/http"
+	"os"
+	"testing"
+
 	"github.com/drone/ff-golang-server-sdk/client"
 	"github.com/drone/ff-golang-server-sdk/dto"
 	"github.com/drone/ff-golang-server-sdk/evaluation"
 	"github.com/drone/ff-golang-server-sdk/rest"
 	"github.com/jarcoal/httpmock"
 	"github.com/stretchr/testify/assert"
-	"net/http"
-	"testing"
-	"os"
 )
 
 const (
 	sdkKey = "27bed8d2-2610-462b-90eb-d80fd594b623"
- 	URL = "http://localhost/api/1.0"
+	URL    = "http://localhost/api/1.0"
+	//nolint
 	AuthToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJwcm9qZWN0IjoiMTA0MjM5NzYtODQ1MS00NmZjLTg2NzctYmNiZDM3MTA3M2JhIiwiZW52aXJvbm1lbnQiOiI3ZWQxMDI1ZC1hOWIxLTQxMjktYTg4Zi1lMjdlZjM2MDk4MmQiLCJwcm9qZWN0SWRlbnRpZmllciI6IiIsImVudmlyb25tZW50SWRlbnRpZmllciI6IlByZVByb2R1Y3Rpb24iLCJhY2NvdW50SUQiOiIiLCJvcmdhbml6YXRpb24iOiIwMDAwMDAwMC0wMDAwLTAwMDAtMDAwMC0wMDAwMDAwMDAwMDAifQ.z6EYSDVWwwAY6OTc2PnjSub43R6lOSJywlEObi6PDqQ"
-
 )
 
 // TestMain runs before the other tests
@@ -61,13 +62,14 @@ func TestCfClient_BoolVariation(t *testing.T) {
 		{"Test Default True Flag when Pre-Req is True returns true", args{"TestTrueOnWithPreReqTrue", target, true}, true, false},
 	}
 	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			flag, err := client.BoolVariation(tt.args.key, tt.args.target, tt.args.defaultValue)
-			if (err != nil) != tt.wantErr {
-				t.Errorf("BoolVariation() error = %v, wantErr %v", err, tt.wantErr)
+		test := tt
+		t.Run(test.name, func(t *testing.T) {
+			flag, err := client.BoolVariation(test.args.key, test.args.target, test.args.defaultValue)
+			if (err != nil) != test.wantErr {
+				t.Errorf("BoolVariation() error = %v, wantErr %v", err, test.wantErr)
 				return
 			}
-			assert.Equal(t, tt.want, flag, "%s didn't get expected value", tt.name)
+			assert.Equal(t, test.want, flag, "%s didn't get expected value", test.name)
 		})
 	}
 }
@@ -89,7 +91,6 @@ func TestCfClient_StringVariation(t *testing.T) {
 		args    args
 		want    string
 		wantErr bool
-
 	}{
 		{"Test Invalid Flag Name returns default value", args{"MadeUpIDontExist", target, "foo"}, "foo", false},
 		{"Test Default String Flag with when On returns A", args{"TestStringAOn", target, "foo"}, "A", false},
@@ -98,13 +99,14 @@ func TestCfClient_StringVariation(t *testing.T) {
 		{"Test Default String Flag when Pre-Req is True returns A", args{"TestStringAOnWithPreReqTrue", target, "foo"}, "A", false},
 	}
 	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			flag, err := client.StringVariation(tt.args.key, tt.args.target, tt.args.defaultValue)
-			if (err != nil) != tt.wantErr {
-				t.Errorf("BoolVariation() error = %v, wantErr %v", err, tt.wantErr)
+		test := tt
+		t.Run(test.name, func(t *testing.T) {
+			flag, err := client.StringVariation(test.args.key, test.args.target, test.args.defaultValue)
+			if (err != nil) != test.wantErr {
+				t.Errorf("BoolVariation() error = %v, wantErr %v", err, test.wantErr)
 				return
 			}
-			assert.Equal(t, tt.want, flag, "%s didn't get expected value", tt.name)
+			assert.Equal(t, test.want, flag, "%s didn't get expected value", test.name)
 		})
 	}
 }
@@ -126,7 +128,6 @@ func MakeNewClientAndTarget() (*client.CfClient, *evaluation.Target, error) {
 	return client, target, nil
 }
 
-
 // newClient creates a new client with some default options
 func newClient(httpClient *http.Client) (*client.CfClient, error) {
 	return client.NewCfClient(sdkKey,
@@ -149,7 +150,7 @@ func target() *evaluation.Target {
 
 var ValidAuthResponse = func(req *http.Request) (*http.Response, error) {
 	return httpmock.NewJsonResponse(200, rest.AuthenticationResponse{
-		AuthToken: 	AuthToken})
+		AuthToken: AuthToken})
 }
 
 var TargetSegmentsResponse = func(req *http.Request) (*http.Response, error) {
@@ -197,4 +198,4 @@ var FeatureConfigsResponse = func(req *http.Request) (*http.Response, error) {
 	FeatureConfigResponse = append(FeatureConfigResponse, MakeStringFeatureConfigs("TestStringAOnWithPreReqTrue", "Alpha", "Bravo", "on", MakeBoolPreRequisite("PreReq1", "true"))...)
 
 	return httpmock.NewJsonResponse(200, FeatureConfigResponse)
-}
+}

client/config.go

@@ -16,9 +16,9 @@ type config struct {
 	Cache        cache.Cache
 	Store        storage.Storage
 	Logger       logger.Logger
-	httpClient	 *http.Client
+	httpClient   *http.Client
 	enableStream bool
-	enableStore bool
+	enableStore  bool
 }
 
 func newDefaultConfig() *config {
@@ -29,7 +29,6 @@ func newDefaultConfig() *config {
 	defaultCache, _ := cache.NewLruCache(10000, defaultLogger) // size of cache
 	defaultStore := storage.NewFileStore("defaultProject", storage.GetHarnessDir(), defaultLogger)
 
-
 	retryClient := retryablehttp.NewClient()
 	retryClient.RetryMax = 10
 
@@ -41,6 +40,6 @@ func newDefaultConfig() *config {
 		Logger:       defaultLogger,
 		httpClient:   retryClient.StandardClient(),
 		enableStream: true,
-		enableStore: true,
+		enableStore:  true,
 	}
 }

client/helpers_test.go

@@ -2,17 +2,18 @@ package client_test
 
 import (
 	"fmt"
+	"net/http"
+
 	"github.com/drone/ff-golang-server-sdk/rest"
 	"github.com/jarcoal/httpmock"
-	"net/http"
 )
 
 func MakeBoolFeatureConfigs(name, defaultVariation, offVariation, state string, preReqs ...rest.Prerequisite) []rest.FeatureConfig {
 	var featureConfig []rest.FeatureConfig
 	featureConfig = append(featureConfig, MakeBoolFeatureConfig(name, defaultVariation, offVariation, state, preReqs))
 
 	// If there are any PreReqs then we need to store them as flags as well.
-	for _, x := range preReqs{
+	for _, x := range preReqs {
 		featureConfig = append(featureConfig, MakeBoolFeatureConfig(x.Feature, "true", "false", x.Variations[0], nil))
 	}
 
@@ -24,24 +25,24 @@ func MakeBoolFeatureConfig(name, defaultVariation, offVariation, state string, p
 		DefaultServe: rest.Serve{
 			Variation: &defaultVariation,
 		},
-		Environment: "PreProduction",
-		Feature: name,
-		Kind: "boolean",
+		Environment:  "PreProduction",
+		Feature:      name,
+		Kind:         "boolean",
 		OffVariation: offVariation,
-		State: rest.FeatureState(state),
+		State:        rest.FeatureState(state),
 		Variations: []rest.Variation{
 			{Identifier: "true", Name: strPtr("True"), Value: "true"},
 			{Identifier: "false", Name: strPtr("False"), Value: "false"},
 		},
 		Prerequisites: &preReqs,
-		Version: intPtr(1),
+		Version:       intPtr(1),
 	}
 }
 
 func MakeBoolPreRequisite(name string, state string) rest.Prerequisite {
 	return rest.Prerequisite{
-			Feature: name,
-			Variations: []string{state},
+		Feature:    name,
+		Variations: []string{state},
 	}
 }
 
@@ -50,14 +51,13 @@ func MakeStringFeatureConfigs(name, defaultVariation, offVariation, state string
 	featureConfig = append(featureConfig, MakeStringFeatureConfig(name, defaultVariation, offVariation, state, preReqs))
 
 	// If there are any PreReqs then we need to store them as flags as well.
-	for _, x := range preReqs{
+	for _, x := range preReqs {
 		featureConfig = append(featureConfig, MakeBoolFeatureConfig(x.Feature, "true", "false", x.Variations[0], nil))
 	}
 
 	return featureConfig
 }
 
-
 /*
 {
 		"defaultServe": {
@@ -85,24 +85,24 @@ func MakeStringFeatureConfigs(name, defaultVariation, offVariation, state string
 		],
 		"version": 1
 	}
- */
+*/
 
 func MakeStringFeatureConfig(name, defaultVariation, offVariation, state string, preReqs []rest.Prerequisite) rest.FeatureConfig {
 	return rest.FeatureConfig{
 		DefaultServe: rest.Serve{
 			Variation: &defaultVariation,
 		},
-		Environment: "PreProduction",
-		Feature: name,
-		Kind: "string",
+		Environment:  "PreProduction",
+		Feature:      name,
+		Kind:         "string",
 		OffVariation: offVariation,
-		State: rest.FeatureState(state),
+		State:        rest.FeatureState(state),
 		Variations: []rest.Variation{
 			{Identifier: "Alpha", Name: strPtr("Alpha"), Value: "A"},
 			{Identifier: "Bravo", Name: strPtr("Bravo"), Value: "B"},
 		},
 		Prerequisites: &preReqs,
-		Version: intPtr(1),
+		Version:       intPtr(1),
 	}
 }
 
@@ -114,6 +114,6 @@ func strPtr(value string) *string {
 	return &value
 }
 
-func jsonError(err error)  (*http.Response, error) {
+func jsonError(err error) (*http.Response, error) {
 	return httpmock.NewJsonResponse(500, fmt.Errorf(`{"error" : "%s"}`, err))
 }

client/options.go

@@ -1,10 +1,11 @@
 package client
 
 import (
+	"net/http"
+
 	"github.com/drone/ff-golang-server-sdk/cache"
 	"github.com/drone/ff-golang-server-sdk/logger"
 	"github.com/drone/ff-golang-server-sdk/storage"
-	"net/http"
 )
 
 // ConfigOption is used as return value for advanced client configuration
@@ -66,7 +67,6 @@ func WithStoreEnabled(val bool) ConfigOption {
 	}
 }
 
-
 // WithHTTPClient set http client for use in interactions with ff server
 func WithHTTPClient(client *http.Client) ConfigOption {
 	return func(config *config) {

evaluation/feature.go

@@ -2,6 +2,7 @@ package evaluation
 
 import (
 	"encoding/json"
+
 	"github.com/drone/ff-golang-server-sdk/types"
 
 	"reflect"