bump ancla, fix datacenter watch (#589)

* bump ancla, fix datacenter watch

* fixed datacenter watch tests

* fixed basculechecks tests

* updated changelog, prep for release

Author: kristinapathak

CHANGELOG.md

@@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [v2.0.3]
+- Bumped argus to v0.6.0 and fixed related datacenter watch code. [#589](https://github.com/xmidt-org/webpa-common/pull/589)
+
 ## [v2.0.2]
 - Added logic to xhttp for retrying on http errors.[#588](https://github.com/xmidt-org/webpa-common/pull/588)
 
@@ -220,7 +223,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
  - The first official release. We will be better about documenting changes 
    moving forward.
 
-[Unreleased]: https://github.com/xmidt-org/webpa-common/compare/v2.0.2...HEAD
+[Unreleased]: https://github.com/xmidt-org/webpa-common/compare/v2.0.3...HEAD
+[v2.0.3]: https://github.com/xmidt-org/webpa-common/compare/v2.0.2...v2.0.3
 [v2.0.2]: https://github.com/xmidt-org/webpa-common/compare/v2.0.1...v2.0.2
 [v2.0.1]: https://github.com/xmidt-org/webpa-common/compare/v2.0.0...v2.0.1
 [v2.0.0]: https://github.com/xmidt-org/webpa-common/compare/v1.11.9...v2.0.0

basculechecks/capabilitiesvalidator_test.go

@@ -230,6 +230,7 @@ func TestCheckCapabilities(t *testing.T) {
 }
 
 func TestGetCapabilities(t *testing.T) {
+	type testType int
 	goodKeyVal := []string{"cap1", "cap2"}
 	emptyVal := []string{}
 	getCapabilitiesErr := errors.New("couldn't get capabilities using key")
@@ -280,7 +281,7 @@ func TestGetCapabilities(t *testing.T) {
 		},
 		{
 			description:    "Non String List Capabilities Error",
-			keyValue:       []int{0, 1, 2},
+			keyValue:       []testType{0, 1, 2},
 			expectedVals:   emptyVal,
 			expectedReason: UndeterminedCapabilities,
 			expectedErr:    badCapabilitiesErr,

basculechecks/metricvalidator.go

@@ -22,13 +22,10 @@ import (
 	"fmt"
 	"regexp"
 
-	"github.com/go-kit/kit/log"
 	"github.com/spf13/cast"
 	"github.com/xmidt-org/bascule"
 )
 
-var defaultLogger = log.NewNopLogger()
-
 // CapabilitiesChecker is an object that can determine if a request is
 // authorized given a bascule.Authentication object.  If it's not authorized, a
 // reason and error are given for logging and metrics.

basculechecks/metricvalidator_test.go

@@ -147,6 +147,7 @@ func TestMetricValidatorFunc(t *testing.T) {
 }
 
 func TestPrepMetrics(t *testing.T) {
+	type testType int
 	var (
 		goodURL        = "/asnkfn/aefkijeoij/aiogj"
 		matchingURL    = "/fnvvdsjkfji/mac:12345544322345334/geigosj"
@@ -221,7 +222,7 @@ func TestPrepMetrics(t *testing.T) {
 		},
 		{
 			description:       "Non String Slice Partner ID Error",
-			partnerIDs:        []int{0, 1, 2},
+			partnerIDs:        []testType{0, 1, 2},
 			url:               goodURL,
 			includeToken:      true,
 			includeAttributes: true,

go.mod

@@ -13,20 +13,20 @@ require (
 	github.com/gorilla/mux v1.8.0
 	github.com/gorilla/schema v1.0.3-0.20180614150749-e0e4b92809ac
 	github.com/gorilla/websocket v1.4.2
-	github.com/hashicorp/consul/api v1.7.0
+	github.com/hashicorp/consul/api v1.10.1
 	github.com/jtacoma/uritemplates v1.0.0
 	github.com/justinas/alice v1.2.0
 	github.com/miekg/dns v1.1.26
-	github.com/mitchellh/mapstructure v1.4.1
+	github.com/mitchellh/mapstructure v1.4.2
 	github.com/prometheus/client_golang v1.10.0
 	github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da
 	github.com/segmentio/ksuid v1.0.2
-	github.com/spf13/cast v1.3.1
+	github.com/spf13/cast v1.4.1
 	github.com/spf13/pflag v1.0.5
-	github.com/spf13/viper v1.7.1
+	github.com/spf13/viper v1.9.0
 	github.com/stretchr/testify v1.7.0
 	github.com/ugorji/go/codec v1.1.7
-	github.com/xmidt-org/argus v0.5.1
+	github.com/xmidt-org/argus v0.6.0
 	github.com/xmidt-org/bascule v0.10.2
 	github.com/xmidt-org/candlelight v0.0.5
 	github.com/xmidt-org/themis v0.4.7

go.sum

@@ -3,6 +3,7 @@ package consul
 import (
 	"context"
 	"errors"
+	"fmt"
 	"sync"
 	"time"
 
@@ -21,7 +22,7 @@ type datacenterWatcher struct {
 	environment         Environment
 	options             Options
 	inactiveDatacenters map[string]bool
-	chrysomClient       *chrysom.Client
+	stopListener        func(context.Context) error
 	consulWatchInterval time.Duration
 	lock                sync.RWMutex
 }
@@ -75,15 +76,18 @@ func newDatacenterWatcher(logger log.Logger, environment Environment, options Op
 		m := &chrysom.Measures{
 			Polls: environment.Provider().NewCounterVec(chrysom.PollCounter),
 		}
-		chrysomClient, err := chrysom.NewClient(options.Chrysom, m, getLogger, logging.WithLogger)
-
+		basic, err := chrysom.NewBasicClient(options.Chrysom.BasicClientConfig, getLogger, logging.WithLogger)
+		if err != nil {
+			return nil, fmt.Errorf("failed to create chrysom basic client: %v", err)
+		}
+		listener, err := chrysom.NewListenerClient(options.Chrysom.Listen, logging.WithLogger, m, basic)
 		if err != nil {
-			return nil, err
+			return nil, fmt.Errorf("failed to create chrysom listener client: %v", err)
 		}
 
 		//create chrysom client and start it
-		datacenterWatcher.chrysomClient = chrysomClient
-		datacenterWatcher.chrysomClient.Start(context.Background())
+		datacenterWatcher.stopListener = listener.Stop
+		listener.Start(context.Background())
 		logger.Log(level.Key(), level.DebugValue(), logging.MessageKey(), "started chrysom, argus client")
 	}
 
@@ -97,8 +101,8 @@ func newDatacenterWatcher(logger log.Logger, environment Environment, options Op
 }
 
 func (d *datacenterWatcher) stop() {
-	if d.chrysomClient != nil {
-		d.chrysomClient.Stop(context.Background())
+	if d.stopListener != nil {
+		d.stopListener(context.Background())
 	}
 }
 

service/consul/datacenterWatch.go

@@ -29,18 +29,22 @@ func TestNewDatacenterWatcher(t *testing.T) {
 	noProviderEnv := new(service.MockEnvironment)
 	noProviderEnv.On("Provider").Return(nil, false)
 
-	validChrysomConfig := chrysom.ClientConfig{
-		Bucket: "random-bucket",
-		Listen: chrysom.ListenerConfig{
-			PullInterval: 10 * time.Second,
+	validChrysomConfig := ChrysomConfig{
+		BasicClientConfig: chrysom.BasicClientConfig{
+			Bucket:  "random-bucket",
+			Address: "http://argus:6600",
+			Auth: chrysom.Auth{
+				Basic: "Basic auth",
+			},
+			Logger: logger,
 		},
-		Address: "http://argus:6600",
-		Auth: chrysom.Auth{
-			Basic: "Basic auth",
+		Listen: chrysom.ListenerClientConfig{
+			PullInterval: 10 * time.Second,
 		},
-		Logger: logger,
 	}
 
+	nopStop := func(_ context.Context) error { return nil }
+
 	tests := []struct {
 		description     string
 		logger          log.Logger
@@ -79,8 +83,10 @@ func TestNewDatacenterWatcher(t *testing.T) {
 				mockServiceEnvironment, new(mockClient),
 			},
 			options: Options{
-				Chrysom: chrysom.ClientConfig{
-					Bucket: "",
+				Chrysom: ChrysomConfig{
+					BasicClientConfig: chrysom.BasicClientConfig{
+						Bucket: "",
+					},
 				},
 			},
 			expectedWatcher: &datacenterWatcher{
@@ -115,7 +121,7 @@ func TestNewDatacenterWatcher(t *testing.T) {
 				},
 				consulWatchInterval: defaultWatchInterval,
 				inactiveDatacenters: make(map[string]bool),
-				chrysomClient:       &chrysom.Client{},
+				stopListener:        nopStop,
 			},
 		},
 		{
@@ -139,7 +145,7 @@ func TestNewDatacenterWatcher(t *testing.T) {
 				},
 				inactiveDatacenters: make(map[string]bool),
 				consulWatchInterval: 10 * time.Second,
-				chrysomClient:       &chrysom.Client{},
+				stopListener:        nopStop,
 			},
 		},
 		{
@@ -201,39 +207,40 @@ func TestNewDatacenterWatcher(t *testing.T) {
 				mockServiceEnvironment, new(mockClient),
 			},
 			options: Options{
-				Chrysom: chrysom.ClientConfig{
-					Bucket: "random-bucket",
-					Listen: chrysom.ListenerConfig{
-						PullInterval: 0,
+				Chrysom: ChrysomConfig{
+					BasicClientConfig: chrysom.BasicClientConfig{
+						Bucket:  "random-bucket",
+						Address: "http://argus:6600",
+						Auth: chrysom.Auth{
+							Basic: "Basic auth",
+						},
+						Logger: logger,
 					},
-					Address: "http://argus:6600",
-					Auth: chrysom.Auth{
-						Basic: "Basic auth",
+					Listen: chrysom.ListenerClientConfig{
+						PullInterval: 0,
 					},
-					Logger: logger,
 				},
 			},
 			expectedErr: errors.New("chrysom pull interval cannot be 0"),
 		},
 	}
 
-	for _, testCase := range tests {
-		t.Run(testCase.description, func(t *testing.T) {
+	for _, tc := range tests {
+		t.Run(tc.description, func(t *testing.T) {
 			assert := assert.New(t)
-			w, err := newDatacenterWatcher(testCase.logger, testCase.environment, testCase.options)
+			w, err := newDatacenterWatcher(tc.logger, tc.environment, tc.options)
 
-			if testCase.expectedErr == nil {
+			if tc.expectedErr == nil {
 				assert.NotNil(w.inactiveDatacenters)
-				assert.Equal(testCase.expectedWatcher.consulWatchInterval, w.consulWatchInterval)
-
-				if testCase.expectedWatcher.chrysomClient != nil {
-					assert.NotNil(w.chrysomClient)
-					testCase.expectedWatcher.chrysomClient = w.chrysomClient
+				assert.Equal(tc.expectedWatcher.consulWatchInterval, w.consulWatchInterval)
+				assert.Equal(tc.expectedWatcher.logger, w.logger)
+				assert.Equal(tc.expectedWatcher.environment, w.environment)
+				assert.Equal(tc.expectedWatcher.options, w.options)
+				if tc.expectedWatcher.stopListener != nil {
+					assert.NotNil(w.stopListener)
 				}
-
-				assert.Equal(testCase.expectedWatcher, w)
 			} else {
-				assert.Equal(testCase.expectedErr, err)
+				assert.Equal(tc.expectedErr, err)
 			}
 
 		})

service/consul/datacenterWatch_test.go

@@ -19,14 +19,19 @@ type Watch struct {
 
 type Options struct {
 	Client                  *api.Config                    `json:"client"`
-	Chrysom                 chrysom.ClientConfig           `json:"chrysom"`
+	Chrysom                 ChrysomConfig                  `json:"chrysom"`
 	DisableGenerateID       bool                           `json:"disableGenerateID"`
 	DatacenterRetries       int                            `json:"datacenterRetries"`
 	DatacenterWatchInterval time.Duration                  `json:"datacenterWatchInterval"`
 	Registrations           []api.AgentServiceRegistration `json:"registrations,omitempty"`
 	Watches                 []Watch                        `json:"watches,omitempty"`
 }
 
+type ChrysomConfig struct {
+	chrysom.BasicClientConfig `mapstructure:",squash"`
+	Listen                    chrysom.ListenerClientConfig
+}
+
 func (o *Options) config() *api.Config {
 	if o != nil && o.Client != nil {
 		return o.Client