[Monitor] Regen ingestion + query for next pylint (#33493)

Signed-off-by: Paul Van Eck <[email protected]>

Author: pvaneck

sdk/monitor/azure-monitor-ingestion/CHANGELOG.md

@@ -10,6 +10,8 @@
 
 ### Other Changes
 
+* Bumped minimum dependency on `azure-core` to `>=1.28.0`.
+
 ## 1.0.3 (2023-11-07)
 
 ### Other Changes

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

@@ -10,6 +10,7 @@
 from typing import Any, TYPE_CHECKING
 
 from azure.core import PipelineClient
+from azure.core.pipeline import policies
 from azure.core.rest import HttpRequest, HttpResponse
 
 from ._configuration import LogsIngestionClientConfiguration
@@ -37,13 +38,30 @@ class LogsIngestionClient(LogsIngestionClientOperationsMixin):  # pylint: disabl
     def __init__(self, endpoint: str, credential: "TokenCredential", **kwargs: Any) -> None:
         _endpoint = "{endpoint}"
         self._config = LogsIngestionClientConfiguration(endpoint=endpoint, credential=credential, **kwargs)
-        self._client: PipelineClient = PipelineClient(base_url=_endpoint, config=self._config, **kwargs)
+        _policies = kwargs.pop("policies", None)
+        if _policies is None:
+            _policies = [
+                policies.RequestIdPolicy(**kwargs),
+                self._config.headers_policy,
+                self._config.user_agent_policy,
+                self._config.proxy_policy,
+                policies.ContentDecodePolicy(**kwargs),
+                self._config.redirect_policy,
+                self._config.retry_policy,
+                self._config.authentication_policy,
+                self._config.custom_hook_policy,
+                self._config.logging_policy,
+                policies.DistributedTracingPolicy(**kwargs),
+                policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None,
+                self._config.http_logging_policy,
+            ]
+        self._client: PipelineClient = PipelineClient(base_url=_endpoint, policies=_policies, **kwargs)
 
         self._serialize = Serializer()
         self._deserialize = Deserializer()
         self._serialize.client_side_validation = False
 
-    def send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse:
+    def send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs: Any) -> HttpResponse:
         """Runs the network request through the client's chained policies.
 
         >>> from azure.core.rest import HttpRequest
@@ -67,7 +85,7 @@ def send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse:
         }
 
         request_copy.url = self._client.format_url(request_copy.url, **path_format_arguments)
-        return self._client.send_request(request_copy, **kwargs)
+        return self._client.send_request(request_copy, stream=stream, **kwargs)  # type: ignore
 
     def close(self) -> None:
         self._client.close()

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

@@ -8,7 +8,6 @@
 
 from typing import Any, TYPE_CHECKING
 
-from azure.core.configuration import Configuration
 from azure.core.pipeline import policies
 
 if TYPE_CHECKING:
@@ -18,7 +17,7 @@
 VERSION = "unknown"
 
 
-class LogsIngestionClientConfiguration(Configuration):  # pylint: disable=too-many-instance-attributes,name-too-long
+class LogsIngestionClientConfiguration:  # 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
@@ -35,7 +34,6 @@ class LogsIngestionClientConfiguration(Configuration):  # pylint: disable=too-ma
     """
 
     def __init__(self, endpoint: str, credential: "TokenCredential", **kwargs: Any) -> None:
-        super(LogsIngestionClientConfiguration, self).__init__(**kwargs)
         api_version: str = kwargs.pop("api_version", "2023-01-01")
 
         if endpoint is None:
@@ -48,6 +46,7 @@ def __init__(self, endpoint: str, credential: "TokenCredential", **kwargs: Any)
         self.api_version = api_version
         self.credential_scopes = kwargs.pop("credential_scopes", ["https://monitor.azure.com//.default"])
         kwargs.setdefault("sdk_moniker", "monitor-ingestion/{}".format(VERSION))
+        self.polling_interval = kwargs.get("polling_interval", 30)
         self._configure(**kwargs)
 
     def _configure(self, **kwargs: Any) -> None:
@@ -56,9 +55,9 @@ def _configure(self, **kwargs: Any) -> None:
         self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs)
         self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs)
         self.http_logging_policy = kwargs.get("http_logging_policy") or policies.HttpLoggingPolicy(**kwargs)
-        self.retry_policy = kwargs.get("retry_policy") or policies.RetryPolicy(**kwargs)
         self.custom_hook_policy = kwargs.get("custom_hook_policy") or policies.CustomHookPolicy(**kwargs)
         self.redirect_policy = kwargs.get("redirect_policy") or policies.RedirectPolicy(**kwargs)
+        self.retry_policy = kwargs.get("retry_policy") or policies.RetryPolicy(**kwargs)
         self.authentication_policy = kwargs.get("authentication_policy")
         if self.credential and not self.authentication_policy:
             self.authentication_policy = policies.BearerTokenCredentialPolicy(

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

@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines
+# pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -89,7 +89,7 @@ def _upload(  # pylint: disable=inconsistent-return-statements
         self,
         rule_id: str,
         stream: str,
-        body: IO,
+        body: IO[bytes],
         *,
         content_encoding: Optional[str] = None,
         content_type: str = "application/json",
@@ -102,7 +102,7 @@ def _upload(  # pylint: disable=inconsistent-return-statements
         self,
         rule_id: str,
         stream: str,
-        body: Union[List[JSON], IO],
+        body: Union[List[JSON], IO[bytes]],
         *,
         content_encoding: Optional[str] = None,
         **kwargs: Any
@@ -116,8 +116,8 @@ def _upload(  # pylint: disable=inconsistent-return-statements
         :param stream: The streamDeclaration name as defined in the Data Collection Rule. Required.
         :type stream: str
         :param body: An array of objects matching the schema defined by the provided stream. Is either
-         a [JSON] type or a IO type. Required.
-        :type body: list[JSON] or IO
+         a [JSON] type or a IO[bytes] type. Required.
+        :type body: list[JSON] or IO[bytes]
         :keyword content_encoding: gzip. Default value is None.
         :paramtype content_encoding: str
         :keyword content_type: Body Parameter content-type. Known values are: 'application/json'.
@@ -149,7 +149,7 @@ def _upload(  # pylint: disable=inconsistent-return-statements
         else:
             _json = body
 
-        request = build_logs_ingestion_upload_request(
+        _request = build_logs_ingestion_upload_request(
             rule_id=rule_id,
             stream=stream,
             content_encoding=content_encoding,
@@ -163,11 +163,11 @@ def _upload(  # pylint: disable=inconsistent-return-statements
         path_format_arguments = {
             "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True),
         }
-        request.url = self._client.format_url(request.url, **path_format_arguments)
+        _request.url = self._client.format_url(_request.url, **path_format_arguments)
 
         _stream = False
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
-            request, stream=_stream, **kwargs
+            _request, stream=_stream, **kwargs
         )
 
         response = pipeline_response.http_response
@@ -179,4 +179,4 @@ def _upload(  # pylint: disable=inconsistent-return-statements
             raise HttpResponseError(response=response)
 
         if cls:
-            return cls(pipeline_response, None, {})
+            return cls(pipeline_response, None, {})  # type: ignore