[Monitor Ingestion] Regen with latest autorest (Azure#31912)

This addresses changes needed for the next-pylint check.

Signed-off-by: Paul Van Eck <paulvaneck@microsoft.com>

Author: pvaneck

sdk/monitor/azure-monitor-ingestion/azure/monitor/ingestion/_configuration.py

@@ -18,7 +18,7 @@
 VERSION = "unknown"
 
 
-class LogsIngestionClientConfiguration(Configuration):  # pylint: disable=too-many-instance-attributes
+class LogsIngestionClientConfiguration(Configuration):  # pylint: disable=too-many-instance-attributes,name-too-long
     """Configuration for LogsIngestionClient.
 
     Note that all parameters used to create this instance are saved as instance

sdk/monitor/azure-monitor-ingestion/azure/monitor/ingestion/_operations/_operations.py

@@ -19,13 +19,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 
 from .._serialization import Serializer
-from .._vendor import LogsIngestionClientMixinABC, _format_url_section
+from .._vendor import LogsIngestionClientMixinABC
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
@@ -40,12 +39,7 @@
 
 
 def build_logs_ingestion_upload_request(
-    rule_id: str,
-    stream: str,
-    *,
-    content_encoding: Optional[str] = None,
-    x_ms_client_request_id: Optional[str] = None,
-    **kwargs: Any
+    rule_id: str, stream: str, *, content_encoding: Optional[str] = None, **kwargs: Any
 ) -> HttpRequest:
     _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
     _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
@@ -61,16 +55,14 @@ def build_logs_ingestion_upload_request(
         "stream": _SERIALIZER.url("stream", stream, "str"),
     }
 
-    _url: str = _format_url_section(_url, **path_format_arguments)  # type: ignore
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
 
     # Construct parameters
     _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
 
     # Construct headers
     if content_encoding is not None:
         _headers["Content-Encoding"] = _SERIALIZER.header("content_encoding", content_encoding, "str")
-    if x_ms_client_request_id is not None:
-        _headers["x-ms-client-request-id"] = _SERIALIZER.header("x_ms_client_request_id", x_ms_client_request_id, "str")
     if content_type is not None:
         _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str")
     _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
@@ -87,7 +79,6 @@ def _upload(  # pylint: disable=inconsistent-return-statements
         body: List[JSON],
         *,
         content_encoding: Optional[str] = None,
-        x_ms_client_request_id: Optional[str] = None,
         content_type: str = "application/json",
         **kwargs: Any
     ) -> None:
@@ -101,7 +92,6 @@ def _upload(  # pylint: disable=inconsistent-return-statements
         body: IO,
         *,
         content_encoding: Optional[str] = None,
-        x_ms_client_request_id: Optional[str] = None,
         content_type: str = "application/json",
         **kwargs: Any
     ) -> None:
@@ -115,7 +105,6 @@ def _upload(  # pylint: disable=inconsistent-return-statements
         body: Union[List[JSON], IO],
         *,
         content_encoding: Optional[str] = None,
-        x_ms_client_request_id: Optional[str] = None,
         **kwargs: Any
     ) -> None:
         """Ingestion API used to directly ingest data using Data Collection Rules.
@@ -131,8 +120,6 @@ def _upload(  # pylint: disable=inconsistent-return-statements
         :type body: list[JSON] or IO
         :keyword content_encoding: gzip. Default value is None.
         :paramtype content_encoding: str
-        :keyword x_ms_client_request_id: Client request Id. Default value is None.
-        :paramtype x_ms_client_request_id: str
         :keyword content_type: Body Parameter content-type. Known values are: 'application/json'.
          Default value is None.
         :paramtype content_type: str
@@ -166,7 +153,6 @@ def _upload(  # pylint: disable=inconsistent-return-statements
             rule_id=rule_id,
             stream=stream,
             content_encoding=content_encoding,
-            x_ms_client_request_id=x_ms_client_request_id,
             content_type=content_type,
             api_version=self._config.api_version,
             json=_json,
@@ -187,6 +173,8 @@ def _upload(  # pylint: disable=inconsistent-return-statements
         response = pipeline_response.http_response
 
         if response.status_code not in [204]:
+            if _stream:
+                response.read()  # Load the body in memory and close the socket
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response)
 

sdk/monitor/azure-monitor-ingestion/azure/monitor/ingestion/_serialization.py

@@ -662,8 +662,9 @@ def _serialize(self, target_obj, data_type=None, **kwargs):
                                 _serialized.update(_new_attr)  # type: ignore
                             _new_attr = _new_attr[k]  # type: ignore
                             _serialized = _serialized[k]
-                except ValueError:
-                    continue
+                except ValueError as err:
+                    if isinstance(err, SerializationError):
+                        raise
 
         except (AttributeError, KeyError, TypeError) as err:
             msg = "Attribute {} in object {} cannot be serialized.\n{}".format(attr_name, class_name, str(target_obj))
@@ -729,6 +730,8 @@ def url(self, name, data, data_type, **kwargs):
 
             if kwargs.get("skip_quote") is True:
                 output = str(output)
+                # https://github.com/Azure/autorest.python/issues/2063
+                output = output.replace("{", quote("{")).replace("}", quote("}"))
             else:
                 output = quote(str(output), safe="")
         except SerializationError:
@@ -741,6 +744,8 @@ def query(self, name, data, data_type, **kwargs):
 
         :param data: The data to be serialized.
         :param str data_type: The type to be serialized from.
+        :keyword bool skip_quote: Whether to skip quote the serialized result.
+        Defaults to False.
         :rtype: str
         :raises: TypeError if serialization fails.
         :raises: ValueError if data is None
@@ -749,10 +754,8 @@ def query(self, name, data, data_type, **kwargs):
             # Treat the list aside, since we don't want to encode the div separator
             if data_type.startswith("["):
                 internal_data_type = data_type[1:-1]
-                data = [self.serialize_data(d, internal_data_type, **kwargs) if d is not None else "" for d in data]
-                if not kwargs.get("skip_quote", False):
-                    data = [quote(str(d), safe="") for d in data]
-                return str(self.serialize_iter(data, internal_data_type, **kwargs))
+                do_quote = not kwargs.get("skip_quote", False)
+                return str(self.serialize_iter(data, internal_data_type, do_quote=do_quote, **kwargs))
 
             # Not a list, regular serialization
             output = self.serialize_data(data, data_type, **kwargs)
@@ -891,6 +894,8 @@ def serialize_iter(self, data, iter_type, div=None, **kwargs):
          not be None or empty.
         :param str div: If set, this str will be used to combine the elements
          in the iterable into a combined string. Default is 'None'.
+        :keyword bool do_quote: Whether to quote the serialized result of each iterable element.
+        Defaults to False.
         :rtype: list, str
         """
         if isinstance(data, str):
@@ -903,9 +908,14 @@ def serialize_iter(self, data, iter_type, div=None, **kwargs):
         for d in data:
             try:
                 serialized.append(self.serialize_data(d, iter_type, **kwargs))
-            except ValueError:
+            except ValueError as err:
+                if isinstance(err, SerializationError):
+                    raise
                 serialized.append(None)
 
+        if kwargs.get("do_quote", False):
+            serialized = ["" if s is None else quote(str(s), safe="") for s in serialized]
+
         if div:
             serialized = ["" if s is None else str(s) for s in serialized]
             serialized = div.join(serialized)
@@ -950,7 +960,9 @@ def serialize_dict(self, attr, dict_type, **kwargs):
         for key, value in attr.items():
             try:
                 serialized[self.serialize_unicode(key)] = self.serialize_data(value, dict_type, **kwargs)
-            except ValueError:
+            except ValueError as err:
+                if isinstance(err, SerializationError):
+                    raise
                 serialized[self.serialize_unicode(key)] = None
 
         if "xml" in serialization_ctxt:

sdk/monitor/azure-monitor-ingestion/azure/monitor/ingestion/_vendor.py

@@ -6,7 +6,7 @@
 # --------------------------------------------------------------------------
 
 from abc import ABC
-from typing import List, TYPE_CHECKING, cast
+from typing import TYPE_CHECKING
 
 from ._configuration import LogsIngestionClientConfiguration
 
@@ -17,18 +17,6 @@
     from ._serialization import Deserializer, Serializer
 
 
-def _format_url_section(template, **kwargs):
-    components = template.split("/")
-    while components:
-        try:
-            return template.format(**kwargs)
-        except KeyError as key:
-            # Need the cast, as for some reasons "split" is typed as list[str | Any]
-            formatted_components = cast(List[str], template.split("/"))
-            components = [c for c in formatted_components if "{}".format(key.args[0]) not in c]
-            template = "/".join(components)
-
-
 class LogsIngestionClientMixinABC(ABC):
     """DO NOT use this class. It is for internal typing use only."""
 

sdk/monitor/azure-monitor-ingestion/azure/monitor/ingestion/aio/_configuration.py

@@ -18,7 +18,7 @@
 VERSION = "unknown"
 
 
-class LogsIngestionClientConfiguration(Configuration):  # pylint: disable=too-many-instance-attributes
+class LogsIngestionClientConfiguration(Configuration):  # pylint: disable=too-many-instance-attributes,name-too-long
     """Configuration for LogsIngestionClient.
 
     Note that all parameters used to create this instance are saved as instance

sdk/monitor/azure-monitor-ingestion/azure/monitor/ingestion/aio/_operations/_operations.py

@@ -19,8 +19,7 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 
@@ -45,7 +44,6 @@ async def _upload(  # pylint: disable=inconsistent-return-statements
         body: List[JSON],
         *,
         content_encoding: Optional[str] = None,
-        x_ms_client_request_id: Optional[str] = None,
         content_type: str = "application/json",
         **kwargs: Any
     ) -> None:
@@ -59,7 +57,6 @@ async def _upload(  # pylint: disable=inconsistent-return-statements
         body: IO,
         *,
         content_encoding: Optional[str] = None,
-        x_ms_client_request_id: Optional[str] = None,
         content_type: str = "application/json",
         **kwargs: Any
     ) -> None:
@@ -73,7 +70,6 @@ async def _upload(  # pylint: disable=inconsistent-return-statements
         body: Union[List[JSON], IO],
         *,
         content_encoding: Optional[str] = None,
-        x_ms_client_request_id: Optional[str] = None,
         **kwargs: Any
     ) -> None:
         """Ingestion API used to directly ingest data using Data Collection Rules.
@@ -89,8 +85,6 @@ async def _upload(  # pylint: disable=inconsistent-return-statements
         :type body: list[JSON] or IO
         :keyword content_encoding: gzip. Default value is None.
         :paramtype content_encoding: str
-        :keyword x_ms_client_request_id: Client request Id. Default value is None.
-        :paramtype x_ms_client_request_id: str
         :keyword content_type: Body Parameter content-type. Known values are: 'application/json'.
          Default value is None.
         :paramtype content_type: str
@@ -124,7 +118,6 @@ async def _upload(  # pylint: disable=inconsistent-return-statements
             rule_id=rule_id,
             stream=stream,
             content_encoding=content_encoding,
-            x_ms_client_request_id=x_ms_client_request_id,
             content_type=content_type,
             api_version=self._config.api_version,
             json=_json,
@@ -145,6 +138,8 @@ async def _upload(  # pylint: disable=inconsistent-return-statements
         response = pipeline_response.http_response
 
         if response.status_code not in [204]:
+            if _stream:
+                await response.read()  # Load the body in memory and close the socket
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response)