Merge pull request #22 from maier/master

v0.0.11

.golangci.yml

@@ -37,7 +37,6 @@ linters-settings:
 
 linters:
   enable:
-    - deadcode
     - errcheck
     - gocritic
     - gofmt
@@ -49,15 +48,11 @@ linters:
     - misspell
     - prealloc
     - staticcheck
-    - structcheck
     - typecheck
     - unparam
     - unused
-    - varcheck
-    # - gci
     - godot
     - godox
-    # - goerr113
     - predeclared
     - unconvert
     - wrapcheck
@@ -67,13 +62,14 @@ linters:
     - errorlint
     - wrapcheck
     - goconst
-    # - stylecheck
     - forcetypeassert
-    # - goimports
   disable:
     - scopelint # deprecated
     - golint    # deprecated
     - maligned  # deprecated
+    - varcheck  # deprecated
+    - structcheck # deprecated
+    - deadcode # deprecated
   disable-all: false
   presets:
     - bugs

CHANGELOG.md

@@ -1,3 +1,9 @@
+# v0.0.11
+
+* fix: init broker list correctly in edge cases
+* fix: lint, struct alignment
+* fix: lint, unused param
+
 # v0.0.10
 
 * feat: add gzip size of sent data stat

broker.go

@@ -32,9 +32,17 @@ func (tc *TrapCheck) fetchBroker(cid, checkType string) error {
 	if cid == "" {
 		return fmt.Errorf("invalid broker cid (empty)")
 	}
+
 	if checkType == "" {
 		return fmt.Errorf("invalid check type (empty)")
 	}
+
+	if tc.brokerList == nil {
+		if err := tc.initBrokerList(); err != nil {
+			return err
+		}
+	}
+
 	broker, err := tc.brokerList.GetBroker(cid)
 	// broker, err := tc.client.FetchBroker(apiclient.CIDType(&cid))
 	if err != nil {
@@ -55,6 +63,12 @@ func (tc *TrapCheck) getBroker(checkType string) error {
 		return tc.fetchBroker(tc.checkConfig.Brokers[0], checkType)
 	}
 
+	if tc.brokerList == nil {
+		if err := tc.initBrokerList(); err != nil {
+			return err
+		}
+	}
+
 	//
 	// otherwise, select an applicable broker
 	//

check_tags.go

@@ -8,7 +8,7 @@ import (
 	"github.com/circonus-labs/go-apiclient"
 )
 
-func (tc *TrapCheck) UpdateCheckTags(ctx context.Context, tags []string) (*apiclient.CheckBundle, error) {
+func (tc *TrapCheck) UpdateCheckTags(_ context.Context, tags []string) (*apiclient.CheckBundle, error) {
 	if tc.checkBundle == nil {
 		return nil, fmt.Errorf("invalid state, check bundle is nil")
 	}

internal/broker_list/broker_list.go

@@ -19,12 +19,12 @@ type BrokerList interface {
 	SearchBrokerList(searchTags apiclient.TagType) (*[]apiclient.Broker, error)
 }
 
-type brokerList struct {
+type brokerList struct { //nolint:govet
 	lastRefresh time.Time
-	logger      Logger
-	client      API
-	brokers     *[]apiclient.Broker
 	sync.Mutex
+	logger  Logger
+	client  API
+	brokers *[]apiclient.Broker
 }
 
 var brokerListInstance *brokerList

tls.go

@@ -24,6 +24,12 @@ func (tc *TrapCheck) clearTLSConfig() {
 // setBrokerTLSConfig sets the broker tls configuration if was
 // not supplied by the caller in the configuration.
 func (tc *TrapCheck) setBrokerTLSConfig() error {
+	if tc.brokerList == nil {
+		if err := tc.initBrokerList(); err != nil {
+			return err
+		}
+	}
+
 	if tc.resetTLSConfig {
 		tc.broker = nil    // force refresh
 		tc.tlsConfig = nil // don't use, refresh and reset

trapcheck.go

@@ -113,16 +113,6 @@ func New(cfg *Config) (*TrapCheck, error) {
 		}
 	}
 
-	if err := brokerList.Init(cfg.Client, tc.Log); err != nil {
-		return nil, fmt.Errorf("initializing broker list: %w", err)
-	}
-
-	if bl, err := brokerList.GetInstance(); err != nil {
-		return nil, fmt.Errorf("getting broker list instance: %w", err)
-	} else {
-		tc.brokerList = bl
-	}
-
 	dur := cfg.BrokerMaxResponseTime
 	if dur == "" {
 		dur = defaultBrokerMaxResponseTime
@@ -165,6 +155,10 @@ func New(cfg *Config) (*TrapCheck, error) {
 		tc.checkBundle = tc.checkConfig
 	}
 
+	if err := tc.initBrokerList(); err != nil {
+		return nil, err
+	}
+
 	if err := tc.setBrokerTLSConfig(); err != nil {
 		return nil, err
 	}
@@ -249,13 +243,33 @@ func NewFromCheckBundle(cfg *Config, bundle *apiclient.CheckBundle) (*TrapCheck,
 
 	tc.submissionURL = surl
 
+	if err := tc.initBrokerList(); err != nil {
+		return nil, err
+	}
+
 	if err := tc.setBrokerTLSConfig(); err != nil {
 		return nil, err
 	}
 
 	return tc, nil
 }
 
+func (tc *TrapCheck) initBrokerList() error {
+	if tc.brokerList != nil {
+		return nil
+	}
+	if err := brokerList.Init(tc.client, tc.Log); err != nil {
+		return fmt.Errorf("initializing broker list: %w", err)
+	}
+
+	bl, err := brokerList.GetInstance()
+	if err != nil {
+		return fmt.Errorf("getting broker list instance: %w", err)
+	}
+	tc.brokerList = bl
+	return nil
+}
+
 // SendMetrics submits the metrics to the broker
 // metrics must be valid JSON encoded data for the broker httptrap check
 // returns trap results in a structure or an error.