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

Merge e79cb38a118b7813398e55be7281cd67f0822505 into f11631f1c1057d8363f9e3f9597c73b90f8924c8

Author: SDKAuto

sdk/billingbenefits/azure-mgmt-billingbenefits/CHANGELOG.md

@@ -1,5 +1,76 @@
 # Release History
 
+## 1.0.0b2 (2025-04-25)
+
+### Features Added
+
+  - Model `BillingBenefitsRP` added property `discounts`
+  - Model `BillingBenefitsRP` added property `discount`
+  - Enum `CommitmentGrain` added member `FULL_TERM`
+  - Enum `CommitmentGrain` added member `UNKNOWN`
+  - Model `SavingsPlanOrderAliasModel` added property `renew`
+  - Model `Sku` added property `tier`
+  - Model `Sku` added property `size`
+  - Model `Sku` added property `family`
+  - Model `Sku` added property `capacity`
+  - Added model `AppliedDiscount`
+  - Added enum `ApplyDiscountOn`
+  - Added model `CatalogClaimsItem`
+  - Added model `ConditionsItem`
+  - Added model `CustomPriceProperties`
+  - Added model `Discount`
+  - Added enum `DiscountAppliedScopeType`
+  - Added enum `DiscountCombinationRule`
+  - Added enum `DiscountEntityType`
+  - Added model `DiscountList`
+  - Added model `DiscountPatchRequest`
+  - Added model `DiscountProperties`
+  - Added enum `DiscountProvisioningState`
+  - Added enum `DiscountProvisioningSubState`
+  - Added enum `DiscountRuleType`
+  - Added enum `DiscountStatus`
+  - Added enum `DiscountType`
+  - Added model `DiscountTypeCustomPrice`
+  - Added model `DiscountTypeCustomPriceMultiCurrency`
+  - Added model `DiscountTypeProduct`
+  - Added model `DiscountTypeProductFamily`
+  - Added model `DiscountTypeProductSku`
+  - Added model `DiscountTypeProperties`
+  - Added model `EntityTypeAffiliateDiscount`
+  - Added model `EntityTypePrimaryDiscount`
+  - Added model `ManagedServiceIdentity`
+  - Added enum `ManagedServiceIdentityType`
+  - Added model `MarketSetPricesItems`
+  - Added model `Plan`
+  - Added model `PriceGuaranteeProperties`
+  - Added enum `PricingPolicy`
+  - Added model `ProxyResource`
+  - Added model `ResourceModelWithAllowedPropertySet`
+  - Added model `ResourceSku`
+  - Added enum `SkuTier`
+  - Added model `TrackedResource`
+  - Added model `UserAssignedIdentity`
+  - Model `SavingsPlanOperations` added method `begin_update`
+  - Added model `DiscountOperations`
+  - Added model `DiscountsOperations`
+  - Method `BillingBenefitsRP.validate_purchase` has a new overload `def validate_purchase(self: None, body: IO[bytes], content_type: str)`
+  - Method `BillingBenefitsRPOperationsMixin.validate_purchase` has a new overload `def validate_purchase(self: None, body: IO[bytes], content_type: str)`
+  - Method `ReservationOrderAliasOperations.begin_create` has a new overload `def begin_create(self: None, reservation_order_alias_name: str, body: IO[bytes], content_type: str)`
+  - Method `SavingsPlanOperations.validate_update` has a new overload `def validate_update(self: None, savings_plan_order_id: str, savings_plan_id: str, body: IO[bytes], content_type: str)`
+  - Method `SavingsPlanOperations.begin_update` has a new overload `def begin_update(self: None, savings_plan_order_id: str, savings_plan_id: str, body: SavingsPlanUpdateRequest, content_type: str)`
+  - Method `SavingsPlanOperations.begin_update` has a new overload `def begin_update(self: None, savings_plan_order_id: str, savings_plan_id: str, body: IO[bytes], content_type: str)`
+  - Method `SavingsPlanOrderAliasOperations.begin_create` has a new overload `def begin_create(self: None, savings_plan_order_alias_name: str, body: IO[bytes], content_type: str)`
+  - Method `DiscountOperations.begin_update` has a new overload `def begin_update(self: None, resource_group_name: str, discount_name: str, body: DiscountPatchRequest, content_type: str)`
+  - Method `DiscountOperations.begin_update` has a new overload `def begin_update(self: None, resource_group_name: str, discount_name: str, body: IO[bytes], content_type: str)`
+  - Method `DiscountsOperations.begin_create` has a new overload `def begin_create(self: None, resource_group_name: str, discount_name: str, body: Discount, content_type: str)`
+  - Method `DiscountsOperations.begin_create` has a new overload `def begin_create(self: None, resource_group_name: str, discount_name: str, body: IO[bytes], content_type: str)`
+
+### Breaking Changes
+
+  - Method `BillingBenefitsRP.__init__` inserted a `positional_or_keyword` parameter `subscription_id`
+  - Method `Sku.__init__` removed default value `None` from its parameter `name`
+  - Deleted or renamed method `SavingsPlanOperations.update`
+
 ## 1.0.0b1 (2022-12-14)
 
 * Initial Release

sdk/billingbenefits/azure-mgmt-billingbenefits/README.md

@@ -1,28 +1,61 @@
 # Microsoft Azure SDK for Python
 
 This is the Microsoft Azure Billingbenefits Management Client Library.
-This package has been tested with Python 3.7+.
+This package has been tested with Python 3.9+.
 For a more complete view of Azure libraries, see the [azure sdk python release](https://aka.ms/azsdk/python/all).
 
 ## _Disclaimer_
 
 _Azure SDK Python packages support for Python 2.7 has ended 01 January 2022. For more information and questions, please refer to https://github.com/Azure/azure-sdk-for-python/issues/20691_
 
-# Usage
+## Getting started
 
+### Prerequisites
 
-To learn how to use this package, see the [quickstart guide](https://aka.ms/azsdk/python/mgmt)
- 
-For docs and references, see [Python SDK References](https://docs.microsoft.com/python/api/overview/azure/)
-Code samples for this package can be found at [Billingbenefits Management](https://docs.microsoft.com/samples/browse/?languages=python&term=Getting%20started%20-%20Managing&terms=Getting%20started%20-%20Managing) on docs.microsoft.com.
-Additional code samples for different Azure services are available at [Samples Repo](https://aka.ms/azsdk/python/mgmt/samples)
+- Python 3.9+ is required to use this package.
+- [Azure subscription](https://azure.microsoft.com/free/)
 
+### Install the package
 
-# Provide Feedback
+```bash
+pip install azure-mgmt-billingbenefits
+pip install azure-identity
+```
 
-If you encounter any bugs or have suggestions, please file an issue in the
-[Issues](https://github.com/Azure/azure-sdk-for-python/issues)
-section of the project. 
+### Authentication
+
+By default, [Azure Active Directory](https://aka.ms/awps/aad) token authentication depends on correct configuration of the following environment variables.
+
+- `AZURE_CLIENT_ID` for Azure client ID.
+- `AZURE_TENANT_ID` for Azure tenant ID.
+- `AZURE_CLIENT_SECRET` for Azure client secret.
+
+In addition, Azure subscription ID can be configured via environment variable `AZURE_SUBSCRIPTION_ID`.
+
+With above configuration, client can be authenticated by following code:
+
+```python
+from azure.identity import DefaultAzureCredential
+from azure.mgmt.billingbenefits import BillingBenefitsRP
+import os
 
+sub_id = os.getenv("AZURE_SUBSCRIPTION_ID")
+client = BillingBenefitsRP(credential=DefaultAzureCredential(), subscription_id=sub_id)
+```
 
+## Examples
 
+Code samples for this package can be found at:
+- [Search Billingbenefits Management](https://docs.microsoft.com/samples/browse/?languages=python&term=Getting%20started%20-%20Managing&terms=Getting%20started%20-%20Managing) on docs.microsoft.com
+- [Azure Python Mgmt SDK Samples Repo](https://aka.ms/azsdk/python/mgmt/samples)
+
+
+## Troubleshooting
+
+## Next steps
+
+## Provide Feedback
+
+If you encounter any bugs or have suggestions, please file an issue in the
+[Issues](https://github.com/Azure/azure-sdk-for-python/issues)
+section of the project. 

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

@@ -1,11 +1,11 @@
 {
-  "commit": "9b3aa35e75751e751070a7af1f96518cb8820e44",
+  "commit": "e365769a59c2b028ae917ea8083ed7c11d71e4f1",
   "repository_url": "https://github.com/Azure/azure-rest-api-specs",
-  "autorest": "3.9.2",
+  "autorest": "3.10.2",
   "use": [
-    "@autorest/python@6.2.7",
-    "@autorest/modelerfour@4.24.3"
+    "@autorest/python@6.34.1",
+    "@autorest/modelerfour@4.27.0"
   ],
-  "autorest_command": "autorest specification/billingbenefits/resource-manager/readme.md --generate-sample=True --include-x-ms-examples-original-file=True --python --python-sdks-folder=/home/vsts/work/1/azure-sdk-for-python/sdk --use=@autorest/python@6.2.7 --use=@autorest/modelerfour@4.24.3 --version=3.9.2 --version-tolerant=False",
+  "autorest_command": "autorest specification/billingbenefits/resource-manager/readme.md --generate-sample=True --generate-test=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.34.1 --use=@autorest/modelerfour@4.27.0 --version=3.10.2 --version-tolerant=False",
   "readme": "specification/billingbenefits/resource-manager/readme.md"
 }

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

@@ -5,22 +5,28 @@
 # Code generated by Microsoft (R) AutoRest Code Generator.
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
+# pylint: disable=wrong-import-position
 
-from ._billing_benefits_rp import BillingBenefitsRP
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._billing_benefits_rp import BillingBenefitsRP  # type: ignore
 from ._version import VERSION
 
 __version__ = VERSION
 
 try:
     from ._patch import __all__ as _patch_all
-    from ._patch import *  # pylint: disable=unused-wildcard-import
+    from ._patch import *
 except ImportError:
     _patch_all = []
 from ._patch import patch_sdk as _patch_sdk
 
 __all__ = [
     "BillingBenefitsRP",
 ]
-__all__.extend([p for p in _patch_all if p not in __all__])
+__all__.extend([p for p in _patch_all if p not in __all__])  # pyright: ignore
 
 _patch_sdk()

sdk/billingbenefits/azure-mgmt-billingbenefits/azure/mgmt/billingbenefits/_billing_benefits_rp.py

@@ -7,16 +7,23 @@
 # --------------------------------------------------------------------------
 
 from copy import deepcopy
-from typing import Any, Optional, TYPE_CHECKING
+from typing import Any, Optional, TYPE_CHECKING, cast
+from typing_extensions import Self
 
+from azure.core.pipeline import policies
 from azure.core.rest import HttpRequest, HttpResponse
+from azure.core.settings import settings
 from azure.mgmt.core import ARMPipelineClient
+from azure.mgmt.core.policies import ARMAutoResourceProviderRegistrationPolicy
+from azure.mgmt.core.tools import get_arm_endpoints
 
 from . import models as _models
 from ._configuration import BillingBenefitsRPConfiguration
-from ._serialization import Deserializer, Serializer
+from ._utils.serialization import Deserializer, Serializer
 from .operations import (
     BillingBenefitsRPOperationsMixin,
+    DiscountOperations,
+    DiscountsOperations,
     Operations,
     ReservationOrderAliasOperations,
     SavingsPlanOperations,
@@ -25,11 +32,10 @@
 )
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials import TokenCredential
 
 
-class BillingBenefitsRP(BillingBenefitsRPOperationsMixin):  # pylint: disable=client-accepts-api-version-keyword
+class BillingBenefitsRP(BillingBenefitsRPOperationsMixin):  # pylint: disable=too-many-instance-attributes
     """Azure Benefits RP let users create and manage benefits like savings plan.
 
     :ivar operations: Operations operations
@@ -44,15 +50,21 @@ class BillingBenefitsRP(BillingBenefitsRPOperationsMixin):  # pylint: disable=cl
     :ivar reservation_order_alias: ReservationOrderAliasOperations operations
     :vartype reservation_order_alias:
      azure.mgmt.billingbenefits.operations.ReservationOrderAliasOperations
+    :ivar discounts: DiscountsOperations operations
+    :vartype discounts: azure.mgmt.billingbenefits.operations.DiscountsOperations
+    :ivar discount: DiscountOperations operations
+    :vartype discount: azure.mgmt.billingbenefits.operations.DiscountOperations
     :param credential: Credential needed for the client to connect to Azure. Required.
     :type credential: ~azure.core.credentials.TokenCredential
+    :param subscription_id: The ID of the target subscription. The value must be an UUID. Required.
+    :type subscription_id: str
     :param expand: May be used to expand the detail information of some properties. Default value
      is None.
     :type expand: str
-    :param base_url: Service URL. Default value is "https://management.azure.com".
+    :param base_url: Service URL. Default value is None.
     :type base_url: str
-    :keyword api_version: Api Version. Default value is "2022-11-01". Note that overriding this
-     default value may result in unsupported behavior.
+    :keyword api_version: Api Version. Default value is "2024-11-01-preview". 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.
@@ -61,12 +73,43 @@ class BillingBenefitsRP(BillingBenefitsRPOperationsMixin):  # pylint: disable=cl
     def __init__(
         self,
         credential: "TokenCredential",
+        subscription_id: str,
         expand: Optional[str] = None,
-        base_url: str = "https://management.azure.com",
+        base_url: Optional[str] = None,
         **kwargs: Any
     ) -> None:
-        self._config = BillingBenefitsRPConfiguration(credential=credential, expand=expand, **kwargs)
-        self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
+        _cloud = kwargs.pop("cloud_setting", None) or settings.current.azure_cloud  # type: ignore
+        _endpoints = get_arm_endpoints(_cloud)
+        if not base_url:
+            base_url = _endpoints["resource_manager"]
+        credential_scopes = kwargs.pop("credential_scopes", _endpoints["credential_scopes"])
+        self._config = BillingBenefitsRPConfiguration(
+            credential=credential,
+            subscription_id=subscription_id,
+            expand=expand,
+            credential_scopes=credential_scopes,
+            **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),
+                ARMAutoResourceProviderRegistrationPolicy(),
+                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: ARMPipelineClient = ARMPipelineClient(base_url=cast(str, base_url), policies=_policies, **kwargs)
 
         client_models = {k: v for k, v in _models.__dict__.items() if isinstance(v, type)}
         self._serialize = Serializer(client_models)
@@ -83,8 +126,10 @@ def __init__(
         self.reservation_order_alias = ReservationOrderAliasOperations(
             self._client, self._config, self._serialize, self._deserialize
         )
+        self.discounts = DiscountsOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.discount = DiscountOperations(self._client, self._config, self._serialize, self._deserialize)
 
-    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
@@ -104,14 +149,14 @@ def _send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse:
 
         request_copy = deepcopy(request)
         request_copy.url = self._client.format_url(request_copy.url)
-        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()
 
-    def __enter__(self) -> "BillingBenefitsRP":
+    def __enter__(self) -> Self:
         self._client.__enter__()
         return self
 
-    def __exit__(self, *exc_details) -> None:
+    def __exit__(self, *exc_details: Any) -> None:
         self._client.__exit__(*exc_details)