Skip to content
This repository was archived by the owner on Feb 8, 2021. It is now read-only.

Commit bab38da

Browse files
carmarkcarmark
committed
add hyper-api instead of engine-api
1 parent a0b1484 commit bab38da

File tree

383 files changed

+6794
-672
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

383 files changed

+6794
-672
lines changed

‎api/client/attach.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"golang.org/x/net/context"
88

99
"github.com/Sirupsen/logrus"
10-
"github.com/docker/engine-api/types"
10+
"github.com/hyperhq/hyper-api/types"
1111
Cli "github.com/hyperhq/hypercli/cli"
1212
flag "github.com/hyperhq/hypercli/pkg/mflag"
1313
"github.com/hyperhq/hypercli/pkg/signal"

‎api/client/build.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import (
1414
"runtime"
1515
"strings"
1616

17-
"github.com/docker/engine-api/types"
1817
"github.com/docker/go-units"
18+
"github.com/hyperhq/hyper-api/types"
1919
"github.com/hyperhq/hypercli/api"
2020
"github.com/hyperhq/hypercli/builder/dockerignore"
2121
Cli "github.com/hyperhq/hypercli/cli"

‎api/client/cli.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99
"os"
1010
"runtime"
1111

12-
"github.com/docker/engine-api/client"
1312
"github.com/docker/go-connections/sockets"
1413
"github.com/docker/go-connections/tlsconfig"
14+
"github.com/hyperhq/hyper-api/client"
1515
"github.com/hyperhq/hypercli/api"
1616
"github.com/hyperhq/hypercli/cli"
1717
"github.com/hyperhq/hypercli/cliconfig"

‎api/client/commit.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"encoding/json"
55
"fmt"
66

7-
"github.com/docker/engine-api/types"
8-
"github.com/docker/engine-api/types/container"
7+
"github.com/hyperhq/hyper-api/types"
8+
"github.com/hyperhq/hyper-api/types/container"
99
Cli "github.com/hyperhq/hypercli/cli"
1010
"github.com/hyperhq/hypercli/opts"
1111
flag "github.com/hyperhq/hypercli/pkg/mflag"

‎api/client/compose.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010
"syscall"
1111

1212
"github.com/Sirupsen/logrus"
13-
"github.com/docker/engine-api/client"
14-
"github.com/docker/engine-api/types"
15-
"github.com/docker/engine-api/types/filters"
13+
"github.com/hyperhq/hyper-api/client"
14+
"github.com/hyperhq/hyper-api/types"
15+
"github.com/hyperhq/hyper-api/types/filters"
1616
Cli "github.com/hyperhq/hypercli/cli"
1717
"github.com/hyperhq/hypercli/pkg/jsonmessage"
1818
flag "github.com/hyperhq/hypercli/pkg/mflag"

‎api/client/cp.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99

1010
"golang.org/x/net/context"
1111

12-
"github.com/docker/engine-api/types"
12+
"github.com/hyperhq/hyper-api/types"
1313
Cli "github.com/hyperhq/hypercli/cli"
1414
"github.com/hyperhq/hypercli/pkg/archive"
1515
flag "github.com/hyperhq/hypercli/pkg/mflag"

‎api/client/create.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import (
99

1010
"golang.org/x/net/context"
1111

12-
"github.com/docker/engine-api/client"
13-
"github.com/docker/engine-api/types"
14-
"github.com/docker/engine-api/types/container"
15-
networktypes "github.com/docker/engine-api/types/network"
12+
"github.com/hyperhq/hyper-api/client"
13+
"github.com/hyperhq/hyper-api/types"
14+
"github.com/hyperhq/hyper-api/types/container"
15+
networktypes "github.com/hyperhq/hyper-api/types/network"
1616
Cli "github.com/hyperhq/hypercli/cli"
1717
"github.com/hyperhq/hypercli/pkg/jsonmessage"
1818
"github.com/hyperhq/hypercli/reference"

‎api/client/cron.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ import (
77
"text/tabwriter"
88
"time"
99

10-
"github.com/docker/engine-api/types"
11-
"github.com/docker/engine-api/types/container"
12-
"github.com/docker/engine-api/types/filters"
13-
"github.com/docker/engine-api/types/network"
14-
"github.com/docker/engine-api/types/strslice"
1510
"github.com/docker/go-connections/nat"
11+
"github.com/hyperhq/hyper-api/types"
12+
"github.com/hyperhq/hyper-api/types/container"
13+
"github.com/hyperhq/hyper-api/types/filters"
14+
"github.com/hyperhq/hyper-api/types/network"
15+
"github.com/hyperhq/hyper-api/types/strslice"
1616
Cli "github.com/hyperhq/hypercli/cli"
1717
ropts "github.com/hyperhq/hypercli/opts"
1818
flag "github.com/hyperhq/hypercli/pkg/mflag"

‎api/client/events.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"net/http"
99
"net/url"
1010

11-
"github.com/docker/engine-api/types/events"
1211
"github.com/gorilla/websocket"
12+
"github.com/hyperhq/hyper-api/types/events"
1313
signutil "github.com/hyperhq/websocket-client/go/util"
1414
"golang.org/x/net/context"
1515
)

‎api/client/exec.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"golang.org/x/net/context"
1010

1111
"github.com/Sirupsen/logrus"
12-
"github.com/docker/engine-api/types"
12+
"github.com/hyperhq/hyper-api/types"
1313
Cli "github.com/hyperhq/hypercli/cli"
1414
flag "github.com/hyperhq/hypercli/pkg/mflag"
1515
"github.com/hyperhq/hypercli/pkg/promise"

‎api/client/exec_test.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"io/ioutil"
66
"testing"
77

8+
"github.com/hyperhq/hyper-api/types"
89
flag "github.com/hyperhq/hypercli/pkg/mflag"
9-
"github.com/docker/engine-api/types"
1010
)
1111

1212
type arguments struct {
@@ -15,28 +15,28 @@ type arguments struct {
1515

1616
func TestParseExec(t *testing.T) {
1717
invalids := map[*arguments]error{
18-
&arguments{[]string{"-unknown"}}: fmt.Errorf("flag provided but not defined: -unknown"),
19-
&arguments{[]string{"-u"}}: fmt.Errorf("flag needs an argument: -u"),
20-
&arguments{[]string{"--user"}}: fmt.Errorf("flag needs an argument: --user"),
18+
{[]string{"-unknown"}}: fmt.Errorf("flag provided but not defined: -unknown"),
19+
{[]string{"-u"}}: fmt.Errorf("flag needs an argument: -u"),
20+
{[]string{"--user"}}: fmt.Errorf("flag needs an argument: --user"),
2121
}
2222
valids := map[*arguments]*types.ExecConfig{
23-
&arguments{
23+
{
2424
[]string{"container", "command"},
2525
}: {
2626
Container: "container",
2727
Cmd: []string{"command"},
2828
AttachStdout: true,
2929
AttachStderr: true,
3030
},
31-
&arguments{
31+
{
3232
[]string{"container", "command1", "command2"},
3333
}: {
3434
Container: "container",
3535
Cmd: []string{"command1", "command2"},
3636
AttachStdout: true,
3737
AttachStderr: true,
3838
},
39-
&arguments{
39+
{
4040
[]string{"-i", "-t", "-u", "uid", "container", "command"},
4141
}: {
4242
User: "uid",
@@ -47,7 +47,7 @@ func TestParseExec(t *testing.T) {
4747
Container: "container",
4848
Cmd: []string{"command"},
4949
},
50-
&arguments{
50+
{
5151
[]string{"-d", "container", "command"},
5252
}: {
5353
AttachStdin: false,
@@ -57,7 +57,7 @@ func TestParseExec(t *testing.T) {
5757
Container: "container",
5858
Cmd: []string{"command"},
5959
},
60-
&arguments{
60+
{
6161
[]string{"-t", "-i", "-d", "container", "command"},
6262
}: {
6363
AttachStdin: false,

‎api/client/fip.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010

1111
"golang.org/x/net/context"
1212

13-
"github.com/docker/engine-api/types"
14-
"github.com/docker/engine-api/types/filters"
13+
"github.com/hyperhq/hyper-api/types"
14+
"github.com/hyperhq/hyper-api/types/filters"
1515
Cli "github.com/hyperhq/hypercli/cli"
1616
"github.com/hyperhq/hypercli/opts"
1717
flag "github.com/hyperhq/hypercli/pkg/mflag"

‎api/client/formatter/custom.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"strings"
77
"time"
88

9-
"github.com/docker/engine-api/types"
109
"github.com/docker/go-units"
10+
"github.com/hyperhq/hyper-api/types"
1111
"github.com/hyperhq/hypercli/api"
1212
"github.com/hyperhq/hypercli/pkg/stringid"
1313
"github.com/hyperhq/hypercli/pkg/stringutils"

‎api/client/formatter/custom_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"testing"
77
"time"
88

9+
"github.com/hyperhq/hyper-api/types"
910
"github.com/hyperhq/hypercli/pkg/stringid"
10-
"github.com/docker/engine-api/types"
1111
)
1212

1313
func TestContainerPsContext(t *testing.T) {

‎api/client/formatter/formatter.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"text/tabwriter"
99
"text/template"
1010

11-
"github.com/docker/engine-api/types"
11+
"github.com/hyperhq/hyper-api/types"
1212
"github.com/hyperhq/hypercli/reference"
1313
)
1414

‎api/client/formatter/formatter_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"testing"
77
"time"
88

9-
"github.com/docker/engine-api/types"
9+
"github.com/hyperhq/hyper-api/types"
1010
)
1111

1212
func TestContainerContextWrite(t *testing.T) {

‎api/client/func.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ import (
1111
"text/tabwriter"
1212
"time"
1313

14-
"github.com/docker/engine-api/types"
15-
"github.com/docker/engine-api/types/container"
16-
"github.com/docker/engine-api/types/filters"
17-
"github.com/docker/engine-api/types/network"
18-
"github.com/docker/engine-api/types/strslice"
1914
"github.com/docker/go-connections/nat"
2015
units "github.com/docker/go-units"
16+
"github.com/hyperhq/hyper-api/types"
17+
"github.com/hyperhq/hyper-api/types/container"
18+
"github.com/hyperhq/hyper-api/types/filters"
19+
"github.com/hyperhq/hyper-api/types/network"
20+
"github.com/hyperhq/hyper-api/types/strslice"
2121
Cli "github.com/hyperhq/hypercli/cli"
2222
ropts "github.com/hyperhq/hypercli/opts"
2323
flag "github.com/hyperhq/hypercli/pkg/mflag"

‎api/client/hijack.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"io"
55

66
"github.com/Sirupsen/logrus"
7+
"github.com/hyperhq/hyper-api/types"
78
"github.com/hyperhq/hypercli/pkg/stdcopy"
8-
"github.com/docker/engine-api/types"
99
)
1010

1111
func (cli *DockerCli) holdHijackedConnection(tty bool, inputStream io.ReadCloser, outputStream, errorStream io.Writer, resp types.HijackedResponse) error {

‎api/client/images.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package client
22

33
import (
4-
"github.com/docker/engine-api/types"
5-
"github.com/docker/engine-api/types/filters"
4+
"github.com/hyperhq/hyper-api/types"
5+
"github.com/hyperhq/hyper-api/types/filters"
66
"github.com/hyperhq/hypercli/api/client/formatter"
77
Cli "github.com/hyperhq/hypercli/cli"
88
"github.com/hyperhq/hypercli/opts"

‎api/client/import.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77

88
"golang.org/x/net/context"
99

10-
"github.com/docker/engine-api/types"
10+
"github.com/hyperhq/hyper-api/types"
1111
Cli "github.com/hyperhq/hypercli/cli"
1212
"github.com/hyperhq/hypercli/opts"
1313
"github.com/hyperhq/hypercli/pkg/jsonmessage"

‎api/client/inspect.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77

88
"golang.org/x/net/context"
99

10-
"github.com/docker/engine-api/client"
10+
"github.com/hyperhq/hyper-api/client"
1111
"github.com/hyperhq/hypercli/api/client/inspect"
1212
Cli "github.com/hyperhq/hypercli/cli"
1313
flag "github.com/hyperhq/hypercli/pkg/mflag"

‎api/client/load.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"path/filepath"
1111
"strings"
1212

13-
"github.com/docker/engine-api/types"
13+
"github.com/hyperhq/hyper-api/types"
1414
Cli "github.com/hyperhq/hypercli/cli"
1515
"github.com/hyperhq/hypercli/image"
1616
"github.com/hyperhq/hypercli/pkg/archive"

‎api/client/login.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010

1111
"golang.org/x/net/context"
1212

13-
"github.com/docker/engine-api/client"
14-
"github.com/docker/engine-api/types"
13+
"github.com/hyperhq/hyper-api/client"
14+
"github.com/hyperhq/hyper-api/types"
1515
Cli "github.com/hyperhq/hypercli/cli"
1616
flag "github.com/hyperhq/hypercli/pkg/mflag"
1717
"github.com/hyperhq/hypercli/pkg/term"

‎api/client/logs.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66

77
"golang.org/x/net/context"
88

9-
"github.com/docker/engine-api/types"
9+
"github.com/hyperhq/hyper-api/types"
1010
Cli "github.com/hyperhq/hypercli/cli"
1111
flag "github.com/hyperhq/hypercli/pkg/mflag"
1212
"github.com/hyperhq/hypercli/pkg/stdcopy"

‎api/client/network.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import (
88

99
"golang.org/x/net/context"
1010

11-
"github.com/docker/engine-api/types"
12-
"github.com/docker/engine-api/types/filters"
13-
"github.com/docker/engine-api/types/network"
11+
"github.com/hyperhq/hyper-api/types"
12+
"github.com/hyperhq/hyper-api/types/filters"
13+
"github.com/hyperhq/hyper-api/types/network"
1414
Cli "github.com/hyperhq/hypercli/cli"
1515
"github.com/hyperhq/hypercli/opts"
1616
flag "github.com/hyperhq/hypercli/pkg/mflag"

‎api/client/ps.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package client
22

33
import (
4-
"github.com/docker/engine-api/types"
5-
"github.com/docker/engine-api/types/filters"
4+
"github.com/hyperhq/hyper-api/types"
5+
"github.com/hyperhq/hyper-api/types/filters"
66
"github.com/hyperhq/hypercli/api/client/formatter"
77
Cli "github.com/hyperhq/hypercli/cli"
88
"github.com/hyperhq/hypercli/opts"

‎api/client/pull.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66

77
"golang.org/x/net/context"
88

9-
"github.com/docker/engine-api/types"
9+
"github.com/hyperhq/hyper-api/types"
1010
Cli "github.com/hyperhq/hypercli/cli"
1111
"github.com/hyperhq/hypercli/pkg/jsonmessage"
1212
flag "github.com/hyperhq/hypercli/pkg/mflag"

‎api/client/push.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package client
33
import (
44
"io"
55

6-
"github.com/docker/engine-api/types"
6+
"github.com/hyperhq/hyper-api/types"
77
Cli "github.com/hyperhq/hypercli/cli"
88
"github.com/hyperhq/hypercli/pkg/jsonmessage"
99
flag "github.com/hyperhq/hypercli/pkg/mflag"

‎api/client/rm.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66

77
"golang.org/x/net/context"
88

9-
"github.com/docker/engine-api/types"
9+
"github.com/hyperhq/hyper-api/types"
1010
Cli "github.com/hyperhq/hypercli/cli"
1111
flag "github.com/hyperhq/hypercli/pkg/mflag"
1212
)

‎api/client/rmi.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77

88
"golang.org/x/net/context"
99

10-
"github.com/docker/engine-api/types"
10+
"github.com/hyperhq/hyper-api/types"
1111
Cli "github.com/hyperhq/hypercli/cli"
1212
flag "github.com/hyperhq/hypercli/pkg/mflag"
1313
)

‎api/client/run.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"strings"
99

1010
"github.com/Sirupsen/logrus"
11-
"github.com/docker/engine-api/types"
1211
"github.com/docker/libnetwork/resolvconf/dns"
12+
"github.com/hyperhq/hyper-api/types"
1313
Cli "github.com/hyperhq/hypercli/cli"
1414
derr "github.com/hyperhq/hypercli/errors"
1515
"github.com/hyperhq/hypercli/opts"

‎api/client/search.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99

1010
"golang.org/x/net/context"
1111

12-
"github.com/docker/engine-api/types"
13-
registrytypes "github.com/docker/engine-api/types/registry"
12+
"github.com/hyperhq/hyper-api/types"
13+
registrytypes "github.com/hyperhq/hyper-api/types/registry"
1414
Cli "github.com/hyperhq/hypercli/cli"
1515
flag "github.com/hyperhq/hypercli/pkg/mflag"
1616
"github.com/hyperhq/hypercli/pkg/stringutils"

0 commit comments

Comments
 (0)