Rewrite imports for godep

moul · moul · commit 210dbf00b8e2 · 2016-01-04T15:07:04.000+01:00
diff --git a/cmd/scw/main.go b/cmd/scw/main.go
@@ -12,7 +12,7 @@ import (
 	"os"
 
 	"github.com/scaleway/scaleway-cli/pkg/cli"
-	"github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
+	"github.com/Sirupsen/logrus"
 )
 
 func main() {
diff --git a/pkg/api/api.go b/pkg/api/api.go
@@ -24,9 +24,9 @@ import (
 	"text/template"
 	"time"
 
-	log "github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
-	"github.com/scaleway/scaleway-cli/vendor/github.com/moul/anonuuid"
-	"github.com/scaleway/scaleway-cli/vendor/github.com/moul/http2curl"
+	log "github.com/Sirupsen/logrus"
+	"github.com/moul/anonuuid"
+	"github.com/moul/http2curl"
 )
 
 // Default values
diff --git a/pkg/api/api_test.go b/pkg/api/api_test.go
@@ -3,7 +3,7 @@ package api
 import (
 	"testing"
 
-	. "github.com/scaleway/scaleway-cli/vendor/github.com/smartystreets/goconvey/convey"
+	. "github.com/smartystreets/goconvey/convey"
 )
 
 func TestNewScalewayAPI(t *testing.T) {
diff --git a/pkg/api/cache.go b/pkg/api/cache.go
@@ -14,9 +14,9 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
-	"github.com/scaleway/scaleway-cli/vendor/github.com/moul/anonuuid"
-	"github.com/scaleway/scaleway-cli/vendor/github.com/renstrom/fuzzysearch/fuzzy"
+	"github.com/Sirupsen/logrus"
+	"github.com/moul/anonuuid"
+	"github.com/renstrom/fuzzysearch/fuzzy"
 )
 
 // ScalewayCache is used not to query the API to resolve full identifiers
diff --git a/pkg/api/helpers.go b/pkg/api/helpers.go
@@ -13,11 +13,11 @@ import (
 	"time"
 
 	"github.com/scaleway/scaleway-cli/pkg/utils"
-	"github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
-	log "github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
-	"github.com/scaleway/scaleway-cli/vendor/github.com/docker/docker/pkg/namesgenerator"
-	"github.com/scaleway/scaleway-cli/vendor/github.com/dustin/go-humanize"
-	"github.com/scaleway/scaleway-cli/vendor/github.com/moul/anonuuid"
+	"github.com/Sirupsen/logrus"
+	log "github.com/Sirupsen/logrus"
+	"github.com/docker/docker/pkg/namesgenerator"
+	"github.com/dustin/go-humanize"
+	"github.com/moul/anonuuid"
 )
 
 // ScalewayResolvedIdentifier represents a list of matching identifier for a specifier pattern
diff --git a/pkg/cli/cmd_help.go b/pkg/cli/cmd_help.go
@@ -7,7 +7,7 @@ package cli
 import (
 	"text/template"
 
-	"github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
+	"github.com/Sirupsen/logrus"
 )
 
 // CmdHelp is the 'scw help' command
diff --git a/pkg/cli/cmd_images.go b/pkg/cli/cmd_images.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 
 	"github.com/scaleway/scaleway-cli/pkg/commands"
-	"github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
+	"github.com/Sirupsen/logrus"
 )
 
 var cmdImages = &Command{
diff --git a/pkg/cli/cmd_ps.go b/pkg/cli/cmd_ps.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 
 	"github.com/scaleway/scaleway-cli/pkg/commands"
-	"github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
+	"github.com/Sirupsen/logrus"
 )
 
 var cmdPs = &Command{
diff --git a/pkg/cli/command.go b/pkg/cli/command.go
@@ -13,8 +13,8 @@ import (
 	"strings"
 	"text/template"
 
-	"github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
-	flag "github.com/scaleway/scaleway-cli/vendor/github.com/docker/docker/pkg/mflag"
+	"github.com/Sirupsen/logrus"
+	flag "github.com/docker/docker/pkg/mflag"
 
 	"github.com/scaleway/scaleway-cli/pkg/api"
 	"github.com/scaleway/scaleway-cli/pkg/commands"
diff --git a/pkg/cli/command_test.go b/pkg/cli/command_test.go
@@ -3,7 +3,7 @@ package cli
 import (
 	"testing"
 
-	. "github.com/scaleway/scaleway-cli/vendor/github.com/smartystreets/goconvey/convey"
+	. "github.com/smartystreets/goconvey/convey"
 )
 
 func TestCommand_Name(t *testing.T) {
diff --git a/pkg/cli/main.go b/pkg/cli/main.go
@@ -9,8 +9,8 @@ import (
 	"io/ioutil"
 	"os"
 
-	"github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
-	flag "github.com/scaleway/scaleway-cli/vendor/github.com/docker/docker/pkg/mflag"
+	"github.com/Sirupsen/logrus"
+	flag "github.com/docker/docker/pkg/mflag"
 
 	"github.com/scaleway/scaleway-cli/pkg/api"
 	"github.com/scaleway/scaleway-cli/pkg/commands"
diff --git a/pkg/cli/main_test.go b/pkg/cli/main_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 
 	"github.com/scaleway/scaleway-cli/pkg/commands"
-	. "github.com/scaleway/scaleway-cli/vendor/github.com/smartystreets/goconvey/convey"
+	. "github.com/smartystreets/goconvey/convey"
 )
 
 func testHelpOutput(out string, err string) {
diff --git a/pkg/cli/run_test.go b/pkg/cli/run_test.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	. "github.com/scaleway/scaleway-cli/vendor/github.com/smartystreets/goconvey/convey"
+	. "github.com/smartystreets/goconvey/convey"
 )
 
 func TestRunRun(t *testing.T) {
diff --git a/pkg/cli/x_billing.go b/pkg/cli/x_billing.go
@@ -13,8 +13,8 @@ import (
 	"github.com/scaleway/scaleway-cli/pkg/commands"
 	"github.com/scaleway/scaleway-cli/pkg/pricing"
 	"github.com/scaleway/scaleway-cli/pkg/utils"
-	"github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
-	"github.com/scaleway/scaleway-cli/vendor/github.com/docker/docker/pkg/units"
+	"github.com/Sirupsen/logrus"
+	"github.com/docker/docker/pkg/units"
 )
 
 var cmdBilling = &Command{
diff --git a/pkg/cli/x_completion.go b/pkg/cli/x_completion.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 
 	utils "github.com/scaleway/scaleway-cli/pkg/utils"
-	"github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
+	"github.com/Sirupsen/logrus"
 )
 
 var cmdCompletion = &Command{
diff --git a/pkg/cli/x_cs.go b/pkg/cli/x_cs.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/scaleway/scaleway-cli/vendor/github.com/dustin/go-humanize"
+	"github.com/dustin/go-humanize"
 )
 
 var cmdCS = &Command{
diff --git a/pkg/cli/x_flushcache.go b/pkg/cli/x_flushcache.go
@@ -7,7 +7,7 @@ package cli
 import (
 	"fmt"
 
-	"github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
+	"github.com/Sirupsen/logrus"
 )
 
 var cmdFlushCache = &Command{
diff --git a/pkg/cli/x_patch.go b/pkg/cli/x_patch.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"strings"
 
-	log "github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
+	log "github.com/Sirupsen/logrus"
 
 	api "github.com/scaleway/scaleway-cli/pkg/api"
 )
diff --git a/pkg/commands/command_test.go b/pkg/commands/command_test.go
@@ -11,7 +11,7 @@ import (
 	"testing"
 
 	"github.com/scaleway/scaleway-cli/pkg/api"
-	"github.com/scaleway/scaleway-cli/vendor/github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/assert"
 )
 
 func testCommandContext() CommandContext {
diff --git a/pkg/commands/cp.go b/pkg/commands/cp.go
@@ -14,8 +14,8 @@ import (
 
 	"github.com/scaleway/scaleway-cli/pkg/api"
 	"github.com/scaleway/scaleway-cli/pkg/utils"
-	"github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
-	"github.com/scaleway/scaleway-cli/vendor/github.com/docker/docker/pkg/archive"
+	"github.com/Sirupsen/logrus"
+	"github.com/docker/docker/pkg/archive"
 )
 
 // CpArgs are arguments passed to `RunCp`
diff --git a/pkg/commands/create_test.go b/pkg/commands/create_test.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"testing"
 
-	. "github.com/scaleway/scaleway-cli/vendor/github.com/smartystreets/goconvey/convey"
+	. "github.com/smartystreets/goconvey/convey"
 )
 
 func ExampleRunCreate() {
diff --git a/pkg/commands/events.go b/pkg/commands/events.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/scaleway/scaleway-cli/vendor/github.com/docker/docker/pkg/units"
+	"github.com/docker/docker/pkg/units"
 )
 
 // EventsArgs are arguments passed to `RunEvents`
diff --git a/pkg/commands/exec.go b/pkg/commands/exec.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"time"
 
-	log "github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
+	log "github.com/Sirupsen/logrus"
 
 	"github.com/scaleway/scaleway-cli/pkg/api"
 	"github.com/scaleway/scaleway-cli/pkg/utils"
diff --git a/pkg/commands/history.go b/pkg/commands/history.go
@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/scaleway/scaleway-cli/pkg/utils"
-	"github.com/scaleway/scaleway-cli/vendor/github.com/docker/docker/pkg/units"
+	"github.com/docker/docker/pkg/units"
 )
 
 // HistoryArgs are flags for the `RunHistory` function
diff --git a/pkg/commands/history_test.go b/pkg/commands/history_test.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"testing"
 
-	. "github.com/scaleway/scaleway-cli/vendor/github.com/smartystreets/goconvey/convey"
+	. "github.com/smartystreets/goconvey/convey"
 )
 
 func ExampleRunHistory() {
diff --git a/pkg/commands/images.go b/pkg/commands/images.go
@@ -14,9 +14,9 @@ import (
 
 	"github.com/scaleway/scaleway-cli/pkg/api"
 	"github.com/scaleway/scaleway-cli/pkg/utils"
-	"github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
-	"github.com/scaleway/scaleway-cli/vendor/github.com/docker/docker/pkg/units"
-	"github.com/scaleway/scaleway-cli/vendor/github.com/renstrom/fuzzysearch/fuzzy"
+	"github.com/Sirupsen/logrus"
+	"github.com/docker/docker/pkg/units"
+	"github.com/renstrom/fuzzysearch/fuzzy"
 )
 
 // ImagesArgs are flags for the `RunImages` function
diff --git a/pkg/commands/images_test.go b/pkg/commands/images_test.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"testing"
 
-	. "github.com/scaleway/scaleway-cli/vendor/github.com/smartystreets/goconvey/convey"
+	. "github.com/smartystreets/goconvey/convey"
 )
 
 func ExampleRunImages() {
diff --git a/pkg/commands/info.go b/pkg/commands/info.go
@@ -9,7 +9,7 @@ import (
 	"os"
 	"runtime"
 
-	"github.com/scaleway/scaleway-cli/vendor/github.com/kardianos/osext"
+	"github.com/kardianos/osext"
 
 	"github.com/scaleway/scaleway-cli/pkg/config"
 	"github.com/scaleway/scaleway-cli/pkg/utils"
diff --git a/pkg/commands/inspect.go b/pkg/commands/inspect.go
@@ -10,8 +10,8 @@ import (
 	"text/template"
 
 	"github.com/scaleway/scaleway-cli/pkg/api"
-	"github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
-	"github.com/scaleway/scaleway-cli/vendor/github.com/skratchdot/open-golang/open"
+	"github.com/Sirupsen/logrus"
+	"github.com/skratchdot/open-golang/open"
 )
 
 // InspectArgs are flags for the `RunInspect` function
diff --git a/pkg/commands/inspect_test.go b/pkg/commands/inspect_test.go
@@ -11,7 +11,7 @@ import (
 	"testing"
 
 	"github.com/scaleway/scaleway-cli/pkg/api"
-	. "github.com/scaleway/scaleway-cli/vendor/github.com/smartystreets/goconvey/convey"
+	. "github.com/smartystreets/goconvey/convey"
 )
 
 func ExampleRunInspect() {
diff --git a/pkg/commands/kill.go b/pkg/commands/kill.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/scaleway/scaleway-cli/pkg/api"
 	"github.com/scaleway/scaleway-cli/pkg/utils"
-	"github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
+	"github.com/Sirupsen/logrus"
 )
 
 // KillArgs are flags for the `RunKill` function
diff --git a/pkg/commands/login.go b/pkg/commands/login.go
@@ -14,8 +14,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
-	"github.com/scaleway/scaleway-cli/vendor/golang.org/x/crypto/ssh/terminal"
+	"github.com/Sirupsen/logrus"
+	"golang.org/x/crypto/ssh/terminal"
 
 	"github.com/scaleway/scaleway-cli/pkg/api"
 	"github.com/scaleway/scaleway-cli/pkg/config"
diff --git a/pkg/commands/ps.go b/pkg/commands/ps.go
@@ -10,9 +10,9 @@ import (
 	"text/tabwriter"
 	"time"
 
-	"github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
-	"github.com/scaleway/scaleway-cli/vendor/github.com/docker/docker/pkg/units"
-	"github.com/scaleway/scaleway-cli/vendor/github.com/renstrom/fuzzysearch/fuzzy"
+	"github.com/Sirupsen/logrus"
+	"github.com/docker/docker/pkg/units"
+	"github.com/renstrom/fuzzysearch/fuzzy"
 
 	"github.com/scaleway/scaleway-cli/pkg/utils"
 )
diff --git a/pkg/commands/restart.go b/pkg/commands/restart.go
@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/scaleway/scaleway-cli/pkg/api"
-	"github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
+	"github.com/Sirupsen/logrus"
 )
 
 // RestartArgs are flags for the `RunRestart` function
diff --git a/pkg/commands/rm.go b/pkg/commands/rm.go
@@ -7,7 +7,7 @@ package commands
 import (
 	"fmt"
 
-	"github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
+	"github.com/Sirupsen/logrus"
 )
 
 // RmArgs are flags for the `RunRm` function
diff --git a/pkg/commands/rmi.go b/pkg/commands/rmi.go
@@ -7,7 +7,7 @@ package commands
 import (
 	"fmt"
 
-	"github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
+	"github.com/Sirupsen/logrus"
 )
 
 // RmiArgs are flags for the `RunRmi` function
diff --git a/pkg/commands/run.go b/pkg/commands/run.go
@@ -15,7 +15,7 @@ import (
 	"github.com/scaleway/scaleway-cli/pkg/api"
 	"github.com/scaleway/scaleway-cli/pkg/config"
 	"github.com/scaleway/scaleway-cli/pkg/utils"
-	"github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
+	"github.com/Sirupsen/logrus"
 )
 
 // RunArgs are flags for the `Run` function
diff --git a/pkg/commands/search.go b/pkg/commands/search.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/scaleway/scaleway-cli/pkg/api"
 	"github.com/scaleway/scaleway-cli/pkg/utils"
-	"github.com/scaleway/scaleway-cli/vendor/github.com/renstrom/fuzzysearch/fuzzy"
+	"github.com/renstrom/fuzzysearch/fuzzy"
 )
 
 // SearchArgs are flags for the `RunSearch` function
diff --git a/pkg/commands/search_test.go b/pkg/commands/search_test.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"testing"
 
-	. "github.com/scaleway/scaleway-cli/vendor/github.com/smartystreets/goconvey/convey"
+	. "github.com/smartystreets/goconvey/convey"
 )
 
 func ExampleRunSearch() {
diff --git a/pkg/commands/start.go b/pkg/commands/start.go
@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/scaleway/scaleway-cli/pkg/api"
-	"github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
+	"github.com/Sirupsen/logrus"
 )
 
 // StartArgs are flags for the `RunStart` function
diff --git a/pkg/commands/stop.go b/pkg/commands/stop.go
diff --git a/pkg/commands/test.go b/pkg/commands/test.go
diff --git a/pkg/commands/top.go b/pkg/commands/top.go
diff --git a/pkg/commands/version_test.go b/pkg/commands/version_test.go
diff --git a/pkg/commands/wait.go b/pkg/commands/wait.go
diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go
diff --git a/pkg/pricing/basket_test.go b/pkg/pricing/basket_test.go
diff --git a/pkg/pricing/pricing_test.go b/pkg/pricing/pricing_test.go
diff --git a/pkg/pricing/usage_test.go b/pkg/pricing/usage_test.go
diff --git a/pkg/pricing/utils.go b/pkg/pricing/utils.go
diff --git a/pkg/scwversion/version_test.go b/pkg/scwversion/version_test.go
diff --git a/pkg/sshcommand/sshcommand_test.go b/pkg/sshcommand/sshcommand_test.go
diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go
diff --git a/pkg/utils/utils_test.go b/pkg/utils/utils_test.go

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import (`
`12`	`12`	`"os"`
`13`	`13`
`14`	`14`	`"github.com/scaleway/scaleway-cli/pkg/cli"`
`15`		`- "github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"`
	`15`	`+ "github.com/Sirupsen/logrus"`
`16`	`16`	`)`
`17`	`17`
`18`	`18`	`func main() {`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package api`
`3`	`3`	`import (`
`4`	`4`	`"testing"`
`5`	`5`
`6`		`- . "github.com/scaleway/scaleway-cli/vendor/github.com/smartystreets/goconvey/convey"`
	`6`	`+ . "github.com/smartystreets/goconvey/convey"`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`func TestNewScalewayAPI(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ package cli`
`7`	`7`	`import (`
`8`	`8`	`"text/template"`
`9`	`9`
`10`		`- "github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"`
	`10`	`+ "github.com/Sirupsen/logrus"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`// CmdHelp is the 'scw help' command`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`"strings"`
`9`	`9`
`10`	`10`	`"github.com/scaleway/scaleway-cli/pkg/commands"`
`11`		`- "github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"`
	`11`	`+ "github.com/Sirupsen/logrus"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`var cmdImages = &Command{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package cli`
`3`	`3`	`import (`
`4`	`4`	`"testing"`
`5`	`5`
`6`		`- . "github.com/scaleway/scaleway-cli/vendor/github.com/smartystreets/goconvey/convey"`
	`6`	`+ . "github.com/smartystreets/goconvey/convey"`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`func TestCommand_Name(t *testing.T) {`