CodeGen from PR 20776 in Azure/azure-rest-api-specs

Merge da97cdef0d4b8c0949a9d2e03b2ca2ec0b865fcc into b25c293b86861309fb7806985f1fcfce24060f84

sdk/costmanagement/azure-mgmt-costmanagement/_meta.json

@@ -1,11 +1,11 @@
 {
-  "autorest": "3.4.5",
+  "autorest": "3.9.2",
   "use": [
-    "@autorest/python@5.8.4",
-    "@autorest/modelerfour@4.19.2"
+    "@autorest/python@6.1.11",
+    "@autorest/modelerfour@4.24.3"
   ],
-  "commit": "74efe54fbc55c91a1d9213afbb2723747acfddf9",
+  "commit": "5f38b77f92b7e55034f78aee35ae16ff80f35658",
   "repository_url": "https://github.com/Azure/azure-rest-api-specs",
-  "autorest_command": "autorest specification/cost-management/resource-manager/readme.md --multiapi --python --python-mode=update --python-sdks-folder=/home/vsts/work/1/s/azure-sdk-for-python/sdk --track2 --use=@autorest/python@5.8.4 --use=@autorest/modelerfour@4.19.2 --version=3.4.5",
+  "autorest_command": "autorest specification/cost-management/resource-manager/readme.md --python --python-sdks-folder=/mnt/vss/_work/1/s/azure-sdk-for-python/sdk --use=@autorest/python@6.1.11 --use=@autorest/modelerfour@4.24.3 --version=3.9.2 --version-tolerant=False",
   "readme": "specification/cost-management/resource-manager/readme.md"
 }

sdk/costmanagement/azure-mgmt-costmanagement/azure/mgmt/costmanagement/__init__.py

@@ -10,10 +10,15 @@
 from ._version import VERSION
 
 __version__ = VERSION
-__all__ = ['CostManagementClient']
 
 try:
-    from ._patch import patch_sdk  # type: ignore
-    patch_sdk()
+    from ._patch import __all__ as _patch_all
+    from ._patch import *  # type: ignore # pylint: disable=unused-wildcard-import
 except ImportError:
-    pass
+    _patch_all = []
+from ._patch import patch_sdk as _patch_sdk
+
+__all__ = ["CostManagementClient"]
+__all__.extend([p for p in _patch_all if p not in __all__])
+
+_patch_sdk()

sdk/costmanagement/azure-mgmt-costmanagement/azure/mgmt/costmanagement/_configuration.py

@@ -6,60 +6,59 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import TYPE_CHECKING
+from typing import Any, TYPE_CHECKING
 
 from azure.core.configuration import Configuration
 from azure.core.pipeline import policies
-from azure.mgmt.core.policies import ARMHttpLoggingPolicy
+from azure.mgmt.core.policies import ARMChallengeAuthenticationPolicy, ARMHttpLoggingPolicy
 
 from ._version import VERSION
 
 if TYPE_CHECKING:
     # pylint: disable=unused-import,ungrouped-imports
-    from typing import Any
-
     from azure.core.credentials import TokenCredential
 
 
-class CostManagementClientConfiguration(Configuration):
+class CostManagementClientConfiguration(Configuration):  # pylint: disable=too-many-instance-attributes
     """Configuration for CostManagementClient.
 
     Note that all parameters used to create this instance are saved as instance
     attributes.
 
-    :param credential: Credential needed for the client to connect to Azure.
+    :param credential: Credential needed for the client to connect to Azure. Required.
     :type credential: ~azure.core.credentials.TokenCredential
+    :keyword api_version: Api Version. Default value is "2022-10-01". Note that overriding this
+     default value may result in unsupported behavior.
+    :paramtype api_version: str
     """
 
-    def __init__(
-        self,
-        credential,  # type: "TokenCredential"
-        **kwargs  # type: Any
-    ):
-        # type: (...) -> None
+    def __init__(self, credential: "TokenCredential", **kwargs: Any) -> None:
+        super(CostManagementClientConfiguration, self).__init__(**kwargs)
+        api_version = kwargs.pop("api_version", "2022-10-01")  # type: str
+
         if credential is None:
             raise ValueError("Parameter 'credential' must not be None.")
-        super(CostManagementClientConfiguration, self).__init__(**kwargs)
 
         self.credential = credential
-        self.api_version = "2019-11-01"
-        self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default'])
-        kwargs.setdefault('sdk_moniker', 'mgmt-costmanagement/{}'.format(VERSION))
+        self.api_version = api_version
+        self.credential_scopes = kwargs.pop("credential_scopes", ["https://management.azure.com/.default"])
+        kwargs.setdefault("sdk_moniker", "mgmt-costmanagement/{}".format(VERSION))
         self._configure(**kwargs)
 
     def _configure(
-        self,
-        **kwargs  # type: Any
+        self, **kwargs  # type: Any
     ):
         # type: (...) -> None
-        self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs)
-        self.headers_policy = kwargs.get('headers_policy') or policies.HeadersPolicy(**kwargs)
-        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 ARMHttpLoggingPolicy(**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.authentication_policy = kwargs.get('authentication_policy')
+        self.user_agent_policy = kwargs.get("user_agent_policy") or policies.UserAgentPolicy(**kwargs)
+        self.headers_policy = kwargs.get("headers_policy") or policies.HeadersPolicy(**kwargs)
+        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 ARMHttpLoggingPolicy(**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.authentication_policy = kwargs.get("authentication_policy")
         if self.credential and not self.authentication_policy:
-            self.authentication_policy = policies.BearerTokenCredentialPolicy(self.credential, *self.credential_scopes, **kwargs)
+            self.authentication_policy = ARMChallengeAuthenticationPolicy(
+                self.credential, *self.credential_scopes, **kwargs
+            )

sdk/costmanagement/azure-mgmt-costmanagement/azure/mgmt/costmanagement/_cost_management_client.py

@@ -6,108 +6,108 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import TYPE_CHECKING
+from copy import deepcopy
+from typing import Any, TYPE_CHECKING
 
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.mgmt.core import ARMPipelineClient
-from msrest import Deserializer, Serializer
+
+from . import models
+from ._configuration import CostManagementClientConfiguration
+from ._serialization import Deserializer, Serializer
+from .operations import (
+    BenefitRecommendationOperations,
+    BenefitRecommendationsOperations,
+    BenefitUtilizationSummariesOperations,
+    GenerateCostDetailsReportOperations,
+    Operations,
+    ScheduledActionsOperations,
+)
 
 if TYPE_CHECKING:
     # pylint: disable=unused-import,ungrouped-imports
-    from typing import Any, Optional
-
     from azure.core.credentials import TokenCredential
-    from azure.core.pipeline.transport import HttpRequest, HttpResponse
 
-from ._configuration import CostManagementClientConfiguration
-from .operations import SettingsOperations
-from .operations import ViewsOperations
-from .operations import AlertsOperations
-from .operations import ForecastOperations
-from .operations import DimensionsOperations
-from .operations import QueryOperations
-from .operations import GenerateReservationDetailsReportOperations
-from .operations import Operations
-from .operations import ExportsOperations
-from . import models
 
+class CostManagementClient:  # pylint: disable=client-accepts-api-version-keyword
+    """CostManagement management client provides access to CostManagement resources for Azure
+    Enterprise Subscriptions.
 
-class CostManagementClient(object):
-    """CostManagementClient.
-
-    :ivar settings: SettingsOperations operations
-    :vartype settings: azure.mgmt.costmanagement.operations.SettingsOperations
-    :ivar views: ViewsOperations operations
-    :vartype views: azure.mgmt.costmanagement.operations.ViewsOperations
-    :ivar alerts: AlertsOperations operations
-    :vartype alerts: azure.mgmt.costmanagement.operations.AlertsOperations
-    :ivar forecast: ForecastOperations operations
-    :vartype forecast: azure.mgmt.costmanagement.operations.ForecastOperations
-    :ivar dimensions: DimensionsOperations operations
-    :vartype dimensions: azure.mgmt.costmanagement.operations.DimensionsOperations
-    :ivar query: QueryOperations operations
-    :vartype query: azure.mgmt.costmanagement.operations.QueryOperations
-    :ivar generate_reservation_details_report: GenerateReservationDetailsReportOperations operations
-    :vartype generate_reservation_details_report: azure.mgmt.costmanagement.operations.GenerateReservationDetailsReportOperations
     :ivar operations: Operations operations
     :vartype operations: azure.mgmt.costmanagement.operations.Operations
-    :ivar exports: ExportsOperations operations
-    :vartype exports: azure.mgmt.costmanagement.operations.ExportsOperations
-    :param credential: Credential needed for the client to connect to Azure.
+    :ivar generate_cost_details_report: GenerateCostDetailsReportOperations operations
+    :vartype generate_cost_details_report:
+     azure.mgmt.costmanagement.operations.GenerateCostDetailsReportOperations
+    :ivar scheduled_actions: ScheduledActionsOperations operations
+    :vartype scheduled_actions: azure.mgmt.costmanagement.operations.ScheduledActionsOperations
+    :ivar benefit_recommendations: BenefitRecommendationsOperations operations
+    :vartype benefit_recommendations:
+     azure.mgmt.costmanagement.operations.BenefitRecommendationsOperations
+    :ivar benefit_recommendation: BenefitRecommendationOperations operations
+    :vartype benefit_recommendation:
+     azure.mgmt.costmanagement.operations.BenefitRecommendationOperations
+    :ivar benefit_utilization_summaries: BenefitUtilizationSummariesOperations operations
+    :vartype benefit_utilization_summaries:
+     azure.mgmt.costmanagement.operations.BenefitUtilizationSummariesOperations
+    :param credential: Credential needed for the client to connect to Azure. Required.
     :type credential: ~azure.core.credentials.TokenCredential
-    :param str base_url: Service URL
-    :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present.
+    :param base_url: Service URL. Default value is "https://management.azure.com".
+    :type base_url: str
+    :keyword api_version: Api Version. Default value is "2022-10-01". Note that overriding this
+     default value may result in unsupported behavior.
+    :paramtype api_version: str
+    :keyword int polling_interval: Default waiting time between two polls for LRO operations if no
+     Retry-After header is present.
     """
 
     def __init__(
-        self,
-        credential,  # type: "TokenCredential"
-        base_url=None,  # type: Optional[str]
-        **kwargs  # type: Any
-    ):
-        # type: (...) -> None
-        if not base_url:
-            base_url = 'https://management.azure.com'
-        self._config = CostManagementClientConfiguration(credential, **kwargs)
+        self, credential: "TokenCredential", base_url: str = "https://management.azure.com", **kwargs: Any
+    ) -> None:
+        self._config = CostManagementClientConfiguration(credential=credential, **kwargs)
         self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self._serialize = Serializer(client_models)
-        self._serialize.client_side_validation = False
         self._deserialize = Deserializer(client_models)
-
-        self.settings = SettingsOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.views = ViewsOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.alerts = AlertsOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.forecast = ForecastOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.dimensions = DimensionsOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.query = QueryOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.generate_reservation_details_report = GenerateReservationDetailsReportOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.operations = Operations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.exports = ExportsOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-
-    def _send_request(self, http_request, **kwargs):
-        # type: (HttpRequest, Any) -> HttpResponse
+        self._serialize.client_side_validation = False
+        self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
+        self.generate_cost_details_report = GenerateCostDetailsReportOperations(
+            self._client, self._config, self._serialize, self._deserialize
+        )
+        self.scheduled_actions = ScheduledActionsOperations(
+            self._client, self._config, self._serialize, self._deserialize
+        )
+        self.benefit_recommendations = BenefitRecommendationsOperations(
+            self._client, self._config, self._serialize, self._deserialize
+        )
+        self.benefit_recommendation = BenefitRecommendationOperations(
+            self._client, self._config, self._serialize, self._deserialize
+        )
+        self.benefit_utilization_summaries = BenefitUtilizationSummariesOperations(
+            self._client, self._config, self._serialize, self._deserialize
+        )
+
+    def _send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse:
         """Runs the network request through the client's chained policies.
 
-        :param http_request: The network request you want to make. Required.
-        :type http_request: ~azure.core.pipeline.transport.HttpRequest
-        :keyword bool stream: Whether the response payload will be streamed. Defaults to True.
+        >>> from azure.core.rest import HttpRequest
+        >>> request = HttpRequest("GET", "https://www.example.org/")
+        <HttpRequest [GET], url: 'https://www.example.org/'>
+        >>> response = client._send_request(request)
+        <HttpResponse: 200 OK>
+
+        For more information on this code flow, see https://aka.ms/azsdk/dpcodegen/python/send_request
+
+        :param request: The network request you want to make. Required.
+        :type request: ~azure.core.rest.HttpRequest
+        :keyword bool stream: Whether the response payload will be streamed. Defaults to False.
         :return: The response of your network call. Does not do error handling on your response.
-        :rtype: ~azure.core.pipeline.transport.HttpResponse
+        :rtype: ~azure.core.rest.HttpResponse
         """
-        http_request.url = self._client.format_url(http_request.url)
-        stream = kwargs.pop("stream", True)
-        pipeline_response = self._client._pipeline.run(http_request, stream=stream, **kwargs)
-        return pipeline_response.http_response
+
+        request_copy = deepcopy(request)
+        request_copy.url = self._client.format_url(request_copy.url)
+        return self._client.send_request(request_copy, **kwargs)
 
     def close(self):
         # type: () -> None