users/asafsmahlev/minor_fixes (#533)

Author: AsafMah

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [4.4.1] - 2024-05-06
+
+### Fixed
+- Fixed bug in ManagedIdentity close method
+- Fixed bug in IngestionResult repr
+
 ## [4.4.0] - 2024-04-08
 
 ### Added

azure-kusto-data/azure/kusto/data/_token_providers.py

@@ -401,7 +401,7 @@ def _get_token_from_cache_impl(self) -> Optional[dict]:
     def close(self):
         if self._msi_auth_context is not None:
             self._msi_auth_context.close()
-        if self._msi_auth_context is not None:
+        if self._msi_auth_context_async is not None:
             raise KustoAsyncUsageError("Can't close async token provider with sync close", self.is_async)
 
     async def close_async(self):

azure-kusto-data/azure/kusto/data/_version.py

@@ -1,3 +1,3 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License
-VERSION = "4.4.0"
+VERSION = "4.4.1"

azure-kusto-data/tests/aio/test_async_token_providers.py

@@ -354,3 +354,22 @@ async def test_azure_identity_token_provider(self):
         ) as provider:
             token = await provider.get_token_async()
             assert TokenProviderTests.get_token_value(token) is not None
+
+    @aio_documented_by(TokenProviderTests.test_sanity_close)
+    @pytest.mark.asyncio
+    async def test_sanity_close(self):
+        DUMMY_URI = "https://dummy_uri.kusto.windows.net"
+        providers = [
+            MsiTokenProvider(DUMMY_URI, is_async=True),
+            AzCliTokenProvider(DUMMY_URI, is_async=True),
+            UserPassTokenProvider(DUMMY_URI, "organizations", "a", "b", is_async=True),
+            ApplicationKeyTokenProvider(DUMMY_URI, "a", "b", "c", is_async=True),
+            ApplicationCertificateTokenProvider(DUMMY_URI, "a", "b", "c", "d", is_async=True),
+            CallbackTokenProvider(lambda: "a", None),
+            AzureIdentityTokenCredentialProvider(DUMMY_URI, credential=AsyncDefaultAzureCredential(), is_async=True),
+            DeviceLoginTokenProvider(DUMMY_URI, "organizations", lambda x, x2, x3: None, is_async=True),
+        ]
+
+        for provider in providers:
+            async with provider:
+                pass

azure-kusto-data/tests/test_token_providers.py

@@ -370,3 +370,21 @@ def test_azure_identity_default_token_provider():
         ) as provider:
             token = provider.get_token()
             assert TokenProviderTests.get_token_value(token) is not None
+
+    @staticmethod
+    def test_sanity_close():
+        DUMMY_URI = "https://dummy_uri.kusto.windows.net"
+        providers = [
+            MsiTokenProvider(DUMMY_URI),
+            AzCliTokenProvider(DUMMY_URI),
+            UserPassTokenProvider(DUMMY_URI, "organizations", "a", "b"),
+            ApplicationKeyTokenProvider(DUMMY_URI, "a", "b", "c"),
+            ApplicationCertificateTokenProvider(DUMMY_URI, "a", "b", "c", "d"),
+            CallbackTokenProvider(lambda: "a", None),
+            AzureIdentityTokenCredentialProvider(DUMMY_URI, credential=DefaultAzureCredential()),
+            DeviceLoginTokenProvider(DUMMY_URI, "organizations", lambda x, x2, x3: None),
+        ]
+
+        for provider in providers:
+            with provider:
+                pass

azure-kusto-ingest/azure/kusto/ingest/_version.py

@@ -1,3 +1,3 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License
-VERSION = "4.4.0"
+VERSION = "4.4.1"

azure-kusto-ingest/azure/kusto/ingest/base_ingest_client.py

@@ -65,9 +65,11 @@ def __init__(self, status: IngestionStatus, database: str, table: str, source_id
 
     def __repr__(self):
         # Remove query parameters from blob_uri, if exists
+        obfuscated_path = None
         if isinstance(self.blob_uri, str):
             obfuscated_path = self.blob_uri.split("?")[0].split(";")[0]
-        return f"IngestionResult(status={self.status}, database={self.database}, table={self.table}, source_id={self.source_id}, blob_uri={obfuscated_path})"
+        blob_uri = f", obfuscated_blob_uri={obfuscated_path}" if obfuscated_path else ""
+        return f"IngestionResult(status={self.status}, database={self.database}, table={self.table}, source_id={self.source_id}{blob_uri})"
 
 
 class BaseIngestClient(metaclass=ABCMeta):

azure-kusto-ingest/tests/test_status_q.py

@@ -3,12 +3,13 @@
 import json
 import time
 import unittest
+import uuid
 from unittest import mock
 from uuid import uuid4
 
 from azure.storage.queue import QueueMessage, QueueClient
 
-from azure.kusto.ingest import QueuedIngestClient
+from azure.kusto.ingest import QueuedIngestClient, IngestionResult, IngestionStatus
 from azure.kusto.ingest._resource_manager import _ResourceUri
 from azure.kusto.ingest.status import KustoIngestStatusQueues, SuccessMessage, FailureMessage
 
@@ -251,3 +252,13 @@ def test_pop_unbalanced_queues(self):
                 actual[call_args[0][0].queue_name] = actual.get(call_args[0][0].queue_name, 0) + call_args[1]["messages_per_page"]
 
             assert actual[fake_failed_queue2.object_name] + actual[fake_failed_queue1.object_name] == (4 + 4 + 6)
+
+    def test_status_sanity(self):
+        i = IngestionResult(IngestionStatus.QUEUED, "db", "table", uuid.UUID("11111111-1111-1111-1111-111111111111"), "path")
+        assert (
+            repr(i)
+            == "IngestionResult(status=IngestionStatus.QUEUED, database=db, table=table, source_id=11111111-1111-1111-1111-111111111111, obfuscated_blob_uri=path)"
+        )
+
+        no_path = IngestionResult(IngestionStatus.QUEUED, "db", "table", uuid.UUID("11111111-1111-1111-1111-111111111111"))
+        assert repr(no_path) == "IngestionResult(status=IngestionStatus.QUEUED, database=db, table=table, source_id=11111111-1111-1111-1111-111111111111)"