Merge branch 'master' into DOG-5440-db-extractor-fails-to-update-extractor-pipeline-in-case-of-message-longer-than-1000-characters

Author: nithinb

cognite/extractorutils/configtools/loaders.py

@@ -27,6 +27,7 @@
 
 import dacite
 import yaml
+from azure.core.credentials import TokenCredential
 from azure.core.exceptions import HttpResponseError, ResourceNotFoundError, ServiceRequestError
 from azure.identity import ClientSecretCredential, DefaultAzureCredential
 from azure.keyvault.secrets import SecretClient
@@ -64,7 +65,6 @@ class KeyVaultLoader:
     def __init__(self, config: dict | None):
         self.config = config
 
-        self.credentials: DefaultAzureCredential | ClientSecretCredential | None = None
         self.client: SecretClient | None = None
 
     def _init_client(self) -> None:
@@ -88,9 +88,10 @@ def _init_client(self) -> None:
 
         vault_url = f"https://{keyvault_name}.vault.azure.net"
 
+        credentials: TokenCredential
         if self.config["authentication-method"] == KeyVaultAuthenticationMethod.DEFAULT.value:
             _logger.info("Using Azure DefaultCredentials to access KeyVault")
-            self.credentials = DefaultAzureCredential()
+            credentials = DefaultAzureCredential()
 
         elif self.config["authentication-method"] == KeyVaultAuthenticationMethod.CLIENTSECRET.value:
             auth_parameters = ("client-id", "tenant-id", "secret")
@@ -107,7 +108,7 @@ def _init_client(self) -> None:
                 client_id = os.path.expandvars(self.config["client-id"])
                 secret = os.path.expandvars(self.config["secret"])
 
-                self.credentials = ClientSecretCredential(
+                credentials = ClientSecretCredential(
                     tenant_id=tenant_id,
                     client_id=client_id,
                     client_secret=secret,
@@ -121,7 +122,7 @@ def _init_client(self) -> None:
                 "Invalid KeyVault authentication method. Possible values : default or client-secret"
             )
 
-        self.client = SecretClient(vault_url=vault_url, credential=self.credentials)
+        self.client = SecretClient(vault_url=vault_url, credential=credentials)
 
     def __call__(self, _: yaml.SafeLoader, node: yaml.Node) -> str:
         self._init_client()