Merge branch 'main' into UAL-logs

microsoft · Sep 18, 2024 · 265bc2a · 265bc2a
2 parents 62c42ce + 2755ea4
commit 265bc2a
Show file tree

Hide file tree

Showing 73 changed files with 4,017 additions and 2,179 deletions.
diff --git a/msticpy/_version.py b/msticpy/_version.py
@@ -1,3 +1,3 @@
 """Version file."""
 
-VERSION = "2.12.0"
+VERSION = "2.13.0"
diff --git a/msticpy/aiagents/config_utils.py b/msticpy/aiagents/config_utils.py
@@ -13,7 +13,6 @@
 from ..common.exceptions import MsticpyUserConfigError
 from ..common.pkg_config import get_config
 
-
 ConfigItem = Dict[str, Union[str, Callable]]
 ConfigList = List[ConfigItem]
 Config = Dict[str, Union[str, float, ConfigList]]

diff --git a/msticpy/aiagents/rag_agents.py b/msticpy/aiagents/rag_agents.py
@@ -11,7 +11,6 @@
 """
 
 import sys
-
 from pathlib import Path
 from typing import List, Optional
 

diff --git a/msticpy/analysis/syslog_utils.py b/msticpy/analysis/syslog_utils.py
@@ -97,7 +97,7 @@ def create_host_record(
         ip_entity = IpAddress()
         ip_entity.Address = host_hb["ComputerIP"]
         geoloc_entity = GeoLocation()
-        geoloc_entity.CountryName = host_hb["RemoteIPCountry"]  # type: ignore
+        geoloc_entity.CountryOrRegionName = host_hb["RemoteIPCountry"]  # type: ignore
         geoloc_entity.Longitude = host_hb["RemoteIPLongitude"]  # type: ignore
         geoloc_entity.Latitude = host_hb["RemoteIPLatitude"]  # type: ignore
         ip_entity.Location = geoloc_entity  # type: ignore

diff --git a/msticpy/auth/azure_auth.py b/msticpy/auth/azure_auth.py
@@ -21,6 +21,7 @@
     AzCredentials,
     AzureCloudConfig,
     AzureCredEnvNames,
+    ChainedTokenCredential,
     az_connect_core,
 )
 from .cred_wrapper import CredentialWrapper
@@ -99,7 +100,10 @@ def az_connect(
             az_cli_config.args.get("clientSecret") or ""
         )
     credentials = az_connect_core(
-        auth_methods=auth_methods, tenant_id=tenant_id, silent=silent, **kwargs
+        auth_methods=auth_methods,
+        tenant_id=tenant_id,
+        silent=silent,
+        **kwargs,
     )
     sub_client = SubscriptionClient(
         credential=credentials.modern,
@@ -174,7 +178,7 @@ def fallback_devicecode_creds(
     if not creds:
         raise CloudError("Could not obtain credentials.")
 
-    return AzCredentials(legacy_creds, creds)
+    return AzCredentials(legacy_creds, ChainedTokenCredential(creds))  # type: ignore[arg-type]
 
 
 def get_default_resource_name(resource_uri: str) -> str: