mirrors/kyverno
mirrors/kyverno
1
0
Fork 0
mirror of https://github.com/kyverno/kyverno.git synced 2025-03-31 03:45:17 +00:00
Code Activity

Update division for same units (#3038)

Browse source 
Signed-off-by: Kumar Mallikarjuna <kumar@nirmata.com>

Co-authored-by: shuting <shutting06@gmail.com>
This commit is contained in:
Kumar Mallikarjuna 2022-01-21 16:36:08 +05:30 • committed by GitHub
parent 376a8d3b22
commit 4124e0f682
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
pkg/engine/jmespath/arithmetic.go
View file

@ -4,6 +4,7 @@ import (
"fmt"
"math"
"reflect"
"strconv"
"time"
"gopkg.in/inf.v0"
@ -229,7 +230,7 @@ func (op1 Quantity) Divide(op2 interface{}) (interface{}, error) {
var quo inf.Dec
scale := inf.Scale(math.Max(float64(op1.AsDec().Scale()), float64(v.AsDec().Scale())))
quo.QuoRound(op1.AsDec(), v.AsDec(), scale, inf.RoundDown)
return resource.NewDecimalQuantity(quo, v.Quantity.Format).String(), nil
return strconv.ParseFloat(quo.String(), 64)
case Scalar:
q, err := resource.ParseQuantity(fmt.Sprintf("%v", v.float64))
if err != nil {
@ -255,20 +256,22 @@ func (op1 Duration) Divide(op2 interface{}) (interface{}, error) {
}
quo = op1.Seconds() / v.Seconds()
return quo, nil
case Scalar:
if v.float64 == 0 {
return nil, fmt.Errorf(undefinedQuoError, divide)
}
quo = op1.Seconds() / v.float64
res, err := time.ParseDuration(fmt.Sprintf("%.9fs", quo))
if err != nil {
return nil, err
}
return res.String(), nil
}
res, err := time.ParseDuration(fmt.Sprintf("%.9fs", quo))
if err != nil {
return nil, err
}
return res.String(), nil
return nil, nil
}
func (op1 Scalar) Divide(op2 interface{}) (interface{}, error) {
@ -315,7 +318,13 @@ func (op1 Quantity) Modulo(op2 interface{}) (interface{}, error) {
return nil, err
}
x, err := resource.ParseQuantity(quo.(string))
var x resource.Quantity
switch y := quo.(type) {
case float64:
x, err = resource.ParseQuantity(fmt.Sprintf("%.9f", y))
case string:
x, err = resource.ParseQuantity(y)
}
if err != nil {
return nil, err
}
@ -339,7 +348,13 @@ func (op1 Duration) Modulo(op2 interface{}) (interface{}, error) {
return nil, err
}
x, err := time.ParseDuration(quo.(string))
var x time.Duration
switch y := quo.(type) {
case float64:
x, err = time.ParseDuration(fmt.Sprintf("%.9fs", y))
case string:
x, err = time.ParseDuration(y)
}
if err != nil {
return nil, err
}

6
pkg/engine/jmespath/functions_test.go
View file

@ -815,7 +815,8 @@ func Test_Divide(t *testing.T) {
},
{
test: "divide('25m0s', '2s')",
expectedResult: `12m30s`,
expectedResult: 750.0,
retFloat: true,
},
{
test: "divide(`360`, '-2s')",
@ -827,7 +828,8 @@ func Test_Divide(t *testing.T) {
},
{
test: "divide('26Gi', '13Ki')",
expectedResult: `2Mi`,
expectedResult: 2097152.0,
retFloat: true,
},
{
test: "divide('500m', `2`)",