[hyper-provider] update hypercli in vendor

This commit is contained in:
Jimmy Xu
2017-12-22 00:30:03 +08:00
parent 1b3d6eae82
commit a6a6267863
200 changed files with 451 additions and 675 deletions

View File

@@ -7,7 +7,7 @@ import (
"golang.org/x/net/context"
"github.com/Sirupsen/logrus"
"github.com/docker/engine-api/types"
"github.com/hyperhq/hyper-api/types"
Cli "github.com/hyperhq/hypercli/cli"
flag "github.com/hyperhq/hypercli/pkg/mflag"
"github.com/hyperhq/hypercli/pkg/signal"

View File

@@ -14,8 +14,8 @@ import (
"runtime"
"strings"
"github.com/docker/engine-api/types"
"github.com/docker/go-units"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hypercli/api"
"github.com/hyperhq/hypercli/builder/dockerignore"
Cli "github.com/hyperhq/hypercli/cli"

View File

@@ -9,9 +9,9 @@ import (
"os"
"runtime"
"github.com/docker/engine-api/client"
"github.com/docker/go-connections/sockets"
"github.com/docker/go-connections/tlsconfig"
"github.com/hyperhq/hyper-api/client"
"github.com/hyperhq/hypercli/api"
"github.com/hyperhq/hypercli/cli"
"github.com/hyperhq/hypercli/cliconfig"

View File

@@ -4,8 +4,8 @@ import (
"encoding/json"
"fmt"
"github.com/docker/engine-api/types"
"github.com/docker/engine-api/types/container"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hyper-api/types/container"
Cli "github.com/hyperhq/hypercli/cli"
"github.com/hyperhq/hypercli/opts"
flag "github.com/hyperhq/hypercli/pkg/mflag"

View File

@@ -10,9 +10,9 @@ import (
"syscall"
"github.com/Sirupsen/logrus"
"github.com/docker/engine-api/client"
"github.com/docker/engine-api/types"
"github.com/docker/engine-api/types/filters"
"github.com/hyperhq/hyper-api/client"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hyper-api/types/filters"
Cli "github.com/hyperhq/hypercli/cli"
"github.com/hyperhq/hypercli/pkg/jsonmessage"
flag "github.com/hyperhq/hypercli/pkg/mflag"

View File

@@ -9,7 +9,7 @@ import (
"golang.org/x/net/context"
"github.com/docker/engine-api/types"
"github.com/hyperhq/hyper-api/types"
Cli "github.com/hyperhq/hypercli/cli"
"github.com/hyperhq/hypercli/pkg/archive"
flag "github.com/hyperhq/hypercli/pkg/mflag"

View File

@@ -9,10 +9,10 @@ import (
"golang.org/x/net/context"
"github.com/docker/engine-api/client"
"github.com/docker/engine-api/types"
"github.com/docker/engine-api/types/container"
networktypes "github.com/docker/engine-api/types/network"
"github.com/hyperhq/hyper-api/client"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hyper-api/types/container"
networktypes "github.com/hyperhq/hyper-api/types/network"
Cli "github.com/hyperhq/hypercli/cli"
"github.com/hyperhq/hypercli/pkg/jsonmessage"
"github.com/hyperhq/hypercli/reference"

View File

@@ -7,12 +7,12 @@ import (
"text/tabwriter"
"time"
"github.com/docker/engine-api/types"
"github.com/docker/engine-api/types/container"
"github.com/docker/engine-api/types/filters"
"github.com/docker/engine-api/types/network"
"github.com/docker/engine-api/types/strslice"
"github.com/docker/go-connections/nat"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hyper-api/types/container"
"github.com/hyperhq/hyper-api/types/filters"
"github.com/hyperhq/hyper-api/types/network"
"github.com/hyperhq/hyper-api/types/strslice"
Cli "github.com/hyperhq/hypercli/cli"
ropts "github.com/hyperhq/hypercli/opts"
flag "github.com/hyperhq/hypercli/pkg/mflag"

View File

@@ -8,8 +8,8 @@ import (
"net/http"
"net/url"
"github.com/docker/engine-api/types/events"
"github.com/gorilla/websocket"
"github.com/hyperhq/hyper-api/types/events"
signutil "github.com/hyperhq/websocket-client/go/util"
"golang.org/x/net/context"
)

View File

@@ -9,7 +9,7 @@ import (
"golang.org/x/net/context"
"github.com/Sirupsen/logrus"
"github.com/docker/engine-api/types"
"github.com/hyperhq/hyper-api/types"
Cli "github.com/hyperhq/hypercli/cli"
flag "github.com/hyperhq/hypercli/pkg/mflag"
"github.com/hyperhq/hypercli/pkg/promise"

View File

@@ -5,8 +5,8 @@ import (
"io/ioutil"
"testing"
"github.com/hyperhq/hyper-api/types"
flag "github.com/hyperhq/hypercli/pkg/mflag"
"github.com/docker/engine-api/types"
)
type arguments struct {
@@ -15,12 +15,12 @@ type arguments struct {
func TestParseExec(t *testing.T) {
invalids := map[*arguments]error{
&arguments{[]string{"-unknown"}}: fmt.Errorf("flag provided but not defined: -unknown"),
&arguments{[]string{"-u"}}: fmt.Errorf("flag needs an argument: -u"),
&arguments{[]string{"--user"}}: fmt.Errorf("flag needs an argument: --user"),
{[]string{"-unknown"}}: fmt.Errorf("flag provided but not defined: -unknown"),
{[]string{"-u"}}: fmt.Errorf("flag needs an argument: -u"),
{[]string{"--user"}}: fmt.Errorf("flag needs an argument: --user"),
}
valids := map[*arguments]*types.ExecConfig{
&arguments{
{
[]string{"container", "command"},
}: {
Container: "container",
@@ -28,7 +28,7 @@ func TestParseExec(t *testing.T) {
AttachStdout: true,
AttachStderr: true,
},
&arguments{
{
[]string{"container", "command1", "command2"},
}: {
Container: "container",
@@ -36,7 +36,7 @@ func TestParseExec(t *testing.T) {
AttachStdout: true,
AttachStderr: true,
},
&arguments{
{
[]string{"-i", "-t", "-u", "uid", "container", "command"},
}: {
User: "uid",
@@ -47,7 +47,7 @@ func TestParseExec(t *testing.T) {
Container: "container",
Cmd: []string{"command"},
},
&arguments{
{
[]string{"-d", "container", "command"},
}: {
AttachStdin: false,
@@ -57,7 +57,7 @@ func TestParseExec(t *testing.T) {
Container: "container",
Cmd: []string{"command"},
},
&arguments{
{
[]string{"-t", "-i", "-d", "container", "command"},
}: {
AttachStdin: false,

View File

@@ -10,8 +10,8 @@ import (
"golang.org/x/net/context"
"github.com/docker/engine-api/types"
"github.com/docker/engine-api/types/filters"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hyper-api/types/filters"
Cli "github.com/hyperhq/hypercli/cli"
"github.com/hyperhq/hypercli/opts"
flag "github.com/hyperhq/hypercli/pkg/mflag"

View File

@@ -6,8 +6,8 @@ import (
"strings"
"time"
"github.com/docker/engine-api/types"
"github.com/docker/go-units"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hypercli/api"
"github.com/hyperhq/hypercli/pkg/stringid"
"github.com/hyperhq/hypercli/pkg/stringutils"

View File

@@ -6,8 +6,8 @@ import (
"testing"
"time"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hypercli/pkg/stringid"
"github.com/docker/engine-api/types"
)
func TestContainerPsContext(t *testing.T) {

View File

@@ -8,7 +8,7 @@ import (
"text/tabwriter"
"text/template"
"github.com/docker/engine-api/types"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hypercli/reference"
)

View File

@@ -6,7 +6,7 @@ import (
"testing"
"time"
"github.com/docker/engine-api/types"
"github.com/hyperhq/hyper-api/types"
)
func TestContainerContextWrite(t *testing.T) {

View File

@@ -11,13 +11,13 @@ import (
"text/tabwriter"
"time"
"github.com/docker/engine-api/types"
"github.com/docker/engine-api/types/container"
"github.com/docker/engine-api/types/filters"
"github.com/docker/engine-api/types/network"
"github.com/docker/engine-api/types/strslice"
"github.com/docker/go-connections/nat"
units "github.com/docker/go-units"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hyper-api/types/container"
"github.com/hyperhq/hyper-api/types/filters"
"github.com/hyperhq/hyper-api/types/network"
"github.com/hyperhq/hyper-api/types/strslice"
Cli "github.com/hyperhq/hypercli/cli"
ropts "github.com/hyperhq/hypercli/opts"
flag "github.com/hyperhq/hypercli/pkg/mflag"

View File

@@ -4,8 +4,8 @@ import (
"io"
"github.com/Sirupsen/logrus"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hypercli/pkg/stdcopy"
"github.com/docker/engine-api/types"
)
func (cli *DockerCli) holdHijackedConnection(tty bool, inputStream io.ReadCloser, outputStream, errorStream io.Writer, resp types.HijackedResponse) error {

View File

@@ -1,8 +1,8 @@
package client
import (
"github.com/docker/engine-api/types"
"github.com/docker/engine-api/types/filters"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hyper-api/types/filters"
"github.com/hyperhq/hypercli/api/client/formatter"
Cli "github.com/hyperhq/hypercli/cli"
"github.com/hyperhq/hypercli/opts"

View File

@@ -7,7 +7,7 @@ import (
"golang.org/x/net/context"
"github.com/docker/engine-api/types"
"github.com/hyperhq/hyper-api/types"
Cli "github.com/hyperhq/hypercli/cli"
"github.com/hyperhq/hypercli/opts"
"github.com/hyperhq/hypercli/pkg/jsonmessage"

View File

@@ -7,7 +7,7 @@ import (
"golang.org/x/net/context"
"github.com/docker/engine-api/client"
"github.com/hyperhq/hyper-api/client"
"github.com/hyperhq/hypercli/api/client/inspect"
Cli "github.com/hyperhq/hypercli/cli"
flag "github.com/hyperhq/hypercli/pkg/mflag"

View File

@@ -10,7 +10,7 @@ import (
"path/filepath"
"strings"
"github.com/docker/engine-api/types"
"github.com/hyperhq/hyper-api/types"
Cli "github.com/hyperhq/hypercli/cli"
"github.com/hyperhq/hypercli/image"
"github.com/hyperhq/hypercli/pkg/archive"

View File

@@ -10,8 +10,8 @@ import (
"golang.org/x/net/context"
"github.com/docker/engine-api/client"
"github.com/docker/engine-api/types"
"github.com/hyperhq/hyper-api/client"
"github.com/hyperhq/hyper-api/types"
Cli "github.com/hyperhq/hypercli/cli"
flag "github.com/hyperhq/hypercli/pkg/mflag"
"github.com/hyperhq/hypercli/pkg/term"

View File

@@ -6,7 +6,7 @@ import (
"golang.org/x/net/context"
"github.com/docker/engine-api/types"
"github.com/hyperhq/hyper-api/types"
Cli "github.com/hyperhq/hypercli/cli"
flag "github.com/hyperhq/hypercli/pkg/mflag"
"github.com/hyperhq/hypercli/pkg/stdcopy"

View File

@@ -8,9 +8,9 @@ import (
"golang.org/x/net/context"
"github.com/docker/engine-api/types"
"github.com/docker/engine-api/types/filters"
"github.com/docker/engine-api/types/network"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hyper-api/types/filters"
"github.com/hyperhq/hyper-api/types/network"
Cli "github.com/hyperhq/hypercli/cli"
"github.com/hyperhq/hypercli/opts"
flag "github.com/hyperhq/hypercli/pkg/mflag"

View File

@@ -1,8 +1,8 @@
package client
import (
"github.com/docker/engine-api/types"
"github.com/docker/engine-api/types/filters"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hyper-api/types/filters"
"github.com/hyperhq/hypercli/api/client/formatter"
Cli "github.com/hyperhq/hypercli/cli"
"github.com/hyperhq/hypercli/opts"

View File

@@ -6,7 +6,7 @@ import (
"golang.org/x/net/context"
"github.com/docker/engine-api/types"
"github.com/hyperhq/hyper-api/types"
Cli "github.com/hyperhq/hypercli/cli"
"github.com/hyperhq/hypercli/pkg/jsonmessage"
flag "github.com/hyperhq/hypercli/pkg/mflag"

View File

@@ -3,7 +3,7 @@ package client
import (
"io"
"github.com/docker/engine-api/types"
"github.com/hyperhq/hyper-api/types"
Cli "github.com/hyperhq/hypercli/cli"
"github.com/hyperhq/hypercli/pkg/jsonmessage"
flag "github.com/hyperhq/hypercli/pkg/mflag"

View File

@@ -6,7 +6,7 @@ import (
"golang.org/x/net/context"
"github.com/docker/engine-api/types"
"github.com/hyperhq/hyper-api/types"
Cli "github.com/hyperhq/hypercli/cli"
flag "github.com/hyperhq/hypercli/pkg/mflag"
)

View File

@@ -7,7 +7,7 @@ import (
"golang.org/x/net/context"
"github.com/docker/engine-api/types"
"github.com/hyperhq/hyper-api/types"
Cli "github.com/hyperhq/hypercli/cli"
flag "github.com/hyperhq/hypercli/pkg/mflag"
)

View File

@@ -8,8 +8,8 @@ import (
"strings"
"github.com/Sirupsen/logrus"
"github.com/docker/engine-api/types"
"github.com/docker/libnetwork/resolvconf/dns"
"github.com/hyperhq/hyper-api/types"
Cli "github.com/hyperhq/hypercli/cli"
derr "github.com/hyperhq/hypercli/errors"
"github.com/hyperhq/hypercli/opts"

View File

@@ -9,8 +9,8 @@ import (
"golang.org/x/net/context"
"github.com/docker/engine-api/types"
registrytypes "github.com/docker/engine-api/types/registry"
"github.com/hyperhq/hyper-api/types"
registrytypes "github.com/hyperhq/hyper-api/types/registry"
Cli "github.com/hyperhq/hypercli/cli"
flag "github.com/hyperhq/hypercli/pkg/mflag"
"github.com/hyperhq/hypercli/pkg/stringutils"

View File

@@ -7,9 +7,9 @@ import (
"strings"
"text/tabwriter"
"github.com/docker/engine-api/types"
"github.com/docker/engine-api/types/filters"
"github.com/docker/engine-api/types/strslice"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hyper-api/types/filters"
"github.com/hyperhq/hyper-api/types/strslice"
Cli "github.com/hyperhq/hypercli/cli"
ropts "github.com/hyperhq/hypercli/opts"
flag "github.com/hyperhq/hypercli/pkg/mflag"

View File

@@ -6,8 +6,8 @@ import (
"golang.org/x/net/context"
"github.com/docker/engine-api/types"
"github.com/docker/engine-api/types/filters"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hyper-api/types/filters"
Cli "github.com/hyperhq/hypercli/cli"
"github.com/hyperhq/hypercli/opts"
flag "github.com/hyperhq/hypercli/pkg/mflag"

View File

@@ -9,7 +9,7 @@ import (
"golang.org/x/net/context"
"github.com/Sirupsen/logrus"
"github.com/docker/engine-api/types"
"github.com/hyperhq/hyper-api/types"
Cli "github.com/hyperhq/hypercli/cli"
flag "github.com/hyperhq/hypercli/pkg/mflag"
"github.com/hyperhq/hypercli/pkg/promise"

View File

@@ -7,8 +7,8 @@ import (
"sync"
"time"
"github.com/docker/engine-api/types"
"github.com/docker/engine-api/types/events"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hyper-api/types/events"
Cli "github.com/hyperhq/hypercli/cli"
"github.com/hyperhq/hypercli/cli/command"
"github.com/hyperhq/hypercli/cli/command/formatter"

View File

@@ -8,8 +8,8 @@ import (
"sync"
"time"
"github.com/docker/engine-api/types"
"github.com/docker/engine-api/types/events"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hyper-api/types/events"
"github.com/hyperhq/hypercli/cli/command/formatter"
"golang.org/x/net/context"
)

View File

@@ -3,7 +3,7 @@ package client
import (
"golang.org/x/net/context"
"github.com/docker/engine-api/types"
"github.com/hyperhq/hyper-api/types"
Cli "github.com/hyperhq/hypercli/cli"
flag "github.com/hyperhq/hypercli/pkg/mflag"
)

View File

@@ -21,8 +21,6 @@ import (
"github.com/docker/distribution/digest"
"github.com/docker/distribution/registry/client/auth"
"github.com/docker/distribution/registry/client/transport"
"github.com/docker/engine-api/types"
registrytypes "github.com/docker/engine-api/types/registry"
"github.com/docker/go-connections/tlsconfig"
"github.com/docker/notary/client"
"github.com/docker/notary/passphrase"
@@ -30,6 +28,8 @@ import (
"github.com/docker/notary/tuf/data"
"github.com/docker/notary/tuf/signed"
"github.com/docker/notary/tuf/store"
"github.com/hyperhq/hyper-api/types"
registrytypes "github.com/hyperhq/hyper-api/types/registry"
"github.com/hyperhq/hypercli/cliconfig"
"github.com/hyperhq/hypercli/distribution"
"github.com/hyperhq/hypercli/dockerversion"

View File

@@ -4,8 +4,8 @@ import (
"os"
"testing"
registrytypes "github.com/hyperhq/hyper-api/types/registry"
"github.com/hyperhq/hypercli/registry"
registrytypes "github.com/docker/engine-api/types/registry"
)
func unsetENV() {

View File

@@ -14,10 +14,10 @@ import (
"time"
"github.com/Sirupsen/logrus"
"github.com/docker/engine-api/client"
"github.com/docker/engine-api/types"
registrytypes "github.com/docker/engine-api/types/registry"
"github.com/dutchcoders/goftp"
"github.com/hyperhq/hyper-api/client"
"github.com/hyperhq/hyper-api/types"
registrytypes "github.com/hyperhq/hyper-api/types/registry"
"github.com/hyperhq/hypercli/pkg/signal"
"github.com/hyperhq/hypercli/pkg/term"
"github.com/hyperhq/hypercli/registry"

View File

@@ -7,7 +7,7 @@ import (
"golang.org/x/net/context"
"github.com/docker/engine-api/types"
"github.com/hyperhq/hyper-api/types"
Cli "github.com/hyperhq/hypercli/cli"
"github.com/hyperhq/hypercli/dockerversion"
flag "github.com/hyperhq/hypercli/pkg/mflag"

View File

@@ -16,8 +16,8 @@ import (
flag "github.com/hyperhq/hypercli/pkg/mflag"
"github.com/cheggaaa/pb"
"github.com/docker/engine-api/types"
"github.com/docker/engine-api/types/filters"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hyper-api/types/filters"
"golang.org/x/net/context"
)