Moves error handling from transport to atlas.go

Author: cveticm

cmd/atlas/atlas.go

@@ -21,6 +21,7 @@ import (
 	"strings"
 
 	"github.com/AlecAivazis/survey/v2/core"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/commonerrors"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/root"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/config"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/telemetry"
@@ -36,6 +37,10 @@ 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)
+		if errMsg != nil {
+			fmt.Println(errMsg)
+		}
 		if !telemetry.StartedTrackingCommand() {
 			telemetry.StartTrackingCommand(cmd, os.Args[1:])
 		}

internal/cli/commonerrors/errors.go

@@ -16,6 +16,7 @@ package commonerrors
 
 import (
 	"errors"
+	"strings"
 
 	"go.mongodb.org/atlas-sdk/v20250312005/admin"
 )
@@ -24,6 +25,9 @@ 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
+	
+To log in using your Atlas username and password or to set credentials using API key, run: atlas auth login`)
 )
 
 const (
@@ -49,6 +53,13 @@ func Check(err error) error {
 	return err
 }
 
+func CheckHTTPError(err error) error {
+	if strings.Contains(err.Error(), "401") && strings.Contains(err.Error(), "Unauthorized") {
+		return errUnauthorized
+	}
+	return nil
+}
+
 func IsAsymmetricShardUnsupported(err error) bool {
 	apiError, ok := admin.AsError(err)
 	if !ok {

internal/cli/commonerrors/errors_test.go

@@ -67,3 +67,33 @@ func TestCheck(t *testing.T) {
 		})
 	}
 }
+
+func TestCheckCommonErrors(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: []`)
+
+	testCases := []struct {
+		name string
+		err  error
+		want error
+	}{
+		{
+			name: "unauthorized error",
+			err:  testErr,
+			want: errUnauthorized,
+		},
+		{
+			name: "arbitrary error",
+			err:  dummyErr,
+			want: nil,
+		},
+	}
+
+	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)
+			}
+		})
+	}
+}

internal/store/store.go

@@ -71,8 +71,7 @@ func (s *Store) httpClient(httpTransport http.RoundTripper) (*http.Client, error
 
 		return &http.Client{Transport: tr}, nil
 	default:
-		tr := &transport.AuthRequiredRoundTripper{Base: httpTransport}
-		return &http.Client{Transport: tr}, nil
+		return &http.Client{Transport: httpTransport}, nil
 	}
 }
 

internal/transport/transport.go

@@ -15,15 +15,13 @@
 package transport
 
 import (
-	"fmt"
 	"net"
 	"net/http"
 	"time"
 
 	"github.com/mongodb-forks/digest"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/config"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/oauth"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/validate"
 	atlasauth "go.mongodb.org/atlas/auth"
 )
 
@@ -112,24 +110,3 @@ func (tr *tokenTransport) RoundTrip(req *http.Request) (*http.Response, error) {
 
 	return tr.base.RoundTrip(req)
 }
-
-type AuthRequiredRoundTripper struct {
-	Base http.RoundTripper
-}
-
-func (tr *AuthRequiredRoundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
-	resp, err := tr.Base.RoundTrip(req)
-	if resp != nil && resp.StatusCode == http.StatusUnauthorized {
-		return nil, 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`,
-			validate.ErrMissingCredentials,
-		)
-	}
-	if err != nil {
-		return nil, err
-	}
-	return resp, nil
-}