From 53536f67c4352b77c772a0515f55813baf4da746 Mon Sep 17 00:00:00 2001 From: kristinaspring Date: Fri, 12 Jul 2019 09:50:30 -0700 Subject: [PATCH] Moved Files and fixed imports (#32) --- .travis.yml | 6 ++--- CHANGELOG.md | 25 ++++++++++++------- README.md | 20 +++++++-------- {bascule/acquire => acquire}/auth.go | 0 {bascule/acquire => acquire}/basic.go | 0 {bascule/acquire => acquire}/basic_test.go | 0 {bascule/acquire => acquire}/jwt.go | 0 {bascule/acquire => acquire}/jwt_test.go | 0 .../basculehttp => basculehttp}/README.md | 2 +- .../constructor.go | 2 +- .../constructor_test.go | 2 +- .../basculehttp => basculehttp}/enforcer.go | 2 +- .../enforcer_test.go | 2 +- .../errorResponseReason.go | 0 .../errorresponsereason_string.go | 0 {bascule/basculehttp => basculehttp}/http.go | 0 .../basculehttp => basculehttp}/http_test.go | 0 .../basculehttp => basculehttp}/listener.go | 2 +- .../listener_test.go | 2 +- .../basculehttp => basculehttp}/mocks_test.go | 2 +- .../notfoundbehavior_string.go | 0 .../tokenFactory.go | 4 +-- .../tokenFactory_test.go | 2 +- bascule/checks.go => checks.go | 0 bascule/checks_test.go => checks_test.go | 0 bascule/context.go => context.go | 0 bascule/context_test.go => context_test.go | 0 bascule/error.go => error.go | 0 bascule/error_test.go => error_test.go | 0 .../acquirer/acquirer.go | 2 +- .../basculehttp/basculehttp.go | 6 ++--- go.mod | 6 ++--- go.sum | 14 +++++------ bascule/jws.go => jws.go | 0 {bascule/key => key}/cache.go | 0 {bascule/key => key}/cache_test.go | 0 {bascule/key => key}/doc.go | 0 {bascule/key => key}/mocks.go | 0 {bascule/key => key}/pair.go | 0 {bascule/key => key}/parser.go | 0 {bascule/key => key}/parser_test.go | 0 {bascule/key => key}/purpose.go | 0 {bascule/key => key}/purpose_test.go | 0 {bascule/key => key}/resolver.go | 2 +- {bascule/key => key}/resolverFactory.go | 4 +-- {bascule/key => key}/resolverFactory_test.go | 2 +- {bascule/key => key}/resolver_test.go | 2 +- {bascule/key => key}/setup_test.go | 0 {bascule/key => key}/testkey | 0 {bascule/key => key}/testkey.pub | 0 {bascule/key => key}/update.go | 0 bascule/log.go => log.go | 0 bascule/token.go => token.go | 0 bascule/token_test.go => token_test.go | 0 bascule/validator.go => validator.go | 0 .../validator_test.go => validator_test.go | 0 56 files changed, 57 insertions(+), 54 deletions(-) rename {bascule/acquire => acquire}/auth.go (100%) rename {bascule/acquire => acquire}/basic.go (100%) rename {bascule/acquire => acquire}/basic_test.go (100%) rename {bascule/acquire => acquire}/jwt.go (100%) rename {bascule/acquire => acquire}/jwt_test.go (100%) rename {bascule/basculehttp => basculehttp}/README.md (87%) rename {bascule/basculehttp => basculehttp}/constructor.go (98%) rename {bascule/basculehttp => basculehttp}/constructor_test.go (97%) rename {bascule/basculehttp => basculehttp}/enforcer.go (98%) rename {bascule/basculehttp => basculehttp}/enforcer_test.go (97%) rename {bascule/basculehttp => basculehttp}/errorResponseReason.go (100%) rename {bascule/basculehttp => basculehttp}/errorresponsereason_string.go (100%) rename {bascule/basculehttp => basculehttp}/http.go (100%) rename {bascule/basculehttp => basculehttp}/http_test.go (100%) rename {bascule/basculehttp => basculehttp}/listener.go (95%) rename {bascule/basculehttp => basculehttp}/listener_test.go (95%) rename {bascule/basculehttp => basculehttp}/mocks_test.go (98%) rename {bascule/basculehttp => basculehttp}/notfoundbehavior_string.go (100%) rename {bascule/basculehttp => basculehttp}/tokenFactory.go (97%) rename {bascule/basculehttp => basculehttp}/tokenFactory_test.go (99%) rename bascule/checks.go => checks.go (100%) rename bascule/checks_test.go => checks_test.go (100%) rename bascule/context.go => context.go (100%) rename bascule/context_test.go => context_test.go (100%) rename bascule/error.go => error.go (100%) rename bascule/error_test.go => error_test.go (100%) rename {bascule/examples => examples}/acquirer/acquirer.go (95%) rename {bascule/examples => examples}/basculehttp/basculehttp.go (92%) rename bascule/jws.go => jws.go (100%) rename {bascule/key => key}/cache.go (100%) rename {bascule/key => key}/cache_test.go (100%) rename {bascule/key => key}/doc.go (100%) rename {bascule/key => key}/mocks.go (100%) rename {bascule/key => key}/pair.go (100%) rename {bascule/key => key}/parser.go (100%) rename {bascule/key => key}/parser_test.go (100%) rename {bascule/key => key}/purpose.go (100%) rename {bascule/key => key}/purpose_test.go (100%) rename {bascule/key => key}/resolver.go (97%) rename {bascule/key => key}/resolverFactory.go (96%) rename {bascule/key => key}/resolverFactory_test.go (99%) rename {bascule/key => key}/resolver_test.go (98%) rename {bascule/key => key}/setup_test.go (100%) rename {bascule/key => key}/testkey (100%) rename {bascule/key => key}/testkey.pub (100%) rename {bascule/key => key}/update.go (100%) rename bascule/log.go => log.go (100%) rename bascule/token.go => token.go (100%) rename bascule/token_test.go => token_test.go (100%) rename bascule/validator.go => validator.go (100%) rename bascule/validator_test.go => validator_test.go (100%) diff --git a/.travis.yml b/.travis.yml index 976da04..64b1d15 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,6 +34,6 @@ jobs: - stage: integration name: "Integration Tests" script: - - git clone https://github.com/Comcast/comcast-bascule.git - - cd comcast-bascule - # build comcast-bascule + - git clone https://github.com/xmidt-org/bascule.git + - cd bascule + # build bascule diff --git a/CHANGELOG.md b/CHANGELOG.md index f32d2a5..a186804 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,13 @@ 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] + +## [v0.3.0] - Added Auth for outgoing requests +- Added jwt Validator +- Removed SermoDigital dependency +- Added documentation and examples +- Moved all packages up one folder ## [v0.2.5] - Added Error Response Reason @@ -41,12 +47,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Added constructor, enforcer, and listener alice decorators - Basic code and structure established -[Unreleased]: https://github.com/Comcast/comcast-bascule/compare/v0.2.5...HEAD -[v0.2.5]: https://github.com/Comcast/comcast-bascule/compare/0.2.4...v0.2.5 -[v0.2.4]: https://github.com/Comcast/comcast-bascule/compare/0.2.3...v0.2.4 -[v0.2.3]: https://github.com/Comcast/comcast-bascule/compare/0.2.2...v0.2.3 -[v0.2.2]: https://github.com/Comcast/comcast-bascule/compare/0.2.1...v0.2.2 -[v0.2.1]: https://github.com/Comcast/comcast-bascule/compare/0.2.0...v0.2.1 -[v0.2.0]: https://github.com/Comcast/comcast-bascule/compare/0.1.1...v0.2.0 -[v0.1.1]: https://github.com/Comcast/comcast-bascule/compare/0.1.0...v0.1.1 -[v0.1.0]: https://github.com/Comcast/comcast-bascule/compare/0.0.0...v0.1.0 +[Unreleased]: https://github.com/xmidt-org/bascule/compare/v0.3.0...HEAD +[v0.3.0]: https://github.com/xmidt-org/bascule/compare/0.2.5...v0.3.0 +[v0.2.5]: https://github.com/xmidt-org/bascule/compare/0.2.4...v0.2.5 +[v0.2.4]: https://github.com/xmidt-org/bascule/compare/0.2.3...v0.2.4 +[v0.2.3]: https://github.com/xmidt-org/bascule/compare/0.2.2...v0.2.3 +[v0.2.2]: https://github.com/xmidt-org/bascule/compare/0.2.1...v0.2.2 +[v0.2.1]: https://github.com/xmidt-org/bascule/compare/0.2.0...v0.2.1 +[v0.2.0]: https://github.com/xmidt-org/bascule/compare/0.1.1...v0.2.0 +[v0.1.1]: https://github.com/xmidt-org/bascule/compare/0.1.0...v0.1.1 +[v0.1.0]: https://github.com/xmidt-org/bascule/compare/0.0.0...v0.1.0 diff --git a/README.md b/README.md index ad6b925..3eb00c2 100644 --- a/README.md +++ b/README.md @@ -2,14 +2,14 @@ The library for authorization: both acquiring and validating. -[![Build Status](https://travis-ci.org/Comcast/comcast-bascule.svg?branch=master)](https://travis-ci.org/Comcast/comcast-bascule) -[![codecov.io](http://codecov.io/github/Comcast/comcast-bascule/coverage.svg?branch=master)](http://codecov.io/github/Comcast/comcast-bascule?branch=master) -[![Code Climate](https://codeclimate.com/github/Comcast/comcast-bascule/badges/gpa.svg)](https://codeclimate.com/github/Comcast/comcast-bascule) -[![Issue Count](https://codeclimate.com/github/Comcast/comcast-bascule/badges/issue_count.svg)](https://codeclimate.com/github/Comcast/comcast-bascule) -[![Go Report Card](https://goreportcard.com/badge/github.com/Comcast/comcast-bascule)](https://goreportcard.com/report/github.com/Comcast/comcast-bascule) -[![Apache V2 License](http://img.shields.io/badge/license-Apache%20V2-blue.svg)](https://github.com/Comcast/comcast-bascule/blob/master/LICENSE) -[![GitHub release](https://img.shields.io/github/release/Comcast/comcast-bascule.svg)](CHANGELOG.md) -[![GoDoc](https://godoc.org/github.com/Comcast/comcast-bascule/bascule?status.svg)](https://godoc.org/github.com/Comcast/comcast-bascule/bascule) +[![Build Status](https://travis-ci.org/xmidt-org/bascule.svg?branch=master)](https://travis-ci.org/xmidt-org/bascule) +[![codecov.io](http://codecov.io/github/xmidt-org/bascule/coverage.svg?branch=master)](http://codecov.io/github/xmidt-org/bascule?branch=master) +[![Code Climate](https://codeclimate.com/github/xmidt-org/bascule/badges/gpa.svg)](https://codeclimate.com/github/xmidt-org/bascule) +[![Issue Count](https://codeclimate.com/github/xmidt-org/bascule/badges/issue_count.svg)](https://codeclimate.com/github/xmidt-org/bascule) +[![Go Report Card](https://goreportcard.com/badge/github.com/xmidt-org/bascule)](https://goreportcard.com/report/github.com/xmidt-org/bascule) +[![Apache V2 License](http://img.shields.io/badge/license-Apache%20V2-blue.svg)](https://github.com/xmidt-org/bascule/blob/master/LICENSE) +[![GitHub release](https://img.shields.io/github/release/xmidt-org/bascule.svg)](CHANGELOG.md) +[![GoDoc](https://godoc.org/github.com/xmidt-org/bascule?status.svg)](https://godoc.org/github.com/xmidt-org/bascule) ## Summary @@ -28,11 +28,11 @@ expires. ## Validating Authorization Validation of Tokens happens once an authorization value has been parsed into -something that implements the [Token interface](https://godoc.org/github.com/Comcast/comcast-bascule/bascule#Token). +something that implements the [Token interface](https://godoc.org/github.com/xmidt-org/bascule#Token). The `basculehttp` subpackage provides http decorators/middleware that will parse an http request into a Token and validate it with configurable rules. -Read more about the `basculehttp` subpackage in its [README](bascule/basculehttp/README.md). +Read more about the `basculehttp` subpackage in its [README](basculehttp/README.md). ## Install This repo is a library of packages used for the authorization. There is no diff --git a/bascule/acquire/auth.go b/acquire/auth.go similarity index 100% rename from bascule/acquire/auth.go rename to acquire/auth.go diff --git a/bascule/acquire/basic.go b/acquire/basic.go similarity index 100% rename from bascule/acquire/basic.go rename to acquire/basic.go diff --git a/bascule/acquire/basic_test.go b/acquire/basic_test.go similarity index 100% rename from bascule/acquire/basic_test.go rename to acquire/basic_test.go diff --git a/bascule/acquire/jwt.go b/acquire/jwt.go similarity index 100% rename from bascule/acquire/jwt.go rename to acquire/jwt.go diff --git a/bascule/acquire/jwt_test.go b/acquire/jwt_test.go similarity index 100% rename from bascule/acquire/jwt_test.go rename to acquire/jwt_test.go diff --git a/bascule/basculehttp/README.md b/basculehttp/README.md similarity index 87% rename from bascule/basculehttp/README.md rename to basculehttp/README.md index 9e2e3a1..6700eca 100644 --- a/bascule/basculehttp/README.md +++ b/basculehttp/README.md @@ -2,7 +2,7 @@ The package for auth related middleware, implemented as [alice-style http decorators](https://github.com/justinas/alice). -[![GoDoc](https://godoc.org/github.com/Comcast/comcast-bascule/bascule/basculehttp?status.svg)](https://godoc.org/github.com/Comcast/comcast-bascule/bascule/basculehttp) +[![GoDoc](https://godoc.org/github.com/xmidt-org/bascule/basculehttp?status.svg)](https://godoc.org/github.com/xmidt-org/bascule/basculehttp) ## Summary diff --git a/bascule/basculehttp/constructor.go b/basculehttp/constructor.go similarity index 98% rename from bascule/basculehttp/constructor.go rename to basculehttp/constructor.go index 36eb3d3..082139b 100644 --- a/bascule/basculehttp/constructor.go +++ b/basculehttp/constructor.go @@ -8,8 +8,8 @@ import ( "net/textproto" "strings" - "github.com/Comcast/comcast-bascule/bascule" "github.com/go-kit/kit/log/level" + "github.com/xmidt-org/bascule" ) const ( diff --git a/bascule/basculehttp/constructor_test.go b/basculehttp/constructor_test.go similarity index 97% rename from bascule/basculehttp/constructor_test.go rename to basculehttp/constructor_test.go index 1fa4ca9..a689f6e 100644 --- a/bascule/basculehttp/constructor_test.go +++ b/basculehttp/constructor_test.go @@ -7,9 +7,9 @@ import ( "os" "testing" - "github.com/Comcast/comcast-bascule/bascule" "github.com/go-kit/kit/log" "github.com/stretchr/testify/assert" + "github.com/xmidt-org/bascule" ) func TestConstructor(t *testing.T) { diff --git a/bascule/basculehttp/enforcer.go b/basculehttp/enforcer.go similarity index 98% rename from bascule/basculehttp/enforcer.go rename to basculehttp/enforcer.go index 43c75ad..f2413cf 100644 --- a/bascule/basculehttp/enforcer.go +++ b/basculehttp/enforcer.go @@ -7,8 +7,8 @@ import ( "github.com/goph/emperror" - "github.com/Comcast/comcast-bascule/bascule" "github.com/go-kit/kit/log/level" + "github.com/xmidt-org/bascule" ) //go:generate stringer -type=NotFoundBehavior diff --git a/bascule/basculehttp/enforcer_test.go b/basculehttp/enforcer_test.go similarity index 97% rename from bascule/basculehttp/enforcer_test.go rename to basculehttp/enforcer_test.go index e8ae1b4..319fc79 100644 --- a/bascule/basculehttp/enforcer_test.go +++ b/basculehttp/enforcer_test.go @@ -7,9 +7,9 @@ import ( "os" "testing" - "github.com/Comcast/comcast-bascule/bascule" "github.com/go-kit/kit/log" "github.com/stretchr/testify/assert" + "github.com/xmidt-org/bascule" ) func TestEnforcer(t *testing.T) { diff --git a/bascule/basculehttp/errorResponseReason.go b/basculehttp/errorResponseReason.go similarity index 100% rename from bascule/basculehttp/errorResponseReason.go rename to basculehttp/errorResponseReason.go diff --git a/bascule/basculehttp/errorresponsereason_string.go b/basculehttp/errorresponsereason_string.go similarity index 100% rename from bascule/basculehttp/errorresponsereason_string.go rename to basculehttp/errorresponsereason_string.go diff --git a/bascule/basculehttp/http.go b/basculehttp/http.go similarity index 100% rename from bascule/basculehttp/http.go rename to basculehttp/http.go diff --git a/bascule/basculehttp/http_test.go b/basculehttp/http_test.go similarity index 100% rename from bascule/basculehttp/http_test.go rename to basculehttp/http_test.go diff --git a/bascule/basculehttp/listener.go b/basculehttp/listener.go similarity index 95% rename from bascule/basculehttp/listener.go rename to basculehttp/listener.go index 9e31df2..2fdc87c 100644 --- a/bascule/basculehttp/listener.go +++ b/basculehttp/listener.go @@ -3,7 +3,7 @@ package basculehttp import ( "net/http" - "github.com/Comcast/comcast-bascule/bascule" + "github.com/xmidt-org/bascule" ) // Listener is anything that takes the Authentication information of an diff --git a/bascule/basculehttp/listener_test.go b/basculehttp/listener_test.go similarity index 95% rename from bascule/basculehttp/listener_test.go rename to basculehttp/listener_test.go index bfa557f..5027a61 100644 --- a/bascule/basculehttp/listener_test.go +++ b/basculehttp/listener_test.go @@ -6,9 +6,9 @@ import ( "net/http/httptest" "testing" - "github.com/Comcast/comcast-bascule/bascule" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" + "github.com/xmidt-org/bascule" ) var ( diff --git a/bascule/basculehttp/mocks_test.go b/basculehttp/mocks_test.go similarity index 98% rename from bascule/basculehttp/mocks_test.go rename to basculehttp/mocks_test.go index 80c47c3..0527168 100644 --- a/bascule/basculehttp/mocks_test.go +++ b/basculehttp/mocks_test.go @@ -1,12 +1,12 @@ package basculehttp import ( - "github.com/Comcast/comcast-bascule/bascule" "github.com/SermoDigital/jose" "github.com/SermoDigital/jose/crypto" "github.com/SermoDigital/jose/jws" "github.com/SermoDigital/jose/jwt" "github.com/stretchr/testify/mock" + "github.com/xmidt-org/bascule" ) type mockJWSParser struct { diff --git a/bascule/basculehttp/notfoundbehavior_string.go b/basculehttp/notfoundbehavior_string.go similarity index 100% rename from bascule/basculehttp/notfoundbehavior_string.go rename to basculehttp/notfoundbehavior_string.go diff --git a/bascule/basculehttp/tokenFactory.go b/basculehttp/tokenFactory.go similarity index 97% rename from bascule/basculehttp/tokenFactory.go rename to basculehttp/tokenFactory.go index 112ed1d..c0564f9 100644 --- a/bascule/basculehttp/tokenFactory.go +++ b/basculehttp/tokenFactory.go @@ -7,10 +7,10 @@ import ( "errors" "net/http" - "github.com/Comcast/comcast-bascule/bascule" - "github.com/Comcast/comcast-bascule/bascule/key" jwt "github.com/dgrijalva/jwt-go" "github.com/goph/emperror" + "github.com/xmidt-org/bascule" + "github.com/xmidt-org/bascule/key" ) const ( diff --git a/bascule/basculehttp/tokenFactory_test.go b/basculehttp/tokenFactory_test.go similarity index 99% rename from bascule/basculehttp/tokenFactory_test.go rename to basculehttp/tokenFactory_test.go index 7448053..9edac5b 100644 --- a/bascule/basculehttp/tokenFactory_test.go +++ b/basculehttp/tokenFactory_test.go @@ -7,8 +7,8 @@ import ( "net/http/httptest" "testing" - "github.com/Comcast/comcast-bascule/bascule" "github.com/stretchr/testify/assert" + "github.com/xmidt-org/bascule" ) func TestBasicTokenFactory(t *testing.T) { diff --git a/bascule/checks.go b/checks.go similarity index 100% rename from bascule/checks.go rename to checks.go diff --git a/bascule/checks_test.go b/checks_test.go similarity index 100% rename from bascule/checks_test.go rename to checks_test.go diff --git a/bascule/context.go b/context.go similarity index 100% rename from bascule/context.go rename to context.go diff --git a/bascule/context_test.go b/context_test.go similarity index 100% rename from bascule/context_test.go rename to context_test.go diff --git a/bascule/error.go b/error.go similarity index 100% rename from bascule/error.go rename to error.go diff --git a/bascule/error_test.go b/error_test.go similarity index 100% rename from bascule/error_test.go rename to error_test.go diff --git a/bascule/examples/acquirer/acquirer.go b/examples/acquirer/acquirer.go similarity index 95% rename from bascule/examples/acquirer/acquirer.go rename to examples/acquirer/acquirer.go index 12f6942..36f6358 100644 --- a/bascule/examples/acquirer/acquirer.go +++ b/examples/acquirer/acquirer.go @@ -7,7 +7,7 @@ import ( "os" "time" - "github.com/Comcast/comcast-bascule/bascule/acquire" + "github.com/xmidt-org/bascule/acquire" ) func main() { diff --git a/bascule/examples/basculehttp/basculehttp.go b/examples/basculehttp/basculehttp.go similarity index 92% rename from bascule/examples/basculehttp/basculehttp.go rename to examples/basculehttp/basculehttp.go index 973b79f..0fbcf6e 100644 --- a/bascule/examples/basculehttp/basculehttp.go +++ b/examples/basculehttp/basculehttp.go @@ -5,12 +5,12 @@ import ( "net/http" "os" - "github.com/Comcast/comcast-bascule/bascule" - "github.com/Comcast/comcast-bascule/bascule/basculehttp" - "github.com/Comcast/webpa-common/logging" "github.com/go-kit/kit/log" "github.com/gorilla/mux" "github.com/justinas/alice" + "github.com/xmidt-org/bascule" + "github.com/xmidt-org/bascule/basculehttp" + "github.com/xmidt-org/webpa-common/logging" ) func SetLogger(logger log.Logger) func(delegate http.Handler) http.Handler { diff --git a/go.mod b/go.mod index 0f0664a..d698eb9 100644 --- a/go.mod +++ b/go.mod @@ -1,20 +1,18 @@ -module github.com/Comcast/comcast-bascule +module github.com/xmidt-org/bascule go 1.12 require ( - github.com/Comcast/webpa-common v1.1.0 github.com/SermoDigital/jose v0.9.2-0.20161205224733-f6df55f235c2 - github.com/VividCortex/gohistogram v1.0.0 // indirect github.com/dgrijalva/jwt-go v3.2.0+incompatible github.com/go-kit/kit v0.8.0 github.com/goph/emperror v0.17.1 github.com/gorilla/mux v1.7.3 - github.com/influxdata/influxdb v1.7.7 // indirect github.com/jtacoma/uritemplates v1.0.0 // indirect github.com/justinas/alice v0.0.0-20171023064455-03f45bd4b7da github.com/pkg/errors v0.8.0 github.com/spf13/viper v1.4.0 // indirect github.com/stretchr/testify v1.3.0 + github.com/xmidt-org/webpa-common v1.1.0 gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect ) diff --git a/go.sum b/go.sum index 986369c..4ef4845 100644 --- a/go.sum +++ b/go.sum @@ -1,14 +1,9 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/Comcast/webpa-common v0.0.0-20190312224005-400bb4f8fc50 h1:GzM00ldkAr5Zp56z3E/ceRFL4O+S8cjE/ZFIhykHDI8= -github.com/Comcast/webpa-common v0.0.0-20190312224005-400bb4f8fc50/go.mod h1:XSu1nN06grod4RD/3WRYdeMMKDXBpeosZgIoNcmYsus= -github.com/Comcast/webpa-common v1.1.0 h1:fS09O+7cPfubrVXuC/8PPc1QyUkhrcI01qzA1Wg92CU= -github.com/Comcast/webpa-common v1.1.0/go.mod h1:XSu1nN06grod4RD/3WRYdeMMKDXBpeosZgIoNcmYsus= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/SermoDigital/jose v0.9.2-0.20161205224733-f6df55f235c2 h1:koK7z0nSsRiRiBWwa+E714Puh+DO+ZRdIyAXiXzL+lg= github.com/SermoDigital/jose v0.9.2-0.20161205224733-f6df55f235c2/go.mod h1:ARgCUhI1MHQH+ONky/PAtmVHQrP5JlGY0F3poXOp/fA= -github.com/VividCortex/gohistogram v1.0.0 h1:6+hBz+qvs0JOrrNhhmR7lFxo5sINxBCGXrdtl/UvroE= -github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= github.com/airbrake/gobrake v3.6.1+incompatible/go.mod h1:wM4gu3Cn0W0K7GUuVWnlXZU11AGBXMILnrdOU8Kn00o= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= @@ -67,8 +62,6 @@ github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/influxdata/influxdb v1.7.7 h1:UvNzAPfBrKMENVbQ4mr4ccA9sW+W1Ihl0Yh1s0BiVAg= -github.com/influxdata/influxdb v1.7.7/go.mod h1:qZna6X/4elxqT3yI9iZYdZrWWdeFOOprn86kgg4+IzY= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/jtacoma/uritemplates v1.0.0 h1:xwx5sBF7pPAb0Uj8lDC1Q/aBPpOFyQza7OC705ZlLCo= github.com/jtacoma/uritemplates v1.0.0/go.mod h1:IhIICdE9OcvgUnGwTtJxgBQ+VrTrti5PcbLVSJianO8= @@ -81,8 +74,10 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 h1:T+h1c/A9Gawja4Y9mFVWj2vyii2bbUNDw3kt9VxK2EY= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= @@ -138,6 +133,8 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= +github.com/xmidt-org/webpa-common v1.1.0 h1:JG3lzyV70BpsVvKKvAn+/9uNI0wNW9H1r3qr0M+dQNM= +github.com/xmidt-org/webpa-common v1.1.0/go.mod h1:oCpKzOC+9h2vYHVzAU/06tDTQuBN4RZz+rhgIXptpOI= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= @@ -176,6 +173,7 @@ google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZi google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8= diff --git a/bascule/jws.go b/jws.go similarity index 100% rename from bascule/jws.go rename to jws.go diff --git a/bascule/key/cache.go b/key/cache.go similarity index 100% rename from bascule/key/cache.go rename to key/cache.go diff --git a/bascule/key/cache_test.go b/key/cache_test.go similarity index 100% rename from bascule/key/cache_test.go rename to key/cache_test.go diff --git a/bascule/key/doc.go b/key/doc.go similarity index 100% rename from bascule/key/doc.go rename to key/doc.go diff --git a/bascule/key/mocks.go b/key/mocks.go similarity index 100% rename from bascule/key/mocks.go rename to key/mocks.go diff --git a/bascule/key/pair.go b/key/pair.go similarity index 100% rename from bascule/key/pair.go rename to key/pair.go diff --git a/bascule/key/parser.go b/key/parser.go similarity index 100% rename from bascule/key/parser.go rename to key/parser.go diff --git a/bascule/key/parser_test.go b/key/parser_test.go similarity index 100% rename from bascule/key/parser_test.go rename to key/parser_test.go diff --git a/bascule/key/purpose.go b/key/purpose.go similarity index 100% rename from bascule/key/purpose.go rename to key/purpose.go diff --git a/bascule/key/purpose_test.go b/key/purpose_test.go similarity index 100% rename from bascule/key/purpose_test.go rename to key/purpose_test.go diff --git a/bascule/key/resolver.go b/key/resolver.go similarity index 97% rename from bascule/key/resolver.go rename to key/resolver.go index aad0769..bf6e567 100644 --- a/bascule/key/resolver.go +++ b/key/resolver.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/Comcast/webpa-common/resource" + "github.com/xmidt-org/webpa-common/resource" ) // Resolver loads and parses keys associated with key identifiers. diff --git a/bascule/key/resolverFactory.go b/key/resolverFactory.go similarity index 96% rename from bascule/key/resolverFactory.go rename to key/resolverFactory.go index fa050e0..b17585d 100644 --- a/bascule/key/resolverFactory.go +++ b/key/resolverFactory.go @@ -3,8 +3,8 @@ package key import ( "fmt" - "github.com/Comcast/webpa-common/resource" - "github.com/Comcast/webpa-common/types" + "github.com/xmidt-org/webpa-common/resource" + "github.com/xmidt-org/webpa-common/types" ) const ( diff --git a/bascule/key/resolverFactory_test.go b/key/resolverFactory_test.go similarity index 99% rename from bascule/key/resolverFactory_test.go rename to key/resolverFactory_test.go index 7f860a4..52d5a03 100644 --- a/bascule/key/resolverFactory_test.go +++ b/key/resolverFactory_test.go @@ -7,9 +7,9 @@ import ( "fmt" "testing" - "github.com/Comcast/webpa-common/resource" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" + "github.com/xmidt-org/webpa-common/resource" ) func ExampleSingleKeyConfiguration() { diff --git a/bascule/key/resolver_test.go b/key/resolver_test.go similarity index 98% rename from bascule/key/resolver_test.go rename to key/resolver_test.go index fb960db..b1d1474 100644 --- a/bascule/key/resolver_test.go +++ b/key/resolver_test.go @@ -6,9 +6,9 @@ import ( "fmt" "testing" - "github.com/Comcast/webpa-common/resource" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" + "github.com/xmidt-org/webpa-common/resource" ) func TestSingleResolver(t *testing.T) { diff --git a/bascule/key/setup_test.go b/key/setup_test.go similarity index 100% rename from bascule/key/setup_test.go rename to key/setup_test.go diff --git a/bascule/key/testkey b/key/testkey similarity index 100% rename from bascule/key/testkey rename to key/testkey diff --git a/bascule/key/testkey.pub b/key/testkey.pub similarity index 100% rename from bascule/key/testkey.pub rename to key/testkey.pub diff --git a/bascule/key/update.go b/key/update.go similarity index 100% rename from bascule/key/update.go rename to key/update.go diff --git a/bascule/log.go b/log.go similarity index 100% rename from bascule/log.go rename to log.go diff --git a/bascule/token.go b/token.go similarity index 100% rename from bascule/token.go rename to token.go diff --git a/bascule/token_test.go b/token_test.go similarity index 100% rename from bascule/token_test.go rename to token_test.go diff --git a/bascule/validator.go b/validator.go similarity index 100% rename from bascule/validator.go rename to validator.go diff --git a/bascule/validator_test.go b/validator_test.go similarity index 100% rename from bascule/validator_test.go rename to validator_test.go