From a54ea2c7f4bc5b59fddc5a4d4ad9220c3337cf43 Mon Sep 17 00:00:00 2001 From: "m.nabokikh" Date: Fri, 16 Apr 2021 01:35:07 +0400 Subject: [PATCH] fix: satisfy goproxy Signed-off-by: m.nabokikh --- Makefile | 6 +-- cmd/dex/config.go | 14 +++---- cmd/dex/config_test.go | 10 ++--- cmd/dex/serve.go | 6 +-- cmd/dex/version.go | 2 +- connector/atlassiancrowd/atlassiancrowd.go | 6 +-- connector/authproxy/authproxy.go | 4 +- connector/bitbucketcloud/bitbucketcloud.go | 6 +-- .../bitbucketcloud/bitbucketcloud_test.go | 2 +- connector/gitea/gitea.go | 4 +- connector/gitea/gitea_test.go | 2 +- connector/github/github.go | 6 +-- connector/github/github_test.go | 2 +- connector/gitlab/gitlab.go | 6 +-- connector/gitlab/gitlab_test.go | 2 +- connector/google/google.go | 6 +-- connector/keystone/keystone.go | 4 +- connector/keystone/keystone_test.go | 2 +- connector/ldap/ldap.go | 4 +- connector/ldap/ldap_test.go | 2 +- connector/linkedin/linkedin.go | 4 +- connector/microsoft/microsoft.go | 6 +-- connector/microsoft/microsoft_test.go | 2 +- connector/mock/connectortest.go | 4 +- connector/oidc/oidc.go | 4 +- connector/oidc/oidc_test.go | 2 +- connector/openshift/openshift.go | 8 ++-- connector/openshift/openshift_test.go | 4 +- connector/saml/saml.go | 6 +-- connector/saml/saml_test.go | 2 +- go.mod | 2 +- pkg/groups/groups_test.go | 2 +- server/api.go | 8 ++-- server/api_test.go | 8 ++-- server/deviceflowhandlers.go | 2 +- server/deviceflowhandlers_test.go | 2 +- server/handlers.go | 6 +-- server/handlers_test.go | 4 +- server/internal/types.proto | 2 +- server/oauth2.go | 6 +-- server/oauth2_test.go | 4 +- server/rotation.go | 4 +- server/rotation_test.go | 4 +- server/server.go | 38 +++++++++---------- server/server_test.go | 8 ++-- storage/conformance/conformance.go | 2 +- storage/conformance/transactions.go | 2 +- storage/etcd/config.go | 4 +- storage/etcd/etcd.go | 4 +- storage/etcd/etcd_test.go | 4 +- storage/etcd/types.go | 2 +- storage/kubernetes/client.go | 6 +-- storage/kubernetes/storage.go | 6 +-- storage/kubernetes/storage_test.go | 4 +- storage/kubernetes/types.go | 4 +- storage/memory/memory.go | 7 ++-- storage/memory/memory_test.go | 4 +- storage/memory/static_test.go | 2 +- storage/sql/config.go | 4 +- storage/sql/config_test.go | 6 +-- storage/sql/crud.go | 4 +- storage/sql/sql.go | 2 +- storage/sql/sqlite.go | 4 +- storage/static.go | 2 +- 64 files changed, 155 insertions(+), 156 deletions(-) diff --git a/Makefile b/Makefile index 25de27c205..75bc0e795e 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ OS = $(shell uname | tr A-Z a-z) PROJ=dex ORG_PATH=github.com/dexidp -REPO_PATH=$(ORG_PATH)/$(PROJ) +REPO_PATH=$(ORG_PATH)/$(PROJ)/v2 export PATH := $(PWD)/bin:$(PATH) VERSION ?= $(shell ./scripts/git-version) @@ -30,7 +30,7 @@ build: bin/dex bin/dex: @mkdir -p bin/ - @go install -v -ldflags $(LD_FLAGS) $(REPO_PATH)/cmd/dex + @go install -v -ldflags $(LD_FLAGS) $(REPO_PATH)/cmd/dex/ examples: bin/grpc-client bin/example-app @@ -44,7 +44,7 @@ bin/example-app: .PHONY: release-binary release-binary: - @go build -o /go/bin/dex -v -ldflags $(LD_FLAGS) $(REPO_PATH)/cmd/dex + @go build -o /go/bin/dex -v -ldflags $(LD_FLAGS) $(REPO_PATH)/cmd/dex/ docker-compose.override.yaml: cp docker-compose.override.yaml.dist docker-compose.override.yaml diff --git a/cmd/dex/config.go b/cmd/dex/config.go index 88dc98e720..f79137632a 100644 --- a/cmd/dex/config.go +++ b/cmd/dex/config.go @@ -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/dexidp/dex/v2/pkg/log" + "github.com/dexidp/dex/v2/server" + "github.com/dexidp/dex/v2/storage" + "github.com/dexidp/dex/v2/storage/etcd" + "github.com/dexidp/dex/v2/storage/kubernetes" + "github.com/dexidp/dex/v2/storage/memory" + "github.com/dexidp/dex/v2/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 8ee02d5aa2..e5086e07bb 100644 --- a/cmd/dex/config_test.go +++ b/cmd/dex/config_test.go @@ -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/dexidp/dex/v2/connector/mock" + "github.com/dexidp/dex/v2/connector/oidc" + "github.com/dexidp/dex/v2/server" + "github.com/dexidp/dex/v2/storage" + "github.com/dexidp/dex/v2/storage/sql" ) var _ = yaml.YAMLToJSON diff --git a/cmd/dex/serve.go b/cmd/dex/serve.go index 1960d101ed..66ce7bb63f 100644 --- a/cmd/dex/serve.go +++ b/cmd/dex/serve.go @@ -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/dexidp/dex/v2/pkg/log" + "github.com/dexidp/dex/v2/server" + "github.com/dexidp/dex/v2/storage" ) type serveOptions struct { diff --git a/cmd/dex/version.go b/cmd/dex/version.go index de206e16d8..f0c0bb2e2e 100644 --- a/cmd/dex/version.go +++ b/cmd/dex/version.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" - "github.com/dexidp/dex/version" + "github.com/dexidp/dex/v2/version" ) func commandVersion() *cobra.Command { diff --git a/connector/atlassiancrowd/atlassiancrowd.go b/connector/atlassiancrowd/atlassiancrowd.go index 6f03406086..83a857d04d 100644 --- a/connector/atlassiancrowd/atlassiancrowd.go +++ b/connector/atlassiancrowd/atlassiancrowd.go @@ -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/dexidp/dex/v2/connector" + "github.com/dexidp/dex/v2/pkg/groups" + "github.com/dexidp/dex/v2/pkg/log" ) // Config holds configuration options for Atlassian Crowd connector. diff --git a/connector/authproxy/authproxy.go b/connector/authproxy/authproxy.go index 853e5ee29f..58a1746eb6 100644 --- a/connector/authproxy/authproxy.go +++ b/connector/authproxy/authproxy.go @@ -8,8 +8,8 @@ import ( "net/http" "net/url" - "github.com/dexidp/dex/connector" - "github.com/dexidp/dex/pkg/log" + "github.com/dexidp/dex/v2/connector" + "github.com/dexidp/dex/v2/pkg/log" ) // Config holds the configuration parameters for a connector which returns an diff --git a/connector/bitbucketcloud/bitbucketcloud.go b/connector/bitbucketcloud/bitbucketcloud.go index e81893da07..fabced6466 100644 --- a/connector/bitbucketcloud/bitbucketcloud.go +++ b/connector/bitbucketcloud/bitbucketcloud.go @@ -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/dexidp/dex/v2/connector" + "github.com/dexidp/dex/v2/pkg/groups" + "github.com/dexidp/dex/v2/pkg/log" ) const ( diff --git a/connector/bitbucketcloud/bitbucketcloud_test.go b/connector/bitbucketcloud/bitbucketcloud_test.go index 3d984a8fcb..fbae931c57 100644 --- 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/dexidp/dex/v2/connector" ) func TestUserGroups(t *testing.T) { diff --git a/connector/gitea/gitea.go b/connector/gitea/gitea.go index 33cc3126e6..18bd7f6aa0 100644 --- a/connector/gitea/gitea.go +++ b/connector/gitea/gitea.go @@ -14,8 +14,8 @@ import ( "golang.org/x/oauth2" - "github.com/dexidp/dex/connector" - "github.com/dexidp/dex/pkg/log" + "github.com/dexidp/dex/v2/connector" + "github.com/dexidp/dex/v2/pkg/log" ) // Config holds configuration options for gitea logins. diff --git a/connector/gitea/gitea_test.go b/connector/gitea/gitea_test.go index a71d79956e..5dc24e7885 100644 --- 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/dexidp/dex/v2/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 index 02f2cae804..dd34bd472a 100644 --- a/connector/github/github.go +++ b/connector/github/github.go @@ -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/dexidp/dex/v2/connector" + groups_pkg "github.com/dexidp/dex/v2/pkg/groups" + "github.com/dexidp/dex/v2/pkg/log" ) const ( diff --git a/connector/github/github_test.go b/connector/github/github_test.go index 76d7463cf6..f0baf983a5 100644 --- a/connector/github/github_test.go +++ b/connector/github/github_test.go @@ -12,7 +12,7 @@ import ( "strings" "testing" - "github.com/dexidp/dex/connector" + "github.com/dexidp/dex/v2/connector" ) type testResponse struct { diff --git a/connector/gitlab/gitlab.go b/connector/gitlab/gitlab.go index e40601402d..868cad681a 100644 --- a/connector/gitlab/gitlab.go +++ b/connector/gitlab/gitlab.go @@ -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/dexidp/dex/v2/connector" + "github.com/dexidp/dex/v2/pkg/groups" + "github.com/dexidp/dex/v2/pkg/log" ) const ( diff --git a/connector/gitlab/gitlab_test.go b/connector/gitlab/gitlab_test.go index 23cf9aac2d..1dd548c856 100644 --- 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/dexidp/dex/v2/connector" ) func TestUserGroups(t *testing.T) { diff --git a/connector/google/google.go b/connector/google/google.go index eccb1fc7d7..c7e68fbfa3 100644 --- a/connector/google/google.go +++ b/connector/google/google.go @@ -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/dexidp/dex/v2/connector" + pkg_groups "github.com/dexidp/dex/v2/pkg/groups" + "github.com/dexidp/dex/v2/pkg/log" ) const ( diff --git a/connector/keystone/keystone.go b/connector/keystone/keystone.go index 3750710e74..2a1aad6cbc 100644 --- a/connector/keystone/keystone.go +++ b/connector/keystone/keystone.go @@ -9,8 +9,8 @@ import ( "io/ioutil" "net/http" - "github.com/dexidp/dex/connector" - "github.com/dexidp/dex/pkg/log" + "github.com/dexidp/dex/v2/connector" + "github.com/dexidp/dex/v2/pkg/log" ) type conn struct { diff --git a/connector/keystone/keystone_test.go b/connector/keystone/keystone_test.go index b138012426..de191bcf51 100644 --- a/connector/keystone/keystone_test.go +++ b/connector/keystone/keystone_test.go @@ -12,7 +12,7 @@ import ( "strings" "testing" - "github.com/dexidp/dex/connector" + "github.com/dexidp/dex/v2/connector" ) const ( diff --git a/connector/ldap/ldap.go b/connector/ldap/ldap.go index d3bc20ab66..4dd8b358ce 100644 --- a/connector/ldap/ldap.go +++ b/connector/ldap/ldap.go @@ -12,8 +12,8 @@ import ( "github.com/go-ldap/ldap/v3" - "github.com/dexidp/dex/connector" - "github.com/dexidp/dex/pkg/log" + "github.com/dexidp/dex/v2/connector" + "github.com/dexidp/dex/v2/pkg/log" ) // 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 index 9ae4567431..bc1e6601a0 100644 --- a/connector/ldap/ldap_test.go +++ b/connector/ldap/ldap_test.go @@ -10,7 +10,7 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/sirupsen/logrus" - "github.com/dexidp/dex/connector" + "github.com/dexidp/dex/v2/connector" ) // connectionMethod indicates how the test should connect to the LDAP server. diff --git a/connector/linkedin/linkedin.go b/connector/linkedin/linkedin.go index 1c8312c11e..db82a76670 100644 --- a/connector/linkedin/linkedin.go +++ b/connector/linkedin/linkedin.go @@ -11,8 +11,8 @@ import ( "golang.org/x/oauth2" - "github.com/dexidp/dex/connector" - "github.com/dexidp/dex/pkg/log" + "github.com/dexidp/dex/v2/connector" + "github.com/dexidp/dex/v2/pkg/log" ) const ( diff --git a/connector/microsoft/microsoft.go b/connector/microsoft/microsoft.go index 3a3cf3b5cc..6e8b171b0a 100644 --- a/connector/microsoft/microsoft.go +++ b/connector/microsoft/microsoft.go @@ -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/dexidp/dex/v2/connector" + groups_pkg "github.com/dexidp/dex/v2/pkg/groups" + "github.com/dexidp/dex/v2/pkg/log" ) // GroupNameFormat represents the format of the group identifier diff --git a/connector/microsoft/microsoft_test.go b/connector/microsoft/microsoft_test.go index 3fba9c2ae2..c0d02b7c4d 100644 --- a/connector/microsoft/microsoft_test.go +++ b/connector/microsoft/microsoft_test.go @@ -9,7 +9,7 @@ import ( "reflect" "testing" - "github.com/dexidp/dex/connector" + "github.com/dexidp/dex/v2/connector" ) type testResponse struct { diff --git a/connector/mock/connectortest.go b/connector/mock/connectortest.go index 5089914ca1..34ca0beb71 100644 --- a/connector/mock/connectortest.go +++ b/connector/mock/connectortest.go @@ -8,8 +8,8 @@ import ( "net/http" "net/url" - "github.com/dexidp/dex/connector" - "github.com/dexidp/dex/pkg/log" + "github.com/dexidp/dex/v2/connector" + "github.com/dexidp/dex/v2/pkg/log" ) // NewCallbackConnector returns a mock connector which requires no user interaction. It always returns diff --git a/connector/oidc/oidc.go b/connector/oidc/oidc.go index b752f9dac5..ef3b05bc2a 100644 --- a/connector/oidc/oidc.go +++ b/connector/oidc/oidc.go @@ -14,8 +14,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/dexidp/dex/v2/connector" + "github.com/dexidp/dex/v2/pkg/log" ) // Config holds configuration options for OpenID Connect logins. diff --git a/connector/oidc/oidc_test.go b/connector/oidc/oidc_test.go index ae92f70caa..5730d2f12e 100644 --- a/connector/oidc/oidc_test.go +++ b/connector/oidc/oidc_test.go @@ -19,7 +19,7 @@ import ( "github.com/sirupsen/logrus" "gopkg.in/square/go-jose.v2" - "github.com/dexidp/dex/connector" + "github.com/dexidp/dex/v2/connector" ) func TestKnownBrokenAuthHeaderProvider(t *testing.T) { diff --git a/connector/openshift/openshift.go b/connector/openshift/openshift.go index f06e8f8045..24ea84250b 100644 --- a/connector/openshift/openshift.go +++ b/connector/openshift/openshift.go @@ -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/dexidp/dex/v2/connector" + "github.com/dexidp/dex/v2/pkg/groups" + "github.com/dexidp/dex/v2/pkg/log" + "github.com/dexidp/dex/v2/storage/kubernetes/k8sapi" ) // Config holds configuration options for OpenShift login diff --git a/connector/openshift/openshift_test.go b/connector/openshift/openshift_test.go index 90f1686c40..176bbfd0d4 100644 --- a/connector/openshift/openshift_test.go +++ b/connector/openshift/openshift_test.go @@ -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/dexidp/dex/v2/connector" + "github.com/dexidp/dex/v2/storage/kubernetes/k8sapi" ) func TestOpen(t *testing.T) { diff --git a/connector/saml/saml.go b/connector/saml/saml.go index 0d52b13116..ecfa85852b 100644 --- a/connector/saml/saml.go +++ b/connector/saml/saml.go @@ -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/dexidp/dex/v2/connector" + "github.com/dexidp/dex/v2/pkg/groups" + "github.com/dexidp/dex/v2/pkg/log" ) // nolint diff --git a/connector/saml/saml_test.go b/connector/saml/saml_test.go index 67d7efb140..d27deabefe 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/dexidp/dex/connector" + "github.com/dexidp/dex/v2/connector" ) // responseTest maps a SAML 2.0 response object to a set of expected values. diff --git a/go.mod b/go.mod index 29b29ef4b2..d57506858d 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/dexidp/dex +module github.com/dexidp/dex/v2 go 1.16 diff --git a/pkg/groups/groups_test.go b/pkg/groups/groups_test.go index 0be62fb430..1a0be0abf1 100644 --- a/pkg/groups/groups_test.go +++ b/pkg/groups/groups_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/dexidp/dex/pkg/groups" + "github.com/dexidp/dex/v2/pkg/groups" ) func TestFilter(t *testing.T) { diff --git a/server/api.go b/server/api.go index 5938efa6a6..afe0d8174c 100644 --- a/server/api.go +++ b/server/api.go @@ -8,10 +8,10 @@ import ( "golang.org/x/crypto/bcrypt" "github.com/dexidp/dex/api/v2" - "github.com/dexidp/dex/pkg/log" - "github.com/dexidp/dex/server/internal" - "github.com/dexidp/dex/storage" - "github.com/dexidp/dex/version" + "github.com/dexidp/dex/v2/pkg/log" + "github.com/dexidp/dex/v2/server/internal" + "github.com/dexidp/dex/v2/storage" + "github.com/dexidp/dex/v2/version" ) // apiVersion increases every time a new call is added to the API. Clients should use this info diff --git a/server/api_test.go b/server/api_test.go index e7725063a5..8e14d6b9e1 100644 --- a/server/api_test.go +++ b/server/api_test.go @@ -11,10 +11,10 @@ import ( "google.golang.org/grpc" "github.com/dexidp/dex/api/v2" - "github.com/dexidp/dex/pkg/log" - "github.com/dexidp/dex/server/internal" - "github.com/dexidp/dex/storage" - "github.com/dexidp/dex/storage/memory" + "github.com/dexidp/dex/v2/pkg/log" + "github.com/dexidp/dex/v2/server/internal" + "github.com/dexidp/dex/v2/storage" + "github.com/dexidp/dex/v2/storage/memory" ) // apiClient is a test gRPC client. When constructed, it runs a server in diff --git a/server/deviceflowhandlers.go b/server/deviceflowhandlers.go index a73dafe8ee..612e819480 100644 --- a/server/deviceflowhandlers.go +++ b/server/deviceflowhandlers.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "github.com/dexidp/dex/storage" + "github.com/dexidp/dex/v2/storage" ) type deviceCodeResponse struct { diff --git a/server/deviceflowhandlers_test.go b/server/deviceflowhandlers_test.go index 3898d4fc8e..846a2851b6 100644 --- a/server/deviceflowhandlers_test.go +++ b/server/deviceflowhandlers_test.go @@ -13,7 +13,7 @@ import ( "testing" "time" - "github.com/dexidp/dex/storage" + "github.com/dexidp/dex/v2/storage" ) func TestDeviceVerificationURI(t *testing.T) { diff --git a/server/handlers.go b/server/handlers.go index eb65f490bd..7521d1a30c 100644 --- a/server/handlers.go +++ b/server/handlers.go @@ -18,9 +18,9 @@ import ( "github.com/gorilla/mux" jose "gopkg.in/square/go-jose.v2" - "github.com/dexidp/dex/connector" - "github.com/dexidp/dex/server/internal" - "github.com/dexidp/dex/storage" + "github.com/dexidp/dex/v2/connector" + "github.com/dexidp/dex/v2/server/internal" + "github.com/dexidp/dex/v2/storage" ) const ( diff --git a/server/handlers_test.go b/server/handlers_test.go index d195af64b4..073198093d 100644 --- a/server/handlers_test.go +++ b/server/handlers_test.go @@ -18,8 +18,8 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/oauth2" - "github.com/dexidp/dex/storage" - "github.com/dexidp/dex/storage/memory" + "github.com/dexidp/dex/v2/storage" + "github.com/dexidp/dex/v2/storage/memory" ) func TestHandleHealth(t *testing.T) { diff --git a/server/internal/types.proto b/server/internal/types.proto index 6a949fe88d..e64a66e677 100644 --- a/server/internal/types.proto +++ b/server/internal/types.proto @@ -3,7 +3,7 @@ syntax = "proto3"; // Package internal holds protobuf types used by the server. package internal; -option go_package = "github.com/dexidp/dex/server/internal"; +option go_package = "github.com/dexidp/dex/v2/server/internal"; // RefreshToken is a message that holds refresh token data used by dex. message RefreshToken { diff --git a/server/oauth2.go b/server/oauth2.go index 577fb94444..b45b716a97 100644 --- a/server/oauth2.go +++ b/server/oauth2.go @@ -22,9 +22,9 @@ import ( jose "gopkg.in/square/go-jose.v2" - "github.com/dexidp/dex/connector" - "github.com/dexidp/dex/server/internal" - "github.com/dexidp/dex/storage" + "github.com/dexidp/dex/v2/connector" + "github.com/dexidp/dex/v2/server/internal" + "github.com/dexidp/dex/v2/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 518e22ee86..12bbcdd94b 100644 --- a/server/oauth2_test.go +++ b/server/oauth2_test.go @@ -13,8 +13,8 @@ import ( "github.com/stretchr/testify/require" "gopkg.in/square/go-jose.v2" - "github.com/dexidp/dex/storage" - "github.com/dexidp/dex/storage/memory" + "github.com/dexidp/dex/v2/storage" + "github.com/dexidp/dex/v2/storage/memory" ) func TestParseAuthorizationRequest(t *testing.T) { diff --git a/server/rotation.go b/server/rotation.go index b7dd8116a8..674a348173 100644 --- a/server/rotation.go +++ b/server/rotation.go @@ -12,8 +12,8 @@ import ( "gopkg.in/square/go-jose.v2" - "github.com/dexidp/dex/pkg/log" - "github.com/dexidp/dex/storage" + "github.com/dexidp/dex/v2/pkg/log" + "github.com/dexidp/dex/v2/storage" ) var errAlreadyRotated = errors.New("keys already rotated by another server instance") diff --git a/server/rotation_test.go b/server/rotation_test.go index 6f9b2ecb3f..d5e23f16b6 100644 --- a/server/rotation_test.go +++ b/server/rotation_test.go @@ -8,8 +8,8 @@ import ( "github.com/sirupsen/logrus" - "github.com/dexidp/dex/storage" - "github.com/dexidp/dex/storage/memory" + "github.com/dexidp/dex/v2/storage" + "github.com/dexidp/dex/v2/storage/memory" ) func signingKeyID(t *testing.T, s storage.Storage) string { diff --git a/server/server.go b/server/server.go index 93ab9f16bc..c5281611be 100644 --- a/server/server.go +++ b/server/server.go @@ -24,25 +24,25 @@ import ( "github.com/prometheus/client_golang/prometheus" "golang.org/x/crypto/bcrypt" - "github.com/dexidp/dex/connector" - "github.com/dexidp/dex/connector/atlassiancrowd" - "github.com/dexidp/dex/connector/authproxy" - "github.com/dexidp/dex/connector/bitbucketcloud" - "github.com/dexidp/dex/connector/gitea" - "github.com/dexidp/dex/connector/github" - "github.com/dexidp/dex/connector/gitlab" - "github.com/dexidp/dex/connector/google" - "github.com/dexidp/dex/connector/keystone" - "github.com/dexidp/dex/connector/ldap" - "github.com/dexidp/dex/connector/linkedin" - "github.com/dexidp/dex/connector/microsoft" - "github.com/dexidp/dex/connector/mock" - "github.com/dexidp/dex/connector/oidc" - "github.com/dexidp/dex/connector/openshift" - "github.com/dexidp/dex/connector/saml" - "github.com/dexidp/dex/pkg/log" - "github.com/dexidp/dex/storage" - "github.com/dexidp/dex/web" + "github.com/dexidp/dex/v2/connector" + "github.com/dexidp/dex/v2/connector/atlassiancrowd" + "github.com/dexidp/dex/v2/connector/authproxy" + "github.com/dexidp/dex/v2/connector/bitbucketcloud" + "github.com/dexidp/dex/v2/connector/gitea" + "github.com/dexidp/dex/v2/connector/github" + "github.com/dexidp/dex/v2/connector/gitlab" + "github.com/dexidp/dex/v2/connector/google" + "github.com/dexidp/dex/v2/connector/keystone" + "github.com/dexidp/dex/v2/connector/ldap" + "github.com/dexidp/dex/v2/connector/linkedin" + "github.com/dexidp/dex/v2/connector/microsoft" + "github.com/dexidp/dex/v2/connector/mock" + "github.com/dexidp/dex/v2/connector/oidc" + "github.com/dexidp/dex/v2/connector/openshift" + "github.com/dexidp/dex/v2/connector/saml" + "github.com/dexidp/dex/v2/pkg/log" + "github.com/dexidp/dex/v2/storage" + "github.com/dexidp/dex/v2/web" ) // LocalConnector is the local passwordDB connector which is an internal diff --git a/server/server_test.go b/server/server_test.go index 87ca6c171e..cea3810c10 100644 --- a/server/server_test.go +++ b/server/server_test.go @@ -31,10 +31,10 @@ import ( "golang.org/x/oauth2" jose "gopkg.in/square/go-jose.v2" - "github.com/dexidp/dex/connector" - "github.com/dexidp/dex/connector/mock" - "github.com/dexidp/dex/storage" - "github.com/dexidp/dex/storage/memory" + "github.com/dexidp/dex/v2/connector" + "github.com/dexidp/dex/v2/connector/mock" + "github.com/dexidp/dex/v2/storage" + "github.com/dexidp/dex/v2/storage/memory" ) func mustLoad(s string) *rsa.PrivateKey { diff --git a/storage/conformance/conformance.go b/storage/conformance/conformance.go index 3f5e2aa191..c92280a50b 100644 --- a/storage/conformance/conformance.go +++ b/storage/conformance/conformance.go @@ -11,7 +11,7 @@ import ( "golang.org/x/crypto/bcrypt" jose "gopkg.in/square/go-jose.v2" - "github.com/dexidp/dex/storage" + "github.com/dexidp/dex/v2/storage" ) // ensure that values being tested on never expire. diff --git a/storage/conformance/transactions.go b/storage/conformance/transactions.go index 2fc6755b09..ac1099b0f6 100644 --- a/storage/conformance/transactions.go +++ b/storage/conformance/transactions.go @@ -6,7 +6,7 @@ import ( "golang.org/x/crypto/bcrypt" - "github.com/dexidp/dex/storage" + "github.com/dexidp/dex/v2/storage" ) // RunTransactionTests runs a test suite aimed a verifying the transaction diff --git a/storage/etcd/config.go b/storage/etcd/config.go index 1a587d2d4e..e5ed1acd3d 100644 --- a/storage/etcd/config.go +++ b/storage/etcd/config.go @@ -7,8 +7,8 @@ import ( "go.etcd.io/etcd/client/v3/namespace" "go.etcd.io/etcd/pkg/v3/transport" - "github.com/dexidp/dex/pkg/log" - "github.com/dexidp/dex/storage" + "github.com/dexidp/dex/v2/pkg/log" + "github.com/dexidp/dex/v2/storage" ) var defaultDialTimeout = 2 * time.Second diff --git a/storage/etcd/etcd.go b/storage/etcd/etcd.go index 63fa7bc225..53b274c675 100644 --- a/storage/etcd/etcd.go +++ b/storage/etcd/etcd.go @@ -9,8 +9,8 @@ import ( clientv3 "go.etcd.io/etcd/client/v3" - "github.com/dexidp/dex/pkg/log" - "github.com/dexidp/dex/storage" + "github.com/dexidp/dex/v2/pkg/log" + "github.com/dexidp/dex/v2/storage" ) const ( diff --git a/storage/etcd/etcd_test.go b/storage/etcd/etcd_test.go index 8a9af5c9d5..305cccad91 100644 --- a/storage/etcd/etcd_test.go +++ b/storage/etcd/etcd_test.go @@ -12,8 +12,8 @@ import ( "github.com/sirupsen/logrus" clientv3 "go.etcd.io/etcd/client/v3" - "github.com/dexidp/dex/storage" - "github.com/dexidp/dex/storage/conformance" + "github.com/dexidp/dex/v2/storage" + "github.com/dexidp/dex/v2/storage/conformance" ) func withTimeout(t time.Duration, f func()) { diff --git a/storage/etcd/types.go b/storage/etcd/types.go index f2ffd9f702..c5c0b810ca 100644 --- a/storage/etcd/types.go +++ b/storage/etcd/types.go @@ -5,7 +5,7 @@ import ( jose "gopkg.in/square/go-jose.v2" - "github.com/dexidp/dex/storage" + "github.com/dexidp/dex/v2/storage" ) // AuthCode is a mirrored struct from storage with JSON struct tags diff --git a/storage/kubernetes/client.go b/storage/kubernetes/client.go index 593f1c0338..f96a87f642 100644 --- a/storage/kubernetes/client.go +++ b/storage/kubernetes/client.go @@ -25,9 +25,9 @@ import ( "github.com/ghodss/yaml" "golang.org/x/net/http2" - "github.com/dexidp/dex/pkg/log" - "github.com/dexidp/dex/storage" - "github.com/dexidp/dex/storage/kubernetes/k8sapi" + "github.com/dexidp/dex/v2/pkg/log" + "github.com/dexidp/dex/v2/storage" + "github.com/dexidp/dex/v2/storage/kubernetes/k8sapi" ) type client struct { diff --git a/storage/kubernetes/storage.go b/storage/kubernetes/storage.go index b670244a0e..a9de7a9f91 100644 --- a/storage/kubernetes/storage.go +++ b/storage/kubernetes/storage.go @@ -9,9 +9,9 @@ import ( "strings" "time" - "github.com/dexidp/dex/pkg/log" - "github.com/dexidp/dex/storage" - "github.com/dexidp/dex/storage/kubernetes/k8sapi" + "github.com/dexidp/dex/v2/pkg/log" + "github.com/dexidp/dex/v2/storage" + "github.com/dexidp/dex/v2/storage/kubernetes/k8sapi" ) const ( diff --git a/storage/kubernetes/storage_test.go b/storage/kubernetes/storage_test.go index 42ba19a401..9503759c07 100644 --- a/storage/kubernetes/storage_test.go +++ b/storage/kubernetes/storage_test.go @@ -17,8 +17,8 @@ import ( "github.com/stretchr/testify/suite" "sigs.k8s.io/testing_frameworks/integration" - "github.com/dexidp/dex/storage" - "github.com/dexidp/dex/storage/conformance" + "github.com/dexidp/dex/v2/storage" + "github.com/dexidp/dex/v2/storage/conformance" ) const kubeconfigTemplate = `apiVersion: v1 diff --git a/storage/kubernetes/types.go b/storage/kubernetes/types.go index 07e2508401..b17699fd5d 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/dexidp/dex/storage" - "github.com/dexidp/dex/storage/kubernetes/k8sapi" + "github.com/dexidp/dex/v2/storage" + "github.com/dexidp/dex/v2/storage/kubernetes/k8sapi" ) var crdMeta = k8sapi.TypeMeta{ diff --git a/storage/memory/memory.go b/storage/memory/memory.go index 82264205e7..9c967c0360 100644 --- a/storage/memory/memory.go +++ b/storage/memory/memory.go @@ -6,8 +6,8 @@ import ( "sync" "time" - "github.com/dexidp/dex/pkg/log" - "github.com/dexidp/dex/storage" + "github.com/dexidp/dex/v2/pkg/log" + "github.com/dexidp/dex/v2/storage" ) // New returns an in memory storage. @@ -29,8 +29,7 @@ func New(logger log.Logger) storage.Storage { // Config is an implementation of a storage configuration. // // TODO(ericchiang): Actually define a storage config interface and have registration. -type Config struct { - // The in memory implementation has no config. +type Config struct { // The in memory implementation has no config. } // Open always returns a new in memory storage. diff --git a/storage/memory/memory_test.go b/storage/memory/memory_test.go index 84a8826ef2..83debff6d1 100644 --- a/storage/memory/memory_test.go +++ b/storage/memory/memory_test.go @@ -6,8 +6,8 @@ import ( "github.com/sirupsen/logrus" - "github.com/dexidp/dex/storage" - "github.com/dexidp/dex/storage/conformance" + "github.com/dexidp/dex/v2/storage" + "github.com/dexidp/dex/v2/storage/conformance" ) func TestStorage(t *testing.T) { diff --git a/storage/memory/static_test.go b/storage/memory/static_test.go index 8513e0ee89..64b5d5d8d1 100644 --- a/storage/memory/static_test.go +++ b/storage/memory/static_test.go @@ -8,7 +8,7 @@ import ( "github.com/sirupsen/logrus" - "github.com/dexidp/dex/storage" + "github.com/dexidp/dex/v2/storage" ) func TestStaticClients(t *testing.T) { diff --git a/storage/sql/config.go b/storage/sql/config.go index 0ce0f117db..52791f7e12 100644 --- a/storage/sql/config.go +++ b/storage/sql/config.go @@ -15,8 +15,8 @@ import ( "github.com/go-sql-driver/mysql" "github.com/lib/pq" - "github.com/dexidp/dex/pkg/log" - "github.com/dexidp/dex/storage" + "github.com/dexidp/dex/v2/pkg/log" + "github.com/dexidp/dex/v2/storage" ) const ( diff --git a/storage/sql/config_test.go b/storage/sql/config_test.go index 1178728c1a..3de0f14a2c 100644 --- a/storage/sql/config_test.go +++ b/storage/sql/config_test.go @@ -10,9 +10,9 @@ import ( "github.com/sirupsen/logrus" - "github.com/dexidp/dex/pkg/log" - "github.com/dexidp/dex/storage" - "github.com/dexidp/dex/storage/conformance" + "github.com/dexidp/dex/v2/pkg/log" + "github.com/dexidp/dex/v2/storage" + "github.com/dexidp/dex/v2/storage/conformance" ) func withTimeout(t time.Duration, f func()) { diff --git a/storage/sql/crud.go b/storage/sql/crud.go index 4451e5c567..1e1a07594e 100644 --- a/storage/sql/crud.go +++ b/storage/sql/crud.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "github.com/dexidp/dex/storage" + "github.com/dexidp/dex/v2/storage" ) // TODO(ericchiang): The update, insert, and select methods queries are all @@ -998,7 +998,7 @@ func (c *conn) UpdateDeviceToken(deviceCode string, updater func(old storage.Dev _, err = tx.Exec(` update device_token set - status = $1, + status = $1, token = $2, last_request = $3, poll_interval = $4 diff --git a/storage/sql/sql.go b/storage/sql/sql.go index 0a29216936..19fdd1b8e3 100644 --- a/storage/sql/sql.go +++ b/storage/sql/sql.go @@ -10,7 +10,7 @@ import ( _ "github.com/lib/pq" _ "github.com/mattn/go-sqlite3" - "github.com/dexidp/dex/pkg/log" + "github.com/dexidp/dex/v2/pkg/log" ) // flavor represents a specific SQL implementation, and is used to translate query strings diff --git a/storage/sql/sqlite.go b/storage/sql/sqlite.go index faefd89ae3..f40fc9ae8f 100644 --- a/storage/sql/sqlite.go +++ b/storage/sql/sqlite.go @@ -8,8 +8,8 @@ import ( sqlite3 "github.com/mattn/go-sqlite3" - "github.com/dexidp/dex/pkg/log" - "github.com/dexidp/dex/storage" + "github.com/dexidp/dex/v2/pkg/log" + "github.com/dexidp/dex/v2/storage" ) // SQLite3 options for creating an SQL db. diff --git a/storage/static.go b/storage/static.go index 806b61f9cd..67093b5adb 100644 --- a/storage/static.go +++ b/storage/static.go @@ -4,7 +4,7 @@ import ( "errors" "strings" - "github.com/dexidp/dex/pkg/log" + "github.com/dexidp/dex/v2/pkg/log" ) // Tests for this code are in the "memory" package, since this package doesn't