[Storage] Fix for missing expires_on kwarg in request handler (#38767)

Author: weirongw23-msft

sdk/storage/azure-storage-file-datalake/CHANGELOG.md

@@ -4,6 +4,9 @@
 
 ### Features Added
 
+### Bugs Fixed
+- Fixed request handler to handle `None` value for `expires_on` keyword to `set_file_expiry` API.
+
 ## 12.18.0 (2024-11-13)
 
 ### Features Added

sdk/storage/azure-storage-file-datalake/assets.json

@@ -2,5 +2,5 @@
   "AssetsRepo": "Azure/azure-sdk-assets",
   "AssetsRepoPrefixPath": "python",
   "TagPrefix": "python/storage/azure-storage-file-datalake",
-  "Tag": "python/storage/azure-storage-file-datalake_e5d1c29802"
+  "Tag": "python/storage/azure-storage-file-datalake_202e9f5227"
 }

sdk/storage/azure-storage-file-datalake/azure/storage/filedatalake/_data_lake_file_client.py

@@ -5,6 +5,7 @@
 # --------------------------------------------------------------------------
 # pylint: disable=docstring-keyword-should-match-keyword-only
 
+from datetime import datetime
 from io import BytesIO
 from typing import (
     Any, AnyStr, AsyncIterable, Dict, IO, Iterable, Optional, Union,
@@ -32,7 +33,6 @@
 
 if TYPE_CHECKING:
     from azure.core.credentials import AzureNamedKeyCredential, AzureSasCredential, TokenCredential
-    from datetime import datetime
     from ._models import ContentSettings
 
 
@@ -368,9 +368,9 @@ def set_file_expiry(self, expiry_options,  # type: str
             #other-client--per-operation-configuration>`_.
         :rtype: None
         """
-        try:
+        if isinstance(expires_on, datetime):
             expires_on = convert_datetime_to_rfc1123(expires_on)
-        except AttributeError:
+        elif expires_on is not None:
             expires_on = str(expires_on)
         self._datalake_client_for_blob_operation.path \
             .set_expiry(expiry_options, expires_on=expires_on, **kwargs)

sdk/storage/azure-storage-file-datalake/azure/storage/filedatalake/aio/_data_lake_file_client_async.py

@@ -5,6 +5,7 @@
 # --------------------------------------------------------------------------
 # pylint: disable=invalid-overridden-method, docstring-keyword-should-match-keyword-only
 
+from datetime import datetime
 from typing import (
     Any, AnyStr, AsyncIterable, Dict, IO, Iterable, Optional, Union,
     TYPE_CHECKING)
@@ -23,7 +24,6 @@
 if TYPE_CHECKING:
     from azure.core.credentials import AzureNamedKeyCredential, AzureSasCredential
     from azure.core.credentials_async import AsyncTokenCredential
-    from datetime import datetime
     from .._models import ContentSettings
 
 
@@ -328,9 +328,9 @@ async def set_file_expiry(self, expiry_options,  # type: str
             #other-client--per-operation-configuration>`_.
         :rtype: None
         """
-        try:
+        if isinstance(expires_on, datetime):
             expires_on = convert_datetime_to_rfc1123(expires_on)
-        except AttributeError:
+        elif expires_on is not None:
             expires_on = str(expires_on)
         await self._datalake_client_for_blob_operation.path.set_expiry(expiry_options, expires_on=expires_on,
                                                                        **kwargs)

sdk/storage/azure-storage-file-datalake/tests/test_file.py

@@ -1188,13 +1188,18 @@ def test_set_expiry(self, **kwargs):
             content_disposition='inline')
         expiry_time = self.get_datetime_variable(variables, 'expiry_time', datetime.utcnow() + timedelta(hours=1))
         file_client = directory_client.create_file("newfile", metadata=metadata, content_settings=content_settings)
+
+        # Act / Assert
         file_client.set_file_expiry("Absolute", expires_on=expiry_time)
         properties = file_client.get_file_properties()
-
-        # Assert
         assert properties
         assert properties.expiry_time is not None
 
+        file_client.set_file_expiry("NeverExpire")
+        properties = file_client.get_file_properties()
+        assert properties
+        assert properties.expiry_time is None
+
         return variables
 
     @DataLakePreparer()

sdk/storage/azure-storage-file-datalake/tests/test_file_async.py

@@ -1137,13 +1137,18 @@ async def test_set_expiry(self, **kwargs):
             content_disposition='inline')
         expiry_time = self.get_datetime_variable(variables, 'expiry_time', datetime.utcnow() + timedelta(hours=1))
         file_client = await directory_client.create_file("newfile", metadata=metadata, content_settings=content_settings)
+
+        # Act / Assert
         await file_client.set_file_expiry("Absolute", expires_on=expiry_time)
         properties = await file_client.get_file_properties()
-
-        # Assert
         assert properties
         assert properties.expiry_time is not None
 
+        await file_client.set_file_expiry("NeverExpire")
+        properties = await file_client.get_file_properties()
+        assert properties
+        assert properties.expiry_time is None
+
         return variables
 
     @DataLakePreparer()