Skip to content

Commit

Permalink
rewrite imports to concourse fork
Browse files Browse the repository at this point in the history
  • Loading branch information
Divya Dadlani committed Aug 29, 2018
1 parent acab990 commit ce45ce8
Show file tree
Hide file tree
Showing 47 changed files with 90 additions and 90 deletions.
12 changes: 6 additions & 6 deletions cmd/dex/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ import (
"github.com/sirupsen/logrus"
"golang.org/x/crypto/bcrypt"

"github.com/coreos/dex/server"
"github.com/coreos/dex/storage"
"github.com/coreos/dex/storage/etcd"
"github.com/coreos/dex/storage/kubernetes"
"github.com/coreos/dex/storage/memory"
"github.com/coreos/dex/storage/sql"
"github.com/concourse/dex/server"
"github.com/concourse/dex/storage"
"github.com/concourse/dex/storage/etcd"
"github.com/concourse/dex/storage/kubernetes"
"github.com/concourse/dex/storage/memory"
"github.com/concourse/dex/storage/sql"
)

// Config is the config format for the main application.
Expand Down
8 changes: 4 additions & 4 deletions cmd/dex/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package main
import (
"testing"

"github.com/coreos/dex/connector/mock"
"github.com/coreos/dex/connector/oidc"
"github.com/coreos/dex/storage"
"github.com/coreos/dex/storage/sql"
"github.com/concourse/dex/connector/mock"
"github.com/concourse/dex/connector/oidc"
"github.com/concourse/dex/storage"
"github.com/concourse/dex/storage/sql"
"github.com/ghodss/yaml"
"github.com/kylelemons/godebug/pretty"
)
Expand Down
6 changes: 3 additions & 3 deletions cmd/dex/serve.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import (
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"

"github.com/coreos/dex/api"
"github.com/coreos/dex/server"
"github.com/coreos/dex/storage"
"github.com/concourse/dex/api"
"github.com/concourse/dex/server"
"github.com/concourse/dex/storage"
)

func commandServe() *cobra.Command {
Expand Down
2 changes: 1 addition & 1 deletion cmd/dex/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"runtime"

"github.com/coreos/dex/version"
"github.com/concourse/dex/version"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion connector/authproxy/authproxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"net/http"
"net/url"

"github.com/coreos/dex/connector"
"github.com/concourse/dex/connector"
"github.com/sirupsen/logrus"
)

Expand Down
2 changes: 1 addition & 1 deletion connector/cf/cf.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"strings"
"time"

"github.com/coreos/dex/connector"
"github.com/concourse/dex/connector"
"github.com/sirupsen/logrus"
"golang.org/x/oauth2"
)
Expand Down
2 changes: 1 addition & 1 deletion connector/cf/cf_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"strings"
"testing"

"github.com/coreos/dex/connector"
"github.com/concourse/dex/connector"
"github.com/sirupsen/logrus"
)

Expand Down
2 changes: 1 addition & 1 deletion connector/github/github.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"golang.org/x/oauth2"
"golang.org/x/oauth2/github"

"github.com/coreos/dex/connector"
"github.com/concourse/dex/connector"
"github.com/sirupsen/logrus"
)

Expand Down
2 changes: 1 addition & 1 deletion connector/github/github_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"reflect"
"testing"

"github.com/coreos/dex/connector"
"github.com/concourse/dex/connector"
)

func TestUserGroups(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion connector/gitlab/gitlab.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"regexp"
"strconv"

"github.com/coreos/dex/connector"
"github.com/concourse/dex/connector"
"github.com/sirupsen/logrus"
"golang.org/x/oauth2"
)
Expand Down
2 changes: 1 addition & 1 deletion connector/ldap/ldap.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (

"gopkg.in/ldap.v2"

"github.com/coreos/dex/connector"
"github.com/concourse/dex/connector"
"github.com/sirupsen/logrus"
)

Expand Down
2 changes: 1 addition & 1 deletion connector/ldap/ldap_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/kylelemons/godebug/pretty"
"github.com/sirupsen/logrus"

"github.com/coreos/dex/connector"
"github.com/concourse/dex/connector"
)

const envVar = "DEX_LDAP_TESTS"
Expand Down
2 changes: 1 addition & 1 deletion connector/linkedin/linkedin.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (

"golang.org/x/oauth2"

"github.com/coreos/dex/connector"
"github.com/concourse/dex/connector"
"github.com/sirupsen/logrus"
)

Expand Down
2 changes: 1 addition & 1 deletion connector/microsoft/microsoft.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (

"golang.org/x/oauth2"

"github.com/coreos/dex/connector"
"github.com/concourse/dex/connector"
"github.com/sirupsen/logrus"
)

Expand Down
2 changes: 1 addition & 1 deletion connector/mock/connectortest.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"net/http"
"net/url"

"github.com/coreos/dex/connector"
"github.com/concourse/dex/connector"
"github.com/sirupsen/logrus"
)

Expand Down
2 changes: 1 addition & 1 deletion connector/oauth/oauth.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"strings"
"time"

"github.com/coreos/dex/connector"
"github.com/concourse/dex/connector"
"github.com/sirupsen/logrus"
"golang.org/x/oauth2"
)
Expand Down
2 changes: 1 addition & 1 deletion connector/oauth/oauth_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"sort"
"testing"

"github.com/coreos/dex/connector"
"github.com/concourse/dex/connector"
"github.com/sirupsen/logrus"
jose "gopkg.in/square/go-jose.v2"
)
Expand Down
2 changes: 1 addition & 1 deletion connector/oidc/oidc.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"github.com/sirupsen/logrus"
"golang.org/x/oauth2"

"github.com/coreos/dex/connector"
"github.com/concourse/dex/connector"
)

// Config holds configuration options for OpenID Connect logins.
Expand Down
2 changes: 1 addition & 1 deletion connector/oidc/oidc_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"testing"
"time"

"github.com/coreos/dex/connector"
"github.com/concourse/dex/connector"
"github.com/sirupsen/logrus"
"gopkg.in/square/go-jose.v2"
)
Expand Down
2 changes: 1 addition & 1 deletion connector/saml/saml.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"github.com/russellhaering/goxmldsig/etreeutils"
"github.com/sirupsen/logrus"

"github.com/coreos/dex/connector"
"github.com/concourse/dex/connector"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion connector/saml/saml_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
dsig "github.com/russellhaering/goxmldsig"
"github.com/sirupsen/logrus"

"github.com/coreos/dex/connector"
"github.com/concourse/dex/connector"
)

// responseTest maps a SAML 2.0 response object to a set of expected values.
Expand Down
2 changes: 1 addition & 1 deletion examples/grpc-client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"io/ioutil"
"log"

"github.com/coreos/dex/api"
"github.com/concourse/dex/api"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"
)
Expand Down
8 changes: 4 additions & 4 deletions server/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import (
// https://github.com/grpc/grpc-go/issues/711
"golang.org/x/net/context"

"github.com/coreos/dex/api"
"github.com/coreos/dex/server/internal"
"github.com/coreos/dex/storage"
"github.com/coreos/dex/version"
"github.com/concourse/dex/api"
"github.com/concourse/dex/server/internal"
"github.com/concourse/dex/storage"
"github.com/concourse/dex/version"
"github.com/sirupsen/logrus"
)

Expand Down
8 changes: 4 additions & 4 deletions server/api_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"testing"
"time"

"github.com/coreos/dex/api"
"github.com/coreos/dex/server/internal"
"github.com/coreos/dex/storage"
"github.com/coreos/dex/storage/memory"
"github.com/concourse/dex/api"
"github.com/concourse/dex/server/internal"
"github.com/concourse/dex/storage"
"github.com/concourse/dex/storage/memory"
"github.com/sirupsen/logrus"
"google.golang.org/grpc"
)
Expand Down
6 changes: 3 additions & 3 deletions server/handlers.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ import (
"github.com/gorilla/mux"
jose "gopkg.in/square/go-jose.v2"

"github.com/coreos/dex/connector"
"github.com/coreos/dex/server/internal"
"github.com/coreos/dex/storage"
"github.com/concourse/dex/connector"
"github.com/concourse/dex/server/internal"
"github.com/concourse/dex/storage"
)

func (s *Server) handleHealth(w http.ResponseWriter, r *http.Request) {
Expand Down
6 changes: 3 additions & 3 deletions server/oauth2.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (

jose "gopkg.in/square/go-jose.v2"

"github.com/coreos/dex/connector"
"github.com/coreos/dex/server/internal"
"github.com/coreos/dex/storage"
"github.com/concourse/dex/connector"
"github.com/concourse/dex/server/internal"
"github.com/concourse/dex/storage"
)

// TODO(ericchiang): clean this file up and figure out more idiomatic error handling.
Expand Down
2 changes: 1 addition & 1 deletion server/oauth2_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

jose "gopkg.in/square/go-jose.v2"

"github.com/coreos/dex/storage"
"github.com/concourse/dex/storage"
)

func TestParseAuthorizationRequest(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion server/rotation.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (

"gopkg.in/square/go-jose.v2"

"github.com/coreos/dex/storage"
"github.com/concourse/dex/storage"
"github.com/sirupsen/logrus"
)

Expand Down
4 changes: 2 additions & 2 deletions server/rotation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"testing"
"time"

"github.com/coreos/dex/storage"
"github.com/coreos/dex/storage/memory"
"github.com/concourse/dex/storage"
"github.com/concourse/dex/storage/memory"
"github.com/sirupsen/logrus"
)

Expand Down
26 changes: 13 additions & 13 deletions server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,19 @@ import (
"github.com/prometheus/client_golang/prometheus"
"github.com/sirupsen/logrus"

"github.com/coreos/dex/connector"
"github.com/coreos/dex/connector/authproxy"
"github.com/coreos/dex/connector/cf"
"github.com/coreos/dex/connector/github"
"github.com/coreos/dex/connector/gitlab"
"github.com/coreos/dex/connector/ldap"
"github.com/coreos/dex/connector/linkedin"
"github.com/coreos/dex/connector/microsoft"
"github.com/coreos/dex/connector/mock"
"github.com/coreos/dex/connector/oauth"
"github.com/coreos/dex/connector/oidc"
"github.com/coreos/dex/connector/saml"
"github.com/coreos/dex/storage"
"github.com/concourse/dex/connector"
"github.com/concourse/dex/connector/authproxy"
"github.com/concourse/dex/connector/cf"
"github.com/concourse/dex/connector/github"
"github.com/concourse/dex/connector/gitlab"
"github.com/concourse/dex/connector/ldap"
"github.com/concourse/dex/connector/linkedin"
"github.com/concourse/dex/connector/microsoft"
"github.com/concourse/dex/connector/mock"
"github.com/concourse/dex/connector/oauth"
"github.com/concourse/dex/connector/oidc"
"github.com/concourse/dex/connector/saml"
"github.com/concourse/dex/storage"
)

// LocalConnector is the local passwordDB connector which is an internal
Expand Down
8 changes: 4 additions & 4 deletions server/server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ import (
"golang.org/x/oauth2"
jose "gopkg.in/square/go-jose.v2"

"github.com/coreos/dex/connector"
"github.com/coreos/dex/connector/mock"
"github.com/coreos/dex/storage"
"github.com/coreos/dex/storage/memory"
"github.com/concourse/dex/connector"
"github.com/concourse/dex/connector/mock"
"github.com/concourse/dex/storage"
"github.com/concourse/dex/storage/memory"
)

func mustLoad(s string) *rsa.PrivateKey {
Expand Down
2 changes: 1 addition & 1 deletion storage/conformance/conformance.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (

"golang.org/x/crypto/bcrypt"

"github.com/coreos/dex/storage"
"github.com/concourse/dex/storage"

"github.com/kylelemons/godebug/pretty"
)
Expand Down
2 changes: 1 addition & 1 deletion storage/conformance/transactions.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"golang.org/x/crypto/bcrypt"

"github.com/coreos/dex/storage"
"github.com/concourse/dex/storage"
)

// RunTransactionTests runs a test suite aimed a verifying the transaction
Expand Down
2 changes: 1 addition & 1 deletion storage/etcd/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package etcd
import (
"time"

"github.com/coreos/dex/storage"
"github.com/concourse/dex/storage"
"github.com/coreos/etcd/clientv3"
"github.com/coreos/etcd/clientv3/namespace"
"github.com/coreos/etcd/pkg/transport"
Expand Down
2 changes: 1 addition & 1 deletion storage/etcd/etcd.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"strings"
"time"

"github.com/coreos/dex/storage"
"github.com/concourse/dex/storage"
"github.com/coreos/etcd/clientv3"
"github.com/sirupsen/logrus"
)
Expand Down
4 changes: 2 additions & 2 deletions storage/etcd/etcd_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"testing"
"time"

"github.com/coreos/dex/storage"
"github.com/coreos/dex/storage/conformance"
"github.com/concourse/dex/storage"
"github.com/concourse/dex/storage/conformance"
"github.com/coreos/etcd/clientv3"
"github.com/sirupsen/logrus"
)
Expand Down
Loading

0 comments on commit ce45ce8

Please sign in to comment.