Skip to content
This repository has been archived by the owner on Mar 11, 2021. It is now read-only.

Commit

Permalink
sirupsen-case for fabric8-auth (#128)
Browse files Browse the repository at this point in the history
* Switched from github.com/Sirupsen/logrus to github.com/sirupsen/logrus

This commit will probably not build because not all packages that this
project depends on have adopted the lowercase version of the package. We
have to merge this commit anyway, I think.

Also updated GOA to 1.3.0

See also fabric8-services/fabric8-wit#1395

* Updated glide.lock

* Remove the dep on wit

* Revert "Remove the dep on wit"

This reverts commit c2e4ea8.

* Make auth compile

* Fix version of wit
  • Loading branch information
kwk authored and alexeykazakov committed Oct 2, 2017
1 parent 995152a commit 468d4e6
Show file tree
Hide file tree
Showing 6 changed files with 47 additions and 35 deletions.
2 changes: 1 addition & 1 deletion application/application_db_calls_bench_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"github.com/fabric8-services/fabric8-auth/migration"
testsupport "github.com/fabric8-services/fabric8-auth/test"

"github.com/almighty/almighty-core/account"
"github.com/fabric8-services/fabric8-wit/account"
"github.com/jinzhu/gorm"
uuid "github.com/satori/go.uuid"
)
Expand Down
2 changes: 1 addition & 1 deletion configuration/configuration.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (

"github.com/fabric8-services/fabric8-auth/rest"

log "github.com/Sirupsen/logrus"
"github.com/goadesign/goa"
"github.com/pkg/errors"
log "github.com/sirupsen/logrus"
"github.com/spf13/viper"
"gopkg.in/yaml.v2"
)
Expand Down
67 changes: 39 additions & 28 deletions glide.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions glide.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ license: Apache-2.0
import:
- package: github.com/fabric8-services/fabric8-wit
subpackages:
- design
- design
- package: github.com/dgrijalva/jwt-go
version: ^3.0.0
- package: github.com/goadesign/goa
version: ^1.2.0
version: ^1.3.0
vcs: git
subpackages:
- client
Expand Down Expand Up @@ -97,7 +97,7 @@ import:
subpackages:
- golint
- package: github.com/fzipp/gocyclo
- package: github.com/Sirupsen/logrus
- package: github.com/sirupsen/logrus
- package: github.com/sourcegraph/syntaxhighlight
- package: github.com/jstemmer/go-junit-report
- package: github.com/sourcegraph/annotate
Expand All @@ -106,3 +106,4 @@ import:
- diffmatchpatch
- package: gopkg.in/square/go-jose.v2
version: ^2.1.2
- package: github.com/armon/go-metrics
2 changes: 1 addition & 1 deletion log/log.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (

"github.com/fabric8-services/fabric8-auth/configuration"

log "github.com/Sirupsen/logrus"
"github.com/goadesign/goa"
log "github.com/sirupsen/logrus"
)

const defaultPackageName = "github.com/fabric8-services/fabric8-auth/"
Expand Down
2 changes: 1 addition & 1 deletion log/log_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"encoding/json"
"testing"

logrus "github.com/Sirupsen/logrus"
logrus "github.com/sirupsen/logrus"
"github.com/stretchr/testify/assert"
)

Expand Down

0 comments on commit 468d4e6

Please sign in to comment.