vendor: run go tidy and go vendor

go.sum

@@ -108,8 +108,6 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGi
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/koofr/go-httpclient v0.0.0-20180104120329-03786175608a h1:W+gnfphB7WpRj0rbTF40e3edULfri4fou2kUFw6AF3A=
 github.com/koofr/go-httpclient v0.0.0-20180104120329-03786175608a/go.mod h1:3xszwh+rNrYk1r9SStc4iJ326gne1OaBcrdB1ACsbzI=
-github.com/koofr/go-koofrclient v0.0.0-20190131164641-7f327592caff h1:GlfzG8bgyoJYz+5sMvGpYnHrg4veNVNnDGuE9hTEMHk=
-github.com/koofr/go-koofrclient v0.0.0-20190131164641-7f327592caff/go.mod h1:MRAz4Gsxd+OzrZ0owwrUHc0zLESL+1Y5syqK/sJxK2A=
 github.com/koofr/go-koofrclient v0.0.0-20190715104037-2c5813f3c29c h1:MaVra5jrE7MxT4k0v0JD2Gh6h94BFu2DgDYq+zMGBW0=
 github.com/koofr/go-koofrclient v0.0.0-20190715104037-2c5813f3c29c/go.mod h1:MRAz4Gsxd+OzrZ0owwrUHc0zLESL+1Y5syqK/sJxK2A=
 github.com/kr/fs v0.1.0 h1:Jskdu9ieNAYnjxsi0LbQp1ulIKZV1LAFgK1tWhpZgl8=

vendor/github.com/Azure/azure-storage-blob-go/azblob/zc_pipeline.go

@@ -41,5 +41,6 @@ func NewPipeline(c Credential, o PipelineOptions) pipeline.Pipeline {
 		NewRequestLogPolicyFactory(o.RequestLog),
 		pipeline.MethodFactoryMarker()) // indicates at what stage in the pipeline the method factory is invoked
 
+
 	return pipeline.NewPipeline(f, pipeline.Options{HTTPSender: o.HTTPSender, Log: o.Log})
 }

vendor/github.com/Azure/azure-storage-blob-go/azblob/zz_generated_append_blob.go

@@ -6,14 +6,13 @@ package azblob
 import (
 	"context"
 	"encoding/base64"
+	"github.com/Azure/azure-pipeline-go/pipeline"
 	"io"
 	"io/ioutil"
 	"net/http"
 	"net/url"
 	"strconv"
 	"time"
-
-	"github.com/Azure/azure-pipeline-go/pipeline"
 )
 
 // appendBlobClient is the client for the AppendBlob methods of the Azblob service.

vendor/github.com/Azure/go-ansiterm/winterm/ansi.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 	"syscall"
 
-	ansiterm "github.com/Azure/go-ansiterm"
+	"github.com/Azure/go-ansiterm"
 )
 
 // Windows keyboard constants

vendor/github.com/Azure/go-ansiterm/winterm/attr_translation.go

@@ -2,7 +2,7 @@
 
 package winterm
 
-import ansiterm "github.com/Azure/go-ansiterm"
+import "github.com/Azure/go-ansiterm"
 
 const (
 	FOREGROUND_COLOR_MASK = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE

vendor/github.com/Azure/go-ansiterm/winterm/erase_helpers.go

@@ -2,7 +2,7 @@
 
 package winterm
 
-import ansiterm "github.com/Azure/go-ansiterm"
+import "github.com/Azure/go-ansiterm"
 
 func (h *windowsAnsiEventHandler) clearRange(attributes uint16, fromCoord COORD, toCoord COORD) error {
 	// Ignore an invalid (negative area) request

vendor/github.com/Azure/go-ansiterm/winterm/win_event_handler.go

@@ -8,7 +8,7 @@ import (
 	"os"
 	"strconv"
 
-	ansiterm "github.com/Azure/go-ansiterm"
+	"github.com/Azure/go-ansiterm"
 )
 
 type windowsAnsiEventHandler struct {

vendor/github.com/atotto/clipboard/clipboard_unix.go

@@ -15,8 +15,8 @@ import (
 const (
 	xsel               = "xsel"
 	xclip              = "xclip"
-	wlcopy             = "wl-copy"
+	wlcopy = "wl-copy"
-	wlpaste            = "wl-paste"
+	wlpaste = "wl-paste"
 	termuxClipboardGet = "termux-clipboard-get"
 	termuxClipboardSet = "termux-clipboard-set"
 )
@@ -34,7 +34,7 @@ var (
 	xclipCopyArgs  = []string{xclip, "-in", "-selection", "clipboard"}
 
 	wlpasteArgs = []string{wlpaste, "--no-newline"}
-	wlcopyArgs  = []string{wlcopy}
+	wlcopyArgs = []string{wlcopy}
 
 	termuxPasteArgs = []string{termuxClipboardGet}
 	termuxCopyArgs  = []string{termuxClipboardSet}
@@ -44,8 +44,8 @@ var (
 
 func init() {
 	if os.Getenv("WAYLAND_DISPLAY") != "" {
-		pasteCmdArgs = wlpasteArgs
+		pasteCmdArgs = wlpasteArgs;
-		copyCmdArgs = wlcopyArgs
+		copyCmdArgs = wlcopyArgs;
 
 		if _, err := exec.LookPath(wlcopy); err == nil {
 			if _, err := exec.LookPath(wlpaste); err == nil {

vendor/github.com/aws/aws-sdk-go/aws/awsutil/path_value.go

@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"strings"
 
-	jmespath "github.com/jmespath/go-jmespath"
+	"github.com/jmespath/go-jmespath"
 )
 
 var indexRe = regexp.MustCompile(`(.+)\[(-?\d+)?\]$`)

vendor/github.com/aws/aws-sdk-go/service/s3/service.go

@@ -7,7 +7,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws/client"
 	"github.com/aws/aws-sdk-go/aws/client/metadata"
 	"github.com/aws/aws-sdk-go/aws/request"
-	v4 "github.com/aws/aws-sdk-go/aws/signer/v4"
+	"github.com/aws/aws-sdk-go/aws/signer/v4"
 	"github.com/aws/aws-sdk-go/private/protocol/restxml"
 )
 

vendor/github.com/aws/aws-sdk-go/service/sts/service.go

@@ -7,7 +7,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws/client"
 	"github.com/aws/aws-sdk-go/aws/client/metadata"
 	"github.com/aws/aws-sdk-go/aws/request"
-	v4 "github.com/aws/aws-sdk-go/aws/signer/v4"
+	"github.com/aws/aws-sdk-go/aws/signer/v4"
 	"github.com/aws/aws-sdk-go/private/protocol/query"
 )
 

vendor/github.com/golang/protobuf/ptypes/any/any.pb.go

@@ -5,9 +5,8 @@ package any
 
 import (
 	fmt "fmt"
-	math "math"
-
 	proto "github.com/golang/protobuf/proto"
+	math "math"
 )
 
 // Reference imports to suppress errors if they are not otherwise used.

vendor/github.com/golang/protobuf/ptypes/duration/duration.pb.go

@@ -5,9 +5,8 @@ package duration
 
 import (
 	fmt "fmt"
-	math "math"
-
 	proto "github.com/golang/protobuf/proto"
+	math "math"
 )
 
 // Reference imports to suppress errors if they are not otherwise used.

vendor/github.com/golang/protobuf/ptypes/timestamp/timestamp.pb.go

@@ -5,9 +5,8 @@ package timestamp
 
 import (
 	fmt "fmt"
-	math "math"
-
 	proto "github.com/golang/protobuf/proto"
+	math "math"
 )
 
 // Reference imports to suppress errors if they are not otherwise used.

vendor/github.com/jlaffaye/ftp/ftp.go

@@ -91,7 +91,7 @@ func Dial(addr string, options ...DialOption) (*ServerConn, error) {
 		if do.dialFunc != nil {
 			tconn, err = do.dialFunc("tcp", addr)
 		} else if do.tlsConfig != nil {
-			tconn, err = tls.DialWithDialer(&do.dialer, "tcp", addr, do.tlsConfig)
+			tconn, err = tls.DialWithDialer(&do.dialer , "tcp", addr, do.tlsConfig)
 		} else {
 			ctx := do.context
 
@@ -188,7 +188,7 @@ func DialWithContext(ctx context.Context) DialOption {
 }
 
 // DialWithTLS returns a DialOption that configures the ServerConn with specified TLS config
-//
+// 
 // If called together with the DialWithDialFunc option, the DialWithDialFunc function
 // will be used when dialing new connections but regardless of the function,
 // the connection will be treated as a TLS connection.

vendor/github.com/koofr/go-koofrclient/client.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"net/url"
 
-	httpclient "github.com/koofr/go-httpclient"
+	"github.com/koofr/go-httpclient"
 )
 
 type KoofrClient struct {

vendor/github.com/koofr/go-koofrclient/client_device.go

@@ -1,9 +1,8 @@
 package koofrclient
 
 import (
+	"github.com/koofr/go-httpclient"
 	"net/http"
-
-	httpclient "github.com/koofr/go-httpclient"
 )
 
 func (c *KoofrClient) Devices() (devices []Device, err error) {

vendor/github.com/koofr/go-koofrclient/client_files.go

@@ -7,7 +7,7 @@ import (
 	"net/url"
 	"path"
 
-	httpclient "github.com/koofr/go-httpclient"
+	"github.com/koofr/go-httpclient"
 )
 
 var ErrCannotOverwrite = fmt.Errorf("Can not overwrite (filter constraint fails)")

vendor/github.com/koofr/go-koofrclient/client_mount.go

@@ -1,9 +1,8 @@
 package koofrclient
 
 import (
+	"github.com/koofr/go-httpclient"
 	"net/http"
-
-	httpclient "github.com/koofr/go-httpclient"
 )
 
 func (c *KoofrClient) Mounts() (mounts []Mount, err error) {

vendor/github.com/koofr/go-koofrclient/client_shared.go

@@ -3,7 +3,7 @@ package koofrclient
 import (
 	"net/http"
 
-	httpclient "github.com/koofr/go-httpclient"
+	"github.com/koofr/go-httpclient"
 )
 
 func (c *KoofrClient) Shared() (shared []Shared, err error) {

vendor/github.com/koofr/go-koofrclient/client_user.go

@@ -1,9 +1,8 @@
 package koofrclient
 
 import (
+	"github.com/koofr/go-httpclient"
 	"net/http"
-
-	httpclient "github.com/koofr/go-httpclient"
 )
 
 func (c *KoofrClient) UserInfo() (user User, err error) {

vendor/github.com/nsf/termbox-go/api.go

@@ -2,16 +2,13 @@
 
 package termbox
 
-import (
+import "github.com/mattn/go-runewidth"
-	"fmt"
+import "fmt"
-	"os"
+import "os"
-	"os/signal"
+import "os/signal"
-	"runtime"
+import "syscall"
-	"syscall"
+import "runtime"
-	"time"
+import "time"
-
-	runewidth "github.com/mattn/go-runewidth"
-)
 
 // public API
 

vendor/github.com/nsf/termbox-go/termbox_windows.go

@@ -4,7 +4,7 @@ import "math"
 import "syscall"
 import "unsafe"
 import "unicode/utf16"
-import runewidth "github.com/mattn/go-runewidth"
+import "github.com/mattn/go-runewidth"
 
 type (
 	wchar     uint16

vendor/github.com/pkg/sftp/server_stubs.go

@@ -3,9 +3,9 @@
 package sftp
 
 import (
-	"fmt"
 	"os"
 	"time"
+	"fmt"
 )
 
 func runLs(dirname string, dirent os.FileInfo) string {

vendor/github.com/sirupsen/logrus/terminal_check_bsd.go

@@ -10,3 +10,4 @@ func isTerminal(fd int) bool {
 	_, err := unix.IoctlGetTermios(fd, ioctlReadTermios)
 	return err == nil
 }
+

vendor/github.com/sirupsen/logrus/terminal_check_unix.go

@@ -10,3 +10,4 @@ func isTerminal(fd int) bool {
 	_, err := unix.IoctlGetTermios(fd, ioctlReadTermios)
 	return err == nil
 }
+

vendor/github.com/spf13/cobra/doc/yaml_docs.go

@@ -23,7 +23,7 @@ import (
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
-	yaml "gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v2"
 )
 
 type cmdOption struct {

vendor/github.com/stretchr/testify/require/require.go

@@ -6,11 +6,10 @@
 package require
 
 import (
+	assert "github.com/stretchr/testify/assert"
 	http "net/http"
 	url "net/url"
 	time "time"
-
-	assert "github.com/stretchr/testify/assert"
 )
 
 // Condition uses a Comparison to assert a complex condition.

vendor/github.com/stretchr/testify/require/require_forward.go

@@ -6,11 +6,10 @@
 package require
 
 import (
+	assert "github.com/stretchr/testify/assert"
 	http "net/http"
 	url "net/url"
 	time "time"
-
-	assert "github.com/stretchr/testify/assert"
 )
 
 // Condition uses a Comparison to assert a complex condition.

vendor/github.com/yunify/qingstor-sdk-go/config/config.go

@@ -24,7 +24,7 @@ import (
 	"strings"
 	"time"
 
-	yaml "gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v2"
 
 	"github.com/yunify/qingstor-sdk-go/logger"
 	"github.com/yunify/qingstor-sdk-go/utils"

vendor/github.com/yunify/qingstor-sdk-go/request/builder/qingstor.go

@@ -32,7 +32,7 @@ import (
 
 	"github.com/pengsrc/go-shared/convert"
 
-	sdk "github.com/yunify/qingstor-sdk-go"
+	"github.com/yunify/qingstor-sdk-go"
 	"github.com/yunify/qingstor-sdk-go/logger"
 	"github.com/yunify/qingstor-sdk-go/request/data"
 	"github.com/yunify/qingstor-sdk-go/utils"

vendor/golang.org/x/crypto/ssh/agent/client.go

@@ -26,7 +26,6 @@ import (
 	"sync"
 
 	"crypto"
-
 	"golang.org/x/crypto/ed25519"
 	"golang.org/x/crypto/ssh"
 )

vendor/golang.org/x/crypto/ssh/terminal/util_solaris.go

@@ -7,10 +7,9 @@
 package terminal // import "golang.org/x/crypto/ssh/terminal"
 
 import (
+	"golang.org/x/sys/unix"
 	"io"
 	"syscall"
-
-	"golang.org/x/sys/unix"
 )
 
 // State contains the state of a terminal.

vendor/gopkg.in/yaml.v2/readerc.go

@@ -95,7 +95,7 @@ func yaml_parser_update_buffer(parser *yaml_parser_t, length int) bool {
 
 	// [Go] This function was changed to guarantee the requested length size at EOF.
 	// The fact we need to do this is pretty awful, but the description above implies
-	// for that to be the case, and there are tests
+	// for that to be the case, and there are tests 
 
 	// If the EOF flag is set and the raw buffer is empty, do nothing.
 	if parser.eof && parser.raw_buffer_pos == len(parser.raw_buffer) {

vendor/gopkg.in/yaml.v2/resolve.go

@@ -180,7 +180,7 @@ func resolve(tag string, in string) (rtag string, out interface{}) {
 					return yaml_INT_TAG, uintv
 				}
 			} else if strings.HasPrefix(plain, "-0b") {
-				intv, err := strconv.ParseInt("-"+plain[3:], 2, 64)
+				intv, err := strconv.ParseInt("-" + plain[3:], 2, 64)
 				if err == nil {
 					if true || intv == int64(int(intv)) {
 						return yaml_INT_TAG, int(intv)

vendor/gopkg.in/yaml.v2/sorter.go

@@ -52,7 +52,7 @@ func (l keyList) Less(i, j int) bool {
 		var ai, bi int
 		var an, bn int64
 		if ar[i] == '0' || br[i] == '0' {
-			for j := i - 1; j >= 0 && unicode.IsDigit(ar[j]); j-- {
+			for j := i-1; j >= 0 && unicode.IsDigit(ar[j]); j-- {
 				if ar[j] != '0' {
 					an = 1
 					bn = 1

vendor/modules.txt

@@ -199,6 +199,7 @@ golang.org/x/crypto/nacl/secretbox
 golang.org/x/crypto/scrypt
 golang.org/x/crypto/ssh
 golang.org/x/crypto/ssh/terminal
+golang.org/x/crypto/bcrypt
 golang.org/x/crypto/internal/subtle
 golang.org/x/crypto/poly1305
 golang.org/x/crypto/salsa20/salsa
@@ -207,9 +208,8 @@ golang.org/x/crypto/ssh/agent
 golang.org/x/crypto/curve25519
 golang.org/x/crypto/ed25519
 golang.org/x/crypto/internal/chacha20
-golang.org/x/crypto/bcrypt
-golang.org/x/crypto/ed25519/internal/edwards25519
 golang.org/x/crypto/blowfish
+golang.org/x/crypto/ed25519/internal/edwards25519
 # golang.org/x/net v0.0.0-20190620200207-3b0461eec859
 golang.org/x/net/websocket
 golang.org/x/net/html