Merge branch 'dev' into gaaguiar/remove_init_flag

Author: gavin-aguiar

azure_functions_worker/functions.py

@@ -80,16 +80,6 @@ def get_return_binding(binding_name: str,
 
         return return_binding_name
 
-    @staticmethod
-    def validate_binding_route(func_name: str, binding: BindingInfo,
-                               func_type: str):
-        if hasattr(binding, 'route') and binding.route.startswith(
-                '/') and func_type == 'function':
-            raise FunctionLoadError(
-                func_name,
-                f'Invalid route name: {binding.route}. Route name cannot begin'
-                f' with a /')
-
     @staticmethod
     def validate_binding_direction(binding_name: str,
                                    binding_direction: str,
@@ -105,14 +95,6 @@ def validate_binding_direction(binding_name: str,
                 func_name,
                 '"$return" binding must have direction set to "out"')
 
-    def validate_binding(self, func_name: str, binding: BindingInfo,
-                         func_type: str):
-        self.validate_binding_route(func_name, binding, func_type)
-
-        self.validate_binding_direction(binding.name,
-                                        binding.direction,
-                                        func_name)
-
     @staticmethod
     def is_context_required(params, bound_params: dict,
                             annotations: dict,
@@ -377,7 +359,6 @@ def add_function(self, function_id: str,
     def add_indexed_function(self, function):
         func = function.get_user_function()
         func_name = function.get_function_name()
-        func_type = function.http_type
         function_id = str(uuid.uuid5(namespace=uuid.NAMESPACE_OID,
                                      name=func_name))
         return_binding_name: typing.Optional[str] = None
@@ -391,7 +372,9 @@ def add_indexed_function(self, function):
 
         bound_params = {}
         for binding in function.get_bindings():
-            self.validate_binding(func_name, binding, func_type)
+            self.validate_binding_direction(binding.name,
+                                            binding.direction,
+                                            func_name)
 
             has_explicit_return, has_implicit_return = \
                 self.get_explicit_and_implicit_return(

setup.py

@@ -107,12 +107,18 @@
 
 INSTALL_REQUIRES = [
     "azure-functions==1.15.1b2",
-    "python-dateutil~=2.8.2",
-    "protobuf~=4.22.0",
-    "grpcio-tools~=1.54.2",
-    "grpcio~=1.54.2"
+    "python-dateutil~=2.8.2"
 ]
 
+if sys.version_info[:2] == (3, 7):
+    INSTALL_REQUIRES.extend(
+        ("protobuf~=3.19.3", "grpcio-tools~=1.43.0", "grpcio~=1.43.0")
+    )
+else:
+    INSTALL_REQUIRES.extend(
+        ("protobuf~=4.22.0", "grpcio-tools~=1.54.2", "grpcio~=1.54.2")
+    )
+
 EXTRA_REQUIRES = {
     "dev": [
         "azure-eventhub~=5.7.0",  # Used for EventHub E2E tests

tests/unittests/test_functions_registry.py

@@ -21,17 +21,6 @@ def dummy():
         self.func = Function(self.dummy, "test.py")
         self.function_registry = functions.Registry()
 
-    def test_add_indexed_function_invalid_route(self):
-        trigger1 = HttpTrigger(name="req1", route="/")
-        self.func.add_trigger(trigger=trigger1)
-
-        with self.assertRaises(FunctionLoadError) as ex:
-            self.function_registry.add_indexed_function(function=self.func)
-
-        self.assertEqual(str(ex.exception),
-                         'cannot load the dummy function: Invalid route name: '
-                         '/. Route name cannot begin with a /')
-
     def test_add_indexed_function_invalid_direction(self):
         trigger1 = HttpTrigger(name="req1", route="test")
         binding = BlobInput(name="$return", path="testpath",