[AutoPR track2_azure-mgmt-consumption] Fix for Adding API Version 2022-06-01 for PriceSheets and Operations

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

@@ -1,11 +1,11 @@
 {
-  "autorest": "3.7.2",
+  "commit": "b6b8fb75cac9498db5aa546da335ec72939d62c3",
+  "repository_url": "https://github.com/Azure/azure-rest-api-specs",
+  "autorest": "3.9.2",
   "use": [
-    "@autorest/python@5.16.0",
-    "@autorest/modelerfour@4.19.3"
+    "@autorest/python@6.2.1",
+    "@autorest/modelerfour@4.24.3"
   ],
-  "commit": "c2d25c0f023edd1fea753a89d6409f3e7a9f8956",
-  "repository_url": "https://github.com/Azure/azure-rest-api-specs",
-  "autorest_command": "autorest specification/consumption/resource-manager/readme.md --python --python-sdks-folder=/home/vsts/work/1/azure-sdk-for-python/sdk --python3-only --use=@autorest/python@5.16.0 --use=@autorest/modelerfour@4.19.3 --version=3.7.2",
+  "autorest_command": "autorest specification/consumption/resource-manager/readme.md --generate-sample=True --include-x-ms-examples-original-file=True --python --python-sdks-folder=/mnt/vss/_work/1/s/azure-sdk-for-python/sdk --use=@autorest/python@6.2.1 --use=@autorest/modelerfour@4.24.3 --version=3.9.2 --version-tolerant=False",
   "readme": "specification/consumption/resource-manager/readme.md"
 }

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

@@ -17,7 +17,10 @@
 except ImportError:
     _patch_all = []
 from ._patch import patch_sdk as _patch_sdk
-__all__ = ['ConsumptionManagementClient']
+
+__all__ = [
+    "ConsumptionManagementClient",
+]
 __all__.extend([p for p in _patch_all if p not in __all__])
 
 _patch_sdk()

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

@@ -6,6 +6,7 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
+import sys
 from typing import Any, TYPE_CHECKING
 
 from azure.core.configuration import Configuration
@@ -14,6 +15,11 @@
 
 from ._version import VERSION
 
+if sys.version_info >= (3, 8):
+    from typing import Literal  # pylint: disable=no-name-in-module, ungrouped-imports
+else:
+    from typing_extensions import Literal  # type: ignore  # pylint: disable=ungrouped-imports
+
 if TYPE_CHECKING:
     # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials import TokenCredential
@@ -25,23 +31,18 @@ class ConsumptionManagementClientConfiguration(Configuration):  # pylint: disabl
     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
-    :param subscription_id: Azure Subscription ID.
+    :param subscription_id: Azure Subscription ID. Required.
     :type subscription_id: str
-    :keyword api_version: Api Version. Default value is "2021-10-01". Note that overriding this
+    :keyword api_version: Api Version. Default value is "2022-06-01". Note that overriding this
      default value may result in unsupported behavior.
     :paramtype api_version: str
     """
 
-    def __init__(
-        self,
-        credential: "TokenCredential",
-        subscription_id: str,
-        **kwargs: Any
-    ) -> None:
+    def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None:
         super(ConsumptionManagementClientConfiguration, self).__init__(**kwargs)
-        api_version = kwargs.pop('api_version', "2021-10-01")  # type: str
+        api_version = kwargs.pop("api_version", "2022-06-01")  # type: Literal["2022-06-01"]
 
         if credential is None:
             raise ValueError("Parameter 'credential' must not be None.")
@@ -51,23 +52,24 @@ def __init__(
         self.credential = credential
         self.subscription_id = subscription_id
         self.api_version = api_version
-        self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default'])
-        kwargs.setdefault('sdk_moniker', 'mgmt-consumption/{}'.format(VERSION))
+        self.credential_scopes = kwargs.pop("credential_scopes", ["https://management.azure.com/.default"])
+        kwargs.setdefault("sdk_moniker", "mgmt-consumption/{}".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 = ARMChallengeAuthenticationPolicy(self.credential, *self.credential_scopes, **kwargs)
+            self.authentication_policy = ARMChallengeAuthenticationPolicy(
+                self.credential, *self.credential_scopes, **kwargs
+            )

sdk/consumption/azure-mgmt-consumption/azure/mgmt/consumption/_consumption_management_client.py

@@ -9,68 +9,34 @@
 from copy import deepcopy
 from typing import Any, TYPE_CHECKING
 
-from msrest import Deserializer, Serializer
-
 from azure.core.rest import HttpRequest, HttpResponse
 from azure.mgmt.core import ARMPipelineClient
 
 from . import models
 from ._configuration import ConsumptionManagementClientConfiguration
-from .operations import AggregatedCostOperations, BalancesOperations, BudgetsOperations, ChargesOperations, CreditsOperations, EventsOperations, LotsOperations, MarketplacesOperations, Operations, PriceSheetOperations, ReservationRecommendationDetailsOperations, ReservationRecommendationsOperations, ReservationTransactionsOperations, ReservationsDetailsOperations, ReservationsSummariesOperations, TagsOperations, UsageDetailsOperations
+from ._serialization import Deserializer, Serializer
+from .operations import Operations, PriceSheetOperations
 
 if TYPE_CHECKING:
     # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials import TokenCredential
 
-class ConsumptionManagementClient:    # pylint: disable=too-many-instance-attributes
+
+class ConsumptionManagementClient:  # pylint: disable=client-accepts-api-version-keyword
     """Consumption management client provides access to consumption resources for Azure Enterprise
     Subscriptions.
 
-    :ivar usage_details: UsageDetailsOperations operations
-    :vartype usage_details: azure.mgmt.consumption.operations.UsageDetailsOperations
-    :ivar marketplaces: MarketplacesOperations operations
-    :vartype marketplaces: azure.mgmt.consumption.operations.MarketplacesOperations
-    :ivar budgets: BudgetsOperations operations
-    :vartype budgets: azure.mgmt.consumption.operations.BudgetsOperations
-    :ivar tags: TagsOperations operations
-    :vartype tags: azure.mgmt.consumption.operations.TagsOperations
-    :ivar charges: ChargesOperations operations
-    :vartype charges: azure.mgmt.consumption.operations.ChargesOperations
-    :ivar balances: BalancesOperations operations
-    :vartype balances: azure.mgmt.consumption.operations.BalancesOperations
-    :ivar reservations_summaries: ReservationsSummariesOperations operations
-    :vartype reservations_summaries:
-     azure.mgmt.consumption.operations.ReservationsSummariesOperations
-    :ivar reservations_details: ReservationsDetailsOperations operations
-    :vartype reservations_details: azure.mgmt.consumption.operations.ReservationsDetailsOperations
-    :ivar reservation_recommendations: ReservationRecommendationsOperations operations
-    :vartype reservation_recommendations:
-     azure.mgmt.consumption.operations.ReservationRecommendationsOperations
-    :ivar reservation_recommendation_details: ReservationRecommendationDetailsOperations operations
-    :vartype reservation_recommendation_details:
-     azure.mgmt.consumption.operations.ReservationRecommendationDetailsOperations
-    :ivar reservation_transactions: ReservationTransactionsOperations operations
-    :vartype reservation_transactions:
-     azure.mgmt.consumption.operations.ReservationTransactionsOperations
     :ivar price_sheet: PriceSheetOperations operations
     :vartype price_sheet: azure.mgmt.consumption.operations.PriceSheetOperations
     :ivar operations: Operations operations
     :vartype operations: azure.mgmt.consumption.operations.Operations
-    :ivar aggregated_cost: AggregatedCostOperations operations
-    :vartype aggregated_cost: azure.mgmt.consumption.operations.AggregatedCostOperations
-    :ivar events: EventsOperations operations
-    :vartype events: azure.mgmt.consumption.operations.EventsOperations
-    :ivar lots: LotsOperations operations
-    :vartype lots: azure.mgmt.consumption.operations.LotsOperations
-    :ivar credits: CreditsOperations operations
-    :vartype credits: azure.mgmt.consumption.operations.CreditsOperations
-    :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
-    :param subscription_id: Azure Subscription ID.
+    :param subscription_id: Azure Subscription ID. Required.
     :type subscription_id: str
     :param base_url: Service URL. Default value is "https://management.azure.com".
     :type base_url: str
-    :keyword api_version: Api Version. Default value is "2021-10-01". Note that overriding this
+    :keyword api_version: Api Version. Default value is "2022-06-01". Note that overriding this
      default value may result in unsupported behavior.
     :paramtype api_version: str
     """
@@ -82,71 +48,19 @@ def __init__(
         base_url: str = "https://management.azure.com",
         **kwargs: Any
     ) -> None:
-        self._config = ConsumptionManagementClientConfiguration(credential=credential, subscription_id=subscription_id, **kwargs)
+        self._config = ConsumptionManagementClientConfiguration(
+            credential=credential, subscription_id=subscription_id, **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._deserialize = Deserializer(client_models)
         self._serialize.client_side_validation = False
-        self.usage_details = UsageDetailsOperations(
-            self._client, self._config, self._serialize, self._deserialize
-        )
-        self.marketplaces = MarketplacesOperations(
-            self._client, self._config, self._serialize, self._deserialize
-        )
-        self.budgets = BudgetsOperations(
-            self._client, self._config, self._serialize, self._deserialize
-        )
-        self.tags = TagsOperations(
-            self._client, self._config, self._serialize, self._deserialize
-        )
-        self.charges = ChargesOperations(
-            self._client, self._config, self._serialize, self._deserialize
-        )
-        self.balances = BalancesOperations(
-            self._client, self._config, self._serialize, self._deserialize
-        )
-        self.reservations_summaries = ReservationsSummariesOperations(
-            self._client, self._config, self._serialize, self._deserialize
-        )
-        self.reservations_details = ReservationsDetailsOperations(
-            self._client, self._config, self._serialize, self._deserialize
-        )
-        self.reservation_recommendations = ReservationRecommendationsOperations(
-            self._client, self._config, self._serialize, self._deserialize
-        )
-        self.reservation_recommendation_details = ReservationRecommendationDetailsOperations(
-            self._client, self._config, self._serialize, self._deserialize
-        )
-        self.reservation_transactions = ReservationTransactionsOperations(
-            self._client, self._config, self._serialize, self._deserialize
-        )
-        self.price_sheet = PriceSheetOperations(
-            self._client, self._config, self._serialize, self._deserialize
-        )
-        self.operations = Operations(
-            self._client, self._config, self._serialize, self._deserialize
-        )
-        self.aggregated_cost = AggregatedCostOperations(
-            self._client, self._config, self._serialize, self._deserialize
-        )
-        self.events = EventsOperations(
-            self._client, self._config, self._serialize, self._deserialize
-        )
-        self.lots = LotsOperations(
-            self._client, self._config, self._serialize, self._deserialize
-        )
-        self.credits = CreditsOperations(
-            self._client, self._config, self._serialize, self._deserialize
-        )
-
+        self.price_sheet = PriceSheetOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
 
-    def _send_request(
-        self,
-        request: HttpRequest,
-        **kwargs: Any
-    ) -> HttpResponse:
+    def _send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse:
         """Runs the network request through the client's chained policies.
 
         >>> from azure.core.rest import HttpRequest
@@ -155,7 +69,7 @@ def _send_request(
         >>> response = client._send_request(request)
         <HttpResponse: 200 OK>
 
-        For more information on this code flow, see https://aka.ms/azsdk/python/protocol/quickstart
+        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

sdk/consumption/azure-mgmt-consumption/azure/mgmt/consumption/_patch.py

@@ -28,4 +28,4 @@
 # This file is used for handwritten extensions to the generated code. Example:
 # https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/customize_code/how-to-patch-sdk-code.md
 def patch_sdk():
-    pass
+    pass