fix(controller) : fix regex for deis limits

Author: pmelmon

controller/api/serializers.py

@@ -17,7 +17,7 @@
 
 
 PROCTYPE_MATCH = re.compile(r'^(?P<type>[a-z]+)')
-MEMLIMIT_MATCH = re.compile(r'^(?P<mem>[0-9]+[BbKkMmGg])$')
+MEMLIMIT_MATCH = re.compile(r'^(?P<mem>[0-9]+(MB|KB|GB|[BKMG]))$', re.IGNORECASE)
 CPUSHARE_MATCH = re.compile(r'^(?P<cpu>[0-9]+)$')
 TAGKEY_MATCH = re.compile(r'^[a-z]+$')
 TAGVAL_MATCH = re.compile(r'^\w+$')

controller/api/tests/__init__.py

@@ -60,3 +60,4 @@ def run_tests(self, test_labels, extra_tests=None, **kwargs):
 from .test_release import *  # noqa
 from .test_scheduler import *  # noqa
 from .test_users import *  # noqa
+from .test_limits import *  # noqa

controller/api/tests/test_limits.py

@@ -0,0 +1,14 @@
+import unittest
+import re
+
+
+MEMLIMIT = re.compile(r'^(?P<mem>[0-9]+(MB|KB|GB|[BKMG]))$', re.IGNORECASE)
+
+
+class TestLimits(unittest.TestCase):
+
+    def test_upper(self):
+        self.assertTrue(MEMLIMIT.match("20MB"))
+        self.assertFalse(MEMLIMIT.match("20MK"))
+        self.assertTrue(MEMLIMIT.match("20gb"))
+        self.assertFalse(MEMLIMIT.match("20gK"))

tests/limits_test.go

@@ -11,7 +11,7 @@ import (
 
 var (
 	limitsListCmd     = "limits:list --app={{.AppName}}"
-	limitsSetMemCmd   = "limits:set --app={{.AppName}} web=256M"
+	limitsSetMemCmd   = "limits:set --app={{.AppName}} web=256MB"
 	limitsSetCPUCmd   = "limits:set --app={{.AppName}} -c web=512"
 	limitsUnsetMemCmd = "limits:unset --app={{.AppName}} --memory web"
 	limitsUnsetCPUCmd = "limits:unset --app={{.AppName}} -c web"