fix: error type conversion (#581)

Signed-off-by: jyjiangkai <[email protected]>

Author: hwjiangkai

pkg/cluster/auth.go

@@ -32,15 +32,15 @@ type authService struct {
 func (a *authService) GetUserRole(ctx context.Context, user string) ([]*metapb.UserRole, error) {
 	resp, err := a.client.GetUserRole(ctx, &ctrlpb.GetUserRoleRequest{UserIdentifier: user})
 	if err != nil {
-		return nil, errors.To(err)
+		return nil, errors.UnwrapOrUnknown(err)
 	}
 	return resp.GetUserRole(), nil
 }
 
 func (a *authService) GetUserByToken(ctx context.Context, token string) (string, error) {
 	user, err := a.client.GetUserByToken(ctx, wrapperspb.String(token))
 	if err != nil {
-		return "", errors.To(err)
+		return "", errors.UnwrapOrUnknown(err)
 	}
 	return user.GetValue(), nil
 }

pkg/cluster/eventbus.go

@@ -44,14 +44,14 @@ func (es *eventbusService) GetEventbusByName(ctx context.Context, ns, name strin
 
 	pb, err := es.nsSvc.GetNamespaceByName(ctx, ns)
 	if err != nil {
-		return nil, errors.To(err)
+		return nil, errors.UnwrapOrUnknown(err)
 	}
 	eb, err := es.client.GetEventbusWithHumanFriendly(ctx, &ctrlpb.GetEventbusWithHumanFriendlyRequest{
 		NamespaceId:  pb.Id,
 		EventbusName: name,
 	})
 	if err != nil {
-		return nil, errors.To(err)
+		return nil, errors.UnwrapOrUnknown(err)
 	}
 
 	// es.cache.Store(key, eb) unmask when dirty cache is resolved
@@ -66,7 +66,7 @@ func (es *eventbusService) GetEventbus(ctx context.Context, id uint64) (*meta.Ev
 
 	eb, err := es.client.GetEventbus(ctx, wrapperspb.UInt64(id))
 	if err != nil {
-		return nil, errors.To(err)
+		return nil, errors.UnwrapOrUnknown(err)
 	}
 
 	// es.cache.Store(id, eb) unmask when dirty cache is resolved
@@ -93,7 +93,7 @@ func (es *eventbusService) CreateSystemEventbusIfNotExist(ctx context.Context, n
 
 	nsPb, err := es.nsSvc.GetSystemNamespace(ctx)
 	if err != nil {
-		return nil, errors.To(err)
+		return nil, errors.UnwrapOrUnknown(err)
 	}
 
 	eventbus, err := es.client.CreateSystemEventbus(ctx, &ctrlpb.CreateEventbusRequest{
@@ -102,12 +102,12 @@ func (es *eventbusService) CreateSystemEventbusIfNotExist(ctx context.Context, n
 		Description: desc,
 		NamespaceId: nsPb.Id,
 	})
-	return eventbus, errors.To(err)
+	return eventbus, errors.UnwrapOrUnknown(err)
 }
 
 func (es *eventbusService) Delete(ctx context.Context, id uint64) error {
 	_, err := es.client.DeleteEventbus(ctx, wrapperspb.UInt64(id))
-	return errors.To(err)
+	return errors.UnwrapOrUnknown(err)
 }
 
 func (es *eventbusService) RawClient() ctrlpb.EventbusControllerClient {

pkg/cluster/namespace.go

@@ -43,7 +43,7 @@ func (ns *namespaceService) GetNamespace(ctx context.Context, id uint64) (*metap
 	}
 	n, err := ns.client.GetNamespace(ctx, &ctrlpb.GetNamespaceRequest{Id: id})
 	if err != nil {
-		return nil, errors.To(err)
+		return nil, errors.UnwrapOrUnknown(err)
 	}
 	// ns.cache.Store(id, n) unmask when dirty cache is resolved
 	return n, nil
@@ -64,7 +64,7 @@ func (ns *namespaceService) GetNamespaceByName(ctx context.Context, name string)
 	}
 	n, err := ns.client.GetNamespaceWithHumanFriendly(ctx, wrapperspb.String(name))
 	if err != nil {
-		return nil, errors.To(err)
+		return nil, errors.UnwrapOrUnknown(err)
 	}
 	// ns.cache.Store(name, n) unmask when dirty cache is resolved
 	return n, nil

pkg/cluster/trigger.go

@@ -29,5 +29,5 @@ func (es *triggerService) RegisterHeartbeat(ctx context.Context, interval time.D
 
 func (es *triggerService) GetSubscription(ctx context.Context, id uint64) (*metapb.Subscription, error) {
 	subscription, err := es.client.GetSubscription(ctx, &ctrlpb.GetSubscriptionRequest{Id: id})
-	return subscription, errors.To(err)
+	return subscription, errors.UnwrapOrUnknown(err)
 }

pkg/errors/utils.go

@@ -66,7 +66,10 @@ func Is(err error, target error) bool {
 	return errType != nil && errType.Code == targetType.Code
 }
 
-func To(err error) *ErrorType {
+func UnwrapOrUnknown(err error) error {
+	if err == nil {
+		return nil
+	}
 	et, _ := FromError(err)
 	return et
 }