Fixing grafana apikey

README.md

@@ -135,11 +135,11 @@ gcapi-cli grafana restart mystackslug
 # Create Grafana API key
 gcapi-cli grafana apikey create mystackslug myname viewer
 # List Grafana API keys
-gcapi-cli grafana apikey list myorgslug mystackslug
+gcapi-cli grafana apikey list mystackslug
 # List a specific Grafana API key
-gcapi-cli grafana apikey list myorgslug mystackslug myname
+gcapi-cli grafana apikey list mystackslug myname
 # Delete a Grafana API key
-gcapi-cli grafana apikey delete myorgslug mystackslug myname
+gcapi-cli grafana apikey delete mystackslug myname
 
 ## Grafana API key (using only Grafana API)
 # Create Grafana API key

cmd/grafana/apikey/apikeyDelete.go

@@ -14,7 +14,7 @@ import (
 // NewCmdDelete returns a new cobra command.
 func NewCmdDelete() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:     "delete (ORG_SLUG STACK_SLUG|--grafana-api-url STRING) NAME",
+		Use:     "delete (STACK_SLUG|--grafana-api-url STRING) NAME",
 		Aliases: []string{"add"},
 		Short:   "Delete API key",
 		Long:    "Delete Grafana API keys in a specific Stack of the Grafana Cloud and print them out.",
@@ -57,20 +57,16 @@ func checkDeleteArgs(cmd *cobra.Command, args []string) error {
 		if err := ak.SetBaseURL(gauFlag); err != nil {
 			return err
 		}
-	} else if argsLen < 3 {
-		return errors.New("requires ORG_SLUG, STACK_SLUG and NAME argument")
-	} else if argsLen > 3 {
-		return errors.New("requires only ORG_SLUG, STACK_SLUG and NAME argument")
+	} else if argsLen < 2 {
+		return errors.New("requires STACK_SLUG and NAME argument")
+	} else if argsLen > 2 {
+		return errors.New("requires only STACK_SLUG and NAME argument")
 	} else {
-		if err := ak.SetOrgSlug(args[0]); err != nil {
+		if err := ak.SetStackSlug(args[0]); err != nil {
 			return err
 		}
 
-		if err := ak.SetStackSlug(args[1]); err != nil {
-			return err
-		}
-
-		if err := ak.SetName(args[2]); err != nil {
+		if err := ak.SetName(args[1]); err != nil {
 			return err
 		}
 

cmd/grafana/apikey/apikeyList.go

@@ -16,7 +16,7 @@ import (
 // NewCmdList returns a new cobra command.
 func NewCmdList() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:     "list (ORG_SLUG STACK_SLUG|--grafana-api-url STRING) [NAME]",
+		Use:     "list (STACK_SLUG|--grafana-api-url STRING) [NAME]",
 		Aliases: []string{"add"},
 		Short:   "List API keys",
 		Long:    "List Grafana API keys in a specific Stack of the Grafana Cloud and print them out.",
@@ -60,21 +60,15 @@ func checkListArgs(cmd *cobra.Command, args []string) error {
 	} else if argsLen == 0 {
 		cmd.Usage()
 		os.Exit(0)
-	} else if argsLen < 2 {
-		return errors.New("requires ORG_SLUG and STACK_SLUG argument")
-	} else if argsLen > 3 {
-		return errors.New("requires only ORG_SLUG, STACK_SLUG and optionally NAME argument")
+	} else if argsLen > 2 {
+		return errors.New("requires only STACK_SLUG and optionally NAME argument")
 	} else {
-		if err := ak.SetOrgSlug(args[0]); err != nil {
+		if err := ak.SetStackSlug(args[0]); err != nil {
 			return err
 		}
 
-		if err := ak.SetStackSlug(args[1]); err != nil {
-			return err
-		}
-
-		if argsLen == 3 {
-			if err := ak.SetName(args[2]); err != nil {
+		if argsLen == 2 {
+			if err := ak.SetName(args[1]); err != nil {
 				return err
 			}
 		}
@@ -97,9 +91,10 @@ func checkListArgs(cmd *cobra.Command, args []string) error {
 
 // runList runs the command's action.
 func runList(cmd *cobra.Command, args []string) {
-	list, raw, err := ak.List()
+	list, raw, ec, err := ak.List()
 	if err != nil {
-		log.Fatalf("failed to get API keys: %s", err)
+		log.Errorf("failed to get API keys: %s", err)
+		log.Exit(ec)
 	}
 
 	oraFlag, err := cmd.Flags().GetBool("only-role-admin")

pkg/grafana/apikey/apikeyCreate.go

@@ -22,22 +22,7 @@ type createResp struct {
 // Create creates a new Grafana API key and returns the value of the newly
 // created API key and the raw API response.
 func (a *APIKey) Create() (string, string, error) {
-	// Use Grafana API token
-	grafanaClientConfig := a.ClientConfig
-	grafanaClientConfig.Token = a.GrafanaToken
-
-	if a.BaseURL == "" {
-		// Get Grafana API URL
-		var err error
-		grafanaClientConfig.BaseURL, err = a.GetGrafanaAPIURL()
-		if err != nil {
-			return "", "", fmt.Errorf("failed to get Grafana API URL: %s", err)
-		}
-	} else {
-		grafanaClientConfig.BaseURL = a.BaseURL
-	}
-
-	client, err := _client.New(grafanaClientConfig)
+	client, err := _client.New(a.ClientConfig)
 	if err != nil {
 		return "", "", fmt.Errorf("failed to get client: %s", err)
 	}

pkg/grafana/apikey/apikeyDelete.go

@@ -33,7 +33,7 @@ func (a *APIKey) Delete() (string, int, error) {
 		return "", consts.ExitError, fmt.Errorf("failed to get client: %s", err)
 	}
 
-	list, _, err := a.List()
+	list, _, _, err := a.List()
 	if err != nil {
 		return "", consts.ExitError, fmt.Errorf("failed to get API key ID: %s", err)
 	}
@@ -52,7 +52,7 @@ func (a *APIKey) Delete() (string, int, error) {
 	}
 
 	// This is here only to be able to mock the Delete() response
-	if deleteClient.Transport != nil {
+	if deleteClient != nil && deleteClient.Transport != nil {
 		_client.Client = deleteClient
 		client, _ = _client.New(grafanaClientConfig)
 	}

pkg/grafana/apikey/apikeyList.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 
 	_client "github.com/jtyr/gcapi/pkg/client"
+	"github.com/jtyr/gcapi/pkg/consts"
 )
 
 // ListItem described properties of individual List item returned by the API.
@@ -18,7 +19,7 @@ type ListItem struct {
 type ListResp []ListItem
 
 // List lists Grafana API keys and returns the list and the raw API response.
-func (a *APIKey) List() (*ListResp, string, error) {
+func (a *APIKey) List() (*ListResp, string, int, error) {
 	// Use Grafana API token
 	grafanaClientConfig := a.ClientConfig
 	grafanaClientConfig.Token = a.GrafanaToken
@@ -28,32 +29,32 @@ func (a *APIKey) List() (*ListResp, string, error) {
 		var err error
 		grafanaClientConfig.BaseURL, err = a.GetGrafanaAPIURL()
 		if err != nil {
-			return nil, "", fmt.Errorf("failed to get Grafana API URL: %s", err)
+			return nil, "", consts.ExitError, fmt.Errorf("failed to get Grafana API URL: %s", err)
 		}
 	} else {
 		grafanaClientConfig.BaseURL = a.BaseURL
 	}
 
 	client, err := _client.New(grafanaClientConfig)
 	if err != nil {
-		return nil, "", fmt.Errorf("failed to get client: %s", err)
+		return nil, "", consts.ExitError, fmt.Errorf("failed to get client: %s", err)
 	}
 
 	client.Endpoint = a.GrafanaEndpoint
 
 	body, statusCode, err := client.Get()
 	if err != nil {
 		if statusCode == 404 {
-			return nil, "", fmt.Errorf("Grafana instance not found: %s", err)
+			return nil, "", consts.ExitNotFound, fmt.Errorf("Grafana instance not found: %s", err)
 		}
 
-		return nil, "", err
+		return nil, "", consts.ExitError, err
 	}
 
 	var jsonData ListResp
 	if err := json.Unmarshal(body, &jsonData); err != nil {
-		return nil, "", fmt.Errorf("cannot parse API response as JSON: %s", err)
+		return nil, "", consts.ExitError, fmt.Errorf("cannot parse API response as JSON: %s", err)
 	}
 
-	return &jsonData, string(body), nil
+	return &jsonData, string(body), consts.ExitOk, nil
 }

pkg/grafana/apikey/apikeyList_test.go

@@ -74,9 +74,9 @@ func TestAPIKeyList(t *testing.T) {
 		a := New()
 		a.SetBaseURL(test.baseURL)
 
-		list, body, err := a.List()
+		list, body, ec, err := a.List()
 		if !test.expectingError && err != nil {
-			t.Errorf("Test [%d]: failed to call List: %s", i, err)
+			t.Errorf("Test [%d]: failed to call List (exit code=%d): %s", i, ec, err)
 		}
 
 		if list != nil && len(*list) == 0 {

pkg/grafana/grafana_test.go

@@ -111,7 +111,6 @@ func TestGrafana(t *testing.T) {
 			expectingGrafanaAPIURLError: true,
 			expectingGrafanaTokenError:  true,
 			expectingNameError:          true,
-			expectingOrgSlugError:       true,
 			expectingStackSlugError:     true,
 			expectingTokenError:         true,
 			orgSlug:                     "testOrgSlug",
@@ -123,8 +122,6 @@ func TestGrafana(t *testing.T) {
 			expectingGrafanaAPIURLError: true,
 			expectingGrafanaTokenError:  true,
 			expectingNameError:          true,
-			expectingOrgSlugError:       true,
-			expectingStackSlugError:     true,
 			expectingTokenError:         true,
 			orgSlug:                     "testOrgSlug",
 			stackSlug:                   "testStackSlug",