fix(limitRequest): check for ErrAPIMismatch (#71)

Author: Joshua-Anderson

apps/apps.go

@@ -23,18 +23,18 @@ var ErrNoLogs = errors.New(
 
 // List lists apps on a Deis controller.
 func List(c *deis.Client, results int) (api.Apps, int, error) {
-	body, count, err := c.LimitedRequest("/v2/apps/", results)
+	body, count, reqErr := c.LimitedRequest("/v2/apps/", results)
 
-	if err != nil {
-		return []api.App{}, -1, err
+	if reqErr != nil && !deis.IsErrAPIMismatch(reqErr) {
+		return []api.App{}, -1, reqErr
 	}
 
 	var apps []api.App
-	if err = json.Unmarshal([]byte(body), &apps); err != nil {
+	if err := json.Unmarshal([]byte(body), &apps); err != nil {
 		return []api.App{}, -1, err
 	}
 
-	return apps, count, nil
+	return apps, count, reqErr
 }
 
 // New creates a new app with the given appID. Passing an empty string will result in

builds/builds.go

@@ -14,18 +14,18 @@ import (
 // List lists an app's builds.
 func List(c *deis.Client, appID string, results int) ([]api.Build, int, error) {
 	u := fmt.Sprintf("/v2/apps/%s/builds/", appID)
-	body, count, err := c.LimitedRequest(u, results)
+	body, count, reqErr := c.LimitedRequest(u, results)
 
-	if err != nil {
-		return []api.Build{}, -1, err
+	if reqErr != nil && !deis.IsErrAPIMismatch(reqErr) {
+		return []api.Build{}, -1, reqErr
 	}
 
 	var builds []api.Build
-	if err = json.Unmarshal([]byte(body), &builds); err != nil {
+	if err := json.Unmarshal([]byte(body), &builds); err != nil {
 		return []api.Build{}, -1, err
 	}
 
-	return builds, count, nil
+	return builds, count, reqErr
 }
 
 // New creates a build for an app from an docker image.

certs/certs.go

@@ -13,18 +13,18 @@ import (
 
 // List lists certificates added to deis.
 func List(c *deis.Client, results int) ([]api.Cert, int, error) {
-	body, count, err := c.LimitedRequest("/v2/certs/", results)
+	body, count, reqErr := c.LimitedRequest("/v2/certs/", results)
 
-	if err != nil {
-		return []api.Cert{}, -1, err
+	if reqErr != nil && !deis.IsErrAPIMismatch(reqErr) {
+		return []api.Cert{}, -1, reqErr
 	}
 
 	var res []api.Cert
-	if err = json.Unmarshal([]byte(body), &res); err != nil {
+	if err := json.Unmarshal([]byte(body), &res); err != nil {
 		return []api.Cert{}, -1, err
 	}
 
-	return res, count, nil
+	return res, count, reqErr
 }
 
 // New creates a new certificate.

domains/domains.go

@@ -14,18 +14,18 @@ import (
 // List domains registered with an app.
 func List(c *deis.Client, appID string, results int) (api.Domains, int, error) {
 	u := fmt.Sprintf("/v2/apps/%s/domains/", appID)
-	body, count, err := c.LimitedRequest(u, results)
+	body, count, reqErr := c.LimitedRequest(u, results)
 
-	if err != nil {
-		return []api.Domain{}, -1, err
+	if reqErr != nil && !deis.IsErrAPIMismatch(reqErr) {
+		return []api.Domain{}, -1, reqErr
 	}
 
 	var domains []api.Domain
-	if err = json.Unmarshal([]byte(body), &domains); err != nil {
+	if err := json.Unmarshal([]byte(body), &domains); err != nil {
 		return []api.Domain{}, -1, err
 	}
 
-	return domains, count, nil
+	return domains, count, reqErr
 }
 
 // New adds a domain to an app.

keys/keys.go

@@ -13,18 +13,18 @@ import (
 
 // List lists a user's ssh keys.
 func List(c *deis.Client, results int) (api.Keys, int, error) {
-	body, count, err := c.LimitedRequest("/v2/keys/", results)
+	body, count, reqErr := c.LimitedRequest("/v2/keys/", results)
 
-	if err != nil {
-		return []api.Key{}, -1, err
+	if reqErr != nil && !deis.IsErrAPIMismatch(reqErr) {
+		return []api.Key{}, -1, reqErr
 	}
 
 	var keys []api.Key
-	if err = json.Unmarshal([]byte(body), &keys); err != nil {
+	if err := json.Unmarshal([]byte(body), &keys); err != nil {
 		return []api.Key{}, -1, err
 	}
 
-	return keys, count, nil
+	return keys, count, reqErr
 }
 
 // New adds a new ssh key for the user. This is used for authenting with the git

perms/perms.go

@@ -33,14 +33,14 @@ func List(c *deis.Client, appID string) ([]string, error) {
 
 // ListAdmins lists deis platform administrators.
 func ListAdmins(c *deis.Client, results int) ([]string, int, error) {
-	body, count, err := c.LimitedRequest("/v2/admin/perms/", results)
+	body, count, reqErr := c.LimitedRequest("/v2/admin/perms/", results)
 
-	if err != nil {
-		return []string{}, -1, err
+	if reqErr != nil && !deis.IsErrAPIMismatch(reqErr) {
+		return []string{}, -1, reqErr
 	}
 
 	var users []api.PermsRequest
-	if err = json.Unmarshal([]byte(body), &users); err != nil {
+	if err := json.Unmarshal([]byte(body), &users); err != nil {
 		return []string{}, -1, err
 	}
 
@@ -50,7 +50,7 @@ func ListAdmins(c *deis.Client, results int) ([]string, int, error) {
 		usersList = append(usersList, user.Username)
 	}
 
-	return usersList, count, nil
+	return usersList, count, reqErr
 }
 
 // New gives a user access to an app.

ps/ps.go

@@ -14,17 +14,17 @@ import (
 // List lists an app's processes.
 func List(c *deis.Client, appID string, results int) ([]api.Pods, int, error) {
 	u := fmt.Sprintf("/v2/apps/%s/pods/", appID)
-	body, count, err := c.LimitedRequest(u, results)
-	if err != nil {
-		return []api.Pods{}, -1, err
+	body, count, reqErr := c.LimitedRequest(u, results)
+	if reqErr != nil && !deis.IsErrAPIMismatch(reqErr) {
+		return []api.Pods{}, -1, reqErr
 	}
 
 	var procs []api.Pods
-	if err = json.Unmarshal([]byte(body), &procs); err != nil {
+	if err := json.Unmarshal([]byte(body), &procs); err != nil {
 		return []api.Pods{}, -1, err
 	}
 
-	return procs, count, nil
+	return procs, count, reqErr
 }
 
 // Scale increases or decreases an app's processes. The processes are specified in the target argument,

releases/releases.go

@@ -15,18 +15,18 @@ import (
 func List(c *deis.Client, appID string, results int) ([]api.Release, int, error) {
 	u := fmt.Sprintf("/v2/apps/%s/releases/", appID)
 
-	body, count, err := c.LimitedRequest(u, results)
+	body, count, reqErr := c.LimitedRequest(u, results)
 
-	if err != nil {
-		return []api.Release{}, -1, err
+	if reqErr != nil && !deis.IsErrAPIMismatch(reqErr) {
+		return []api.Release{}, -1, reqErr
 	}
 
 	var releases []api.Release
-	if err = json.Unmarshal([]byte(body), &releases); err != nil {
+	if err := json.Unmarshal([]byte(body), &releases); err != nil {
 		return []api.Release{}, -1, err
 	}
 
-	return releases, count, nil
+	return releases, count, reqErr
 }
 
 // Get retrieves a release of an app.

users/users.go

@@ -10,16 +10,16 @@ import (
 
 // List lists users registered with the controller.
 func List(c *deis.Client, results int) (api.Users, int, error) {
-	body, count, err := c.LimitedRequest("/v2/users/", results)
+	body, count, reqErr := c.LimitedRequest("/v2/users/", results)
 
-	if err != nil {
-		return []api.User{}, -1, err
+	if reqErr != nil && !deis.IsErrAPIMismatch(reqErr) {
+		return []api.User{}, -1, reqErr
 	}
 
 	var users []api.User
-	if err = json.Unmarshal([]byte(body), &users); err != nil {
+	if err := json.Unmarshal([]byte(body), &users); err != nil {
 		return []api.User{}, -1, err
 	}
 
-	return users, count, nil
+	return users, count, reqErr
 }