From 4a88d0641a8574c7c999f0e5183150ea63ba7d6c Mon Sep 17 00:00:00 2001
From: Eric Stroczynski <ericstroczynski@gmail.com>
Date: Tue, 25 Jul 2017 13:45:17 -0700
Subject: [PATCH] : update {S->s}irupsen/logrus
---
cmd/dex/config.go | 2 +-
cmd/dex/serve.go | 2 +-
connector/github/github.go | 2 +-
connector/gitlab/gitlab.go | 2 +-
connector/ldap/ldap.go | 2 +-
connector/ldap/ldap_test.go | 2 +-
connector/mock/connectortest.go | 2 +-
connector/oidc/oidc.go | 2 +-
connector/oidc/oidc_test.go | 2 +-
connector/saml/saml.go | 2 +-
connector/saml/saml_test.go | 2 +-
glide.yaml | 12 +++++++-----
server/api.go | 2 +-
server/api_test.go | 2 +-
server/rotation.go | 2 +-
server/rotation_test.go | 2 +-
server/server.go | 2 +-
server/server_test.go | 2 +-
storage/kubernetes/client.go | 2 +-
storage/kubernetes/storage.go | 2 +-
storage/kubernetes/storage_test.go | 2 +-
storage/memory/memory.go | 2 +-
storage/memory/memory_test.go | 2 +-
storage/memory/static_test.go | 2 +-
storage/sql/config.go | 2 +-
storage/sql/config_test.go | 2 +-
storage/sql/migrate_test.go | 2 +-
storage/sql/sql.go | 2 +-
28 files changed, 34 insertions(+), 32 deletions(-)
diff --git a/cmd/dex/config.go b/cmd/dex/config.go
index 2c0cae29..59733bc4 100644
--- a/cmd/dex/config.go
+++ b/cmd/dex/config.go
@@ -6,7 +6,7 @@ import (
"fmt"
"os"
- "github.com/Sirupsen/logrus"
+ "github.com/sirupsen/logrus"
"golang.org/x/crypto/bcrypt"
"github.com/coreos/dex/server"
diff --git a/cmd/dex/serve.go b/cmd/dex/serve.go
index 78194161..f2221c71 100644
--- a/cmd/dex/serve.go
+++ b/cmd/dex/serve.go
@@ -13,8 +13,8 @@ import (
"strings"
"time"
- "github.com/Sirupsen/logrus"
"github.com/ghodss/yaml"
+ "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"
diff --git a/connector/github/github.go b/connector/github/github.go
index c483246b..0a45c3c7 100644
--- a/connector/github/github.go
+++ b/connector/github/github.go
@@ -19,8 +19,8 @@ import (
"golang.org/x/oauth2"
"golang.org/x/oauth2/github"
- "github.com/Sirupsen/logrus"
"github.com/coreos/dex/connector"
+ "github.com/sirupsen/logrus"
)
const (
diff --git a/connector/gitlab/gitlab.go b/connector/gitlab/gitlab.go
index b0f10cf1..df9b13b6 100644
--- a/connector/gitlab/gitlab.go
+++ b/connector/gitlab/gitlab.go
@@ -11,8 +11,8 @@ import (
"regexp"
"strconv"
- "github.com/Sirupsen/logrus"
"github.com/coreos/dex/connector"
+ "github.com/sirupsen/logrus"
"golang.org/x/oauth2"
)
diff --git a/connector/ldap/ldap.go b/connector/ldap/ldap.go
index 127d5d9f..9107031a 100644
--- a/connector/ldap/ldap.go
+++ b/connector/ldap/ldap.go
@@ -12,8 +12,8 @@ import (
"gopkg.in/ldap.v2"
- "github.com/Sirupsen/logrus"
"github.com/coreos/dex/connector"
+ "github.com/sirupsen/logrus"
)
// 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 cd4d69ee..08f85be3 100644
--- a/connector/ldap/ldap_test.go
+++ b/connector/ldap/ldap_test.go
@@ -13,8 +13,8 @@ import (
"text/template"
"time"
- "github.com/Sirupsen/logrus"
"github.com/kylelemons/godebug/pretty"
+ "github.com/sirupsen/logrus"
"github.com/coreos/dex/connector"
)
diff --git a/connector/mock/connectortest.go b/connector/mock/connectortest.go
index ef7749f7..7236230a 100644
--- a/connector/mock/connectortest.go
+++ b/connector/mock/connectortest.go
@@ -8,8 +8,8 @@ import (
"net/http"
"net/url"
- "github.com/Sirupsen/logrus"
"github.com/coreos/dex/connector"
+ "github.com/sirupsen/logrus"
)
// 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 cd04a374..b4a02bc7 100644
--- a/connector/oidc/oidc.go
+++ b/connector/oidc/oidc.go
@@ -10,8 +10,8 @@ import (
"strings"
"sync"
- "github.com/Sirupsen/logrus"
"github.com/coreos/go-oidc"
+ "github.com/sirupsen/logrus"
"golang.org/x/oauth2"
"github.com/coreos/dex/connector"
diff --git a/connector/oidc/oidc_test.go b/connector/oidc/oidc_test.go
index a484d0a2..305ab2ce 100644
--- a/connector/oidc/oidc_test.go
+++ b/connector/oidc/oidc_test.go
@@ -1,8 +1,8 @@
package oidc
import (
- "github.com/Sirupsen/logrus"
"github.com/coreos/dex/connector"
+ "github.com/sirupsen/logrus"
"net/url"
"os"
"reflect"
diff --git a/connector/saml/saml.go b/connector/saml/saml.go
index fad270c6..706ba95b 100644
--- a/connector/saml/saml.go
+++ b/connector/saml/saml.go
@@ -12,10 +12,10 @@ import (
"strings"
"time"
- "github.com/Sirupsen/logrus"
"github.com/beevik/etree"
dsig "github.com/russellhaering/goxmldsig"
"github.com/russellhaering/goxmldsig/etreeutils"
+ "github.com/sirupsen/logrus"
"github.com/coreos/dex/connector"
)
diff --git a/connector/saml/saml_test.go b/connector/saml/saml_test.go
index 2d73ff50..37cda8c3 100644
--- a/connector/saml/saml_test.go
+++ b/connector/saml/saml_test.go
@@ -10,9 +10,9 @@ import (
"testing"
"time"
- "github.com/Sirupsen/logrus"
"github.com/kylelemons/godebug/pretty"
dsig "github.com/russellhaering/goxmldsig"
+ "github.com/sirupsen/logrus"
"github.com/coreos/dex/connector"
)
diff --git a/glide.yaml b/glide.yaml
index 6fff9565..9b55ef18 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -74,7 +74,7 @@ import:
version: c97913dcbd76de40b051a9b4cd827f7eaeb7a868
- package: golang.org/x/oauth2
version: 08c8d727d2392d18286f9f88ad775ad98f09ab33
- subpackages: []
+
# The oauth2 package only imports the appengine code when it's given a
# specific build tags, but glide detects it anyway.
#
@@ -92,10 +92,10 @@ import:
# Testing conveniences.
- package: github.com/kylelemons/godebug
+ version: eadb3ce320cbab8393bea5ca17bebac3f78a021b
subpackages:
- diff
- pretty
- version: eadb3ce320cbab8393bea5ca17bebac3f78a021b
# SQL drivers
- package: github.com/mattn/go-sqlite3
@@ -131,10 +131,12 @@ import:
version: 411e09b969b1170a9f0c467558eb4c4c110d9c77
# Structured logging
-- package: github.com/Sirupsen/logrus
- version: v0.11.0
-- package: golang.org/x/sys/unix
+- package: github.com/sirupsen/logrus
+ version: v1.0.2
+- package: golang.org/x/sys
version: 833a04a10549a95dc34458c195cbad61bbb6cb4d
+ subpackages:
+ - unix
# XML signature validation for SAML connector
- package: github.com/russellhaering/goxmldsig
diff --git a/server/api.go b/server/api.go
index ae1fe949..c6a9731f 100644
--- a/server/api.go
+++ b/server/api.go
@@ -10,11 +10,11 @@ import (
// https://github.com/grpc/grpc-go/issues/711
"golang.org/x/net/context"
- "github.com/Sirupsen/logrus"
"github.com/coreos/dex/api"
"github.com/coreos/dex/server/internal"
"github.com/coreos/dex/storage"
"github.com/coreos/dex/version"
+ "github.com/sirupsen/logrus"
)
// 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 8fd09639..3c35403c 100644
--- a/server/api_test.go
+++ b/server/api_test.go
@@ -7,11 +7,11 @@ import (
"testing"
"time"
- "github.com/Sirupsen/logrus"
"github.com/coreos/dex/api"
"github.com/coreos/dex/server/internal"
"github.com/coreos/dex/storage"
"github.com/coreos/dex/storage/memory"
+ "github.com/sirupsen/logrus"
"google.golang.org/grpc"
)
diff --git a/server/rotation.go b/server/rotation.go
index 076d3ddc..a628bfa7 100644
--- a/server/rotation.go
+++ b/server/rotation.go
@@ -12,8 +12,8 @@ import (
"gopkg.in/square/go-jose.v2"
- "github.com/Sirupsen/logrus"
"github.com/coreos/dex/storage"
+ "github.com/sirupsen/logrus"
)
var errAlreadyRotated = errors.New("keys already rotated by another server instance")
diff --git a/server/rotation_test.go b/server/rotation_test.go
index 5d6c18b2..9d236b70 100644
--- a/server/rotation_test.go
+++ b/server/rotation_test.go
@@ -6,9 +6,9 @@ import (
"testing"
"time"
- "github.com/Sirupsen/logrus"
"github.com/coreos/dex/storage"
"github.com/coreos/dex/storage/memory"
+ "github.com/sirupsen/logrus"
)
func signingKeyID(t *testing.T, s storage.Storage) string {
diff --git a/server/server.go b/server/server.go
index 829de4c2..e78a33c1 100644
--- a/server/server.go
+++ b/server/server.go
@@ -14,9 +14,9 @@ import (
"golang.org/x/crypto/bcrypt"
- "github.com/Sirupsen/logrus"
"github.com/gorilla/handlers"
"github.com/gorilla/mux"
+ "github.com/sirupsen/logrus"
"github.com/coreos/dex/connector"
"github.com/coreos/dex/connector/github"
diff --git a/server/server_test.go b/server/server_test.go
index 844c7f7b..cb7bbc0a 100644
--- a/server/server_test.go
+++ b/server/server_test.go
@@ -21,9 +21,9 @@ import (
"testing"
"time"
- "github.com/Sirupsen/logrus"
oidc "github.com/coreos/go-oidc"
"github.com/kylelemons/godebug/pretty"
+ "github.com/sirupsen/logrus"
"golang.org/x/crypto/bcrypt"
"golang.org/x/oauth2"
jose "gopkg.in/square/go-jose.v2"
diff --git a/storage/kubernetes/client.go b/storage/kubernetes/client.go
index f61c37db..ccdb895c 100644
--- a/storage/kubernetes/client.go
+++ b/storage/kubernetes/client.go
@@ -22,9 +22,9 @@ import (
"strings"
"time"
- "github.com/Sirupsen/logrus"
"github.com/ghodss/yaml"
"github.com/gtank/cryptopasta"
+ "github.com/sirupsen/logrus"
"golang.org/x/net/http2"
"github.com/coreos/dex/storage"
diff --git a/storage/kubernetes/storage.go b/storage/kubernetes/storage.go
index ce7c58fe..15f7e3a9 100644
--- a/storage/kubernetes/storage.go
+++ b/storage/kubernetes/storage.go
@@ -7,9 +7,9 @@ import (
"strings"
"time"
- "github.com/Sirupsen/logrus"
"github.com/coreos/dex/storage"
"github.com/coreos/dex/storage/kubernetes/k8sapi"
+ "github.com/sirupsen/logrus"
)
const (
diff --git a/storage/kubernetes/storage_test.go b/storage/kubernetes/storage_test.go
index 2addd12e..58340f70 100644
--- a/storage/kubernetes/storage_test.go
+++ b/storage/kubernetes/storage_test.go
@@ -5,9 +5,9 @@ import (
"os"
"testing"
- "github.com/Sirupsen/logrus"
"github.com/coreos/dex/storage"
"github.com/coreos/dex/storage/conformance"
+ "github.com/sirupsen/logrus"
)
const testKubeConfigEnv = "DEX_KUBECONFIG"
diff --git a/storage/memory/memory.go b/storage/memory/memory.go
index 97940c0e..90d3d85a 100644
--- a/storage/memory/memory.go
+++ b/storage/memory/memory.go
@@ -6,8 +6,8 @@ import (
"sync"
"time"
- "github.com/Sirupsen/logrus"
"github.com/coreos/dex/storage"
+ "github.com/sirupsen/logrus"
)
// New returns an in memory storage.
diff --git a/storage/memory/memory_test.go b/storage/memory/memory_test.go
index aab63ffc..6628e50c 100644
--- a/storage/memory/memory_test.go
+++ b/storage/memory/memory_test.go
@@ -4,9 +4,9 @@ import (
"os"
"testing"
- "github.com/Sirupsen/logrus"
"github.com/coreos/dex/storage"
"github.com/coreos/dex/storage/conformance"
+ "github.com/sirupsen/logrus"
)
func TestStorage(t *testing.T) {
diff --git a/storage/memory/static_test.go b/storage/memory/static_test.go
index b29b5ea9..17ddf7c8 100644
--- a/storage/memory/static_test.go
+++ b/storage/memory/static_test.go
@@ -6,8 +6,8 @@ import (
"strings"
"testing"
- "github.com/Sirupsen/logrus"
"github.com/coreos/dex/storage"
+ "github.com/sirupsen/logrus"
)
func TestStaticClients(t *testing.T) {
diff --git a/storage/sql/config.go b/storage/sql/config.go
index 56ee0c1a..2a70234f 100644
--- a/storage/sql/config.go
+++ b/storage/sql/config.go
@@ -6,10 +6,10 @@ import (
"net/url"
"strconv"
- "github.com/Sirupsen/logrus"
"github.com/coreos/dex/storage"
"github.com/lib/pq"
sqlite3 "github.com/mattn/go-sqlite3"
+ "github.com/sirupsen/logrus"
)
const (
diff --git a/storage/sql/config_test.go b/storage/sql/config_test.go
index a91195cc..13b2508e 100644
--- a/storage/sql/config_test.go
+++ b/storage/sql/config_test.go
@@ -7,9 +7,9 @@ import (
"testing"
"time"
- "github.com/Sirupsen/logrus"
"github.com/coreos/dex/storage"
"github.com/coreos/dex/storage/conformance"
+ "github.com/sirupsen/logrus"
)
func withTimeout(t time.Duration, f func()) {
diff --git a/storage/sql/migrate_test.go b/storage/sql/migrate_test.go
index 0e9e0179..e94e819f 100644
--- a/storage/sql/migrate_test.go
+++ b/storage/sql/migrate_test.go
@@ -5,8 +5,8 @@ import (
"os"
"testing"
- "github.com/Sirupsen/logrus"
sqlite3 "github.com/mattn/go-sqlite3"
+ "github.com/sirupsen/logrus"
)
func TestMigrate(t *testing.T) {
diff --git a/storage/sql/sql.go b/storage/sql/sql.go
index 2c6b74bc..c0407887 100644
--- a/storage/sql/sql.go
+++ b/storage/sql/sql.go
@@ -6,8 +6,8 @@ import (
"regexp"
"time"
- "github.com/Sirupsen/logrus"
"github.com/cockroachdb/cockroach-go/crdb"
+ "github.com/sirupsen/logrus"
// import third party drivers
_ "github.com/go-sql-driver/mysql"
--
GitLab