This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

vendor: Update all dependencies and use new logrus repo

This commit updates all our vendored dependencies. Because some of our
dependencies now use the lower-cased repo for github.com/sirupsen/logrus
rather than github.com/Sirupsen/logrus, this commit also converts our
code to use the lower-cased repo name to avoid the following compile error:

minion/run.go:15:2: case-insensitive import collision: "github.com/quilt/quilt/vendor/github.com/Sirupsen/logrus" and "github.com/quilt/quilt/vendor/github.com/sirupsen/logrus"
  • Loading branch information...
kklin committed Sep 26, 2017
1 parent 2344e44 commit f79427d10590a70fc7aa1463dcf7a05745926057
Showing 621 changed files with 64,278 additions and 31,722 deletions.
View
@@ -22,7 +22,7 @@ import (
"github.com/docker/distribution/reference"
"golang.org/x/net/context"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
)
var errDaemonOnlyRPC = errors.New("only defined on the daemon")
View
@@ -7,7 +7,7 @@ import (
"github.com/quilt/quilt/cli/command"
"github.com/quilt/quilt/cli/command/inspect"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
)
// Note the `minion` command is in quiltctl_posix.go as it only runs on posix systems.
View
@@ -19,7 +19,7 @@ import (
"github.com/quilt/quilt/util"
"github.com/quilt/quilt/version"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
)
// Daemon contains the options for running the Quilt daemon.
View
@@ -12,7 +12,7 @@ import (
"strings"
"time"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/quilt/quilt/cli/ssh"
"github.com/quilt/quilt/db"
View
@@ -7,7 +7,7 @@ import (
"github.com/quilt/quilt/util"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
)
// Init represents an Init command.
View
@@ -9,7 +9,7 @@ import (
"github.com/quilt/quilt/cli/ssh"
"github.com/quilt/quilt/util"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
)
// Log is the structure for the `quilt logs` command.
View
@@ -13,7 +13,7 @@ import (
"github.com/quilt/quilt/util"
"github.com/quilt/quilt/version"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
)
// Minion contains the options for running the Quilt minion.
View
@@ -11,9 +11,9 @@ import (
"os"
"strings"
log "github.com/Sirupsen/logrus"
"github.com/fatih/color"
"github.com/pmezard/go-difflib/difflib"
log "github.com/sirupsen/logrus"
"github.com/quilt/quilt/api/client"
"github.com/quilt/quilt/blueprint"
View
@@ -8,7 +8,7 @@ import (
"github.com/quilt/quilt/connection/credentials/tls/rsa"
"github.com/quilt/quilt/util"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
)
// SetupTLS contains the options for setting up Quilt TLS.
View
@@ -7,7 +7,7 @@ import (
"os"
"strings"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"golang.org/x/crypto/ssh/terminal"
"github.com/quilt/quilt/api/client"
View
@@ -3,7 +3,7 @@ package command
import (
"flag"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/quilt/quilt/blueprint"
"github.com/quilt/quilt/util"
View
@@ -7,7 +7,7 @@ import (
"github.com/quilt/quilt/util"
"github.com/quilt/quilt/version"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
)
// Version prints the Quilt version information.
View
@@ -11,8 +11,8 @@ import (
"github.com/quilt/quilt/util"
log "github.com/Sirupsen/logrus"
homedir "github.com/mitchellh/go-homedir"
log "github.com/sirupsen/logrus"
"golang.org/x/crypto/ssh"
"golang.org/x/crypto/ssh/agent"
"golang.org/x/crypto/ssh/terminal"
View
@@ -18,7 +18,7 @@ import (
"github.com/aws/aws-sdk-go/aws/defaults"
"github.com/aws/aws-sdk-go/service/ec2"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
)
// The Provider wraps a client to Amazon EC2.
View
@@ -9,7 +9,7 @@ import (
"github.com/quilt/quilt/db"
"github.com/quilt/quilt/version"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
)
const (
View
@@ -5,7 +5,7 @@ import (
"github.com/quilt/quilt/db"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
)
func TestCloudConfig(t *testing.T) {
View
@@ -5,7 +5,6 @@ import (
"fmt"
"time"
log "github.com/Sirupsen/logrus"
"github.com/quilt/quilt/blueprint"
"github.com/quilt/quilt/cloud/acl"
"github.com/quilt/quilt/cloud/amazon"
@@ -19,6 +18,7 @@ import (
"github.com/quilt/quilt/db"
"github.com/quilt/quilt/join"
"github.com/quilt/quilt/util"
log "github.com/sirupsen/logrus"
)
type provider interface {
View
@@ -6,8 +6,8 @@ import (
"os"
"time"
log "github.com/Sirupsen/logrus"
"github.com/pkg/sftp"
log "github.com/sirupsen/logrus"
"github.com/spf13/afero"
"github.com/spf13/afero/sftpfs"
"golang.org/x/crypto/ssh"
@@ -21,7 +21,7 @@ import (
"golang.org/x/oauth2"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
)
// DefaultRegion is assigned to Machines without a specified region
View
@@ -14,7 +14,7 @@ import (
"github.com/quilt/quilt/db"
"github.com/quilt/quilt/minion/pb"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
)
var minions map[string]*minion
View
@@ -17,8 +17,8 @@ import (
"github.com/quilt/quilt/join"
"github.com/quilt/quilt/util"
log "github.com/Sirupsen/logrus"
"github.com/satori/go.uuid"
log "github.com/sirupsen/logrus"
compute "google.golang.org/api/compute/v1"
)
View
@@ -7,7 +7,7 @@ import (
"github.com/quilt/quilt/db"
"github.com/quilt/quilt/util"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
)
func updateMachineStatuses(conn db.Conn) {
View
@@ -10,9 +10,9 @@ import (
"strings"
"text/template"
log "github.com/Sirupsen/logrus"
homedir "github.com/mitchellh/go-homedir"
"github.com/quilt/quilt/util"
log "github.com/sirupsen/logrus"
)
const inboundPublicInterface = "enp0s8"
View
@@ -4,12 +4,12 @@ import (
"errors"
"sync"
log "github.com/Sirupsen/logrus"
"github.com/quilt/quilt/cloud/acl"
"github.com/quilt/quilt/cloud/cfg"
"github.com/quilt/quilt/counter"
"github.com/quilt/quilt/db"
"github.com/satori/go.uuid"
log "github.com/sirupsen/logrus"
)
// The Provider object represents a connection to Vagrant.
View
@@ -4,7 +4,7 @@ import (
"net"
"time"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"google.golang.org/grpc"
)
View
@@ -4,7 +4,7 @@ import (
"sort"
"strings"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
)
func (conn Conn) runLogger() {
View
@@ -8,7 +8,7 @@ import (
"github.com/quilt/quilt/join"
"github.com/quilt/quilt/util"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
)
var myIP = util.MyIP
@@ -5,7 +5,7 @@ import (
"fmt"
"os"
"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"
)
// JUnitReport defines the XML output schema for a Jenkins job (which in our case
@@ -12,7 +12,7 @@ import (
"strings"
"time"
"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"
"github.com/quilt/quilt/api"
"github.com/quilt/quilt/api/client"
@@ -12,7 +12,7 @@ import (
"github.com/quilt/quilt/connection/credentials"
"github.com/quilt/quilt/minion/supervisor/images"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
)
func TestStopContainer(t *testing.T) {
@@ -11,7 +11,7 @@ import (
"github.com/quilt/quilt/connection/credentials"
"github.com/quilt/quilt/db"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/stretchr/testify/assert"
)
@@ -5,7 +5,7 @@ import (
"strings"
"testing"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/quilt/quilt/api"
"github.com/quilt/quilt/api/client"
@@ -6,7 +6,7 @@ import (
"strconv"
"testing"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/quilt/quilt/db"
)
View
@@ -13,8 +13,8 @@ import (
"github.com/quilt/quilt/minion/ipdef"
"github.com/quilt/quilt/util"
log "github.com/Sirupsen/logrus"
dkc "github.com/fsouza/go-dockerclient"
log "github.com/sirupsen/logrus"
)
var pullCacheTimeout = time.Minute
View
@@ -5,7 +5,7 @@ import (
"github.com/quilt/quilt/db"
"github.com/quilt/quilt/join"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
)
func updatePolicy(view db.Database, bp string) {
@@ -9,7 +9,7 @@ import (
"github.com/quilt/quilt/join"
"github.com/quilt/quilt/util"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
)
const connectionPath = "/connections"
View
@@ -9,7 +9,7 @@ import (
"github.com/quilt/quilt/join"
"github.com/quilt/quilt/util"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
)
const containerPath = "/containers"
View
@@ -7,7 +7,7 @@ import (
"github.com/quilt/quilt/counter"
"github.com/quilt/quilt/db"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
)
const electionTTL = 30
View
@@ -6,9 +6,9 @@ import (
"golang.org/x/net/context"
log "github.com/Sirupsen/logrus"
"github.com/coreos/etcd/client"
"github.com/quilt/quilt/counter"
log "github.com/sirupsen/logrus"
)
// A Store implements a consistent distributed key value store similar to Etcd.
View
@@ -9,7 +9,7 @@ import (
"github.com/quilt/quilt/join"
"github.com/quilt/quilt/util"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
)
const hostnamePath = "/hostnames"
View
@@ -10,7 +10,7 @@ import (
"github.com/quilt/quilt/join"
"github.com/quilt/quilt/util"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
)
const (
View
@@ -6,7 +6,7 @@ import (
"github.com/coreos/etcd/client"
"github.com/quilt/quilt/db"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
)
// Run synchronizes state in `conn` with the Etcd cluster.
Oops, something went wrong.

0 comments on commit f79427d

Please sign in to comment.