[Storage] Formatted azure-storage-queue and other shared directories (Azure#41004)

Author: weirongw23-msft

sdk/storage/azure-storage-blob/azure/storage/blob/_encryption.py

@@ -11,7 +11,7 @@
 try:
     from urllib.parse import quote, unquote
 except ImportError:
-    from urllib2 import quote, unquote # type: ignore
+    from urllib2 import quote, unquote  # type: ignore
 
 
 def url_quote(url):
@@ -24,30 +24,30 @@ def url_unquote(url):
 
 def encode_base64(data):
     if isinstance(data, str):
-        data = data.encode('utf-8')
+        data = data.encode("utf-8")
     encoded = base64.b64encode(data)
-    return encoded.decode('utf-8')
+    return encoded.decode("utf-8")
 
 
 def decode_base64_to_bytes(data):
     if isinstance(data, str):
-        data = data.encode('utf-8')
+        data = data.encode("utf-8")
     return base64.b64decode(data)
 
 
 def decode_base64_to_text(data):
     decoded_bytes = decode_base64_to_bytes(data)
-    return decoded_bytes.decode('utf-8')
+    return decoded_bytes.decode("utf-8")
 
 
 def sign_string(key, string_to_sign, key_is_base64=True):
     if key_is_base64:
         key = decode_base64_to_bytes(key)
     else:
         if isinstance(key, str):
-            key = key.encode('utf-8')
+            key = key.encode("utf-8")
     if isinstance(string_to_sign, str):
-        string_to_sign = string_to_sign.encode('utf-8')
+        string_to_sign = string_to_sign.encode("utf-8")
     signed_hmac_sha256 = hmac.HMAC(key, string_to_sign, hashlib.sha256)
     digest = signed_hmac_sha256.digest()
     encoded_digest = encode_base64(digest)

sdk/storage/azure-storage-blob/azure/storage/blob/_shared/__init__.py

@@ -28,6 +28,7 @@
 logger = logging.getLogger(__name__)
 
 
+# fmt: off
 table_lv0 = [
     0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
     0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
@@ -51,6 +52,8 @@
     0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
     0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
 ]
+# fmt: on
+
 
 def compare(lhs: str, rhs: str) -> int:  # pylint:disable=too-many-return-statements
     tables = [table_lv0, table_lv4]
@@ -95,6 +98,7 @@ def _wrap_exception(ex, desired_type):
         msg = ex.args[0]
     return desired_type(msg)
 
+
 # This method attempts to emulate the sorting done by the service
 def _storage_header_sort(input_headers: List[Tuple[str, str]]) -> List[Tuple[str, str]]:
 
@@ -135,84 +139,97 @@ def __init__(self, account_name, account_key):
     @staticmethod
     def _get_headers(request, headers_to_sign):
         headers = dict((name.lower(), value) for name, value in request.http_request.headers.items() if value)
-        if 'content-length' in headers and headers['content-length'] == '0':
-            del headers['content-length']
-        return '\n'.join(headers.get(x, '') for x in headers_to_sign) + '\n'
+        if "content-length" in headers and headers["content-length"] == "0":
+            del headers["content-length"]
+        return "\n".join(headers.get(x, "") for x in headers_to_sign) + "\n"
 
     @staticmethod
     def _get_verb(request):
-        return request.http_request.method + '\n'
+        return request.http_request.method + "\n"
 
     def _get_canonicalized_resource(self, request):
         uri_path = urlparse(request.http_request.url).path
         try:
-            if isinstance(request.context.transport, AioHttpTransport) or \
-                    isinstance(getattr(request.context.transport, "_transport", None), AioHttpTransport) or \
-                    isinstance(getattr(getattr(request.context.transport, "_transport", None), "_transport", None),
-                               AioHttpTransport):
+            if (
+                isinstance(request.context.transport, AioHttpTransport)
+                or isinstance(getattr(request.context.transport, "_transport", None), AioHttpTransport)
+                or isinstance(
+                    getattr(getattr(request.context.transport, "_transport", None), "_transport", None),
+                    AioHttpTransport,
+                )
+            ):
                 uri_path = URL(uri_path)
-                return '/' + self.account_name + str(uri_path)
+                return "/" + self.account_name + str(uri_path)
         except TypeError:
             pass
-        return '/' + self.account_name + uri_path
+        return "/" + self.account_name + uri_path
 
     @staticmethod
     def _get_canonicalized_headers(request):
-        string_to_sign = ''
+        string_to_sign = ""
         x_ms_headers = []
         for name, value in request.http_request.headers.items():
-            if name.startswith('x-ms-'):
+            if name.startswith("x-ms-"):
                 x_ms_headers.append((name.lower(), value))
         x_ms_headers = _storage_header_sort(x_ms_headers)
         for name, value in x_ms_headers:
             if value is not None:
-                string_to_sign += ''.join([name, ':', value, '\n'])
+                string_to_sign += "".join([name, ":", value, "\n"])
         return string_to_sign
 
     @staticmethod
     def _get_canonicalized_resource_query(request):
         sorted_queries = list(request.http_request.query.items())
         sorted_queries.sort()
 
-        string_to_sign = ''
+        string_to_sign = ""
         for name, value in sorted_queries:
             if value is not None:
-                string_to_sign += '\n' + name.lower() + ':' + unquote(value)
+                string_to_sign += "\n" + name.lower() + ":" + unquote(value)
 
         return string_to_sign
 
     def _add_authorization_header(self, request, string_to_sign):
         try:
             signature = sign_string(self.account_key, string_to_sign)
-            auth_string = 'SharedKey ' + self.account_name + ':' + signature
-            request.http_request.headers['Authorization'] = auth_string
+            auth_string = "SharedKey " + self.account_name + ":" + signature
+            request.http_request.headers["Authorization"] = auth_string
         except Exception as ex:
             # Wrap any error that occurred as signing error
             # Doing so will clarify/locate the source of problem
             raise _wrap_exception(ex, AzureSigningError) from ex
 
     def on_request(self, request):
-        string_to_sign = \
-            self._get_verb(request) + \
-            self._get_headers(
+        string_to_sign = (
+            self._get_verb(request)
+            + self._get_headers(
                 request,
                 [
-                    'content-encoding', 'content-language', 'content-length',
-                    'content-md5', 'content-type', 'date', 'if-modified-since',
-                    'if-match', 'if-none-match', 'if-unmodified-since', 'byte_range'
-                ]
-            ) + \
-            self._get_canonicalized_headers(request) + \
-            self._get_canonicalized_resource(request) + \
-            self._get_canonicalized_resource_query(request)
+                    "content-encoding",
+                    "content-language",
+                    "content-length",
+                    "content-md5",
+                    "content-type",
+                    "date",
+                    "if-modified-since",
+                    "if-match",
+                    "if-none-match",
+                    "if-unmodified-since",
+                    "byte_range",
+                ],
+            )
+            + self._get_canonicalized_headers(request)
+            + self._get_canonicalized_resource(request)
+            + self._get_canonicalized_resource_query(request)
+        )
 
         self._add_authorization_header(request, string_to_sign)
         # logger.debug("String_to_sign=%s", string_to_sign)
 
 
 class StorageHttpChallenge(object):
     def __init__(self, challenge):
-        """ Parses an HTTP WWW-Authentication Bearer challenge from the Storage service. """
+        """Parses an HTTP WWW-Authentication Bearer challenge from the Storage service."""
         if not challenge:
             raise ValueError("Challenge cannot be empty")
 
@@ -221,7 +238,7 @@ def __init__(self, challenge):
 
         # name=value pairs either comma or space separated with values possibly being
         # enclosed in quotes
-        for item in re.split('[, ]', trimmed_challenge):
+        for item in re.split("[, ]", trimmed_challenge):
             comps = item.split("=")
             if len(comps) == 2:
                 key = comps[0].strip(' "')
@@ -230,11 +247,11 @@ def __init__(self, challenge):
                     self._parameters[key] = value
 
         # Extract and verify required parameters
-        self.authorization_uri = self._parameters.get('authorization_uri')
+        self.authorization_uri = self._parameters.get("authorization_uri")
         if not self.authorization_uri:
             raise ValueError("Authorization Uri not found")
 
-        self.resource_id = self._parameters.get('resource_id')
+        self.resource_id = self._parameters.get("resource_id")
         if not self.resource_id:
             raise ValueError("Resource id not found")