refactor(ssh,pkg): return single error instead of slice on some methods

Author: henrybarreto

pkg/api/internalclient/mocks/internalclient.go

@@ -12,14 +12,14 @@ import (
 type namespaceAPI interface {
 	// NamespaceLookup retrieves namespace with the specified tenant.
 	// It returns the namespace and any encountered errors.
-	NamespaceLookup(ctx context.Context, tenant string) (*models.Namespace, []error)
+	NamespaceLookup(ctx context.Context, tenant string) (*models.Namespace, error)
 	// InviteMember sends an invitation to join the namespace with the specified tenant ID to the
 	// user with the specified id. The job will use the forwarded host to build the invitation link.
 	// It returns an error if any and panics if the Client has no worker available.
 	InviteMember(ctx context.Context, tenantID, userID, forwardedHost string) error
 }
 
-func (c *client) NamespaceLookup(ctx context.Context, tenant string) (*models.Namespace, []error) {
+func (c *client) NamespaceLookup(ctx context.Context, tenant string) (*models.Namespace, error) {
 	namespace := new(models.Namespace)
 	res, err := c.http.
 		R().
@@ -28,11 +28,11 @@ func (c *client) NamespaceLookup(ctx context.Context, tenant string) (*models.Na
 		SetResult(namespace).
 		Get(c.Config.APIBaseURL + "/api/namespaces/{tenant}")
 	if err != nil {
-		return nil, []error{err}
+		return nil, err
 	}
 
 	if res.StatusCode() != http.StatusOK {
-		return nil, []error{err}
+		return nil, err
 	}
 
 	return namespace, nil

pkg/api/internalclient/namespace.go

@@ -21,15 +21,15 @@ type sessionAPI interface {
 
 	// SessionAsAuthenticated marks a session with the specified uid as authenticated.
 	// It returns a slice of errors encountered during the operation.
-	SessionAsAuthenticated(ctx context.Context, uid string) []error
+	SessionAsAuthenticated(ctx context.Context, uid string) error
 
 	// FinishSession finishes the session with the specified uid.
 	// It returns a slice of errors encountered during the operation.
-	FinishSession(ctx context.Context, uid string) []error
+	FinishSession(ctx context.Context, uid string) error
 
 	// KeepAliveSession sends a keep-alive signal for the session with the specified uid.
 	// It returns a slice of errors encountered during the operation.
-	KeepAliveSession(ctx context.Context, uid string) []error
+	KeepAliveSession(ctx context.Context, uid string) error
 
 	// UpdateSession updates some fields of [models.Session] using [models.SessionUpdate].
 	UpdateSession(ctx context.Context, uid string, model *models.SessionUpdate) error
@@ -52,8 +52,7 @@ func (c *client) SessionCreate(ctx context.Context, session requests.SessionCrea
 	return err
 }
 
-func (c *client) SessionAsAuthenticated(ctx context.Context, uid string) []error {
-	var errors []error
+func (c *client) SessionAsAuthenticated(ctx context.Context, uid string) error {
 	_, err := c.http.
 		R().
 		SetContext(ctx).
@@ -63,38 +62,36 @@ func (c *client) SessionAsAuthenticated(ctx context.Context, uid string) []error
 		}).
 		Patch(c.Config.APIBaseURL + "/internal/sessions/{uid}")
 	if err != nil {
-		errors = append(errors, err)
+		return err
 	}
 
-	return errors
+	return nil
 }
 
-func (c *client) FinishSession(ctx context.Context, uid string) []error {
-	var errors []error
+func (c *client) FinishSession(ctx context.Context, uid string) error {
 	_, err := c.http.
 		R().
 		SetContext(ctx).
 		SetPathParam("uid", uid).
 		Post(c.Config.APIBaseURL + "/internal/sessions/{uid}/finish")
 	if err != nil {
-		errors = append(errors, err)
+		return err
 	}
 
-	return errors
+	return nil
 }
 
-func (c *client) KeepAliveSession(ctx context.Context, uid string) []error {
-	var errors []error
+func (c *client) KeepAliveSession(ctx context.Context, uid string) error {
 	_, err := c.http.
 		R().
 		SetContext(ctx).
 		SetPathParam("uid", uid).
 		Post(c.Config.APIBaseURL + "/internal/sessions/{uid}/keepalive")
 	if err != nil {
-		errors = append(errors, err)
+		return err
 	}
 
-	return errors
+	return nil
 }
 
 func (c *client) UpdateSession(ctx context.Context, uid string, model *models.SessionUpdate) error {

pkg/api/internalclient/session.go

@@ -302,9 +302,9 @@ func NewSession(ctx gliderssh.Context, tunnel *httptunnel.Tunnel, cache cache.Ca
 		return nil, err
 	}
 
-	namespace, errs := api.NamespaceLookup(ctx, lookupDevice.TenantID)
-	if len(errs) > 1 {
-		return nil, errs[0]
+	namespace, err := api.NamespaceLookup(ctx, lookupDevice.TenantID)
+	if err != nil {
+		return nil, err
 	}
 
 	events, err := api.EventSessionStream(ctx, ctx.SessionID())
@@ -682,10 +682,12 @@ func Event[D any](sess *Session, t string, data []byte, seat int) {
 }
 
 func (s *Session) KeepAlive() error {
-	if errs := s.api.KeepAliveSession(context.TODO(), s.UID); len(errs) > 0 {
-		log.Error(errs[0])
+	if err := s.api.KeepAliveSession(context.TODO(), s.UID); err != nil {
+		log.WithError(err).
+			WithFields(log.Fields{"session": s.UID, "sshid": s.SSHID}).
+			Error("Error when trying to keep alive the session")
 
-		return errs[0]
+		return err
 	}
 
 	return nil
@@ -739,12 +741,10 @@ func (s *Session) Finish() (err error) {
 			}
 		}
 
-		if errs := s.api.FinishSession(context.TODO(), s.UID); len(errs) > 0 {
-			log.WithError(errs[0]).
+		if err := s.api.FinishSession(context.TODO(), s.UID); err != nil {
+			log.WithError(err).
 				WithFields(log.Fields{"session": s.UID, "sshid": s.SSHID}).
 				Error("Error when trying to finish the session")
-
-			err = errs[0]
 		}
 
 		if envs.IsEnterprise() {