Skip to content

Commit

Permalink
Merge pull request #333 from kinvolk/update-go-packages
Browse files Browse the repository at this point in the history
Update/Replace go packages
  • Loading branch information
joaquimrocha authored Feb 24, 2021
2 parents c39e81f + a4621e1 commit ee6f943
Show file tree
Hide file tree
Showing 23 changed files with 271 additions and 257 deletions.
2 changes: 1 addition & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ linters:

linters-settings:
errcheck:
ignore: github.com/mgutz/logxi/v1:Error|Warn|Debug
ignore: github.com/rs/zerolog:Error|Warn|Debug

gofmt:
simplify: true
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ frontend-lint:
cd frontend && npm run lint

run-backend: backend-binary
LOGXI=* ./bin/nebraska -auth-mode noop
./bin/nebraska -auth-mode noop

.PHONY: backend
backend: run-generators backend-code-checks build-backend-binary
Expand Down
9 changes: 7 additions & 2 deletions cmd/nebraska/auth/auth.go
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
package auth

import (
"os"

"github.com/gin-gonic/gin"
log "github.com/mgutz/logxi/v1"
"github.com/rs/zerolog"

"github.com/kinvolk/nebraska/cmd/nebraska/ginhelpers"
)

var (
logger = log.New("auth")
logger = zerolog.New(zerolog.ConsoleWriter{Out: os.Stderr}).Hook(
zerolog.HookFunc(func(e *zerolog.Event, level zerolog.Level, message string) {
e.Str("context", "auth")
}))
)

// Authenticator provides a way to authenticate a user sending an HTTP
Expand Down
124 changes: 62 additions & 62 deletions cmd/nebraska/auth/githubauth.go

Large diffs are not rendered by default.

Loading

0 comments on commit ee6f943

Please sign in to comment.