Skip to content

Commit

Permalink
upstream dex release: v2.28.1
Browse files Browse the repository at this point in the history
The official docker release for this release can be pulled from

```
ghcr.io/dexidp/dex:v2.28.1
```
**Bugfixes:**

- Fix gomplate on ARM (dexidp#2053, @sagikazarmark)
  • Loading branch information
CI Bot committed Mar 20, 2021
1 parent 26b124f commit 05bffc9
Show file tree
Hide file tree
Showing 67 changed files with 157 additions and 157 deletions.
14 changes: 7 additions & 7 deletions cmd/dex/config.go
Expand Up @@ -10,13 +10,13 @@ import (

"golang.org/x/crypto/bcrypt"

"github.com/dexidp/dex/pkg/log"
"github.com/dexidp/dex/server"
"github.com/dexidp/dex/storage"
"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/log"
"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
10 changes: 5 additions & 5 deletions cmd/dex/config_test.go
Expand Up @@ -7,11 +7,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
Expand Down
6 changes: 3 additions & 3 deletions cmd/dex/serve.go
Expand Up @@ -29,9 +29,9 @@ import (
"google.golang.org/grpc/reflection"

"github.com/dexidp/dex/api/v2"
"github.com/dexidp/dex/pkg/log"
"github.com/dexidp/dex/server"
"github.com/dexidp/dex/storage"
"github.com/concourse/dex/pkg/log"
"github.com/concourse/dex/server"
"github.com/concourse/dex/storage"
)

type serveOptions struct {
Expand Down
2 changes: 1 addition & 1 deletion cmd/dex/version.go
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/spf13/cobra"

"github.com/dexidp/dex/version"
"github.com/concourse/dex/version"
)

func commandVersion() *cobra.Command {
Expand Down
6 changes: 3 additions & 3 deletions connector/atlassiancrowd/atlassiancrowd.go
Expand Up @@ -13,9 +13,9 @@ import (
"strings"
"time"

"github.com/dexidp/dex/connector"
"github.com/dexidp/dex/pkg/groups"
"github.com/dexidp/dex/pkg/log"
"github.com/concourse/dex/connector"
"github.com/concourse/dex/pkg/groups"
"github.com/concourse/dex/pkg/log"
)

// Config holds configuration options for Atlassian Crowd connector.
Expand Down
4 changes: 2 additions & 2 deletions connector/authproxy/authproxy.go
Expand Up @@ -8,8 +8,8 @@ import (
"net/http"
"net/url"

"github.com/dexidp/dex/connector"
"github.com/dexidp/dex/pkg/log"
"github.com/concourse/dex/connector"
"github.com/concourse/dex/pkg/log"
)

// Config holds the configuration parameters for a connector which returns an
Expand Down
6 changes: 3 additions & 3 deletions connector/bitbucketcloud/bitbucketcloud.go
Expand Up @@ -14,9 +14,9 @@ import (
"golang.org/x/oauth2"
"golang.org/x/oauth2/bitbucket"

"github.com/dexidp/dex/connector"
"github.com/dexidp/dex/pkg/groups"
"github.com/dexidp/dex/pkg/log"
"github.com/concourse/dex/connector"
"github.com/concourse/dex/pkg/groups"
"github.com/concourse/dex/pkg/log"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion connector/bitbucketcloud/bitbucketcloud_test.go
Expand Up @@ -10,7 +10,7 @@ import (
"reflect"
"testing"

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

func TestUserGroups(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions connector/cf/cf.go
Expand Up @@ -16,8 +16,8 @@ import (

"golang.org/x/oauth2"

"github.com/dexidp/dex/connector"
"github.com/dexidp/dex/pkg/log"
"github.com/concourse/dex/connector"
"github.com/concourse/dex/pkg/log"
)

type cfConnector struct {
Expand Down
2 changes: 1 addition & 1 deletion connector/cf/cf_test.go
Expand Up @@ -12,7 +12,7 @@ import (

"github.com/sirupsen/logrus"

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

func TestOpen(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions connector/gitea/gitea.go
Expand Up @@ -14,8 +14,8 @@ import (

"golang.org/x/oauth2"

"github.com/dexidp/dex/connector"
"github.com/dexidp/dex/pkg/log"
"github.com/concourse/dex/connector"
"github.com/concourse/dex/pkg/log"
)

// Config holds configuration options for gitea logins.
Expand Down
2 changes: 1 addition & 1 deletion connector/gitea/gitea_test.go
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions connector/github/github.go
Expand Up @@ -19,9 +19,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/log"
"github.com/concourse/dex/connector"
groups_pkg "github.com/concourse/dex/pkg/groups"
"github.com/concourse/dex/pkg/log"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion connector/github/github_test.go
Expand Up @@ -12,7 +12,7 @@ import (
"strings"
"testing"

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

type testResponse struct {
Expand Down
6 changes: 3 additions & 3 deletions connector/gitlab/gitlab.go
Expand Up @@ -12,9 +12,9 @@ import (

"golang.org/x/oauth2"

"github.com/dexidp/dex/connector"
"github.com/dexidp/dex/pkg/groups"
"github.com/dexidp/dex/pkg/log"
"github.com/concourse/dex/connector"
"github.com/concourse/dex/pkg/groups"
"github.com/concourse/dex/pkg/log"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion connector/gitlab/gitlab_test.go
Expand Up @@ -10,7 +10,7 @@ import (
"reflect"
"testing"

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

func TestUserGroups(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions connector/google/google.go
Expand Up @@ -15,9 +15,9 @@ import (
admin "google.golang.org/api/admin/directory/v1"
"google.golang.org/api/option"

"github.com/dexidp/dex/connector"
pkg_groups "github.com/dexidp/dex/pkg/groups"
"github.com/dexidp/dex/pkg/log"
"github.com/concourse/dex/connector"
pkg_groups "github.com/concourse/dex/pkg/groups"
"github.com/concourse/dex/pkg/log"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions connector/keystone/keystone.go
Expand Up @@ -9,8 +9,8 @@ import (
"io/ioutil"
"net/http"

"github.com/dexidp/dex/connector"
"github.com/dexidp/dex/pkg/log"
"github.com/concourse/dex/connector"
"github.com/concourse/dex/pkg/log"
)

type conn struct {
Expand Down
2 changes: 1 addition & 1 deletion connector/keystone/keystone_test.go
Expand Up @@ -12,7 +12,7 @@ import (
"strings"
"testing"

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

const (
Expand Down
4 changes: 2 additions & 2 deletions connector/ldap/ldap.go
Expand Up @@ -12,8 +12,8 @@ import (

"gopkg.in/ldap.v2"

"github.com/dexidp/dex/connector"
"github.com/dexidp/dex/pkg/log"
"github.com/concourse/dex/connector"
"github.com/concourse/dex/pkg/log"
)

// Config holds the configuration parameters for the LDAP connector. The LDAP
Expand Down
2 changes: 1 addition & 1 deletion connector/ldap/ldap_test.go
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/kylelemons/godebug/pretty"
"github.com/sirupsen/logrus"

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

// connectionMethod indicates how the test should connect to the LDAP server.
Expand Down
4 changes: 2 additions & 2 deletions connector/linkedin/linkedin.go
Expand Up @@ -11,8 +11,8 @@ import (

"golang.org/x/oauth2"

"github.com/dexidp/dex/connector"
"github.com/dexidp/dex/pkg/log"
"github.com/concourse/dex/connector"
"github.com/concourse/dex/pkg/log"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions connector/microsoft/microsoft.go
Expand Up @@ -15,9 +15,9 @@ import (

"golang.org/x/oauth2"

"github.com/dexidp/dex/connector"
groups_pkg "github.com/dexidp/dex/pkg/groups"
"github.com/dexidp/dex/pkg/log"
"github.com/concourse/dex/connector"
groups_pkg "github.com/concourse/dex/pkg/groups"
"github.com/concourse/dex/pkg/log"
)

// GroupNameFormat represents the format of the group identifier
Expand Down
2 changes: 1 addition & 1 deletion connector/microsoft/microsoft_test.go
Expand Up @@ -9,7 +9,7 @@ import (
"reflect"
"testing"

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

type testResponse struct {
Expand Down
4 changes: 2 additions & 2 deletions connector/mock/connectortest.go
Expand Up @@ -8,8 +8,8 @@ import (
"net/http"
"net/url"

"github.com/dexidp/dex/connector"
"github.com/dexidp/dex/pkg/log"
"github.com/concourse/dex/connector"
"github.com/concourse/dex/pkg/log"
)

// NewCallbackConnector returns a mock connector which requires no user interaction. It always returns
Expand Down
4 changes: 2 additions & 2 deletions connector/oauth/oauth.go
Expand Up @@ -16,8 +16,8 @@ import (

"golang.org/x/oauth2"

"github.com/dexidp/dex/connector"
"github.com/dexidp/dex/pkg/log"
"github.com/concourse/dex/connector"
"github.com/concourse/dex/pkg/log"
)

type oauthConnector struct {
Expand Down
2 changes: 1 addition & 1 deletion connector/oauth/oauth_test.go
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/stretchr/testify/assert"
jose "gopkg.in/square/go-jose.v2"

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

func TestOpen(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions connector/oidc/oidc.go
Expand Up @@ -18,8 +18,8 @@ import (
"github.com/coreos/go-oidc/v3/oidc"
"golang.org/x/oauth2"

"github.com/dexidp/dex/connector"
"github.com/dexidp/dex/pkg/log"
"github.com/concourse/dex/connector"
"github.com/concourse/dex/pkg/log"
)

// Config holds configuration options for OpenID Connect logins.
Expand Down
2 changes: 1 addition & 1 deletion connector/oidc/oidc_test.go
Expand Up @@ -19,7 +19,7 @@ import (
"github.com/sirupsen/logrus"
"gopkg.in/square/go-jose.v2"

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

func TestKnownBrokenAuthHeaderProvider(t *testing.T) {
Expand Down
8 changes: 4 additions & 4 deletions connector/openshift/openshift.go
Expand Up @@ -14,10 +14,10 @@ import (

"golang.org/x/oauth2"

"github.com/dexidp/dex/connector"
"github.com/dexidp/dex/pkg/groups"
"github.com/dexidp/dex/pkg/log"
"github.com/dexidp/dex/storage/kubernetes/k8sapi"
"github.com/concourse/dex/connector"
"github.com/concourse/dex/pkg/groups"
"github.com/concourse/dex/pkg/log"
"github.com/concourse/dex/storage/kubernetes/k8sapi"
)

// Config holds configuration options for OpenShift login
Expand Down
4 changes: 2 additions & 2 deletions connector/openshift/openshift_test.go
Expand Up @@ -13,8 +13,8 @@ import (
"github.com/sirupsen/logrus"
"golang.org/x/oauth2"

"github.com/dexidp/dex/connector"
"github.com/dexidp/dex/storage/kubernetes/k8sapi"
"github.com/concourse/dex/connector"
"github.com/concourse/dex/storage/kubernetes/k8sapi"
)

func TestOpen(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions connector/saml/saml.go
Expand Up @@ -19,9 +19,9 @@ import (
dsig "github.com/russellhaering/goxmldsig"
"github.com/russellhaering/goxmldsig/etreeutils"

"github.com/dexidp/dex/connector"
"github.com/dexidp/dex/pkg/groups"
"github.com/dexidp/dex/pkg/log"
"github.com/concourse/dex/connector"
"github.com/concourse/dex/pkg/groups"
"github.com/concourse/dex/pkg/log"
)

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

"github.com/dexidp/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/go.mod
@@ -1,4 +1,4 @@
module github.com/dexidp/dex/examples
module github.com/concourse/dex/examples

go 1.14

Expand Down
2 changes: 1 addition & 1 deletion go.mod
@@ -1,4 +1,4 @@
module github.com/dexidp/dex
module github.com/concourse/dex

go 1.16

Expand Down
2 changes: 1 addition & 1 deletion pkg/groups/groups_test.go
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/stretchr/testify/assert"

"github.com/dexidp/dex/pkg/groups"
"github.com/concourse/dex/pkg/groups"
)

func TestFilter(t *testing.T) {
Expand Down

0 comments on commit 05bffc9

Please sign in to comment.