Make error message more verbose

jtyr · Apr 23, 2021 · 18f77bb · 18f77bb
1 parent f0800d0
commit 18f77bb
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 22 deletions.
diff --git a/pkg/apikey/apikeyCreate.go b/pkg/apikey/apikeyCreate.go
@@ -2,7 +2,6 @@ package apikey
 
 import (
 	"encoding/json"
-	"errors"
 	"fmt"
 
 	_client "github.com/jtyr/gcapi/pkg/client"
@@ -37,7 +36,7 @@ func (a *APIKey) Create() (string, string, error) {
 	body, statusCode, err := client.Post(data)
 	if err != nil {
 		if statusCode == 409 {
-			return "", "", errors.New("API key with this name already exists")
+			return "", "", fmt.Errorf("API key with this name already exists: %s", err)
 		}
 
 		return "", "", err

diff --git a/pkg/apikey/apikeyDelete.go b/pkg/apikey/apikeyDelete.go
@@ -1,7 +1,6 @@
 package apikey
 
 import (
-	"errors"
 	"fmt"
 
 	_client "github.com/jtyr/gcapi/pkg/client"
@@ -20,7 +19,7 @@ func (a *APIKey) Delete() (string, int, error) {
 	body, statusCode, err := client.Delete()
 	if err != nil {
 		if statusCode == 404 {
-			return "", consts.ExitNotFound, errors.New("API key not found")
+			return "", consts.ExitNotFound, fmt.Errorf("API key not found: %s", err)
 		}
 
 		return "", consts.ExitError, err

diff --git a/pkg/apikey/apikeyList.go b/pkg/apikey/apikeyList.go
@@ -2,7 +2,6 @@ package apikey
 
 import (
 	"encoding/json"
-	"errors"
 	"fmt"
 
 	_client "github.com/jtyr/gcapi/pkg/client"
@@ -36,9 +35,9 @@ func (a *APIKey) List() (*[]ListItem, string, int, error) {
 	body, statusCode, err := client.Get()
 	if err != nil {
 		if a.Name == "" && statusCode == 404 {
-			return nil, "", consts.ExitError, errors.New("Org Slug not found")
+			return nil, "", consts.ExitError, fmt.Errorf("Org Slug not found: %s", err)
 		} else if a.Name != "" && statusCode == 404 {
-			return nil, "", consts.ExitNotFound, errors.New("key not found")
+			return nil, "", consts.ExitNotFound, fmt.Errorf("key not found: %s", err)
 		}
 
 		return nil, "", consts.ExitError, err

diff --git a/pkg/grafana/apikey/apikeyCreate.go b/pkg/grafana/apikey/apikeyCreate.go
@@ -2,7 +2,6 @@ package apikey
 
 import (
 	"encoding/json"
-	"errors"
 	"fmt"
 
 	_client "github.com/jtyr/gcapi/pkg/client"
@@ -61,7 +60,7 @@ func (a *APIKey) Create() (string, string, error) {
 	body, statusCode, err := client.Post(data)
 	if err != nil {
 		if statusCode == 409 {
-			return "", "", errors.New("API key with this name already exists")
+			return "", "", fmt.Errorf("API key with this name already exists: %s", err)
 		}
 
 		return "", "", err

diff --git a/pkg/grafana/apikey/apikeyDelete.go b/pkg/grafana/apikey/apikeyDelete.go
@@ -45,15 +45,15 @@ func (a *APIKey) Delete() (string, int, error) {
 	}
 
 	if keyID == -1 {
-		return "", consts.ExitNotFound, errors.New("API key not found")
+		return "", consts.ExitNotFound, errors.New("API key not found in the list of API keys")
 	}
 
 	client.Endpoint = fmt.Sprintf(a.GrafanaEndpoint+"/%d", keyID)
 
 	body, statusCode, err := client.Delete()
 	if err != nil {
 		if statusCode == 404 {
-			return "", consts.ExitNotFound, errors.New("API key not found")
+			return "", consts.ExitNotFound, fmt.Errorf("API key not found: %s", err)
 		}
 
 		return "", consts.ExitError, err

diff --git a/pkg/grafana/apikey/apikeyList.go b/pkg/grafana/apikey/apikeyList.go
@@ -2,7 +2,6 @@ package apikey
 
 import (
 	"encoding/json"
-	"errors"
 	"fmt"
 
 	_client "github.com/jtyr/gcapi/pkg/client"
@@ -45,7 +44,7 @@ func (a *APIKey) List() (*ListResp, string, error) {
 	body, statusCode, err := client.Get()
 	if err != nil {
 		if statusCode == 404 {
-			return nil, "", errors.New("Grafana instance not found")
+			return nil, "", fmt.Errorf("Grafana instance not found: %s", err)
 		}
 
 		return nil, "", err

diff --git a/pkg/grafana/grafanaRestart.go b/pkg/grafana/grafanaRestart.go
@@ -1,7 +1,6 @@
 package grafana
 
 import (
-	"errors"
 	"fmt"
 
 	_client "github.com/jtyr/gcapi/pkg/client"
@@ -19,7 +18,7 @@ func (g *Grafana) Restart() (string, error) {
 	body, statusCode, err := client.Post(nil)
 	if err != nil {
 		if statusCode == 404 {
-			return "", errors.New("Stack Slug not found")
+			return "", fmt.Errorf("Stack Slug not found: %s", err)
 		}
 
 		return "", err

diff --git a/pkg/stack/stackCreate.go b/pkg/stack/stackCreate.go
@@ -2,7 +2,6 @@ package stack
 
 import (
 	"encoding/json"
-	"errors"
 	"fmt"
 
 	_client "github.com/jtyr/gcapi/pkg/client"
@@ -32,7 +31,7 @@ func (s *Stack) Create() (*ListItem, string, error) {
 	body, statusCode, err := client.Post(data)
 	if err != nil {
 		if statusCode == 409 {
-			return nil, "", errors.New("stack with this name already exists")
+			return nil, "", fmt.Errorf("stack with this name already exists: %s", err)
 		}
 
 		return nil, "", err

diff --git a/pkg/stack/stackDelete.go b/pkg/stack/stackDelete.go
@@ -1,7 +1,6 @@
 package stack
 
 import (
-	"errors"
 	"fmt"
 
 	_client "github.com/jtyr/gcapi/pkg/client"
@@ -20,7 +19,7 @@ func (s *Stack) Delete() (string, int, error) {
 	body, statusCode, err := client.Delete()
 	if err != nil {
 		if statusCode == 404 {
-			return "", consts.ExitNotFound, errors.New("API key not found")
+			return "", consts.ExitNotFound, fmt.Errorf("API key not found: %s", err)
 		}
 
 		return "", consts.ExitError, err

diff --git a/pkg/stack/stackList.go b/pkg/stack/stackList.go
@@ -2,7 +2,6 @@ package stack
 
 import (
 	"encoding/json"
-	"errors"
 	"fmt"
 
 	_client "github.com/jtyr/gcapi/pkg/client"
@@ -46,9 +45,9 @@ func (s *Stack) List() (*[]ListItem, string, int, error) {
 	body, statusCode, err := client.Get()
 	if err != nil {
 		if s.StackSlug == "" && statusCode == 404 {
-			return nil, "", consts.ExitError, errors.New("Org Slug not found")
+			return nil, "", consts.ExitError, fmt.Errorf("Org Slug not found: %s", err)
 		} else if s.StackSlug != "" && statusCode == 404 {
-			return nil, "", consts.ExitNotFound, errors.New("Stack not found")
+			return nil, "", consts.ExitNotFound, fmt.Errorf("Stack not found: %s", err)
 		}
 
 		return nil, "", consts.ExitError, err