Skip to content

Commit

Permalink
fix: resolve linting issues and disable nancy
Browse files Browse the repository at this point in the history
  • Loading branch information
aeneasr committed Jan 11, 2021
1 parent 17a0bf5 commit c8396f6
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 28 deletions.
26 changes: 3 additions & 23 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ orbs:
slack: circleci/slack@3.4.2
sdk: ory/sdk@0.1.38
docs: ory/docs@0.0.8
nancy: ory/nancy@0.0.13
golangci: ory/golangci@0.0.9

jobs:
Expand Down Expand Up @@ -133,31 +134,10 @@ jobs:
bash <(curl -s https://raw.githubusercontent.com/ory/ci/master/src/scripts/install/prettier.sh)
npm run format:check
nancy:
docker:
- image: circleci/golang:1.15-node
environment:
GO111MODULE: 'on'
working_directory: /go/src/github.com/ory/kratos
steps:
- checkout
- run: |
set -euxo
# install nancy
curl -L -o $GOPATH/bin/nancy https://github.com/sonatype-nexus-community/nancy/releases/download/v1.0.5/nancy-linux.amd64-v1.0.5 && chmod +x $GOPATH/bin/nancy
# run nancy but without the internal client rewrite
go list -m all | sed -r 's/ => .\/internal\/httpclient//' | nancy sleuth --quiet
workflows:
tbr:
jobs:
-
nancy:
filters:
tags:
only: /.*/
# - nancy/test
-
validate:
filters:
Expand All @@ -168,7 +148,7 @@ workflows:
flavor: sqlite
requires:
- test
- nancy
# - nancy/test
- validate
filters:
tags:
Expand Down
3 changes: 0 additions & 3 deletions courier/courier.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@ type (
Dialer *gomail.Dialer
d smtpDependencies
c *config.Provider
// graceful shutdown handling
ctx context.Context
shutdown context.CancelFunc
}
Provider interface {
Courier() *Courier
Expand Down
2 changes: 0 additions & 2 deletions identity/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import (
"github.com/ory/x/errorsx"

"github.com/ory/kratos/courier"
"github.com/ory/kratos/driver/config"
)

var ErrProtectedFieldModified = herodot.ErrForbidden.
Expand All @@ -31,7 +30,6 @@ type (
}
Manager struct {
r managerDependencies
c *config.Provider
}

managerOptions struct {
Expand Down

0 comments on commit c8396f6

Please sign in to comment.