Skip to content

Commit d57fd94

Browse files
arschlesarschles
committed
Merge pull request #1 from arschles/import-paths
fix(*): fix all import paths
2 parents be4c111 + aa8bf9d commit d57fd94

59 files changed

Lines changed: 112 additions & 112 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 & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,5 @@ _testmain.go
2222
*.exe
2323
*.test
2424
*.prof
25+
vendor
26+
deis

‎Makefile‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
export GO15VENDOREXPERIMENT=1
22

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

66
HOST_OS := $(shell uname)
77
ifeq ($(HOST_OS),Darwin)
@@ -13,6 +13,7 @@ endif
1313
DEV_ENV_IMAGE := quay.io/deis/go-dev:0.9.0
1414
DEV_ENV_WORK_DIR := /go/src/${repo_path}
1515
DEV_ENV_PREFIX := docker run --rm -e GO15VENDOREXPERIMENT=1 -e CGO_ENABLED=0 -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR}
16+
DEV_ENV_PREFIX_CGO_ENABLED := docker run --rm -e GO15VENDOREXPERIMENT=1 -e CGO_ENABLED=1 -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR}
1617
DEV_ENV_CMD := ${DEV_ENV_PREFIX} ${DEV_ENV_IMAGE}
1718
DIST_DIR := _dist
1819

@@ -87,13 +88,10 @@ setup-gotools:
8788
test: test-style test-unit
8889

8990
test-style:
90-
@if [ $(shell $(GOFMT) $(GO_FILES) $(GO_PACKAGES)) ]; then \
91-
echo "gofmt check failed:"; $(GOFMT) $(GO_FILES) $(GO_PACKAGES); exit 1; \
92-
fi
93-
@go vet $(repo_path) $(GO_PACKAGES_REPO_PATH)
91+
${DEV_ENV_CMD} sh -c '${GOFMT} ${GO_FILES} ${GO_PACKAGES} && go vet $(repo_path) $(GO_PACKAGES_REPO_PATH)'
9492
@for i in $(addsuffix /...,$(GO_PACKAGES)); do \
95-
golint $$i; \
93+
${DEV_ENV_CMD} golint $$i; \
9694
done
9795

9896
test-unit:
99-
$(GOTEST) $(shell glide novendor)
97+
${DEV_ENV_PREFIX_CGO_ENABLED} ${DEV_ENV_IMAGE} ${GOTEST} $$(glide nv)

‎cmd/apps.go‎

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

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

11-
"github.com/deis/workflow/client/controller/api"
12-
"github.com/deis/workflow/client/controller/client"
13-
"github.com/deis/workflow/client/controller/models/apps"
14-
"github.com/deis/workflow/client/controller/models/config"
15-
"github.com/deis/workflow/client/pkg/git"
16-
"github.com/deis/workflow/client/pkg/webbrowser"
11+
"github.com/deis/workflow-cli/client/controller/api"
12+
"github.com/deis/workflow-cli/client/controller/client"
13+
"github.com/deis/workflow-cli/client/controller/models/apps"
14+
"github.com/deis/workflow-cli/client/controller/models/config"
15+
"github.com/deis/workflow-cli/client/pkg/git"
16+
"github.com/deis/workflow-cli/client/pkg/webbrowser"
1717
)
1818

1919
// AppCreate creates an app.

‎cmd/auth.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
"strings"
1010
"syscall"
1111

12-
"github.com/deis/workflow/client/controller/client"
13-
"github.com/deis/workflow/client/controller/models/auth"
12+
"github.com/deis/workflow-cli/client/controller/client"
13+
"github.com/deis/workflow-cli/client/controller/models/auth"
1414
"golang.org/x/crypto/ssh/terminal"
1515
)
1616

‎cmd/builds.go‎

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

88
"gopkg.in/yaml.v2"
99

10-
"github.com/deis/workflow/client/controller/models/builds"
10+
"github.com/deis/workflow-cli/client/controller/models/builds"
1111
)
1212

1313
// BuildsList lists an app's builds.

‎cmd/certs.go‎

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

1010
"github.com/olekukonko/tablewriter"
1111

12-
"github.com/deis/workflow/client/controller/client"
13-
"github.com/deis/workflow/client/controller/models/certs"
12+
"github.com/deis/workflow-cli/client/controller/client"
13+
"github.com/deis/workflow-cli/client/controller/models/certs"
1414
)
1515

1616
// CertsList lists certs registered with the controller.

‎cmd/config.go‎

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

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

15-
"github.com/deis/workflow/client/controller/api"
16-
"github.com/deis/workflow/client/controller/models/config"
15+
"github.com/deis/workflow-cli/client/controller/api"
16+
"github.com/deis/workflow-cli/client/controller/models/config"
1717
)
1818

1919
// ConfigList lists an app's config.

‎cmd/domains.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package cmd
33
import (
44
"fmt"
55

6-
"github.com/deis/workflow/client/controller/models/domains"
6+
"github.com/deis/workflow-cli/client/controller/models/domains"
77
)
88

99
// DomainsList lists domains registered with an app.

‎cmd/git.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package cmd
22

33
import (
4-
"github.com/deis/workflow/client/pkg/git"
4+
"github.com/deis/workflow-cli/client/pkg/git"
55
)
66

77
// GitRemote creates a git remote for a deis app.

‎cmd/keys.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import (
88
"strconv"
99
"strings"
1010

11-
"github.com/deis/workflow/client/controller/api"
12-
"github.com/deis/workflow/client/controller/client"
13-
"github.com/deis/workflow/client/controller/models/keys"
11+
"github.com/deis/workflow-cli/client/controller/api"
12+
"github.com/deis/workflow-cli/client/controller/client"
13+
"github.com/deis/workflow-cli/client/controller/models/keys"
1414
)
1515

1616
// KeysList lists a user's keys.

0 commit comments

Comments
 (0)