bumped bascule, webpa-common, and wrp-go (#116)

* bumped bascule, webpa-common, and wrp-go

updated related code

* increase go version

CHANGELOG.md

@@ -5,7 +5,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
-- Updated references to the main branch [#114](https://github.com/xmidt-org/svalinn/pull/114)
+
+## [v0.14.2]
+- Updated references to the main branch [#114](https://github.com/xmidt-org/gungnir/pull/114)
+- Bumped bascule and webpa-common versions to have case sensitivity for jwt claims [#115](https://github.com/xmidt-org/gungnir/pull/115)
 
 ## [v0.14.1]
 - add fix for empty sessionID [#112](https://github.com/xmidt-org/gungnir/pull/112)
@@ -159,7 +162,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Initial creation
 - Bumped codex version, modified code to match changes
 
-[Unreleased]: https://github.com/xmidt-org/gungnir/compare/v0.14.1...HEAD
+[Unreleased]: https://github.com/xmidt-org/gungnir/compare/v0.14.2...HEAD
+[v0.14.2]: https://github.com/xmidt-org/gungnir/compare/v0.14.1...v0.14.2
 [v0.14.1]: https://github.com/xmidt-org/gungnir/compare/v0.14.0...v0.14.1
 [v0.14.0]: https://github.com/xmidt-org/gungnir/compare/v0.13.1...v0.14.0
 [v0.13.1]: https://github.com/xmidt-org/gungnir/compare/v0.13.0...v0.13.1

deviceStatus.go

@@ -30,9 +30,9 @@ import (
 	kithttp "github.com/go-kit/kit/transport/http"
 	"github.com/goph/emperror"
 	"github.com/gorilla/mux"
-	"github.com/xmidt-org/codex-db"
+	db "github.com/xmidt-org/codex-db"
 	"github.com/xmidt-org/webpa-common/logging"
-	"github.com/xmidt-org/wrp-go/v2"
+	"github.com/xmidt-org/wrp-go/v3"
 )
 
 const (

deviceStatus_test.go

@@ -33,9 +33,9 @@ import (
 	"github.com/xmidt-org/voynicrypto"
 	"github.com/xmidt-org/webpa-common/logging"
 	"github.com/xmidt-org/webpa-common/xmetrics/xmetricstest"
-	"github.com/xmidt-org/wrp-go/v2"
+	"github.com/xmidt-org/wrp-go/v3"
 
-	"github.com/xmidt-org/codex-db"
+	db "github.com/xmidt-org/codex-db"
 )
 
 func TestGetStatusInfo(t *testing.T) {

go.mod

@@ -1,21 +1,21 @@
 module github.com/xmidt-org/gungnir
 
-go 1.12
+go 1.15
 
 require (
 	github.com/InVisionApp/go-health/v2 v2.1.2
 	github.com/c9s/goprocinfo v0.0.0-20190309065803-0b2ad9ac246b // indirect
 	github.com/go-kit/kit v0.9.0
 	github.com/goph/emperror v0.17.3-0.20190703203600-60a8d9faa17b
-	github.com/gorilla/mux v1.7.3
+	github.com/gorilla/mux v1.7.4
 	github.com/justinas/alice v1.2.0
 	github.com/spf13/pflag v1.0.3
-	github.com/spf13/viper v1.6.1
+	github.com/spf13/viper v1.7.0
 	github.com/stretchr/testify v1.4.0
 	github.com/ugorji/go/codec v1.1.7
-	github.com/xmidt-org/bascule v0.8.0
+	github.com/xmidt-org/bascule v0.9.0
 	github.com/xmidt-org/codex-db v0.7.0
 	github.com/xmidt-org/voynicrypto v0.1.1
-	github.com/xmidt-org/webpa-common v1.9.0
-	github.com/xmidt-org/wrp-go/v2 v2.0.1
+	github.com/xmidt-org/webpa-common v1.11.1
+	github.com/xmidt-org/wrp-go/v3 v3.0.1
 )

model/event.go

@@ -1,7 +1,7 @@
 package model
 
 import (
-	"github.com/xmidt-org/wrp-go/v2"
+	"github.com/xmidt-org/wrp-go/v3"
 )
 
 //go:generate codecgen -st "json" -o event_codec.go event.go

primaryHandler.go

@@ -30,7 +30,7 @@ import (
 
 	"github.com/ugorji/go/codec"
 	"github.com/xmidt-org/gungnir/model"
-	"github.com/xmidt-org/wrp-go/v2"
+	"github.com/xmidt-org/wrp-go/v3"
 
 	"github.com/justinas/alice"
 	"github.com/xmidt-org/bascule"
@@ -356,6 +356,10 @@ func authChain(basicAuth []string, jwtVal JWTValidator, capabilityCheck Capabili
 	// only add capability check if the configuration is set
 	if capabilityCheck.Type == "enforce" || capabilityCheck.Type == "monitor" {
 		var endpoints []*regexp.Regexp
+		c, err := basculechecks.NewEndpointRegexCheck(capabilityCheck.Prefix, capabilityCheck.AcceptAllMethod)
+		if err != nil {
+			return alice.Chain{}, emperror.With(err, "failed to create capability check")
+		}
 		for _, e := range capabilityCheck.EndpointBuckets {
 			r, err := regexp.Compile(e)
 			if err != nil {
@@ -364,11 +368,12 @@ func authChain(basicAuth []string, jwtVal JWTValidator, capabilityCheck Capabili
 			}
 			endpoints = append(endpoints, r)
 		}
-		checker, err := basculechecks.NewCapabilityChecker(capabilityCheckMeasures, capabilityCheck.Prefix, capabilityCheck.AcceptAllMethod, endpoints)
-		if err != nil {
-			return alice.Chain{}, emperror.With(err, "failed to create capability check")
+		m := basculechecks.MetricValidator{
+			C:         basculechecks.CapabilitiesValidator{Checker: c},
+			Measures:  capabilityCheckMeasures,
+			Endpoints: endpoints,
 		}
-		bearerRules = append(bearerRules, checker.CreateBasculeCheck(capabilityCheck.Type == "enforce"))
+		bearerRules = append(bearerRules, m.CreateValidator(capabilityCheck.Type == "enforce"))
 	}
 
 	authEnforcer := basculehttp.NewEnforcer(

primaryHandler_test.go

@@ -22,21 +22,22 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/xmidt-org/gungnir/model"
-	"github.com/xmidt-org/wrp-go/v2"
 	"net/http"
 	"net/http/httptest"
 	"testing"
 	"time"
 
+	db "github.com/xmidt-org/codex-db"
+	"github.com/xmidt-org/gungnir/model"
+	"github.com/xmidt-org/wrp-go/v3"
+
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 	"github.com/xmidt-org/voynicrypto"
 
 	kithttp "github.com/go-kit/kit/transport/http"
 	"github.com/gorilla/mux"
 	"github.com/stretchr/testify/assert"
-	"github.com/xmidt-org/codex-db"
 	"github.com/xmidt-org/webpa-common/logging"
 	"github.com/xmidt-org/webpa-common/xmetrics/xmetricstest"
 )