diff --git a/cmd/dex/config.go b/cmd/dex/config.go index 54a4ef4904..3759916f88 100644 --- a/cmd/dex/config.go +++ b/cmd/dex/config.go @@ -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. diff --git a/cmd/dex/config_test.go b/cmd/dex/config_test.go index f5913cdec4..ad7db5242a 100644 --- a/cmd/dex/config_test.go +++ b/cmd/dex/config_test.go @@ -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" ) diff --git a/cmd/dex/serve.go b/cmd/dex/serve.go index fec17df387..ef6a713d35 100644 --- a/cmd/dex/serve.go +++ b/cmd/dex/serve.go @@ -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 { diff --git a/cmd/dex/version.go b/cmd/dex/version.go index 1e92c4dcab..b985ac5b7b 100644 --- a/cmd/dex/version.go +++ b/cmd/dex/version.go @@ -4,7 +4,7 @@ import ( "fmt" "runtime" - "github.com/coreos/dex/version" + "github.com/concourse/dex/version" "github.com/spf13/cobra" ) diff --git a/connector/authproxy/authproxy.go b/connector/authproxy/authproxy.go index e367c4f91f..13d0aa2599 100644 --- a/connector/authproxy/authproxy.go +++ b/connector/authproxy/authproxy.go @@ -8,7 +8,7 @@ import ( "net/http" "net/url" - "github.com/coreos/dex/connector" + "github.com/concourse/dex/connector" "github.com/sirupsen/logrus" ) diff --git a/connector/cf/cf.go b/connector/cf/cf.go index 565b8b79cc..bd6844efd6 100644 --- a/connector/cf/cf.go +++ b/connector/cf/cf.go @@ -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" ) diff --git a/connector/cf/cf_test.go b/connector/cf/cf_test.go index 79b0627340..215bb50a9d 100644 --- a/connector/cf/cf_test.go +++ b/connector/cf/cf_test.go @@ -11,7 +11,7 @@ import ( "strings" "testing" - "github.com/coreos/dex/connector" + "github.com/concourse/dex/connector" "github.com/sirupsen/logrus" ) diff --git a/connector/github/github.go b/connector/github/github.go index dcc828ec41..f7c93b1844 100644 --- a/connector/github/github.go +++ b/connector/github/github.go @@ -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" ) diff --git a/connector/github/github_test.go b/connector/github/github_test.go index 0186a57865..9037fd6289 100644 --- a/connector/github/github_test.go +++ b/connector/github/github_test.go @@ -10,7 +10,7 @@ import ( "reflect" "testing" - "github.com/coreos/dex/connector" + "github.com/concourse/dex/connector" ) func TestUserGroups(t *testing.T) { diff --git a/connector/gitlab/gitlab.go b/connector/gitlab/gitlab.go index 508bc29ea1..d78de2beab 100644 --- a/connector/gitlab/gitlab.go +++ b/connector/gitlab/gitlab.go @@ -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" ) diff --git a/connector/ldap/ldap.go b/connector/ldap/ldap.go index 510aee2e7d..7020826a7c 100644 --- a/connector/ldap/ldap.go +++ b/connector/ldap/ldap.go @@ -12,7 +12,7 @@ import ( "gopkg.in/ldap.v2" - "github.com/coreos/dex/connector" + "github.com/concourse/dex/connector" "github.com/sirupsen/logrus" ) diff --git a/connector/ldap/ldap_test.go b/connector/ldap/ldap_test.go index 23ad593bbd..1ab4661198 100644 --- a/connector/ldap/ldap_test.go +++ b/connector/ldap/ldap_test.go @@ -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" diff --git a/connector/linkedin/linkedin.go b/connector/linkedin/linkedin.go index 4f469f80e7..ad76abcaf9 100644 --- a/connector/linkedin/linkedin.go +++ b/connector/linkedin/linkedin.go @@ -11,7 +11,7 @@ import ( "golang.org/x/oauth2" - "github.com/coreos/dex/connector" + "github.com/concourse/dex/connector" "github.com/sirupsen/logrus" ) diff --git a/connector/microsoft/microsoft.go b/connector/microsoft/microsoft.go index faa5b8a84c..5e7e1ef7f9 100644 --- a/connector/microsoft/microsoft.go +++ b/connector/microsoft/microsoft.go @@ -14,7 +14,7 @@ import ( "golang.org/x/oauth2" - "github.com/coreos/dex/connector" + "github.com/concourse/dex/connector" "github.com/sirupsen/logrus" ) diff --git a/connector/mock/connectortest.go b/connector/mock/connectortest.go index 9e46b29f7a..451f3d650b 100644 --- a/connector/mock/connectortest.go +++ b/connector/mock/connectortest.go @@ -8,7 +8,7 @@ import ( "net/http" "net/url" - "github.com/coreos/dex/connector" + "github.com/concourse/dex/connector" "github.com/sirupsen/logrus" ) diff --git a/connector/oauth/oauth.go b/connector/oauth/oauth.go index 8167a9b1eb..ad72e0ecd9 100644 --- a/connector/oauth/oauth.go +++ b/connector/oauth/oauth.go @@ -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" ) diff --git a/connector/oauth/oauth_test.go b/connector/oauth/oauth_test.go index 7fc7e8616a..42dbd1ffee 100644 --- a/connector/oauth/oauth_test.go +++ b/connector/oauth/oauth_test.go @@ -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" ) diff --git a/connector/oidc/oidc.go b/connector/oidc/oidc.go index 2aa560e7b4..c8bf76aaee 100644 --- a/connector/oidc/oidc.go +++ b/connector/oidc/oidc.go @@ -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. diff --git a/connector/oidc/oidc_test.go b/connector/oidc/oidc_test.go index cb844f544a..114dafd033 100644 --- a/connector/oidc/oidc_test.go +++ b/connector/oidc/oidc_test.go @@ -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" ) diff --git a/connector/saml/saml.go b/connector/saml/saml.go index 54e1414f5e..616b75af71 100644 --- a/connector/saml/saml.go +++ b/connector/saml/saml.go @@ -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 ( diff --git a/connector/saml/saml_test.go b/connector/saml/saml_test.go index 665503eef4..3f07fb87ce 100644 --- a/connector/saml/saml_test.go +++ b/connector/saml/saml_test.go @@ -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. diff --git a/examples/grpc-client/client.go b/examples/grpc-client/client.go index 31100b3c2f..e0218f3b3f 100644 --- a/examples/grpc-client/client.go +++ b/examples/grpc-client/client.go @@ -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" ) diff --git a/server/api.go b/server/api.go index 6aecef592a..9857478a5b 100644 --- a/server/api.go +++ b/server/api.go @@ -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" ) diff --git a/server/api_test.go b/server/api_test.go index 697d8d76d8..68ee123f8f 100644 --- a/server/api_test.go +++ b/server/api_test.go @@ -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" ) diff --git a/server/handlers.go b/server/handlers.go index d65595087c..60eea9ce15 100644 --- a/server/handlers.go +++ b/server/handlers.go @@ -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) { diff --git a/server/oauth2.go b/server/oauth2.go index 462105fd89..5ebc364280 100644 --- a/server/oauth2.go +++ b/server/oauth2.go @@ -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. diff --git a/server/oauth2_test.go b/server/oauth2_test.go index dcf4947b33..dd13370fb8 100644 --- a/server/oauth2_test.go +++ b/server/oauth2_test.go @@ -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) { diff --git a/server/rotation.go b/server/rotation.go index a628bfa7c7..10f92190eb 100644 --- a/server/rotation.go +++ b/server/rotation.go @@ -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" ) diff --git a/server/rotation_test.go b/server/rotation_test.go index 9d236b707c..e0e6d73c50 100644 --- a/server/rotation_test.go +++ b/server/rotation_test.go @@ -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" ) diff --git a/server/server.go b/server/server.go index d9ade43431..dd8b1b8f82 100644 --- a/server/server.go +++ b/server/server.go @@ -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 diff --git a/server/server_test.go b/server/server_test.go index 88a3568fed..b6401cc24b 100644 --- a/server/server_test.go +++ b/server/server_test.go @@ -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 { diff --git a/storage/conformance/conformance.go b/storage/conformance/conformance.go index eb038b148d..2932c12a2d 100644 --- a/storage/conformance/conformance.go +++ b/storage/conformance/conformance.go @@ -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" ) diff --git a/storage/conformance/transactions.go b/storage/conformance/transactions.go index 3478460d0d..0ed163fb98 100644 --- a/storage/conformance/transactions.go +++ b/storage/conformance/transactions.go @@ -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 diff --git a/storage/etcd/config.go b/storage/etcd/config.go index ad27396863..07e9fb9534 100644 --- a/storage/etcd/config.go +++ b/storage/etcd/config.go @@ -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" diff --git a/storage/etcd/etcd.go b/storage/etcd/etcd.go index 7ad35ea5ed..81fc4df8bc 100644 --- a/storage/etcd/etcd.go +++ b/storage/etcd/etcd.go @@ -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" ) diff --git a/storage/etcd/etcd_test.go b/storage/etcd/etcd_test.go index 7029e4ca69..3545ed6702 100644 --- a/storage/etcd/etcd_test.go +++ b/storage/etcd/etcd_test.go @@ -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" ) diff --git a/storage/etcd/types.go b/storage/etcd/types.go index acca7f3795..2efd87886f 100644 --- a/storage/etcd/types.go +++ b/storage/etcd/types.go @@ -3,7 +3,7 @@ package etcd import ( "time" - "github.com/coreos/dex/storage" + "github.com/concourse/dex/storage" jose "gopkg.in/square/go-jose.v2" ) diff --git a/storage/kubernetes/client.go b/storage/kubernetes/client.go index c17b637693..b5ac8b44e5 100644 --- a/storage/kubernetes/client.go +++ b/storage/kubernetes/client.go @@ -27,8 +27,8 @@ import ( "github.com/sirupsen/logrus" "golang.org/x/net/http2" - "github.com/coreos/dex/storage" - "github.com/coreos/dex/storage/kubernetes/k8sapi" + "github.com/concourse/dex/storage" + "github.com/concourse/dex/storage/kubernetes/k8sapi" ) type client struct { diff --git a/storage/kubernetes/storage.go b/storage/kubernetes/storage.go index 0b99a8b18c..26844870ea 100644 --- a/storage/kubernetes/storage.go +++ b/storage/kubernetes/storage.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "github.com/coreos/dex/storage" - "github.com/coreos/dex/storage/kubernetes/k8sapi" + "github.com/concourse/dex/storage" + "github.com/concourse/dex/storage/kubernetes/k8sapi" "github.com/sirupsen/logrus" ) diff --git a/storage/kubernetes/storage_test.go b/storage/kubernetes/storage_test.go index 58340f7057..9af239577a 100644 --- a/storage/kubernetes/storage_test.go +++ b/storage/kubernetes/storage_test.go @@ -5,8 +5,8 @@ import ( "os" "testing" - "github.com/coreos/dex/storage" - "github.com/coreos/dex/storage/conformance" + "github.com/concourse/dex/storage" + "github.com/concourse/dex/storage/conformance" "github.com/sirupsen/logrus" ) diff --git a/storage/kubernetes/types.go b/storage/kubernetes/types.go index aa2965312f..d92728d61a 100644 --- a/storage/kubernetes/types.go +++ b/storage/kubernetes/types.go @@ -6,8 +6,8 @@ import ( jose "gopkg.in/square/go-jose.v2" - "github.com/coreos/dex/storage" - "github.com/coreos/dex/storage/kubernetes/k8sapi" + "github.com/concourse/dex/storage" + "github.com/concourse/dex/storage/kubernetes/k8sapi" ) var tprMeta = k8sapi.TypeMeta{ diff --git a/storage/memory/memory.go b/storage/memory/memory.go index ed80778b63..ed2f219ad1 100644 --- a/storage/memory/memory.go +++ b/storage/memory/memory.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "github.com/coreos/dex/storage" + "github.com/concourse/dex/storage" "github.com/sirupsen/logrus" ) diff --git a/storage/memory/memory_test.go b/storage/memory/memory_test.go index 6628e50ccb..dd8706ad53 100644 --- a/storage/memory/memory_test.go +++ b/storage/memory/memory_test.go @@ -4,8 +4,8 @@ import ( "os" "testing" - "github.com/coreos/dex/storage" - "github.com/coreos/dex/storage/conformance" + "github.com/concourse/dex/storage" + "github.com/concourse/dex/storage/conformance" "github.com/sirupsen/logrus" ) diff --git a/storage/memory/static_test.go b/storage/memory/static_test.go index df990ebb2f..115338c5b2 100644 --- a/storage/memory/static_test.go +++ b/storage/memory/static_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/coreos/dex/storage" + "github.com/concourse/dex/storage" "github.com/sirupsen/logrus" ) diff --git a/storage/sql/config.go b/storage/sql/config.go index b8aee59995..4ba0b4d78f 100644 --- a/storage/sql/config.go +++ b/storage/sql/config.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "github.com/coreos/dex/storage" + "github.com/concourse/dex/storage" "github.com/lib/pq" sqlite3 "github.com/mattn/go-sqlite3" "github.com/sirupsen/logrus" diff --git a/storage/sql/config_test.go b/storage/sql/config_test.go index 6831a5c5ab..079f0ebe71 100644 --- a/storage/sql/config_test.go +++ b/storage/sql/config_test.go @@ -7,8 +7,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/sirupsen/logrus" ) diff --git a/storage/sql/crud.go b/storage/sql/crud.go index 17886b91d0..0f196cf113 100644 --- a/storage/sql/crud.go +++ b/storage/sql/crud.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "github.com/coreos/dex/storage" + "github.com/concourse/dex/storage" ) // TODO(ericchiang): The update, insert, and select methods queries are all