: update {S->s}irupsen/logrus

This commit is contained in:
Eric Stroczynski 2017-07-25 13:45:17 -07:00
parent 0e0b4c53ef
commit 4a88d0641a
28 changed files with 34 additions and 32 deletions

View file

@ -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"

View file

@ -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"

View file

@ -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 (

View file

@ -11,8 +11,8 @@ import (
"regexp"
"strconv"
"github.com/Sirupsen/logrus"
"github.com/coreos/dex/connector"
"github.com/sirupsen/logrus"
"golang.org/x/oauth2"
)

View file

@ -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

View file

@ -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"
)

View file

@ -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

View file

@ -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"

View file

@ -1,8 +1,8 @@
package oidc
import (
"github.com/Sirupsen/logrus"
"github.com/coreos/dex/connector"
"github.com/sirupsen/logrus"
"net/url"
"os"
"reflect"

View file

@ -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"
)

View file

@ -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"
)

View file

@ -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

View file

@ -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

View file

@ -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"
)

View file

@ -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")

View file

@ -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 {

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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 (

View file

@ -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"

View file

@ -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.

View file

@ -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) {

View file

@ -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) {

View file

@ -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 (

View file

@ -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()) {

View file

@ -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) {

View file

@ -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"