Revert "Switch over internal dependencies to new upstream"

This reverts commit cf9fac0.
ploxiln · Jan 10, 2019 · 9437866 · 9437866
1 parent cf9fac0
commit 9437866
Show file tree

Hide file tree

Showing 16 changed files with 22 additions and 21 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -5,7 +5,7 @@ RUN wget -O /usr/local/bin/dep \
          https://github.com/golang/dep/releases/download/v0.4.1/dep-linux-amd64 \
  && chmod a+x /usr/local/bin/dep
 
-WORKDIR $GOPATH/src/github.com/ploxiln/oauth2_proxy/
+WORKDIR $GOPATH/src/github.com/bitly/oauth2_proxy/
 COPY . .
 RUN dep ensure -v
 RUN CGO_ENABLED=0 go build -ldflags="-s -w" -o /usr/local/bin/oauth2_proxy

diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ to validate accounts by email, domain or group.
 ## This Fork
 
 This repo [ploxiln/oauth2_proxy](https://github.com/ploxiln/oauth2_proxy)
-is a fork of [ploxiln/oauth2_proxy](https://github.com/ploxiln/oauth2_proxy)
+is a fork of [bitly/oauth2_proxy](https://github.com/bitly/oauth2_proxy)
 which is [no longer maintained](https://github.com/bitly/oauth2_proxy/issues/628#issuecomment-417121636).
 
 When your organization finds itself with a few instances of `oauth2_proxy` controlling access
@@ -48,11 +48,12 @@ docker run ... -p 4180:4180 -e OAUTH2_PROXY_CLIENT_SECRET ploxiln/oauth2_proxy o
 
 ### Build from source
 
-Dependencies are managed with [dep](https://github.com/golang/dep/).
+The source needs to be checked-out into GOPATH under the old "bitly/" import path because internal
+package imports have not been changed over yet. Dependencies are managed with [dep](https://github.com/golang/dep/).
 
 ```sh
-git clone git@github.com:ploxiln/oauth2_proxy.git $GOPATH/src/github.com/ploxiln/oauth2_proxy
-cd $GOPATH/src/github.com/ploxiln/oauth2_proxy
+git clone git@github.com:ploxiln/oauth2_proxy.git $GOPATH/src/github.com/bitly/oauth2_proxy
+cd $GOPATH/src/github.com/bitly/oauth2_proxy
 dep ensure
 go build
 ```
@@ -201,7 +202,7 @@ OpenID Connect is a spec for OAUTH 2.0 + identity that is implemented by many ma
     -email-domain example.com
 
 If you enable cookie-refresh, it should be set to the same duration as token lifetime
-(due to a limitation in `oauth2_proxy` - see [ploxiln/oauth2_proxy#620](https://github.com/ploxiln/oauth2_proxy/pull/620)).
+(due to a limitation in `oauth2_proxy` - see [bitly/oauth2_proxy#620](https://github.com/bitly/oauth2_proxy/pull/620)).
 
 ### Discord Auth Provider
 

diff --git a/oauthproxy.go b/oauthproxy.go
@@ -14,8 +14,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/ploxiln/oauth2_proxy/cookie"
-	"github.com/ploxiln/oauth2_proxy/providers"
+	"github.com/bitly/oauth2_proxy/cookie"
+	"github.com/bitly/oauth2_proxy/providers"
 	"github.com/mbland/hmacauth"
 )
 

diff --git a/oauthproxy_test.go b/oauthproxy_test.go
@@ -15,7 +15,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ploxiln/oauth2_proxy/providers"
+	"github.com/bitly/oauth2_proxy/providers"
 	"github.com/mbland/hmacauth"
 	"github.com/stretchr/testify/assert"
 )

diff --git a/options.go b/options.go
@@ -13,7 +13,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/ploxiln/oauth2_proxy/providers"
+	"github.com/bitly/oauth2_proxy/providers"
 	oidc "github.com/coreos/go-oidc"
 	"github.com/mbland/hmacauth"
 )

diff --git a/providers/azure.go b/providers/azure.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 	"github.com/bitly/go-simplejson"
-	"github.com/ploxiln/oauth2_proxy/api"
+	"github.com/bitly/oauth2_proxy/api"
 	"log"
 	"net/http"
 	"net/url"

diff --git a/providers/discord.go b/providers/discord.go
@@ -6,7 +6,7 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/ploxiln/oauth2_proxy/api"
+	"github.com/bitly/oauth2_proxy/api"
 )
 
 type DiscordProvider struct {

diff --git a/providers/facebook.go b/providers/facebook.go
@@ -6,7 +6,7 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/ploxiln/oauth2_proxy/api"
+	"github.com/bitly/oauth2_proxy/api"
 )
 
 type FacebookProvider struct {

diff --git a/providers/gitlab.go b/providers/gitlab.go
@@ -7,7 +7,7 @@ import (
 	"path"
 	"strconv"
 
-	"github.com/ploxiln/oauth2_proxy/api"
+	"github.com/bitly/oauth2_proxy/api"
 )
 
 type GitLabProvider struct {

diff --git a/providers/internal_util.go b/providers/internal_util.go
@@ -6,7 +6,7 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/ploxiln/oauth2_proxy/api"
+	"github.com/bitly/oauth2_proxy/api"
 )
 
 // stripToken is a helper function to obfuscate "access_token"

diff --git a/providers/linkedin.go b/providers/linkedin.go
@@ -6,7 +6,7 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/ploxiln/oauth2_proxy/api"
+	"github.com/bitly/oauth2_proxy/api"
 )
 
 type LinkedInProvider struct {

diff --git a/providers/provider_default.go b/providers/provider_default.go
@@ -9,7 +9,7 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/ploxiln/oauth2_proxy/cookie"
+	"github.com/bitly/oauth2_proxy/cookie"
 )
 
 func (p *ProviderData) Redeem(redirectURL, code string) (s *SessionState, err error) {

diff --git a/providers/providers.go b/providers/providers.go
@@ -1,7 +1,7 @@
 package providers
 
 import (
-	"github.com/ploxiln/oauth2_proxy/cookie"
+	"github.com/bitly/oauth2_proxy/cookie"
 )
 
 type Provider interface {

diff --git a/providers/session_state.go b/providers/session_state.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/ploxiln/oauth2_proxy/cookie"
+	"github.com/bitly/oauth2_proxy/cookie"
 )
 
 type SessionState struct {

diff --git a/providers/session_state_test.go b/providers/session_state_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ploxiln/oauth2_proxy/cookie"
+	"github.com/bitly/oauth2_proxy/cookie"
 	"github.com/stretchr/testify/assert"
 )