Merge pull request #691 from helgi/proc_name_fix

fix(config): proc type names validation should allow alphanumeric

Author: helgi

rootfs/api/serializers.py

@@ -11,7 +11,9 @@
 
 from api import models
 
-PROCTYPE_MATCH = re.compile(r'^(?P<type>[a-z]+)')
+# proc type name is alphanumeric
+# https://docs-v2.readthedocs.io/en/latest/using-workflow/process-types-and-the-procfile/#declaring-process-types
+PROCTYPE_MATCH = re.compile(r'^(?P<type>[a-z0-9]+)$')
 MEMLIMIT_MATCH = re.compile(r'^(?P<mem>[0-9]+(MB|KB|GB|[BKMG]))$', re.IGNORECASE)
 CPUSHARE_MATCH = re.compile(r'^(?P<cpu>[0-9.]+[m]{0,1})$')
 TAGVAL_MATCH = re.compile(r'^(?:[a-zA-Z\d][-\.\w]{0,61})?[a-zA-Z\d]$')
@@ -145,7 +147,7 @@ def validate_memory(self, data):
                 continue
 
             if not re.match(PROCTYPE_MATCH, key):
-                raise serializers.ValidationError("Process types can only contain [a-z]")
+                raise serializers.ValidationError("Process types can only contain alphanumeric")
 
             if not re.match(MEMLIMIT_MATCH, str(value)):
                 raise serializers.ValidationError(
@@ -159,7 +161,7 @@ def validate_cpu(self, data):
                 continue
 
             if not re.match(PROCTYPE_MATCH, key):
-                raise serializers.ValidationError("Process types can only contain [a-z]")
+                raise serializers.ValidationError("Process types can only contain alphanumeric")
 
             shares = re.match(CPUSHARE_MATCH, str(value))
             if not shares:

rootfs/api/tests/test_config.py

@@ -4,8 +4,6 @@
 
 Run the tests with "./manage.py test api"
 """
-
-
 import json
 
 from django.contrib.auth.models import User
@@ -355,6 +353,17 @@ def test_limit_memory(self, mock_requests):
         self.assertNotEqual(limit3['uuid'], limit4['uuid'])
         self.assertNotIn('worker', json.dumps(response.data['memory']))
 
+        # bad memory values
+        mem = {'web': '1Z'}
+        body = {'memory': json.dumps(mem)}
+        response = self.client.post(url, body)
+        self.assertEqual(response.status_code, 400)
+
+        mem = {'w3&b': '1G'}
+        body = {'memory': json.dumps(mem)}
+        response = self.client.post(url, body)
+        self.assertEqual(response.status_code, 400)
+
         # disallow put/patch/delete
         response = self.client.put(url)
         self.assertEqual(response.status_code, 405)
@@ -397,14 +406,14 @@ def test_limit_cpu(self, mock_requests):
         self.assertEqual(cpu['web'], '1024')
 
         # set an additional value
-        body = {'cpu': json.dumps({'worker': '512'})}
+        body = {'cpu': json.dumps({'worker': '512m'})}
         response = self.client.post(url, body)
         self.assertEqual(response.status_code, 201)
         limit2 = response.data
         self.assertNotEqual(limit1['uuid'], limit2['uuid'])
         cpu = response.data['cpu']
         self.assertIn('worker', cpu)
-        self.assertEqual(cpu['worker'], '512')
+        self.assertEqual(cpu['worker'], '512m')
         self.assertIn('web', cpu)
         self.assertEqual(cpu['web'], '1024')
 
@@ -415,17 +424,28 @@ def test_limit_cpu(self, mock_requests):
         self.assertEqual(limit2, limit3)
         cpu = response.data['cpu']
         self.assertIn('worker', cpu)
-        self.assertEqual(cpu['worker'], '512')
+        self.assertEqual(cpu['worker'], '512m')
         self.assertIn('web', cpu)
         self.assertEqual(cpu['web'], '1024')
 
         # unset a value
-        body = {'memory': json.dumps({'worker': None})}
+        body = {'cpu': json.dumps({'worker': None})}
         response = self.client.post(url, body)
         self.assertEqual(response.status_code, 201)
         limit4 = response.data
         self.assertNotEqual(limit3['uuid'], limit4['uuid'])
-        self.assertNotIn('worker', json.dumps(response.data['memory']))
+        self.assertNotIn('worker', json.dumps(response.data['cpu']))
+
+        # bad cpu values
+        mem = {'web': '1G'}
+        body = {'cpu': json.dumps(mem)}
+        response = self.client.post(url, body)
+        self.assertEqual(response.status_code, 400)
+
+        mem = {'w3&b': '1G'}
+        body = {'cpu': json.dumps(mem)}
+        response = self.client.post(url, body)
+        self.assertEqual(response.status_code, 400)
 
         # disallow put/patch/delete
         response = self.client.put(url)

rootfs/scheduler/mock.py

@@ -98,6 +98,9 @@ def delete_pods(url, pods, current, desired):
         if len(removed) == delta:
             break
 
+        if not pods:
+            break
+
         item = pods.pop()
         pod = cache.get(item)
         if 'deletionTimestamp' in pod['metadata']: