refactoring for env var reading

Author: Victoria Hall

azure_functions_worker/dispatcher.py

@@ -115,6 +115,7 @@ def __init__(
         self._context_api = None
         self._trace_context_propagator = None
 
+        config_manager.read_environment_variables()
         # We allow the customer to change synchronous thread pool max worker
         # count by setting the PYTHON_THREADPOOL_THREAD_COUNT app setting.
         #   For 3.[6|7|8] The default value is 1.
@@ -375,7 +376,7 @@ async def _handle__worker_init_request(self, request):
         self._sync_call_tp = self._create_sync_call_tp(
             self._get_sync_tp_max_workers()
         )
-        config_manager.read_config(
+        config_manager.set_config(
             os.path.join(worker_init_request.function_app_directory, "az-config.json")
         )
         logger.info(
@@ -822,7 +823,7 @@ async def _handle__function_environment_reload_request(self, request):
             env_vars = func_env_reload_request.environment_variables
             for var in env_vars:
                 os.environ[var] = env_vars[var]
-            config_manager.read_config(
+            config_manager.set_config(
                 os.path.join(
                     func_env_reload_request.function_app_directory, "az-config.json"
                 )

azure_functions_worker/utils/config_manager.py

@@ -15,6 +15,13 @@ def __init__(self):
         """
         self.config_data: Optional[Dict[str, str]] = None
 
+    def read_environment_variables(self):
+        if self.config_data is None:
+            self.config_data = {}
+        env_copy = os.environ
+        for k, v in env_copy.items():
+            self.config_data.update({k.upper(): v})
+
     def read_config(self, function_path: str):
         if self.config_data is None:
             self.config_data = {}
@@ -29,13 +36,17 @@ def read_config(self, function_path: str):
 
         # updates the config dictionary with the environment variables
         # this prioritizes set env variables over the config file
-        env_copy = os.environ
-        for k, v in env_copy.items():
-            self.config_data.update({k.upper(): v})
+        # env_copy = os.environ
+        # for k, v in env_copy.items():
+        #     self.config_data.update({k.upper(): v})
+
+    def set_config(self, function_path: str):
+        self.read_config(function_path)
+        self.read_environment_variables()
 
     def config_exists(self) -> bool:
         if self.config_data is None:
-            self.read_config("")
+            self.set_config("")
         return self.config_data is not None
 
     def get_config(self) -> dict:

tests/utils/testutils.py

@@ -141,6 +141,7 @@ class AsyncTestCase(unittest.TestCase, metaclass=AsyncTestCaseMeta):
 class WebHostTestCaseMeta(type(unittest.TestCase)):
 
     def __new__(mcls, name, bases, dct):
+        config_manager.read_environment_variables()
         if config_manager.is_envvar_true(DEDICATED_DOCKER_TEST) \
                 or config_manager.is_envvar_true(CONSUMPTION_DOCKER_TEST):
             return super().__new__(mcls, name, bases, dct)