Merge branch 'dev' into sdk/1.12.0

Author: vrdmr

.ci/e2e_integration_test/pipeline.yml

@@ -11,7 +11,6 @@ pool:
 
 variables:
     DOTNET_VERSION: '3.1.x'
-    DOTNET_VERSION_5: '5.0.x'
     DOTNET_VERSION_6: '6.x'
     PYTHON_VERSION: '3.9'
 
@@ -26,11 +25,6 @@ steps:
   inputs:
     packageType: 'sdk'
     version: $(DOTNET_VERSION)
-- task: UseDotNet@2
-  displayName: 'Install DotNet 5'
-  inputs:
-    packageType: 'sdk'
-    version: $(DOTNET_VERSION_5)
 - task: UseDotNet@2
   displayName: 'Install DotNet 6'
   inputs:

.github/workflows/ci_e2e_workflow.yml

@@ -34,10 +34,6 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '3.1.x'
-      - name: Set up Dotnet 5.0.x
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: '5.0.x'
       - name: Set up Dotnet 6.x
         uses: actions/setup-dotnet@v1
         with:

.github/workflows/codeql-analysis.yml

@@ -13,7 +13,7 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ dev, *dev, main*, release* ]
+    branches: [ dev, v3.x-dev, main*, release* ]
   pull_request:
     # The branches below must be a subset of the branches above
     branches: [ dev ]
@@ -32,7 +32,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: [ 'javascript', 'python' ]
+        language: [ 'python' ]
         # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
         # Learn more about CodeQL language support at https://git.io/codeql-language-support
 

.github/workflows/perf-testing-setup.yml

@@ -27,10 +27,6 @@ jobs:
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: '3.1.405'
-    - name: Set up Dotnet 5.0.x
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '5.0.x'
     - name: Set up Dotnet 6.x
       uses: actions/setup-dotnet@v1
       with:

.github/workflows/ut_ci_workflow.yml

@@ -18,7 +18,7 @@ jobs:
     name: "Python UT CI Run"
     runs-on: ubuntu-latest
     strategy:
-      fail-fast: true
+      fail-fast: false
       matrix:
         python-version: [ 3.7, 3.8, 3.9, "3.10" ]
     steps:
@@ -31,10 +31,6 @@ jobs:
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: '3.1.x'
-    - name: Set up Dotnet 5.0.x
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '5.0.x'
     - name: Set up Dotnet 6.x
       uses: actions/setup-dotnet@v1
       with:

azure_functions_worker/dispatcher.py

@@ -314,7 +314,7 @@ async def _handle__functions_metadata_request(self, request):
         try:
             fx_metadata_results = []
             indexed_functions = loader.index_function_app(function_path)
-            logger.info('Indexed function app and found {} functions',
+            logger.info('Indexed function app and found %s functions',
                         len(indexed_functions))
             if indexed_functions:
                 indexed_function_logs: List[str] = []

azure_functions_worker/testutils.py

@@ -83,19 +83,19 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.EventHubs"
-     Version="5.0.0" />
+     Version="5.1.2.0" />
     <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.EventGrid"
-     Version="3.1.0" />
+     Version="3.2.0" />
     <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.CosmosDB"
      Version="3.0.10" />
      <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Storage"
      Version="4.0.5" />
      <PackageReference
       Include="Microsoft.Azure.WebJobs.Extensions.Storage.Blobs"
-      Version="5.0.0" />
+      Version="5.1.0" />
      <PackageReference
       Include="Microsoft.Azure.WebJobs.Extensions.Storage.Queues"
-      Version="5.0.0" />
+      Version="5.1.0" />
     <PackageReference
      Include="Microsoft.Azure.WebJobs.Script.ExtensionsMetadataGenerator"
      Version="1.1.3" />

tests/unittests/test_code_quality.py

@@ -13,8 +13,8 @@ class TestCodeQuality(unittest.TestCase):
     def test_mypy(self):
         try:
             import mypy  # NoQA
-        except ImportError:
-            raise unittest.SkipTest('mypy module is missing')
+        except ImportError as e:
+            raise unittest.SkipTest('mypy module is missing') from e
 
         try:
             subprocess.run(
@@ -26,16 +26,17 @@ def test_mypy(self):
         except subprocess.CalledProcessError as ex:
             if (sys.version_info[1] == 7
                     and sys.version_info[2] == 3):
-                raise unittest.SkipTest('Subprocess start failing for 3.7.3')
+                raise unittest.SkipTest('Subprocess start failing for 3.7.3') \
+                    from ex
             output = ex.output.decode()
             raise AssertionError(
                 f'mypy validation failed:\n{output}') from None
 
     def test_flake8(self):
         try:
             import flake8  # NoQA
-        except ImportError:
-            raise unittest.SkipTest('flake8 moudule is missing')
+        except ImportError as e:
+            raise unittest.SkipTest('flake8 moudule is missing') from e
 
         config_path = ROOT_PATH / '.flake8'
         if not config_path.exists():

tests/unittests/test_enable_debug_logging_functions.py

@@ -34,9 +34,9 @@ def setUpClass(cls):
         super().setUpClass()
 
     @classmethod
-    def tearDownClass(self):
+    def tearDownClass(cls):
         super().tearDownClass()
-        self._patch_environ.stop()
+        cls._patch_environ.stop()
 
     @classmethod
     def get_script_dir(cls):
@@ -71,9 +71,9 @@ def setUpClass(cls):
         super().setUpClass()
 
     @classmethod
-    def tearDownClass(self):
+    def tearDownClass(cls):
         super().tearDownClass()
-        self._patch_environ.stop()
+        cls._patch_environ.stop()
 
     @classmethod
     def get_script_dir(cls):
@@ -114,12 +114,12 @@ def setUpClass(cls):
         super().setUpClass()
 
     @classmethod
-    def tearDownClass(self):
-        host_json = TESTS_ROOT / self.get_script_dir() / 'host.json'
+    def tearDownClass(cls):
+        host_json = TESTS_ROOT / cls.get_script_dir() / 'host.json'
         remove_path(host_json)
 
         super().tearDownClass()
-        self._patch_environ.stop()
+        cls._patch_environ.stop()
 
     @classmethod
     def get_script_dir(cls):

tests/unittests/test_utilities_dependency.py

@@ -1,13 +1,12 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
+import importlib.util
 import os
 import sys
-import importlib.util
 import unittest
 from unittest.mock import patch
 
 from azure_functions_worker import testutils
-from azure_functions_worker.utils.common import is_python_version
 from azure_functions_worker.utils.dependency import DependencyManager
 
 
@@ -555,12 +554,8 @@ def test_use_worker_dependencies_disable(self):
         with self.assertRaises(ImportError):
             import common_module  # NoQA
 
-    @unittest.skipUnless(
-        sys.version_info.major == 3 and sys.version_info.minor != 10,
-        'Test only available for Python 3.6, 3.7, 3.8 or 3.9'
-    )
-    def test_use_worker_dependencies_default_python_36_37_38_39(self):
-        # Feature should be disabled in Python 3.6, 3.7, 3.8 and 3.9
+    def test_use_worker_dependencies_default_python_all_versions(self):
+        # Feature should be disabled for all python versions
         # Setup paths
         DependencyManager.worker_deps_path = self._worker_deps_path
         DependencyManager.cx_deps_path = self._customer_deps_path
@@ -571,25 +566,6 @@ def test_use_worker_dependencies_default_python_36_37_38_39(self):
         with self.assertRaises(ImportError):
             import common_module  # NoQA
 
-    @unittest.skipUnless(
-        sys.version_info.major == 3 and sys.version_info.minor == 10,
-        'Test only available for Python 3.10'
-    )
-    def test_use_worker_dependencies_default_python_310(self):
-        # Feature should be enabled in Python 3.10 by default
-        # Setup paths
-        DependencyManager.worker_deps_path = self._worker_deps_path
-        DependencyManager.cx_deps_path = self._customer_deps_path
-        DependencyManager.cx_working_dir = self._customer_func_path
-
-        # Ensure the common_module is imported from _worker_deps_path
-        DependencyManager.use_worker_dependencies()
-        import common_module  # NoQA
-        self.assertEqual(
-            common_module.package_location,
-            os.path.join(self._worker_deps_path, 'common_module')
-        )
-
     def test_prioritize_customer_dependencies(self):
         # Setup app settings
         os.environ['PYTHON_ISOLATE_WORKER_DEPENDENCIES'] = 'true'
@@ -628,10 +604,8 @@ def test_prioritize_customer_dependencies_disable(self):
         with self.assertRaises(ImportError):
             import common_module  # NoQA
 
-    @unittest.skipIf(is_python_version('3.10'),
-                     'Test not available for python 3.10')
-    def test_prioritize_customer_dependencies_default_python_36_37_38_39(self):
-        # Feature should be disabled in Python 3.6, 3.7, 3.8 and 3.9
+    def test_prioritize_customer_dependencies_default_all_versions(self):
+        # Feature should be disabled in Python for all versions
         # Setup paths
         DependencyManager.worker_deps_path = self._worker_deps_path
         DependencyManager.cx_deps_path = self._customer_deps_path
@@ -642,25 +616,6 @@ def test_prioritize_customer_dependencies_default_python_36_37_38_39(self):
         with self.assertRaises(ImportError):
             import common_module  # NoQA
 
-    @unittest.skipUnless(
-        sys.version_info.major == 3 and sys.version_info.minor == 10,
-        'Test only available for Python 3.10'
-    )
-    def test_prioritize_customer_dependencies_default_python_310(self):
-        # Feature should be enabled in Python 3.10 by default
-        # Setup paths
-        DependencyManager.worker_deps_path = self._worker_deps_path
-        DependencyManager.cx_deps_path = self._customer_deps_path
-        DependencyManager.cx_working_dir = self._customer_func_path
-
-        # Ensure the common_module is imported from _customer_deps_path
-        DependencyManager.prioritize_customer_dependencies()
-        import common_module  # NoQA
-        self.assertEqual(
-            common_module.package_location,
-            os.path.join(self._customer_deps_path, 'common_module')
-        )
-
     def test_prioritize_customer_dependencies_from_working_directory(self):
         self._initialize_scenario()