From 636669092744c0362dbec14471b8b7f59b88509c Mon Sep 17 00:00:00 2001 From: Joel Speed Date: Sat, 15 Jun 2019 11:33:29 +0200 Subject: [PATCH] Fix gofmt for changed files --- oauthproxy.go | 2 +- oauthproxy_test.go | 2 +- options.go | 2 +- pkg/cookies/cookies.go | 2 +- providers/azure.go | 2 +- providers/github.go | 2 +- providers/gitlab.go | 2 +- providers/google.go | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/oauthproxy.go b/oauthproxy.go index fc4bb43..b431d67 100644 --- a/oauthproxy.go +++ b/oauthproxy.go @@ -14,9 +14,9 @@ import ( "time" "github.com/mbland/hmacauth" - "github.com/pusher/oauth2_proxy/pkg/logger" sessionsapi "github.com/pusher/oauth2_proxy/pkg/apis/sessions" "github.com/pusher/oauth2_proxy/pkg/encryption" + "github.com/pusher/oauth2_proxy/pkg/logger" "github.com/pusher/oauth2_proxy/providers" "github.com/yhat/wsutil" ) diff --git a/oauthproxy_test.go b/oauthproxy_test.go index 2fa3e00..b278fd4 100644 --- a/oauthproxy_test.go +++ b/oauthproxy_test.go @@ -15,8 +15,8 @@ import ( "time" "github.com/mbland/hmacauth" - "github.com/pusher/oauth2_proxy/pkg/logger" "github.com/pusher/oauth2_proxy/pkg/apis/sessions" + "github.com/pusher/oauth2_proxy/pkg/logger" "github.com/pusher/oauth2_proxy/pkg/sessions/cookie" "github.com/pusher/oauth2_proxy/providers" "github.com/stretchr/testify/assert" diff --git a/options.go b/options.go index 5053e94..c7d5d52 100644 --- a/options.go +++ b/options.go @@ -17,10 +17,10 @@ import ( oidc "github.com/coreos/go-oidc" "github.com/dgrijalva/jwt-go" "github.com/mbland/hmacauth" - "github.com/pusher/oauth2_proxy/pkg/logger" "github.com/pusher/oauth2_proxy/pkg/apis/options" sessionsapi "github.com/pusher/oauth2_proxy/pkg/apis/sessions" "github.com/pusher/oauth2_proxy/pkg/encryption" + "github.com/pusher/oauth2_proxy/pkg/logger" "github.com/pusher/oauth2_proxy/pkg/sessions" "github.com/pusher/oauth2_proxy/providers" "gopkg.in/natefinch/lumberjack.v2" diff --git a/pkg/cookies/cookies.go b/pkg/cookies/cookies.go index 5a7343b..75b93e4 100644 --- a/pkg/cookies/cookies.go +++ b/pkg/cookies/cookies.go @@ -6,8 +6,8 @@ import ( "strings" "time" - "github.com/pusher/oauth2_proxy/pkg/logger" "github.com/pusher/oauth2_proxy/pkg/apis/options" + "github.com/pusher/oauth2_proxy/pkg/logger" ) // MakeCookie constructs a cookie from the given parameters, diff --git a/providers/azure.go b/providers/azure.go index 12e2320..653090b 100644 --- a/providers/azure.go +++ b/providers/azure.go @@ -7,8 +7,8 @@ import ( "net/url" "github.com/bitly/go-simplejson" - "github.com/pusher/oauth2_proxy/pkg/logger" "github.com/pusher/oauth2_proxy/pkg/apis/sessions" + "github.com/pusher/oauth2_proxy/pkg/logger" "github.com/pusher/oauth2_proxy/pkg/requests" ) diff --git a/providers/github.go b/providers/github.go index e1a7ed8..ba58bb1 100644 --- a/providers/github.go +++ b/providers/github.go @@ -10,8 +10,8 @@ import ( "strconv" "strings" - "github.com/pusher/oauth2_proxy/pkg/logger" "github.com/pusher/oauth2_proxy/pkg/apis/sessions" + "github.com/pusher/oauth2_proxy/pkg/logger" ) // GitHubProvider represents an GitHub based Identity Provider diff --git a/providers/gitlab.go b/providers/gitlab.go index f8e6739..663ebd4 100644 --- a/providers/gitlab.go +++ b/providers/gitlab.go @@ -4,8 +4,8 @@ import ( "net/http" "net/url" - "github.com/pusher/oauth2_proxy/pkg/logger" "github.com/pusher/oauth2_proxy/pkg/apis/sessions" + "github.com/pusher/oauth2_proxy/pkg/logger" "github.com/pusher/oauth2_proxy/pkg/requests" ) diff --git a/providers/google.go b/providers/google.go index e7821e2..6f53887 100644 --- a/providers/google.go +++ b/providers/google.go @@ -13,8 +13,8 @@ import ( "strings" "time" - "github.com/pusher/oauth2_proxy/pkg/logger" "github.com/pusher/oauth2_proxy/pkg/apis/sessions" + "github.com/pusher/oauth2_proxy/pkg/logger" "golang.org/x/oauth2" "golang.org/x/oauth2/google" admin "google.golang.org/api/admin/directory/v1"