Skip to content

Commit 10b8e69

Browse files
mboersmamboersma
committed
ref(client): move new go CLI to client dir
1 parent 472f628 commit 10b8e69

90 files changed

Lines changed: 107 additions & 123 deletions

Some content is hidden

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

‎.gitignore‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ logs/
2424
# local binaries, installers, and artifacts
2525
builder/rootfs/usr/bin
2626
cache/image/bin/
27-
client-go/deis
28-
client-go/deis.exe
27+
client/deis
28+
client/deis.exe
2929
contrib/azure/azure-user-data
3030
contrib/bumpver/bumpver
3131
deisctl/deisctl

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ GO_PACKAGES_REPO_PATH = $(addprefix $(repo_path)/,$(GO_PACKAGES))
1212

1313
COMPONENTS=builder cache controller database logger logspout publisher registry router $(STORE_IF_STATEFUL)
1414
START_ORDER=publisher $(STORE_IF_STATEFUL) logger logspout database cache registry controller builder router
15-
CLIENTS=client-go deisctl
15+
CLIENTS=client deisctl
1616

1717
all: build run
1818

client-go/LICENSE renamed to client/LICENSE

File renamed without changes.

client-go/Makefile renamed to client/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
include ../includes.mk
22

33
# the filepath to this repository, relative to $GOPATH/src
4-
repo_path = github.com/deis/deis/client-go
4+
repo_path = github.com/deis/deis/client
55

66
GO_FILES = $(wildcard *.go)
77
GO_PACKAGES = parser cmd controller/api controller/client $(wildcard controller/models/*) $(wildcard pkg/*)

client-go/README.md renamed to client/README.md

client-go/cmd/apps.go renamed to client/cmd/apps.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ import (
99

1010
"github.com/deis/deis/pkg/prettyprint"
1111

12-
"github.com/deis/deis/client-go/controller/api"
13-
"github.com/deis/deis/client-go/controller/client"
14-
"github.com/deis/deis/client-go/controller/models/apps"
15-
"github.com/deis/deis/client-go/controller/models/config"
16-
"github.com/deis/deis/client-go/pkg/git"
17-
"github.com/deis/deis/client-go/pkg/webbrowser"
12+
"github.com/deis/deis/client/controller/api"
13+
"github.com/deis/deis/client/controller/client"
14+
"github.com/deis/deis/client/controller/models/apps"
15+
"github.com/deis/deis/client/controller/models/config"
16+
"github.com/deis/deis/client/pkg/git"
17+
"github.com/deis/deis/client/pkg/webbrowser"
1818
)
1919

2020
// AppCreate creates an app.

client-go/cmd/auth.go renamed to client/cmd/auth.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"strings"
88
"syscall"
99

10-
"github.com/deis/deis/client-go/controller/client"
11-
"github.com/deis/deis/client-go/controller/models/auth"
10+
"github.com/deis/deis/client/controller/client"
11+
"github.com/deis/deis/client/controller/models/auth"
1212
"golang.org/x/crypto/ssh/terminal"
1313
)
1414

client-go/cmd/builds.go renamed to client/cmd/builds.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55

66
"gopkg.in/yaml.v2"
77

8-
"github.com/deis/deis/client-go/controller/models/builds"
8+
"github.com/deis/deis/client/controller/models/builds"
99
)
1010

1111
// BuildsList lists an app's builds.

client-go/cmd/certs.go renamed to client/cmd/certs.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77

88
"github.com/deis/deis/pkg/prettyprint"
99

10-
"github.com/deis/deis/client-go/controller/client"
11-
"github.com/deis/deis/client-go/controller/models/certs"
10+
"github.com/deis/deis/client/controller/client"
11+
"github.com/deis/deis/client/controller/models/certs"
1212
)
1313

1414
// CertsList lists certs registered with the controller.

client-go/cmd/config.go renamed to client/cmd/config.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111

1212
"github.com/deis/deis/pkg/prettyprint"
1313

14-
"github.com/deis/deis/client-go/controller/api"
15-
"github.com/deis/deis/client-go/controller/models/config"
14+
"github.com/deis/deis/client/controller/api"
15+
"github.com/deis/deis/client/controller/models/config"
1616
)
1717

1818
// ConfigList lists an app's config.

0 commit comments

Comments
 (0)