upstream dex release: v2.37.0

The official container image for this release can be pulled from ``` ghcr.io/dexidp/dex:v2.37.0 ```  * TLS cert reloader by @seankhliao in dexidp#2964 * Add xx to cross-compile binaries in Docker by @sagikazarmark in dexidp#2898 * Spelling by @jsoref in dexidp#2919 * LDAP case-insensitive DN attribute by @nabokihms in dexidp#2829 * Utilize native git diff --exit-code by @marcofranssen in dexidp#2981 * Google: Add Support for Multiple Admin Emails to Retrieve Group Lists by @vsychov in dexidp#2911 * Do not skip approval screen by default by @nabokihms in dexidp#2897 * Fail if OIDC config contains hosted domains by @nabokihms in dexidp#2937 * build(deps): bump alpine from 3.17.2 to 3.17.3 by @dependabot in dexidp#2879 * build(deps): bump mheap/github-action-required-labels from 3 to 4 by @dependabot in dexidp#2881 * build(deps): bump google.golang.org/grpc from 1.53.0 to 1.54.0 by @dependabot in dexidp#2873 * build(deps): bump golang.org/x/oauth2 from 0.6.0 to 0.7.0 by @dependabot in dexidp#2892 * build(deps): bump golang from 1.20.2-alpine3.16 to 1.20.3-alpine3.16 by @dependabot in dexidp#2884 * build(deps): bump github.com/spf13/cobra from 1.6.1 to 1.7.0 by @dependabot in dexidp#2885 * build(deps): bump aquasecurity/trivy-action from 0.9.2 to 0.10.0 by @dependabot in dexidp#2905 * build(deps): bump github.com/prometheus/client_golang from 1.14.0 to 1.15.0 by @dependabot in dexidp#2900 * build(deps): bump golang.org/x/crypto from 0.7.0 to 0.8.0 by @dependabot in dexidp#2891 * build(deps): bump github.com/russellhaering/goxmldsig from 1.3.0 to 1.4.0 by @dependabot in dexidp#2920 * build(deps): bump golang from 1.20.3-alpine3.16 to 1.20.4-alpine3.16 by @dependabot in dexidp#2924 * build(deps): bump github.com/lib/pq from 1.10.7 to 1.10.9 by @dependabot in dexidp#2922 * build(deps): bump golang.org/x/oauth2 from 0.7.0 to 0.8.0 by @dependabot in dexidp#2929 * build(deps): bump google.golang.org/grpc from 1.54.0 to 1.55.0 by @dependabot in dexidp#2932 * build(deps): bump go.etcd.io/etcd/client/pkg/v3 from 3.5.7 to 3.5.8 by @dependabot in dexidp#2899 * build(deps): bump github.com/beevik/etree from 1.1.0 to 1.1.4 by @dependabot in dexidp#2939 * build(deps): bump github.com/go-sql-driver/mysql from 1.7.0 to 1.7.1 by @dependabot in dexidp#2938 * build(deps): bump go.etcd.io/etcd/client/pkg/v3 from 3.5.8 to 3.5.9 by @dependabot in dexidp#2946 * build(deps): bump github/codeql-action from 2.3.1 to 2.3.3 by @dependabot in dexidp#2943 * build(deps): bump anchore/sbom-action from 0.14.1 to 0.14.2 by @dependabot in dexidp#2942 * build(deps): bump alpine from 3.17.3 to 3.18.0 by @dependabot in dexidp#2930 * build(deps): bump google.golang.org/grpc from 1.53.0 to 1.55.0 in /api/v2 by @dependabot in dexidp#2927 * build(deps): bump google.golang.org/api from 0.114.0 to 0.122.0 by @dependabot in dexidp#2931 * build(deps): bump entgo.io/ent from 0.11.10 to 0.12.3 by @dependabot in dexidp#2923 * build(deps): bump go.etcd.io/etcd/client/v3 from 3.5.7 to 3.5.9 by @dependabot in dexidp#2944 * build(deps): bump github.com/prometheus/client_golang from 1.15.0 to 1.15.1 by @dependabot in dexidp#2945 * build(deps): bump helm/kind-action from 1.5.0 to 1.7.0 by @dependabot in dexidp#2956 * build(deps): bump github.com/sirupsen/logrus from 1.9.0 to 1.9.2 by @dependabot in dexidp#2957 * build(deps): bump actions/setup-go from 4.0.0 to 4.0.1 by @dependabot in dexidp#2949 * build(deps): bump golang.org/x/crypto from 0.8.0 to 0.9.0 by @dependabot in dexidp#2948 * build(deps): bump google.golang.org/api from 0.122.0 to 0.123.0 by @dependabot in dexidp#2959 * build(deps): bump github.com/beevik/etree from 1.1.4 to 1.2.0 by @dependabot in dexidp#2947 * build(deps): bump github/codeql-action from 2.3.3 to 2.3.5 by @dependabot in dexidp#2970 * build(deps): bump google.golang.org/api from 0.123.0 to 0.124.0 by @dependabot in dexidp#2968 * build(deps): bump github.com/stretchr/testify from 1.8.2 to 1.8.3 by @dependabot in dexidp#2958 * build(deps): bump aquasecurity/trivy-action from 0.10.0 to 0.11.0 by @dependabot in dexidp#2984 * build(deps): bump github/codeql-action from 2.3.5 to 2.3.6 by @dependabot in dexidp#2982 * build(deps): bump actions/dependency-review-action from 3.0.4 to 3.0.6 by @dependabot in dexidp#2978 * build(deps): bump github.com/sirupsen/logrus from 1.9.2 to 1.9.3 by @dependabot in dexidp#2983 * build(deps): bump github.com/mattn/go-sqlite3 from 1.14.16 to 1.14.17 by @dependabot in dexidp#2979 * build(deps): bump google.golang.org/api from 0.124.0 to 0.125.0 by @dependabot in dexidp#2976 * build(deps): bump github.com/stretchr/testify from 1.8.3 to 1.8.4 by @dependabot in dexidp#2977 * build(deps): bump docker/login-action from 2.1.0 to 2.2.0 by @dependabot in dexidp#2987 * build(deps): bump docker/setup-qemu-action from 2.1.0 to 2.2.0 by @dependabot in dexidp#2985 * build(deps): bump docker/metadata-action from 4.4.0 to 4.5.0 by @dependabot in dexidp#2986 * build(deps): bump docker/setup-buildx-action from 2.5.0 to 2.6.0 by @dependabot in dexidp#2988 * build(deps): bump mheap/github-action-required-labels from 4 to 5 by @dependabot in dexidp#2990 * build(deps): bump aquasecurity/trivy-action from 0.11.0 to 0.11.2 by @dependabot in dexidp#2995 * build(deps): bump github/codeql-action from 2.3.6 to 2.20.0 by @dependabot in dexidp#3002 * build(deps): bump google.golang.org/api from 0.125.0 to 0.127.0 by @dependabot in dexidp#2999 * build(deps): bump docker/setup-buildx-action from 2.6.0 to 2.7.0 by @dependabot in dexidp#3001 * build(deps): bump docker/build-push-action from 4.0.0 to 4.1.1 by @dependabot in dexidp#3003 * build(deps): bump actions/checkout from 3.5.2 to 3.5.3 by @dependabot in dexidp#2993 * build(deps): bump github.com/go-ldap/ldap/v3 from 3.4.4 to 3.4.5 by @dependabot in dexidp#2997 * build(deps): bump golang.org/x/net from 0.10.0 to 0.11.0 by @dependabot in dexidp#3004 * build(deps): bump alpine from 3.18.0 to 3.18.2 by @dependabot in dexidp#3008 * build(deps): bump docker/metadata-action from 4.5.0 to 4.6.0 by @dependabot in dexidp#3007 * build(deps): bump golang.org/x/oauth2 from 0.8.0 to 0.9.0 by @dependabot in dexidp#3005 * build(deps): bump google.golang.org/grpc from 1.55.0 to 1.56.0 by @dependabot in dexidp#3009 * build(deps): bump github.com/prometheus/client_golang from 1.15.1 to 1.16.0 by @dependabot in dexidp#3010 * build(deps): bump google.golang.org/grpc from 1.56.0 to 1.56.1 by @dependabot in dexidp#3016 * build(deps): bump github/codeql-action from 2.20.0 to 2.20.1 by @dependabot in dexidp#3015 * build(deps): bump anchore/sbom-action from 0.14.2 to 0.14.3 by @dependabot in dexidp#3014 * build(deps): bump ossf/scorecard-action from 2.1.3 to 2.2.0 by @dependabot in dexidp#3019 * build(deps): bump google.golang.org/api from 0.127.0 to 0.129.0 by @dependabot in dexidp#3022 * build(deps): bump docker/setup-buildx-action from 2.7.0 to 2.8.0 by @dependabot in dexidp#3023 * @marcofranssen made their first contribution in dexidp#2981 * @vsychov made their first contribution in dexidp#2911 **Full Changelog**: dexidp/dex@v2.36.0...v2.37.0
concourse · Jan 16, 2025 · 56050f4 · 56050f4
1 parent ae1c12a
commit 56050f4
Show file tree

Hide file tree

Showing 160 changed files with 350 additions and 351 deletions.
diff --git a/cmd/dex/config.go b/cmd/dex/config.go
@@ -12,14 +12,14 @@ import (
 
 	"golang.org/x/crypto/bcrypt"
 
-	"github.com/dexidp/dex/pkg/featureflags"
-	"github.com/dexidp/dex/server"
-	"github.com/dexidp/dex/storage"
-	"github.com/dexidp/dex/storage/ent"
-	"github.com/dexidp/dex/storage/etcd"
-	"github.com/dexidp/dex/storage/kubernetes"
-	"github.com/dexidp/dex/storage/memory"
-	"github.com/dexidp/dex/storage/sql"
+	"github.com/concourse/dex/pkg/featureflags"
+	"github.com/concourse/dex/server"
+	"github.com/concourse/dex/storage"
+	"github.com/concourse/dex/storage/ent"
+	"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
@@ -8,11 +8,11 @@ import (
 	"github.com/ghodss/yaml"
 	"github.com/kylelemons/godebug/pretty"
 
-	"github.com/dexidp/dex/connector/mock"
-	"github.com/dexidp/dex/connector/oidc"
-	"github.com/dexidp/dex/server"
-	"github.com/dexidp/dex/storage"
-	"github.com/dexidp/dex/storage/sql"
+	"github.com/concourse/dex/connector/mock"
+	"github.com/concourse/dex/connector/oidc"
+	"github.com/concourse/dex/server"
+	"github.com/concourse/dex/storage"
+	"github.com/concourse/dex/storage/sql"
 )
 
 var _ = yaml.YAMLToJSON

diff --git a/cmd/dex/logger.go b/cmd/dex/logger.go
@@ -7,7 +7,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/dexidp/dex/server"
+	"github.com/concourse/dex/server"
 )
 
 var logFormats = []string{"json", "text"}

diff --git a/cmd/dex/serve.go b/cmd/dex/serve.go
@@ -34,9 +34,9 @@ import (
 	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/reflection"
 
+	"github.com/concourse/dex/server"
+	"github.com/concourse/dex/storage"
 	"github.com/dexidp/dex/api/v2"
-	"github.com/dexidp/dex/server"
-	"github.com/dexidp/dex/storage"
 )
 
 type serveOptions struct {

diff --git a/connector/atlassiancrowd/atlassiancrowd.go b/connector/atlassiancrowd/atlassiancrowd.go
@@ -13,8 +13,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/dexidp/dex/connector"
-	"github.com/dexidp/dex/pkg/groups"
+	"github.com/concourse/dex/connector"
+	"github.com/concourse/dex/pkg/groups"
 )
 
 // Config holds configuration options for Atlassian Crowd connector.

diff --git a/connector/authproxy/authproxy.go b/connector/authproxy/authproxy.go
@@ -10,7 +10,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/dexidp/dex/connector"
+	"github.com/concourse/dex/connector"
 )
 
 // Config holds the configuration parameters for a connector which returns an

diff --git a/connector/authproxy/authproxy_test.go b/connector/authproxy/authproxy_test.go
@@ -7,7 +7,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/dexidp/dex/connector"
+	"github.com/concourse/dex/connector"
 )
 
 const (

diff --git a/connector/bitbucketcloud/bitbucketcloud.go b/connector/bitbucketcloud/bitbucketcloud.go
@@ -15,8 +15,8 @@ import (
 	"golang.org/x/oauth2"
 	"golang.org/x/oauth2/bitbucket"
 
-	"github.com/dexidp/dex/connector"
-	"github.com/dexidp/dex/pkg/groups"
+	"github.com/concourse/dex/connector"
+	"github.com/concourse/dex/pkg/groups"
 )
 
 const (

diff --git a/connector/bitbucketcloud/bitbucketcloud_test.go b/connector/bitbucketcloud/bitbucketcloud_test.go
@@ -10,7 +10,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/dexidp/dex/connector"
+	"github.com/concourse/dex/connector"
 )
 
 func TestUserGroups(t *testing.T) {

diff --git a/connector/cloudfoundry/cloudfoundry.go b/connector/cloudfoundry/cloudfoundry.go
@@ -7,6 +7,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"log/slog"
 	"net"
 	"net/http"
 	"os"
@@ -16,8 +17,7 @@ import (
 
 	"golang.org/x/oauth2"
 
-	"github.com/dexidp/dex/connector"
-	"github.com/dexidp/dex/pkg/log"
+	"github.com/concourse/dex/connector"
 )
 
 type cloudfoundryConnector struct {
@@ -29,7 +29,7 @@ type cloudfoundryConnector struct {
 	authorizationURL string
 	userInfoURL      string
 	httpClient       *http.Client
-	logger           log.Logger
+	logger           *slog.Logger
 }
 
 type connectorData struct {
@@ -77,15 +77,15 @@ type org struct {
 	GUID string
 }
 
-func (c *Config) Open(id string, logger log.Logger) (connector.Connector, error) {
+func (c *Config) Open(id string, logger *slog.Logger) (connector.Connector, error) {
 	var err error
 
 	cloudfoundryConn := &cloudfoundryConnector{
 		clientID:     c.ClientID,
 		clientSecret: c.ClientSecret,
 		apiURL:       c.APIURL,
 		redirectURI:  c.RedirectURI,
-		logger:       logger,
+		logger:       logger.With(slog.Group("connector", "type", "cloudfoundry", "id", id)),
 	}
 
 	cloudfoundryConn.httpClient, err = newHTTPClient(c.RootCAs, c.InsecureSkipVerify)
@@ -96,16 +96,14 @@ func (c *Config) Open(id string, logger log.Logger) (connector.Connector, error)
 	apiURL := strings.TrimRight(c.APIURL, "/")
 	apiResp, err := cloudfoundryConn.httpClient.Get(fmt.Sprintf("%s/v2/info", apiURL))
 	if err != nil {
-		logger.Errorf("failed-to-send-request-to-cloud-controller-api", err)
-		return nil, err
+		return nil, fmt.Errorf("failed-to-send-request-to-cloud-controller-api: %w", err)
 	}
 
 	defer apiResp.Body.Close()
 
 	if apiResp.StatusCode != http.StatusOK {
 		err = fmt.Errorf("request failed with status %d", apiResp.StatusCode)
-		logger.Errorf("failed-get-info-response-from-api", err)
-		return nil, err
+		return nil, fmt.Errorf("failed-get-info-response-from-api: %w", err)
 	}
 
 	var apiResult map[string]interface{}
@@ -114,14 +112,12 @@ func (c *Config) Open(id string, logger log.Logger) (connector.Connector, error)
 	uaaURL := strings.TrimRight(apiResult["authorization_endpoint"].(string), "/")
 	uaaResp, err := cloudfoundryConn.httpClient.Get(fmt.Sprintf("%s/.well-known/openid-configuration", uaaURL))
 	if err != nil {
-		logger.Errorf("failed-to-send-request-to-uaa-api", err)
-		return nil, err
+		return nil, fmt.Errorf("failed-to-send-request-to-uaa-api: %w", err)
 	}
 
 	if apiResp.StatusCode != http.StatusOK {
 		err = fmt.Errorf("request failed with status %d", apiResp.StatusCode)
-		logger.Errorf("failed-to-get-well-known-config-response-from-api", err)
-		return nil, err
+		return nil, fmt.Errorf("failed-to-get-well-known-config-response-from-api: %w", err)
 	}
 
 	defer uaaResp.Body.Close()
@@ -130,8 +126,7 @@ func (c *Config) Open(id string, logger log.Logger) (connector.Connector, error)
 	err = json.NewDecoder(uaaResp.Body).Decode(&uaaResult)
 
 	if err != nil {
-		logger.Errorf("failed-to-decode-response-from-uaa-api", err)
-		return nil, err
+		return nil, fmt.Errorf("failed-to-decode-response-from-uaa-api: %w", err)
 	}
 
 	cloudfoundryConn.tokenURL, _ = uaaResult["token_endpoint"].(string)

diff --git a/connector/cloudfoundry/cloudfoundry_test.go b/connector/cloudfoundry/cloudfoundry_test.go
@@ -4,15 +4,15 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"io"
+	"log/slog"
 	"net/http"
 	"net/http/httptest"
 	"reflect"
 	"strings"
 	"testing"
 
-	"github.com/sirupsen/logrus"
-
-	"github.com/dexidp/dex/connector"
+	"github.com/concourse/dex/connector"
 )
 
 func TestOpen(t *testing.T) {
@@ -231,7 +231,7 @@ func newConnector(t *testing.T, serverURL string) *cloudfoundryConnector {
 		InsecureSkipVerify: true,
 	}
 
-	log := logrus.New()
+	log := slog.New(slog.NewTextHandler(io.Discard, &slog.HandlerOptions{}))
 
 	conn, err := testConfig.Open("id", log)
 	if err != nil {

diff --git a/connector/gitea/gitea.go b/connector/gitea/gitea.go
@@ -15,7 +15,7 @@ import (
 
 	"golang.org/x/oauth2"
 
-	"github.com/dexidp/dex/connector"
+	"github.com/concourse/dex/connector"
 )
 
 // Config holds configuration options for gitea logins.

diff --git a/connector/gitea/gitea_test.go b/connector/gitea/gitea_test.go
@@ -9,7 +9,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/dexidp/dex/connector"
+	"github.com/concourse/dex/connector"
 )
 
 // tests that the email is used as their username when they have no username set

diff --git a/connector/github/github.go b/connector/github/github.go
@@ -16,9 +16,9 @@ import (
 	"golang.org/x/oauth2"
 	"golang.org/x/oauth2/github"
 
-	"github.com/dexidp/dex/connector"
-	groups_pkg "github.com/dexidp/dex/pkg/groups"
-	"github.com/dexidp/dex/pkg/httpclient"
+	"github.com/concourse/dex/connector"
+	groups_pkg "github.com/concourse/dex/pkg/groups"
+	"github.com/concourse/dex/pkg/httpclient"
 )
 
 const (

diff --git a/connector/github/github_test.go b/connector/github/github_test.go
@@ -15,7 +15,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/dexidp/dex/connector"
+	"github.com/concourse/dex/connector"
 )
 
 type testResponse struct {

diff --git a/connector/gitlab/gitlab.go b/connector/gitlab/gitlab.go
@@ -14,8 +14,8 @@ import (
 
 	"golang.org/x/oauth2"
 
-	"github.com/dexidp/dex/connector"
-	"github.com/dexidp/dex/pkg/groups"
+	"github.com/concourse/dex/connector"
+	"github.com/concourse/dex/pkg/groups"
 )
 
 const (

diff --git a/connector/gitlab/gitlab_test.go b/connector/gitlab/gitlab_test.go
@@ -10,7 +10,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/dexidp/dex/connector"
+	"github.com/concourse/dex/connector"
 )
 
 func TestUserGroups(t *testing.T) {

diff --git a/connector/google/google.go b/connector/google/google.go
@@ -20,8 +20,8 @@ import (
 	"google.golang.org/api/impersonate"
 	"google.golang.org/api/option"
 
-	"github.com/dexidp/dex/connector"
-	pkg_groups "github.com/dexidp/dex/pkg/groups"
+	"github.com/concourse/dex/connector"
+	pkg_groups "github.com/concourse/dex/pkg/groups"
 )
 
 const (

diff --git a/connector/google/google_test.go b/connector/google/google_test.go
@@ -17,7 +17,7 @@ import (
 	admin "google.golang.org/api/admin/directory/v1"
 	"google.golang.org/api/option"
 
-	"github.com/dexidp/dex/connector"
+	"github.com/concourse/dex/connector"
 )
 
 var (

diff --git a/connector/keystone/keystone.go b/connector/keystone/keystone.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/google/uuid"
 
-	"github.com/dexidp/dex/connector"
+	"github.com/concourse/dex/connector"
 )
 
 type conn struct {

diff --git a/connector/keystone/keystone_test.go b/connector/keystone/keystone_test.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/dexidp/dex/connector"
+	"github.com/concourse/dex/connector"
 )
 
 const (

diff --git a/connector/ldap/ldap.go b/connector/ldap/ldap.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/go-ldap/ldap/v3"
 
-	"github.com/dexidp/dex/connector"
+	"github.com/concourse/dex/connector"
 )
 
 // Config holds the configuration parameters for the LDAP connector. The LDAP

diff --git a/connector/ldap/ldap_test.go b/connector/ldap/ldap_test.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/kylelemons/godebug/pretty"
 
-	"github.com/dexidp/dex/connector"
+	"github.com/concourse/dex/connector"
 )
 
 // connectionMethod indicates how the test should connect to the LDAP server.

diff --git a/connector/linkedin/linkedin.go b/connector/linkedin/linkedin.go
@@ -12,7 +12,7 @@ import (
 
 	"golang.org/x/oauth2"
 
-	"github.com/dexidp/dex/connector"
+	"github.com/concourse/dex/connector"
 )
 
 const (

diff --git a/connector/microsoft/microsoft.go b/connector/microsoft/microsoft.go
@@ -16,8 +16,8 @@ import (
 
 	"golang.org/x/oauth2"
 
-	"github.com/dexidp/dex/connector"
-	groups_pkg "github.com/dexidp/dex/pkg/groups"
+	"github.com/concourse/dex/connector"
+	groups_pkg "github.com/concourse/dex/pkg/groups"
 )
 
 // GroupNameFormat represents the format of the group identifier

diff --git a/connector/microsoft/microsoft_test.go b/connector/microsoft/microsoft_test.go
@@ -10,7 +10,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/dexidp/dex/connector"
+	"github.com/concourse/dex/connector"
 )
 
 type testResponse struct {

diff --git a/connector/mock/connectortest.go b/connector/mock/connectortest.go
@@ -9,7 +9,7 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/dexidp/dex/connector"
+	"github.com/concourse/dex/connector"
 )
 
 // NewCallbackConnector returns a mock connector which requires no user interaction. It always returns

diff --git a/connector/oauth/oauth.go b/connector/oauth/oauth.go
@@ -12,8 +12,8 @@ import (
 
 	"golang.org/x/oauth2"
 
-	"github.com/dexidp/dex/connector"
-	"github.com/dexidp/dex/pkg/httpclient"
+	"github.com/concourse/dex/connector"
+	"github.com/concourse/dex/pkg/httpclient"
 )
 
 type oauthConnector struct {
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,7 +12,7 @@ import ( @@
     	"golang.org/x/oauth2"
-    	"github.com/dexidp/dex/connector"
+    	"github.com/concourse/dex/connector"
     )
     const (
@@ Expand Down @@