Ensure required integer parameters.

Author: springcomp

jmespath/functions.py

@@ -314,6 +314,8 @@ def _func_keys(self, arg):
         {'type': 'number', 'optional': True},
         {'type': 'number', 'optional': True})
     def _func_find_first(self, text, search, start = 0, end = None):
+        self._ensure_integer('find_first', start, start)
+        self._ensure_integer('find_first', end, end)
         return self._find_impl(
             text,
             search,
@@ -328,6 +330,8 @@ def _func_find_first(self, text, search, start = 0, end = None):
         {'type': 'number', 'optional': True},
         {'type': 'number', 'optional': True})
     def _func_find_last(self, text, search, start = 0, end = None):
+        self._ensure_integer('find_last', start, start)
+        self._ensure_integer('find_last', end, end)
         return self._find_impl(
             text,
             search,
@@ -355,13 +359,15 @@ def _find_impl(self, text, search, func, start, end):
         {'type': 'number'},
         {'type': 'string', 'optional': True})
     def _func_pad_left(self, text, width, padding = ' '):
+        self._ensure_non_negative_integer('pad_left', 'width', width)
         return self._pad_impl(lambda : text.rjust(width, padding), padding)
 
     @signature(
         {'type': 'string'},
         {'type': 'number'},
         {'type': 'string', 'optional': True})
     def _func_pad_right(self, text, width, padding = ' '):
+        self._ensure_non_negative_integer('pad_left', 'width', width)
         return self._pad_impl(lambda : text.ljust(width, padding), padding)
 
     def _pad_impl(self, func, padding):
@@ -378,7 +384,7 @@ def _pad_impl(self, func, padding):
         {'type': 'string'},
         {'type': 'number', 'optional': True})
     def _func_replace(self, text, search, replacement, count = None):
-        self._ensure_non_negative_optional_integer(
+        self._ensure_non_negative_integer(
             'replace',
             'count',
             count)
@@ -392,7 +398,7 @@ def _func_replace(self, text, search, replacement, count = None):
         {'type': 'string'},
         {'type': 'number', 'optional': True})
     def _func_split(self, text, search, count = None):
-        self._ensure_non_negative_optional_integer(
+        self._ensure_non_negative_integer(
             'split',
             'count',
             count)
@@ -410,7 +416,24 @@ def _func_split(self, text, search, count = None):
             return text.split(search, count)
         return text.split(search)
 
-    def _ensure_non_negative_optional_integer(
+    def _ensure_integer(
+        self,
+        func_name,
+        param_name,
+        param_value):
+
+        if param_value != None: 
+            if int(param_value) != param_value:
+                raise exceptions.JMESPathError(
+                    'invalid-type: {}() expects ${} to be a '
+                    'integer, but received {} instead.'
+                    .format(
+                        func_name,
+                        param_name,
+                        param_value
+                    ))
+
+    def _ensure_non_negative_integer(
         self,
         func_name,
         param_name,
@@ -419,12 +442,12 @@ def _ensure_non_negative_optional_integer(
         if param_value != None: 
             if int(param_value) != param_value or int(param_value) < 0:
                 raise exceptions.JMESPathError(
-                    'syntax-error: replace() expects ${} to be a '
+                    'invalid-type: {}() expects ${} to be a '
                     'non-negative integer, but received {} instead.'
                     .format(
                         func_name,
                         param_name,
-                        param_name
+                        param_value
                     ))
 
     @signature({'type': 'string'}, {'type': 'string', 'optional': True})

tests/compliance/string_functions.json

@@ -22,6 +22,14 @@
         "expression": "find_first(string, 'string', `1`, '2')",
         "error": "invalid-type"
       },
+      {
+        "expression": "find_first(string, 'string', `1.3`, '2')",
+        "error": "invalid-type"
+      },
+      {
+        "expression": "find_first(string, 'string', `1`, '2.4')",
+        "error": "invalid-type"
+      },
 
       { "expression": "find_first(string, 'string')", "result": 8 },
       { "expression": "find_first(string, 'string', `0`)", "result": 8 },
@@ -52,7 +60,12 @@
 
       {
         "expression": "replace(abab, 'aa', '-', `0.333333`)",
-        "error": "syntax"
+        "error": "invalid-type"
+      },
+
+      {
+        "expression": "replace(abab, 'aa', '-', `0.001`)",
+        "error": "invalid-type"
       },
 
       { "expression": "replace(abab, 'aa', '-', `0`)", "result": "aabaaabaaaab" },
@@ -95,6 +108,11 @@
         "expression": "pad_left('string', `1`, '--')",
         "error": "syntax"
 
+      },
+      {
+        "expression": "pad_left('string', '1.4')",
+        "error": "invalid-type"
+
       },
 
       { "expression": "pad_left('string', `0`)", "result": "string" },
@@ -107,6 +125,11 @@
       { "expression": "pad_right('string', `10`)", "result": "string    " },
       { "expression": "pad_right('string', `10`, '-')", "result": "string----" },
 
+      {
+        "expression": "split('/', '/', `3.7`)",
+        "error": "invalid-type"
+      },
+
       { "expression": "split('/', '/')", "result": [ "", "" ] },
       { "expression": "split('', '')", "result": [ ] },
       { "expression": "split('all chars', '')", "result": [ "a", "l", "l", " ", "c", "h", "a", "r", "s" ] },