feat(*): update controller-go-sdk (#87)

Author: Joshua-Anderson

cmd/auth.go

@@ -8,7 +8,7 @@ import (
 	"strings"
 	"syscall"
 
-	client "github.com/deis/controller-sdk-go"
+	deis "github.com/deis/controller-sdk-go"
 	"github.com/deis/controller-sdk-go/auth"
 	"github.com/deis/workflow-cli/settings"
 	"golang.org/x/crypto/ssh/terminal"
@@ -18,7 +18,7 @@ import (
 func Register(controller string, username string, password string, email string,
 	sslVerify bool) error {
 
-	c, err := client.New(sslVerify, controller, "", "")
+	c, err := deis.New(sslVerify, controller, "", "")
 
 	if err != nil {
 		return err
@@ -76,7 +76,7 @@ func Register(controller string, username string, password string, email string,
 	return doLogin(c, username, password)
 }
 
-func doLogin(c *client.Client, username, password string) error {
+func doLogin(c *deis.Client, username, password string) error {
 	token, err := auth.Login(c, username, password)
 	if checkAPICompatibility(c, err) != nil {
 		return err
@@ -97,7 +97,7 @@ func doLogin(c *client.Client, username, password string) error {
 
 // Login to a Deis controller.
 func Login(controller string, username string, password string, sslVerify bool) error {
-	c, err := client.New(sslVerify, controller, "", "")
+	c, err := deis.New(sslVerify, controller, "", "")
 
 	if err != nil {
 		return err

cmd/certs.go

@@ -117,7 +117,7 @@ func CertAdd(cert string, key string, name string) error {
 	return nil
 }
 
-func doCertAdd(c *client.Client, cert string, key string, name string) error {
+func doCertAdd(c *deis.Client, cert string, key string, name string) error {
 	certFile, err := ioutil.ReadFile(cert)
 	if err != nil {
 		return err

cmd/perms.go

@@ -98,7 +98,7 @@ func PermDelete(appID string, username string, admin bool) error {
 	return nil
 }
 
-func permsLoad(appID string, admin bool) (*client.Client, string, error) {
+func permsLoad(appID string, admin bool) (*deis.Client, string, error) {
 	c, err := settings.Load()
 
 	if err != nil {

cmd/utils.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 	"time"
 
-	client "github.com/deis/controller-sdk-go"
+	deis "github.com/deis/controller-sdk-go"
 	"github.com/deis/workflow-cli/pkg/git"
 	"github.com/deis/workflow-cli/settings"
 )
@@ -54,7 +54,7 @@ func chooseColor(input string) string {
 	return fmt.Sprintf("\033[3%dm", color)
 }
 
-func load(appID string) (*client.Client, string, error) {
+func load(appID string) (*deis.Client, string, error) {
 	c, err := settings.Load()
 
 	if err != nil {
@@ -92,12 +92,12 @@ func limitCount(objs, total int) string {
 
 // checkAPICompatibility handles specific behavior for certain errors,
 // such as printing an warning for the API mismatch error
-func checkAPICompatibility(c *client.Client, err error) error {
-	if err == client.ErrAPIMismatch {
+func checkAPICompatibility(c *deis.Client, err error) error {
+	if err == deis.ErrAPIMismatch {
 		fmt.Printf(`!    WARNING: Client and server API versions do not match. Please consider upgrading.
 !    Client version: %s
 !    Server version: %s
-`, client.APIVersion, c.ControllerAPIVersion)
+`, deis.APIVersion, c.ControllerAPIVersion)
 
 		// API mismatch isn't fatal, so after warning continue on.
 		return nil

glide.lock

@@ -7,7 +7,7 @@ import (
 	"os"
 	"path/filepath"
 
-	client "github.com/deis/controller-sdk-go"
+	deis "github.com/deis/controller-sdk-go"
 	"github.com/deis/workflow-cli/version"
 )
 
@@ -23,7 +23,7 @@ type settingsFile struct {
 }
 
 // Load loads a new client from a settings file.
-func Load() (*client.Client, error) {
+func Load() (*deis.Client, error) {
 	filename := locateSettingsFile()
 
 	if _, err := os.Stat(filename); err != nil {
@@ -44,7 +44,7 @@ func Load() (*client.Client, error) {
 		return nil, err
 	}
 
-	c, err := client.New(settings.VerifySSL, settings.Controller, settings.Token, settings.Username)
+	c, err := deis.New(settings.VerifySSL, settings.Controller, settings.Token, settings.Username)
 
 	if err != nil {
 		return nil, err
@@ -62,7 +62,7 @@ func Load() (*client.Client, error) {
 }
 
 // Save settings to a file
-func Save(c *client.Client) error {
+func Save(c *deis.Client) error {
 	settings := settingsFile{Username: c.Username, VerifySSL: c.VerifySSL,
 		Controller: c.ControllerURL.String(), Token: c.Token, Limit: c.ResponseLimit}