@@ -50,7 +50,7 @@ func validateAndBuildResourcesAssignment(dat map[string]interface{}, validationK
5050
5151func MemoryToNumber (memory string ) (float64 , error ) {
5252 if memoryParser == nil {
53- pattern := "(\\ d*e? \\ d* )(Ei?|Pi?|Ti?|Gi?|Mi?|Ki?|$)"
53+ pattern := "([0-9.]+ )(Ei?|Pi?|Ti?|Gi?|Mi?|Ki?|$)"
5454 re , _ := regexp .Compile (pattern )
5555 memoryParser = & resourceParser {
5656 name : "memory" ,
@@ -80,7 +80,7 @@ func CpuToNumber(cpu string) (float64, error) {
8080 return strconv .ParseFloat (cpu , 64 )
8181 }
8282 if cpuParser == nil {
83- pattern := "( \\ d*e? \\ d* )(m?)"
83+ pattern := "^([0-9.]+ )(m?)"
8484 re , _ := regexp .Compile (pattern )
8585 cpuParser = & resourceParser {
8686 name : "cpu" ,
@@ -262,11 +262,11 @@ func AutoScale(dat map[string]interface{}) (bool, error) {
262262var (
263263 CpuUnitChecker , _ = regexp .Compile ("^([0-9.]+)m$" )
264264 NoCpuUnitChecker , _ = regexp .Compile ("^([0-9.]+)$" )
265- MiChecker , _ = regexp .Compile ("^[0-9]+Mi$" )
266- GiChecker , _ = regexp .Compile ("^[0-9]+Gi$" )
267- TiChecker , _ = regexp .Compile ("^[0-9]+Ti$" )
268- PiChecker , _ = regexp .Compile ("^[0-9]+Pi$" )
269- KiChecker , _ = regexp .Compile ("^[0-9]+Ki$" )
265+ MiChecker , _ = regexp .Compile ("^[0-9. ]+Mi$" )
266+ GiChecker , _ = regexp .Compile ("^[0-9. ]+Gi$" )
267+ TiChecker , _ = regexp .Compile ("^[0-9. ]+Ti$" )
268+ PiChecker , _ = regexp .Compile ("^[0-9. ]+Pi$" )
269+ KiChecker , _ = regexp .Compile ("^[0-9. ]+Ki$" )
270270)
271271
272272func (f CpuChecker ) IsFormat (input interface {}) bool {
0 commit comments