fix(*): fix more import paths

Aaron Schlesinger · Aaron Schlesinger · commit 7564297b1911 · 2016-03-07T13:28:43.000-08:00
these weren’t caught in the make test command because the cli was being
mounted to ‘github.com/deis/workflow-cli/client’, which was making them
work
diff --git a/client/http.go b/client/http.go
@@ -13,7 +13,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/deis/workflow-cli/client/version"
+	"github.com/deis/workflow-cli/version"
 )
 
 // CreateHTTPClient creates a HTTP Client with proper SSL options.
diff --git a/client/http_test.go b/client/http_test.go
@@ -8,7 +8,7 @@ import (
 	"net/url"
 	"testing"
 
-	"github.com/deis/workflow-cli/client/version"
+	"github.com/deis/workflow-cli/version"
 )
 
 type fakeHTTPServer struct{}
diff --git a/client/utils.go b/client/utils.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"path"
 
-	"github.com/deis/workflow-cli/client/version"
+	"github.com/deis/workflow-cli/version"
 )
 
 func locateSettingsFile() string {
diff --git a/models/apps/apps.go b/models/apps/apps.go
@@ -6,8 +6,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/deis/workflow-cli/client/controller/api"
-	"github.com/deis/workflow-cli/client/controller/client"
+	"github.com/deis/workflow-cli/controller/api"
+	"github.com/deis/workflow-cli/controller/client"
 )
 
 const workflowURLPrefix = "deis."
diff --git a/models/apps/apps_test.go b/models/apps/apps_test.go
@@ -9,9 +9,9 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/deis/workflow-cli/client/controller/api"
-	"github.com/deis/workflow-cli/client/controller/client"
-	"github.com/deis/workflow-cli/client/version"
+	"github.com/deis/workflow-cli/controller/api"
+	"github.com/deis/workflow-cli/controller/client"
+	"github.com/deis/workflow-cli/version"
 )
 
 const appFixture string = `
diff --git a/models/auth/auth.go b/models/auth/auth.go
@@ -3,8 +3,8 @@ package auth
 import (
 	"encoding/json"
 
-	"github.com/deis/workflow-cli/client/controller/api"
-	"github.com/deis/workflow-cli/client/controller/client"
+	"github.com/deis/workflow-cli/controller/api"
+	"github.com/deis/workflow-cli/controller/client"
 )
 
 // Register a new user with the controller.
diff --git a/models/auth/auth_test.go b/models/auth/auth_test.go
@@ -9,8 +9,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/deis/workflow-cli/client/controller/client"
-	"github.com/deis/workflow-cli/client/version"
+	"github.com/deis/workflow-cli/controller/client"
+	"github.com/deis/workflow-cli/version"
 )
 
 const registerExpected string = `{"username":"test","password":"opensesame","email":"test@example.com"}`
diff --git a/models/builds/builds.go b/models/builds/builds.go
@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/deis/workflow-cli/client/controller/api"
-	"github.com/deis/workflow-cli/client/controller/client"
+	"github.com/deis/workflow-cli/controller/api"
+	"github.com/deis/workflow-cli/controller/client"
 )
 
 // List lists an app's builds.
diff --git a/models/builds/builds_test.go b/models/builds/builds_test.go
@@ -9,9 +9,9 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/deis/workflow-cli/client/controller/api"
-	"github.com/deis/workflow-cli/client/controller/client"
-	"github.com/deis/workflow-cli/client/version"
+	"github.com/deis/workflow-cli/controller/api"
+	"github.com/deis/workflow-cli/controller/client"
+	"github.com/deis/workflow-cli/version"
 )
 
 const buildsFixture string = `
diff --git a/models/certs/certs.go b/models/certs/certs.go
@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/deis/workflow-cli/client/controller/api"
-	"github.com/deis/workflow-cli/client/controller/client"
+	"github.com/deis/workflow-cli/controller/api"
+	"github.com/deis/workflow-cli/controller/client"
 )
 
 // List certs registered with the controller.
diff --git a/models/certs/certs_test.go b/models/certs/certs_test.go
@@ -10,9 +10,9 @@ import (
 	"testing"
 
 	"github.com/deis/pkg/time"
-	"github.com/deis/workflow-cli/client/controller/api"
-	"github.com/deis/workflow-cli/client/controller/client"
-	"github.com/deis/workflow-cli/client/version"
+	"github.com/deis/workflow-cli/controller/api"
+	"github.com/deis/workflow-cli/controller/client"
+	"github.com/deis/workflow-cli/version"
 )
 
 const certsFixture string = `
diff --git a/models/config/config.go b/models/config/config.go
@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/deis/workflow-cli/client/controller/api"
-	"github.com/deis/workflow-cli/client/controller/client"
+	"github.com/deis/workflow-cli/controller/api"
+	"github.com/deis/workflow-cli/controller/client"
 )
 
 // List lists an app's config.
diff --git a/models/config/config_test.go b/models/config/config_test.go
@@ -9,9 +9,9 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/deis/workflow-cli/client/controller/api"
-	"github.com/deis/workflow-cli/client/controller/client"
-	"github.com/deis/workflow-cli/client/version"
+	"github.com/deis/workflow-cli/controller/api"
+	"github.com/deis/workflow-cli/controller/client"
+	"github.com/deis/workflow-cli/version"
 )
 
 const configFixture string = `
diff --git a/models/domains/domains.go b/models/domains/domains.go
@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/deis/workflow-cli/client/controller/api"
-	"github.com/deis/workflow-cli/client/controller/client"
+	"github.com/deis/workflow-cli/controller/api"
+	"github.com/deis/workflow-cli/controller/client"
 )
 
 // List domains registered with an app.
diff --git a/models/domains/domains_test.go b/models/domains/domains_test.go
@@ -9,9 +9,9 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/deis/workflow-cli/client/controller/api"
-	"github.com/deis/workflow-cli/client/controller/client"
-	"github.com/deis/workflow-cli/client/version"
+	"github.com/deis/workflow-cli/controller/api"
+	"github.com/deis/workflow-cli/controller/client"
+	"github.com/deis/workflow-cli/version"
 )
 
 const domainsFixture string = `
diff --git a/models/keys/keys.go b/models/keys/keys.go
@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/deis/workflow-cli/client/controller/api"
-	"github.com/deis/workflow-cli/client/controller/client"
+	"github.com/deis/workflow-cli/controller/api"
+	"github.com/deis/workflow-cli/controller/client"
 )
 
 // List keys on a controller.
diff --git a/models/keys/keys_test.go b/models/keys/keys_test.go
@@ -9,9 +9,9 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/deis/workflow-cli/client/controller/api"
-	"github.com/deis/workflow-cli/client/controller/client"
-	"github.com/deis/workflow-cli/client/version"
+	"github.com/deis/workflow-cli/controller/api"
+	"github.com/deis/workflow-cli/controller/client"
+	"github.com/deis/workflow-cli/version"
 )
 
 const keysFixture string = `
diff --git a/models/perms/perms.go b/models/perms/perms.go
@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/deis/workflow-cli/client/controller/api"
-	"github.com/deis/workflow-cli/client/controller/client"
+	"github.com/deis/workflow-cli/controller/api"
+	"github.com/deis/workflow-cli/controller/client"
 )
 
 // List users that can access an app.
diff --git a/models/perms/perms_test.go b/models/perms/perms_test.go
@@ -9,8 +9,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/deis/workflow-cli/client/controller/client"
-	"github.com/deis/workflow-cli/client/version"
+	"github.com/deis/workflow-cli/controller/client"
+	"github.com/deis/workflow-cli/version"
 )
 
 const adminFixture string = `
diff --git a/models/ps/ps.go b/models/ps/ps.go
@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/deis/workflow-cli/client/controller/api"
-	"github.com/deis/workflow-cli/client/controller/client"
+	"github.com/deis/workflow-cli/controller/api"
+	"github.com/deis/workflow-cli/controller/client"
 )
 
 // List an app's processes.
diff --git a/models/ps/ps_test.go b/models/ps/ps_test.go
@@ -10,9 +10,9 @@ import (
 	"testing"
 
 	"github.com/deis/pkg/time"
-	"github.com/deis/workflow-cli/client/controller/api"
-	"github.com/deis/workflow-cli/client/controller/client"
-	"github.com/deis/workflow-cli/client/version"
+	"github.com/deis/workflow-cli/controller/api"
+	"github.com/deis/workflow-cli/controller/client"
+	"github.com/deis/workflow-cli/version"
 )
 
 const processesFixture string = `
diff --git a/models/releases/releases.go b/models/releases/releases.go
@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/deis/workflow-cli/client/controller/api"
-	"github.com/deis/workflow-cli/client/controller/client"
+	"github.com/deis/workflow-cli/controller/api"
+	"github.com/deis/workflow-cli/controller/client"
 )
 
 // List lists an app's releases.
diff --git a/models/releases/releases_test.go b/models/releases/releases_test.go
@@ -9,9 +9,9 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/deis/workflow-cli/client/controller/api"
-	"github.com/deis/workflow-cli/client/controller/client"
-	"github.com/deis/workflow-cli/client/version"
+	"github.com/deis/workflow-cli/controller/api"
+	"github.com/deis/workflow-cli/controller/client"
+	"github.com/deis/workflow-cli/version"
 )
 
 const releasesFixture string = `
diff --git a/models/users/users.go b/models/users/users.go
@@ -3,8 +3,8 @@ package users
 import (
 	"encoding/json"
 
-	"github.com/deis/workflow-cli/client/controller/api"
-	"github.com/deis/workflow-cli/client/controller/client"
+	"github.com/deis/workflow-cli/controller/api"
+	"github.com/deis/workflow-cli/controller/client"
 )
 
 // List users registered with the controller.
diff --git a/models/users/users_test.go b/models/users/users_test.go
@@ -8,9 +8,9 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/deis/workflow-cli/client/controller/api"
-	"github.com/deis/workflow-cli/client/controller/client"
-	"github.com/deis/workflow-cli/client/version"
+	"github.com/deis/workflow-cli/controller/api"
+	"github.com/deis/workflow-cli/controller/client"
+	"github.com/deis/workflow-cli/version"
 )
 
 const usersFixture string = `

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ import (`
`13`	`13`	`"strconv"`
`14`	`14`	`"strings"`
`15`	`15`
`16`		`- "github.com/deis/workflow-cli/client/version"`
	`16`	`+ "github.com/deis/workflow-cli/version"`
`17`	`17`	`)`
`18`	`18`
`19`	`19`	`// CreateHTTPClient creates a HTTP Client with proper SSL options.`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`"net/url"`
`9`	`9`	`"testing"`
`10`	`10`
`11`		`- "github.com/deis/workflow-cli/client/version"`
	`11`	`+ "github.com/deis/workflow-cli/version"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`type fakeHTTPServer struct{}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"os"`
`6`	`6`	`"path"`
`7`	`7`
`8`		`- "github.com/deis/workflow-cli/client/version"`
	`8`	`+ "github.com/deis/workflow-cli/version"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`func locateSettingsFile() string {`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@ import (`
`6`	`6`	`"strconv"`
`7`	`7`	`"strings"`
`8`	`8`
`9`		`- "github.com/deis/workflow-cli/client/controller/api"`
`10`		`- "github.com/deis/workflow-cli/client/controller/client"`
	`9`	`+ "github.com/deis/workflow-cli/controller/api"`
	`10`	`+ "github.com/deis/workflow-cli/controller/client"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`const workflowURLPrefix = "deis."`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@ package auth`
`3`	`3`	`import (`
`4`	`4`	`"encoding/json"`
`5`	`5`
`6`		`- "github.com/deis/workflow-cli/client/controller/api"`
`7`		`- "github.com/deis/workflow-cli/client/controller/client"`
	`6`	`+ "github.com/deis/workflow-cli/controller/api"`
	`7`	`+ "github.com/deis/workflow-cli/controller/client"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`// Register a new user with the controller.`
Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,8 @@ import (`
`9`	`9`	`"reflect"`
`10`	`10`	`"testing"`
`11`	`11`
`12`		`- "github.com/deis/workflow-cli/client/controller/client"`
`13`		`- "github.com/deis/workflow-cli/client/version"`
	`12`	`+ "github.com/deis/workflow-cli/controller/client"`
	`13`	`+ "github.com/deis/workflow-cli/version"`
`14`	`14`	`)`
`15`	`15`
`16`	`16`	const registerExpected string = `{"username":"test","password":"opensesame","email":"test@example.com"}`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@ import (`
`4`	`4`	`"encoding/json"`
`5`	`5`	`"fmt"`
`6`	`6`
`7`		`- "github.com/deis/workflow-cli/client/controller/api"`
`8`		`- "github.com/deis/workflow-cli/client/controller/client"`
	`7`	`+ "github.com/deis/workflow-cli/controller/api"`
	`8`	`+ "github.com/deis/workflow-cli/controller/client"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`// List lists an app's builds.`