Fix regex validation in Product type for fields that specify USD

This applies to pricePerUnit, setupFee and costMonth fields
3scale · Aug 4, 2020 · 7d731f7 · 7d731f7
1 parent 490504a
commit 7d731f7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/deploy/crds/capabilities.3scale.net_products_crd.yaml b/deploy/crds/capabilities.3scale.net_products_crd.yaml
@@ -42,7 +42,7 @@ spec:
                     type: boolean
                   costMonth:
                     description: Cost per Month (USD)
-                    pattern: ^\d+.?\d{2}$
+                    pattern: ^\d+(\.\d{2})?$
                     type: string
                   limits:
                     description: Limits
@@ -115,7 +115,7 @@ spec:
                           type: object
                         pricePerUnit:
                           description: Price per unit (USD)
-                          pattern: ^\d+.?\d{2}$
+                          pattern: ^\d+(\.\d{2})?$
                           type: string
                         to:
                           description: Range To
@@ -129,7 +129,7 @@ spec:
                     type: array
                   setupFee:
                     description: Setup fee (USD)
-                    pattern: ^\d+.?\d{2}$
+                    pattern: ^\d+(\.\d{2})?$
                     type: string
                   trialPeriod:
                     description: Trial Period (days)

diff --git a/pkg/apis/capabilities/v1beta1/product_types.go b/pkg/apis/capabilities/v1beta1/product_types.go
@@ -96,7 +96,7 @@ type PricingRuleSpec struct {
 	MetricMethodRef MetricMethodRefSpec `json:"metricMethodRef"`
 
 	// Price per unit (USD)
-	// +kubebuilder:validation:Pattern=`^\d+.?\d{2}$`
+	// +kubebuilder:validation:Pattern=`^\d+(\.\d{2})?$`
 	PricePerUnit string `json:"pricePerUnit"`
 }
 
@@ -116,12 +116,12 @@ type ApplicationPlanSpec struct {
 	TrialPeriod *int `json:"trialPeriod,omitempty"`
 
 	// Setup fee (USD)
-	// +kubebuilder:validation:Pattern=`^\d+.?\d{2}$`
+	// +kubebuilder:validation:Pattern=`^\d+(\.\d{2})?$`
 	// +optional
 	SetupFee *string `json:"setupFee,omitempty"`
 
 	// Cost per Month (USD)
-	// +kubebuilder:validation:Pattern=`^\d+.?\d{2}$`
+	// +kubebuilder:validation:Pattern=`^\d+(\.\d{2})?$`
 	// +optional
 	CostMonth *string `json:"costMonth,omitempty"`