fix naming

Author: cveticm

cmd/atlas/atlas.go

@@ -37,7 +37,7 @@ func execute(rootCmd *cobra.Command) {
 
 To learn more, see our documentation: https://www.mongodb.com/docs/atlas/cli/stable/connect-atlas-cli/`
 	if cmd, err := rootCmd.ExecuteContextC(ctx); err != nil {
-		errMsg := commonerrors.CheckHTTPError(err)
+		errMsg := commonerrors.CheckHTTPErrors(err)
 		if errMsg != nil {
 			fmt.Println(errMsg)
 		}

internal/cli/commonerrors/errors.go

@@ -25,9 +25,10 @@ var (
 	errClusterUnsupported         = errors.New("atlas supports this command only for M10+ clusters. You can upgrade your cluster by running the 'atlas cluster upgrade' command")
 	errOutsideVPN                 = errors.New("forbidden action outside access allow list, if you are a MongoDB employee double check your VPN connection")
 	errAsymmetricShardUnsupported = errors.New("trying to run a cluster wide scaling command on an independent shard scaling cluster. Use --autoScalingMode 'independentShardScaling' instead")
-	errUnauthorized               = errors.New(`this action requires authentication
+	ErrUnauthorized               = errors.New(`this action requires authentication
 	
-To log in using your Atlas username and password or to set credentials using API key, run: atlas auth login`)
+To log in using your Atlas username and password, run: atlas auth login
+To set credentials using API keys, run: atlas config init`)
 )
 
 const (
@@ -53,9 +54,9 @@ func Check(err error) error {
 	return err
 }
 
-func CheckHTTPError(err error) error {
+func CheckHTTPErrors(err error) error {
 	if strings.Contains(err.Error(), "401") && strings.Contains(err.Error(), "Unauthorized") {
-		return errUnauthorized
+		return ErrUnauthorized
 	}
 	return nil
 }

internal/cli/commonerrors/errors_test.go

@@ -68,7 +68,7 @@ func TestCheck(t *testing.T) {
 	}
 }
 
-func TestCheckCommonErrors(t *testing.T) {
+func TestCheckHTTPErrors(t *testing.T) {
 	dummyErr := errors.New("dummy error")
 	testErr := errors.New(`Error: https://cloud.mongodb.com/api/atlas/v2/groups/670e34d35a4f587387db2102/clusters GET: HTTP 401 Unauthorized (Error code: "") Detail: You are not authorized for this resource. Reason: Unauthorized. Params: []`)
 
@@ -80,7 +80,7 @@ func TestCheckCommonErrors(t *testing.T) {
 		{
 			name: "unauthorized error",
 			err:  testErr,
-			want: errUnauthorized,
+			want: ErrUnauthorized,
 		},
 		{
 			name: "arbitrary error",
@@ -91,8 +91,8 @@ func TestCheckCommonErrors(t *testing.T) {
 
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
-			if got := CheckHTTPError(tc.err); !errors.Is(got, tc.want) {
-				t.Errorf("CheckHTTPError(%v) = %v, want %v", tc.err, got, tc.want)
+			if got := CheckHTTPErrors(tc.err); !errors.Is(got, tc.want) {
+				t.Errorf("CheckHTTPErrors(%v) = %v, want %v", tc.err, got, tc.want)
 			}
 		})
 	}

internal/validate/validate.go

@@ -24,6 +24,7 @@ import (
 	"slices"
 	"strings"
 
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/commonerrors"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/config"
 )
 
@@ -95,8 +96,6 @@ func ObjectID(s string) error {
 	return nil
 }
 
-var ErrMissingCredentials = errors.New("this action requires authentication")
-
 // Credentials validates public and private API keys have been set.
 func Credentials() error {
 	if t, err := config.Token(); t != nil {
@@ -106,13 +105,7 @@ func Credentials() error {
 		return nil
 	}
 
-	return fmt.Errorf(
-		`%w
-
-To log in using your Atlas username and password, run: atlas auth login
-To set credentials using API keys, run: atlas config init`,
-		ErrMissingCredentials,
-	)
+	return commonerrors.ErrUnauthorized
 }
 
 var ErrAlreadyAuthenticatedAPIKeys = errors.New("already authenticated with an API key")