Move logger to pkg/logger
commitfb9616160e7406c804e60f08bd73223ce5d1e40f
authorJoel Speed <Joel.speed@hotmail.co.uk>
dateFri 24 May 2019, 17:08 (7 years ago)
parentd1ef14b
htpasswd.go+1−1
@@ -7,7 +7,7 @@ import (
77 "io"
88 "os"
99
10− "github.com/pusher/oauth2_proxy/logger"
10+ "github.com/pusher/oauth2_proxy/pkg/logger"
1111 "golang.org/x/crypto/bcrypt"
1212)
1313
http.go+1−1
@@ -7,7 +7,7 @@ import (
77 "strings"
88 "time"
99
10− "github.com/pusher/oauth2_proxy/logger"
10+ "github.com/pusher/oauth2_proxy/pkg/logger"
1111)
1212
1313// Server represents an HTTP server
logging_handler.go+1−1
@@ -10,7 +10,7 @@ import (
1010 "net/http"
1111 "time"
1212
13− "github.com/pusher/oauth2_proxy/logger"
13+ "github.com/pusher/oauth2_proxy/pkg/logger"
1414)
1515
1616// responseLogger is wrapper of http.ResponseWriter that keeps track of its HTTP status
logging_handler_test.go+1−1
@@ -9,7 +9,7 @@ import (
99 "testing"
1010 "time"
1111
12− "github.com/pusher/oauth2_proxy/logger"
12+ "github.com/pusher/oauth2_proxy/pkg/logger"
1313)
1414
1515func TestLoggingHandler_ServeHTTP(t *testing.T) {
main.go+1−1
@@ -12,7 +12,7 @@ import (
1212
1313 "github.com/BurntSushi/toml"
1414 options "github.com/mreiferson/go-options"
15− "github.com/pusher/oauth2_proxy/logger"
15+ "github.com/pusher/oauth2_proxy/pkg/logger"
1616)
1717
1818func main() {
oauthproxy.go+1−1
@@ -14,7 +14,7 @@ import (
1414 "time"
1515
1616 "github.com/mbland/hmacauth"
17− "github.com/pusher/oauth2_proxy/logger"
17+ "github.com/pusher/oauth2_proxy/pkg/logger"
1818 sessionsapi "github.com/pusher/oauth2_proxy/pkg/apis/sessions"
1919 "github.com/pusher/oauth2_proxy/pkg/encryption"
2020 "github.com/pusher/oauth2_proxy/providers"
oauthproxy_test.go+1−1
@@ -15,7 +15,7 @@ import (
1515 "time"
1616
1717 "github.com/mbland/hmacauth"
18− "github.com/pusher/oauth2_proxy/logger"
18+ "github.com/pusher/oauth2_proxy/pkg/logger"
1919 "github.com/pusher/oauth2_proxy/pkg/apis/sessions"
2020 "github.com/pusher/oauth2_proxy/pkg/sessions/cookie"
2121 "github.com/pusher/oauth2_proxy/providers"
options.go+1−1
@@ -17,7 +17,7 @@ import (
1717 oidc "github.com/coreos/go-oidc"
1818 "github.com/dgrijalva/jwt-go"
1919 "github.com/mbland/hmacauth"
20− "github.com/pusher/oauth2_proxy/logger"
20+ "github.com/pusher/oauth2_proxy/pkg/logger"
2121 "github.com/pusher/oauth2_proxy/pkg/apis/options"
2222 sessionsapi "github.com/pusher/oauth2_proxy/pkg/apis/sessions"
2323 "github.com/pusher/oauth2_proxy/pkg/encryption"
pkg/cookies/cookies.go+1−1
@@ -6,7 +6,7 @@ import (
66 "strings"
77 "time"
88
9− "github.com/pusher/oauth2_proxy/logger"
9+ "github.com/pusher/oauth2_proxy/pkg/logger"
1010 "github.com/pusher/oauth2_proxy/pkg/apis/options"
1111)
1212
logger/logger.go → pkg/logger/logger.gorenamed
The content is the same.
pkg/requests/requests.go+1−1
@@ -7,7 +7,7 @@ import (
77 "net/http"
88
99 "github.com/bitly/go-simplejson"
10− "github.com/pusher/oauth2_proxy/logger"
10+ "github.com/pusher/oauth2_proxy/pkg/logger"
1111)
1212
1313// Request parses the request body into a simplejson.Json object
providers/azure.go+1−1
@@ -7,7 +7,7 @@ import (
77 "net/url"
88
99 "github.com/bitly/go-simplejson"
10− "github.com/pusher/oauth2_proxy/logger"
10+ "github.com/pusher/oauth2_proxy/pkg/logger"
1111 "github.com/pusher/oauth2_proxy/pkg/apis/sessions"
1212 "github.com/pusher/oauth2_proxy/pkg/requests"
1313)
providers/github.go+1−1
@@ -10,7 +10,7 @@ import (
1010 "strconv"
1111 "strings"
1212
13− "github.com/pusher/oauth2_proxy/logger"
13+ "github.com/pusher/oauth2_proxy/pkg/logger"
1414 "github.com/pusher/oauth2_proxy/pkg/apis/sessions"
1515)
1616
providers/gitlab.go+1−1
@@ -4,7 +4,7 @@ import (
44 "net/http"
55 "net/url"
66
7− "github.com/pusher/oauth2_proxy/logger"
7+ "github.com/pusher/oauth2_proxy/pkg/logger"
88 "github.com/pusher/oauth2_proxy/pkg/apis/sessions"
99 "github.com/pusher/oauth2_proxy/pkg/requests"
1010)
providers/google.go+1−1
@@ -13,7 +13,7 @@ import (
1313 "strings"
1414 "time"
1515
16− "github.com/pusher/oauth2_proxy/logger"
16+ "github.com/pusher/oauth2_proxy/pkg/logger"
1717 "github.com/pusher/oauth2_proxy/pkg/apis/sessions"
1818 "golang.org/x/oauth2"
1919 "golang.org/x/oauth2/google"
providers/internal_util.go+1−1
@@ -5,7 +5,7 @@ import (
55 "net/http"
66 "net/url"
77
8− "github.com/pusher/oauth2_proxy/logger"
8+ "github.com/pusher/oauth2_proxy/pkg/logger"
99 "github.com/pusher/oauth2_proxy/pkg/requests"
1010)
1111
templates.go+1−1
@@ -4,7 +4,7 @@ import (
44 "html/template"
55 "path"
66
7− "github.com/pusher/oauth2_proxy/logger"
7+ "github.com/pusher/oauth2_proxy/pkg/logger"
88)
99
1010func loadTemplates(dir string) *template.Template {
validator.go+1−1
@@ -8,7 +8,7 @@ import (
88 "sync/atomic"
99 "unsafe"
1010
11− "github.com/pusher/oauth2_proxy/logger"
11+ "github.com/pusher/oauth2_proxy/pkg/logger"
1212)
1313
1414// UserMap holds information from the authenticated emails file
watcher.go+1−1
@@ -7,7 +7,7 @@ import (
77 "path/filepath"
88 "time"
99
10− "github.com/pusher/oauth2_proxy/logger"
10+ "github.com/pusher/oauth2_proxy/pkg/logger"
1111 fsnotify "gopkg.in/fsnotify/fsnotify.v1"
1212)
1313
watcher_unsupported.go+1−1
@@ -2,7 +2,7 @@
22
33package main
44
5−import "github.com/pusher/oauth2_proxy/logger"
5+import "github.com/pusher/oauth2_proxy/pkg/logger"
66
77func WatchForUpdates(filename string, done <-chan bool, action func()) {
88 logger.Printf("file watching not implemented on this platform")