Merge pull request #632 from xmidt-org/denopink/feature/jwk-migration

JWK Migration

CHANGELOG.md

@@ -5,8 +5,6 @@ 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]
-- Dependency update, note vulnerabilities
-  - Introduces new vuln https://www.mend.io/vulnerability-database/CVE-2022-29526
 
 ## [v2.0.7-dev.1]
 - Update dependencies. [603](https://github.com/xmidt-org/webpa-common/pull/603)
@@ -16,7 +14,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
   - guardrails says github.com/gorilla/websocket v1.5.0 has a high vulnerability but no vulnerabilities have been filed atm
   - [github.com/gorilla/sessions v1.2.1 CWE-613 no patch available](https://cwe.mitre.org/data/definitions/613.html)
 - Fixed error string sent in response when device ID can't be parsed. [#599](https://github.com/xmidt-org/webpa-common/pull/599)
-
+- Update Argus & Bascule for jwk migration
+- Dependency update, note vulnerabilities
+  - Introduces new vuln https://www.mend.io/vulnerability-database/CVE-2022-29526
+
 ## [v2.0.6]
 - Patch for manager writePump panic. [#595](https://github.com/xmidt-org/webpa-common/pull/595)
 
@@ -244,7 +245,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.7-dev.1...HEAD
+[Unreleased]: https://github.com/xmidt-org/webpa-common/compare/v2.0.7-dev.2...HEAD
+[v2.0.7-dev.2]: https://github.com/xmidt-org/webpa-common/compare/v2.0.7-dev.1...v2.0.7-dev.2
 [v2.0.7-dev.1]: https://github.com/xmidt-org/webpa-common/compare/v2.0.6...v2.0.7-dev.1
 [v2.0.6]: https://github.com/xmidt-org/webpa-common/compare/v2.0.5...v2.0.6
 [v2.0.5]: https://github.com/xmidt-org/webpa-common/compare/v2.0.4...v2.0.5

go.mod

@@ -3,7 +3,6 @@ module github.com/xmidt-org/webpa-common/v2
 go 1.13
 
 require (
-	emperror.dev/errors v0.8.1 // indirect
 	github.com/SermoDigital/jose v0.9.2-0.20161205224733-f6df55f235c2
 	github.com/armon/go-metrics v0.4.0 // indirect
 	github.com/aws/aws-sdk-go v1.44.83
@@ -12,47 +11,35 @@ require (
 	github.com/davecgh/go-spew v1.1.1
 	github.com/go-kit/kit v0.12.0
 	github.com/go-zookeeper/zk v1.0.3
-	github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
 	github.com/goph/emperror v0.17.3-0.20190703203600-60a8d9faa17b
 	github.com/gorilla/mux v1.8.0
 	github.com/gorilla/schema v1.2.0
 	github.com/gorilla/websocket v1.5.0
 	github.com/hashicorp/consul/api v1.14.0
 	github.com/hashicorp/go-hclog v1.2.2 // indirect
-	github.com/hashicorp/serf v0.9.8 // indirect
+	github.com/hashicorp/serf v0.10.0 // indirect
 	github.com/influxdata/influxdb1-client v0.0.0-20220302092344-a9ab5670611c // indirect
 	github.com/jtacoma/uritemplates v1.0.0
 	github.com/justinas/alice v1.2.0
+	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/miekg/dns v1.1.50
 	github.com/mitchellh/mapstructure v1.5.0
-	github.com/pelletier/go-toml/v2 v2.0.2 // indirect
 	github.com/prometheus/client_golang v1.13.0
 	github.com/segmentio/ksuid v1.0.4
 	github.com/spaolacci/murmur3 v1.1.0 // indirect
-	github.com/spf13/afero v1.9.2 // indirect
 	github.com/spf13/cast v1.5.0
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.12.0
 	github.com/stretchr/testify v1.8.0
-	github.com/subosito/gotenv v1.4.0 // indirect
 	github.com/ugorji/go/codec v1.2.7
-	github.com/xmidt-org/argus v0.9.0
-	github.com/xmidt-org/bascule v0.10.2
+	github.com/xmidt-org/argus v0.9.1
+	github.com/xmidt-org/bascule v0.11.0
 	github.com/xmidt-org/candlelight v0.0.10
-	github.com/xmidt-org/httpaux v0.3.2 // indirect
-	github.com/xmidt-org/sallust v0.1.6 // indirect
 	github.com/xmidt-org/themis v0.4.8
-	github.com/xmidt-org/touchstone v0.1.1 // indirect
-	github.com/xmidt-org/webpa-common v1.11.9 // indirect
 	github.com/xmidt-org/wrp-go/v3 v3.1.3
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0
-	go.opentelemetry.io/otel/exporters/jaeger v1.9.0 // indirect
-	go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.9.0 // indirect
-	go.opentelemetry.io/otel/exporters/zipkin v1.9.0 // indirect
 	go.uber.org/fx v1.18.1
-	golang.org/x/net v0.0.0-20220805013720-a33c5aa5df48 // indirect
-	golang.org/x/sys v0.0.0-20220804214406-8e32c043e418 // indirect
+	golang.org/x/net v0.0.0-20220822230855-b0a4917ee28c // indirect
 	golang.org/x/tools v0.1.12 // indirect
-	gopkg.in/ini.v1 v1.66.6 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0
 )