fix: error mapping (#3161)

Author: chrisgacsal

openmeter/productcatalog/addon/service/addon.go

@@ -68,7 +68,7 @@ func (s service) resolveFeatures(ctx context.Context, namespace string, rateCard
 	}
 
 	// Let's make a clone of it
-	rateCardsClone := (rateCards.Clone())
+	rateCardsClone := rateCards.Clone()
 
 	for _, rateCard := range rateCardsClone {
 		fK := rateCard.AsMeta().FeatureKey
@@ -138,7 +138,7 @@ func (s service) resolveFeatures(ctx context.Context, namespace string, rateCard
 				return models.NewGenericValidationError(fmt.Errorf("unsupported RateCard type: %s", rateCard.Type()))
 			}
 
-			if err := rateCard.Merge(rcNew); err != nil {
+			if err = rateCard.Merge(rcNew); err != nil {
 				return fmt.Errorf("failed to merge RateCard: %w", err)
 			}
 		} else if fID == nil && fK != nil {
@@ -172,7 +172,7 @@ func (s service) resolveFeatures(ctx context.Context, namespace string, rateCard
 				return fmt.Errorf("unsupported RateCard type: %s", rateCard.Type())
 			}
 
-			if err := rateCard.Merge(rcNew); err != nil {
+			if err = rateCard.Merge(rcNew); err != nil {
 				return fmt.Errorf("failed to merge RateCard: %w", err)
 			}
 		}
@@ -273,7 +273,11 @@ func (s service) CreateAddon(ctx context.Context, params addon.CreateAddonInput)
 		logger.Debug("creating add-on")
 
 		if len(params.RateCards) > 0 {
-			if err := s.resolveFeatures(ctx, params.Namespace, &params.RateCards); err != nil {
+			if err = s.resolveFeatures(ctx, params.Namespace, &params.RateCards); err != nil {
+				if models.IsGenericNotFoundError(err) {
+					err = models.NewGenericValidationError(err)
+				}
+
 				return nil, fmt.Errorf("failed to expand features for ratecards in add-on: %w", err)
 			}
 		}
@@ -421,6 +425,10 @@ func (s service) UpdateAddon(ctx context.Context, params addon.UpdateAddonInput)
 
 		if params.RateCards != nil && len(*params.RateCards) > 0 {
 			if err := s.resolveFeatures(ctx, params.Namespace, params.RateCards); err != nil {
+				if models.IsGenericNotFoundError(err) {
+					err = models.NewGenericValidationError(err)
+				}
+
 				return nil, fmt.Errorf("failed to expand features for ratecards in add-on: %w", err)
 			}
 		}

openmeter/productcatalog/errors.go

@@ -164,7 +164,7 @@ var ErrRateCardDuplicatedKey = models.NewValidationIssue(
 	ErrCodeRateCardDuplicatedKey,
 	"duplicated key",
 	models.WithFieldString("key"),
-	models.WithWarningSeverity(),
+	models.WithCriticalSeverity(),
 )
 
 const ErrCodeRateCardEntitlementTemplateWithNoFeature models.ErrorCode = "entitlement_template_with_no_feature"

openmeter/productcatalog/plan/service/plan.go

@@ -65,7 +65,7 @@ func (s service) resolveFeatures(ctx context.Context, namespace string, rateCard
 	}
 
 	// Let's make a clone of it
-	rateCardsClone := (rateCards.Clone())
+	rateCardsClone := rateCards.Clone()
 
 	for _, rateCard := range rateCardsClone {
 		fK := rateCard.AsMeta().FeatureKey
@@ -135,13 +135,13 @@ func (s service) resolveFeatures(ctx context.Context, namespace string, rateCard
 				return fmt.Errorf("unsupported RateCard type: %s", rateCard.Type())
 			}
 
-			if err := rateCard.Merge(rcNew); err != nil {
+			if err = rateCard.Merge(rcNew); err != nil {
 				return fmt.Errorf("failed to merge RateCard: %w", err)
 			}
 		} else if fID == nil && fK != nil {
 			// We need to populate FeatureID
 			if !featureByKeyOk {
-				return fmt.Errorf("feature with key %s not found", *fK)
+				return models.NewGenericNotFoundError(fmt.Errorf("feature with key %s not found", *fK))
 			}
 
 			// FIXME: merging like this is a pain, we should just use pointers...
@@ -169,7 +169,7 @@ func (s service) resolveFeatures(ctx context.Context, namespace string, rateCard
 				return fmt.Errorf("unsupported RateCard type: %s", rateCard.Type())
 			}
 
-			if err := rateCard.Merge(rcNew); err != nil {
+			if err = rateCard.Merge(rcNew); err != nil {
 				return fmt.Errorf("failed to merge RateCard: %w", err)
 			}
 		}
@@ -226,7 +226,11 @@ func (s service) CreatePlan(ctx context.Context, params plan.CreatePlanInput) (*
 
 		if len(params.Phases) > 0 {
 			for _, phase := range params.Phases {
-				if err := s.resolveFeatures(ctx, params.Namespace, &phase.RateCards); err != nil {
+				if err = s.resolveFeatures(ctx, params.Namespace, &phase.RateCards); err != nil {
+					if models.IsGenericNotFoundError(err) {
+						err = models.NewGenericValidationError(err)
+					}
+
 					return nil, fmt.Errorf("failed to expand Features for RateCards in PlanPhase: %w", err)
 				}
 			}
@@ -366,6 +370,10 @@ func (s service) UpdatePlan(ctx context.Context, params plan.UpdatePlanInput) (*
 		if params.Phases != nil && len(*params.Phases) > 0 {
 			for _, phase := range *params.Phases {
 				if err := s.resolveFeatures(ctx, params.Namespace, &phase.RateCards); err != nil {
+					if models.IsGenericNotFoundError(err) {
+						err = models.NewGenericValidationError(err)
+					}
+
 					return nil, fmt.Errorf("failed to expand Features for RateCards in PlanPhase: %w", err)
 				}
 			}