[Fileshare] Generated Fileshare using newest autorest version

sdk/storage/azure-storage-blob/tests/test_blob_api_version.py

@@ -17,7 +17,7 @@
     BlobClient,
     BlobSasPermissions
 )
-from azure.storage.blob._generated import AzureBlobStorage
+from azure.storage.blob._shared.constants import X_MS_VERSION
 from devtools_testutils import ResourceGroupPreparer, StorageAccountPreparer
 from _shared.testcase import StorageTestCase, GlobalStorageAccountPreparer
 
@@ -29,7 +29,7 @@ class StorageClientTest(StorageTestCase):
     def setUp(self):
         super(StorageClientTest, self).setUp()
         self.api_version_1 = "2019-02-02"
-        self.api_version_2 = AzureBlobStorage(url="get_api_version")._config.version # pylint: disable=protected-access
+        self.api_version_2 = X_MS_VERSION
         self.container_name = self.get_resource_name('utcontainer')
 
     # --Helpers-----------------------------------------------------------------

sdk/storage/azure-storage-blob/tests/test_blob_api_version_async.py

@@ -10,7 +10,7 @@
 
 from azure.core.exceptions import AzureError, ResourceExistsError
 from azure.storage.blob import generate_blob_sas, BlobSasPermissions
-from azure.storage.blob._generated import AzureBlobStorage
+from azure.storage.blob._shared.constants import X_MS_VERSION
 from azure.storage.blob.aio import (
     BlobServiceClient,
     ContainerClient,
@@ -27,7 +27,7 @@ class StorageClientTest(AsyncStorageTestCase):
     def setUp(self):
         super(StorageClientTest, self).setUp()
         self.api_version_1 = "2019-02-02"
-        self.api_version_2 = AzureBlobStorage(url="get_api_version")._config.version # pylint: disable=protected-access
+        self.api_version_2 = X_MS_VERSION
         self.container_name = self.get_resource_name('utcontainer')
 
     # --Helpers-----------------------------------------------------------------

sdk/storage/azure-storage-file-share/azure/storage/fileshare/_deserialize.py

@@ -49,7 +49,7 @@ def deserialize_file_properties(response, obj, headers):
 def deserialize_file_stream(response, obj, headers):
     file_properties = deserialize_file_properties(response, obj, headers)
     obj.properties = file_properties
-    return response.location_mode, obj
+    return response.http_response.location_mode, obj
 
 
 def deserialize_permission(response, obj, headers):  # pylint: disable=unused-argument

sdk/storage/azure-storage-file-share/azure/storage/fileshare/_directory_client.py

@@ -10,20 +10,20 @@
     Optional, Union, Any, Dict, TYPE_CHECKING
 )
 
+
 try:
     from urllib.parse import urlparse, quote, unquote
 except ImportError:
     from urlparse import urlparse # type: ignore
     from urllib2 import quote, unquote # type: ignore
 
 import six
+from azure.core.exceptions import HttpResponseError
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import Pipeline
 from azure.core.tracing.decorator import distributed_trace
 
 from ._generated import AzureFileStorage
-from ._generated.version import VERSION
-from ._generated.models import StorageErrorException
 from ._shared.base_client import StorageAccountHostsMixin, TransportWrapper, parse_connection_str, parse_query
 from ._shared.request_handlers import add_metadata_headers
 from ._shared.response_handlers import return_response_headers, process_storage_error
@@ -112,8 +112,9 @@ def __init__( # type: ignore
         self._query_str, credential = self._format_query_string(
             sas_token, credential, share_snapshot=self.snapshot)
         super(ShareDirectoryClient, self).__init__(parsed_url, service='file-share', credential=credential, **kwargs)
-        self._client = AzureFileStorage(version=VERSION, url=self.url, pipeline=self._pipeline)
-        self._client._config.version = get_api_version(kwargs, VERSION)  # pylint: disable=protected-access
+        self._client = AzureFileStorage(url=self.url, pipeline=self._pipeline)
+        default_api_version = self._client._config.version  # pylint: disable=protected-access
+        self._client._config.version = get_api_version(kwargs, default_api_version)  # pylint: disable=protected-access
 
     @classmethod
     def from_directory_url(cls, directory_url,  # type: str
@@ -291,7 +292,7 @@ def create_directory(self, **kwargs):
                 cls=return_response_headers,
                 headers=headers,
                 **kwargs)
-        except StorageErrorException as error:
+        except HttpResponseError as error:
             process_storage_error(error)
 
     @distributed_trace
@@ -316,7 +317,7 @@ def delete_directory(self, **kwargs):
         timeout = kwargs.pop('timeout', None)
         try:
             self._client.directory.delete(timeout=timeout, **kwargs)
-        except StorageErrorException as error:
+        except HttpResponseError as error:
             process_storage_error(error)
 
     @distributed_trace
@@ -411,7 +412,7 @@ def close_handle(self, handle, **kwargs):
                 'closed_handles_count': response.get('number_of_handles_closed', 0),
                 'failed_handles_count': response.get('number_of_handles_failed', 0)
             }
-        except StorageErrorException as error:
+        except HttpResponseError as error:
             process_storage_error(error)
 
     @distributed_trace
@@ -448,7 +449,7 @@ def close_all_handles(self, recursive=False, **kwargs):
                     cls=return_response_headers,
                     **kwargs
                 )
-            except StorageErrorException as error:
+            except HttpResponseError as error:
                 process_storage_error(error)
             continuation_token = response.get('marker')
             try_close = bool(continuation_token)
@@ -479,7 +480,7 @@ def get_directory_properties(self, **kwargs):
                 timeout=timeout,
                 cls=deserialize_directory_properties,
                 **kwargs)
-        except StorageErrorException as error:
+        except HttpResponseError as error:
             process_storage_error(error)
         return response # type: ignore
 
@@ -509,7 +510,7 @@ def set_directory_metadata(self, metadata, **kwargs):
                 cls=return_response_headers,
                 headers=headers,
                 **kwargs)
-        except StorageErrorException as error:
+        except HttpResponseError as error:
             process_storage_error(error)
 
     @distributed_trace
@@ -562,7 +563,7 @@ def set_http_headers(self, file_attributes="none",  # type: Union[str, NTFSAttri
                 timeout=timeout,
                 cls=return_response_headers,
                 **kwargs)
-        except StorageErrorException as error:
+        except HttpResponseError as error:
             process_storage_error(error)
 
     @distributed_trace

sdk/storage/azure-storage-file-share/azure/storage/fileshare/_file_client.py

@@ -12,19 +12,20 @@
     TYPE_CHECKING
 )
 
+
 try:
     from urllib.parse import urlparse, quote, unquote
 except ImportError:
     from urlparse import urlparse # type: ignore
     from urllib2 import quote, unquote # type: ignore
 
 import six
+from azure.core.exceptions import HttpResponseError
 from azure.core.paging import ItemPaged  # pylint: disable=ungrouped-imports
 from azure.core.tracing.decorator import distributed_trace
 
 from ._generated import AzureFileStorage
-from ._generated.version import VERSION
-from ._generated.models import StorageErrorException, FileHTTPHeaders
+from ._generated.models import FileHTTPHeaders
 from ._shared.uploads import IterStreamer, FileChunkUploader, upload_data_chunks
 from ._shared.base_client import StorageAccountHostsMixin, parse_connection_str, parse_query
 from ._shared.request_handlers import add_metadata_headers, get_length
@@ -89,7 +90,7 @@ def _upload_file_helper(
             **kwargs
         )
         return sorted(responses, key=lambda r: r.get('last_modified'))[-1]
-    except StorageErrorException as error:
+    except HttpResponseError as error:
         process_storage_error(error)
 
 
@@ -165,8 +166,9 @@ def __init__( # type: ignore
         self._query_str, credential = self._format_query_string(
             sas_token, credential, share_snapshot=self.snapshot)
         super(ShareFileClient, self).__init__(parsed_url, service='file-share', credential=credential, **kwargs)
-        self._client = AzureFileStorage(version=VERSION, url=self.url, pipeline=self._pipeline)
-        self._client._config.version = get_api_version(kwargs, VERSION)  # pylint: disable=protected-access
+        self._client = AzureFileStorage(url=self.url, pipeline=self._pipeline)
+        default_api_version = self._client._config.version  # pylint: disable=protected-access
+        self._client._config.version = get_api_version(kwargs, default_api_version) # pylint: disable=protected-access
 
     @classmethod
     def from_file_url(
@@ -396,7 +398,7 @@ def create_file(  # type: ignore
                 timeout=timeout,
                 cls=return_response_headers,
                 **kwargs)
-        except StorageErrorException as error:
+        except HttpResponseError as error:
             process_storage_error(error)
 
     @distributed_trace
@@ -631,7 +633,7 @@ def start_copy_from_url(self, source_url, **kwargs):
                 cls=return_response_headers,
                 timeout=timeout,
                 **kwargs)
-        except StorageErrorException as error:
+        except HttpResponseError as error:
             process_storage_error(error)
 
     def abort_copy(self, copy_id, **kwargs):
@@ -669,7 +671,7 @@ def abort_copy(self, copy_id, **kwargs):
             self._client.file.abort_copy(copy_id=copy_id,
                                          lease_access_conditions=access_conditions,
                                          timeout=timeout, **kwargs)
-        except StorageErrorException as error:
+        except HttpResponseError as error:
             process_storage_error(error)
 
     @distributed_trace
@@ -772,7 +774,7 @@ def delete_file(self, **kwargs):
         timeout = kwargs.pop('timeout', None)
         try:
             self._client.file.delete(lease_access_conditions=access_conditions, timeout=timeout, **kwargs)
-        except StorageErrorException as error:
+        except HttpResponseError as error:
             process_storage_error(error)
 
     @distributed_trace
@@ -802,7 +804,7 @@ def get_file_properties(self, **kwargs):
                 timeout=timeout,
                 cls=deserialize_file_properties,
                 **kwargs)
-        except StorageErrorException as error:
+        except HttpResponseError as error:
             process_storage_error(error)
         file_props.name = self.file_name
         file_props.share = self.share_name
@@ -884,7 +886,7 @@ def set_http_headers(self, content_settings,  # type: ContentSettings
                 timeout=timeout,
                 cls=return_response_headers,
                 **kwargs)
-        except StorageErrorException as error:
+        except HttpResponseError as error:
             process_storage_error(error)
 
     @distributed_trace
@@ -924,7 +926,7 @@ def set_file_metadata(self, metadata=None, **kwargs):
                 metadata=metadata,
                 lease_access_conditions=access_conditions,
                 **kwargs)
-        except StorageErrorException as error:
+        except HttpResponseError as error:
             process_storage_error(error)
 
     @distributed_trace
@@ -987,7 +989,7 @@ def upload_range(  # type: ignore
                 lease_access_conditions=access_conditions,
                 cls=return_response_headers,
                 **kwargs)
-        except StorageErrorException as error:
+        except HttpResponseError as error:
             process_storage_error(error)
 
     @staticmethod
@@ -1091,7 +1093,7 @@ def upload_range_from_url(self, source_url,
         )
         try:
             return self._client.file.upload_range_from_url(**options)  # type: ignore
-        except StorageErrorException as error:
+        except HttpResponseError as error:
             process_storage_error(error)
 
     def _get_ranges_options( # type: ignore
@@ -1161,7 +1163,7 @@ def get_ranges(  # type: ignore
             **kwargs)
         try:
             ranges = self._client.file.get_range_list(**options)
-        except StorageErrorException as error:
+        except HttpResponseError as error:
             process_storage_error(error)
         return [{'start': file_range.start, 'end': file_range.end} for file_range in ranges.ranges]
 
@@ -1204,7 +1206,7 @@ def get_ranges_diff(  # type: ignore
             **kwargs)
         try:
             ranges = self._client.file.get_range_list(**options)
-        except StorageErrorException as error:
+        except HttpResponseError as error:
             process_storage_error(error)
         return get_file_ranges_result(ranges)
 
@@ -1252,11 +1254,12 @@ def clear_range( # type: ignore
                 timeout=timeout,
                 cls=return_response_headers,
                 content_length=0,
+                optionalbody=None,
                 file_range_write="clear",
                 range=content_range,
                 lease_access_conditions=access_conditions,
                 **kwargs)
-        except StorageErrorException as error:
+        except HttpResponseError as error:
             process_storage_error(error)
 
     @distributed_trace
@@ -1291,7 +1294,7 @@ def resize_file(self, size, **kwargs):
                 cls=return_response_headers,
                 timeout=timeout,
                 **kwargs)
-        except StorageErrorException as error:
+        except HttpResponseError as error:
             process_storage_error(error)
 
     @distributed_trace
@@ -1348,7 +1351,7 @@ def close_handle(self, handle, **kwargs):
                 'closed_handles_count': response.get('number_of_handles_closed', 0),
                 'failed_handles_count': response.get('number_of_handles_failed', 0)
             }
-        except StorageErrorException as error:
+        except HttpResponseError as error:
             process_storage_error(error)
 
     @distributed_trace
@@ -1381,7 +1384,7 @@ def close_all_handles(self, **kwargs):
                     cls=return_response_headers,
                     **kwargs
                 )
-            except StorageErrorException as error:
+            except HttpResponseError as error:
                 process_storage_error(error)
             continuation_token = response.get('marker')
             try_close = bool(continuation_token)

sdk/storage/azure-storage-file-share/azure/storage/fileshare/_generated/__init__.py

@@ -1,18 +1,16 @@
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for
-# license information.
-#
+# Licensed under the MIT License. See License.txt in the project root for license information.
 # Code generated by Microsoft (R) AutoRest Code Generator.
-# Changes may cause incorrect behavior and will be lost if the code is
-# regenerated.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
 from ._azure_file_storage import AzureFileStorage
 __all__ = ['AzureFileStorage']
 
-from .version import VERSION
-
-__version__ = VERSION
-
+try:
+    from ._patch import patch_sdk  # type: ignore
+    patch_sdk()
+except ImportError:
+    pass