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

Merge 86f28f32592b57efedac456837a8bf64888b271b into 761d8b58e465b26eddb8ad70dda3cde7b4228bdf

Author: SDKAuto

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

@@ -1,7 +1,7 @@
 # Microsoft Azure SDK for Python
 
 This is the Microsoft Azure Hardwaresecuritymodules Management Client Library.
-This package has been tested with Python 3.8+.
+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_
@@ -12,7 +12,7 @@ _Azure SDK Python packages support for Python 2.7 has ended 01 January 2022. For
 
 ### Prerequisites
 
-- Python 3.8+ is required to use this package.
+- Python 3.9+ is required to use this package.
 - [Azure subscription](https://azure.microsoft.com/free/)
 
 ### Install the package
@@ -24,7 +24,7 @@ pip install azure-identity
 
 ### Authentication
 
-By default, [Azure Active Directory](https://aka.ms/awps/aad) token authentication depends on correct configure of following environment variables.
+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.

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

@@ -1,11 +1,6 @@
 {
-  "commit": "66fefe4b93b3f1ab515757e48597a9205c924879",
+  "commit": "e2be75ed1428d068d3ea9f08828e79308f31c4fe",
   "repository_url": "https://github.com/Azure/azure-rest-api-specs",
-  "autorest": "3.10.2",
-  "use": [
-    "@autorest/[email protected]",
-    "@autorest/[email protected]"
-  ],
-  "autorest_command": "autorest specification/hardwaresecuritymodules/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/azure-sdk-for-python/sdk --use=@autorest/[email protected] --use=@autorest/[email protected] --version=3.10.2 --version-tolerant=False",
-  "readme": "specification/hardwaresecuritymodules/resource-manager/readme.md"
+  "typespec_src": "specification/hardwaresecuritymodules/HardwareSecurityModules.Management",
+  "@azure-tools/typespec-python": "0.44.2"
 }

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

@@ -2,25 +2,31 @@
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License. See License.txt in the project root for license information.
-# Code generated by Microsoft (R) AutoRest Code Generator.
+# Code generated by Microsoft (R) Python Code Generator.
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
+# pylint: disable=wrong-import-position
 
-from ._hardware_security_modules_mgmt_client import HardwareSecurityModulesMgmtClient
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._client import HardwareSecurityModulesClient  # 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__ = [
-    "HardwareSecurityModulesMgmtClient",
+    "HardwareSecurityModulesClient",
 ]
-__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/hardwaresecuritymodules/azure-mgmt-hardwaresecuritymodules/apiview-properties.json

@@ -2,89 +2,79 @@
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License. See License.txt in the project root for license information.
-# Code generated by Microsoft (R) AutoRest Code Generator.
+# Code generated by Microsoft (R) Python Code Generator.
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
 from copy import deepcopy
-from typing import Any, 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 HardwareSecurityModulesMgmtClientConfiguration
-from ._serialization import Deserializer, Serializer
+from ._configuration import HardwareSecurityModulesClientConfiguration
+from ._utils.serialization import Deserializer, Serializer
 from .operations import (
-    CloudHsmClusterBackupStatusOperations,
-    CloudHsmClusterPrivateEndpointConnectionsOperations,
-    CloudHsmClusterPrivateLinkResourcesOperations,
-    CloudHsmClusterRestoreStatusOperations,
     CloudHsmClustersOperations,
-    DedicatedHsmOperations,
+    DedicatedHsmsOperations,
     Operations,
     PrivateEndpointConnectionsOperations,
 )
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials import TokenCredential
 
 
-class HardwareSecurityModulesMgmtClient:  # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes
-    """The Azure management API provides a RESTful set of web services that interact with Azure HSM
-    RP.
+class HardwareSecurityModulesClient:
+    """The Azure management API provides a RESTful set of web services that interact with Hardware
+    Security Modules.
 
+    :ivar operations: Operations operations
+    :vartype operations: azure.mgmt.hardwaresecuritymodules.operations.Operations
     :ivar cloud_hsm_clusters: CloudHsmClustersOperations operations
     :vartype cloud_hsm_clusters:
      azure.mgmt.hardwaresecuritymodules.operations.CloudHsmClustersOperations
-    :ivar cloud_hsm_cluster_private_link_resources: CloudHsmClusterPrivateLinkResourcesOperations
-     operations
-    :vartype cloud_hsm_cluster_private_link_resources:
-     azure.mgmt.hardwaresecuritymodules.operations.CloudHsmClusterPrivateLinkResourcesOperations
-    :ivar cloud_hsm_cluster_private_endpoint_connections:
-     CloudHsmClusterPrivateEndpointConnectionsOperations operations
-    :vartype cloud_hsm_cluster_private_endpoint_connections:
-     azure.mgmt.hardwaresecuritymodules.operations.CloudHsmClusterPrivateEndpointConnectionsOperations
     :ivar private_endpoint_connections: PrivateEndpointConnectionsOperations operations
     :vartype private_endpoint_connections:
      azure.mgmt.hardwaresecuritymodules.operations.PrivateEndpointConnectionsOperations
-    :ivar cloud_hsm_cluster_backup_status: CloudHsmClusterBackupStatusOperations operations
-    :vartype cloud_hsm_cluster_backup_status:
-     azure.mgmt.hardwaresecuritymodules.operations.CloudHsmClusterBackupStatusOperations
-    :ivar cloud_hsm_cluster_restore_status: CloudHsmClusterRestoreStatusOperations operations
-    :vartype cloud_hsm_cluster_restore_status:
-     azure.mgmt.hardwaresecuritymodules.operations.CloudHsmClusterRestoreStatusOperations
-    :ivar dedicated_hsm: DedicatedHsmOperations operations
-    :vartype dedicated_hsm: azure.mgmt.hardwaresecuritymodules.operations.DedicatedHsmOperations
-    :ivar operations: Operations operations
-    :vartype operations: azure.mgmt.hardwaresecuritymodules.operations.Operations
-    :param credential: Credential needed for the client to connect to Azure. Required.
+    :ivar dedicated_hsms: DedicatedHsmsOperations operations
+    :vartype dedicated_hsms: azure.mgmt.hardwaresecuritymodules.operations.DedicatedHsmsOperations
+    :param credential: Credential used to authenticate requests to the service. 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 base_url: Service URL. Default value is "https://management.azure.com".
+    :param base_url: Service host. Default value is None.
     :type base_url: str
-    :keyword api_version: Api Version. Default value is "2024-06-30-preview". Note that overriding
-     this default value may result in unsupported behavior.
+    :keyword api_version: The API version to use for this operation. Default value is
+     "2024-06-30-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.
     """
 
     def __init__(
-        self,
-        credential: "TokenCredential",
-        subscription_id: str,
-        base_url: str = "https://management.azure.com",
-        **kwargs: Any
+        self, credential: "TokenCredential", subscription_id: str, base_url: Optional[str] = None, **kwargs: Any
     ) -> None:
-        self._config = HardwareSecurityModulesMgmtClientConfiguration(
-            credential=credential, subscription_id=subscription_id, **kwargs
+        _endpoint = "{endpoint}"
+        _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 = HardwareSecurityModulesClientConfiguration(
+            credential=credential,
+            subscription_id=subscription_id,
+            base_url=cast(str, base_url),
+            credential_scopes=credential_scopes,
+            **kwargs
         )
+
         _policies = kwargs.pop("policies", None)
         if _policies is None:
             _policies = [
@@ -103,40 +93,27 @@ def __init__(
                 policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None,
                 self._config.http_logging_policy,
             ]
-        self._client: ARMPipelineClient = ARMPipelineClient(base_url=base_url, policies=_policies, **kwargs)
+        self._client: ARMPipelineClient = ARMPipelineClient(base_url=cast(str, _endpoint), policies=_policies, **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 = Serializer()
+        self._deserialize = Deserializer()
         self._serialize.client_side_validation = False
+        self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
         self.cloud_hsm_clusters = CloudHsmClustersOperations(
             self._client, self._config, self._serialize, self._deserialize
         )
-        self.cloud_hsm_cluster_private_link_resources = CloudHsmClusterPrivateLinkResourcesOperations(
-            self._client, self._config, self._serialize, self._deserialize
-        )
-        self.cloud_hsm_cluster_private_endpoint_connections = CloudHsmClusterPrivateEndpointConnectionsOperations(
-            self._client, self._config, self._serialize, self._deserialize
-        )
         self.private_endpoint_connections = PrivateEndpointConnectionsOperations(
             self._client, self._config, self._serialize, self._deserialize
         )
-        self.cloud_hsm_cluster_backup_status = CloudHsmClusterBackupStatusOperations(
-            self._client, self._config, self._serialize, self._deserialize
-        )
-        self.cloud_hsm_cluster_restore_status = CloudHsmClusterRestoreStatusOperations(
-            self._client, self._config, self._serialize, self._deserialize
-        )
-        self.dedicated_hsm = DedicatedHsmOperations(self._client, self._config, self._serialize, self._deserialize)
-        self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
+        self.dedicated_hsms = DedicatedHsmsOperations(self._client, self._config, self._serialize, self._deserialize)
 
-    def _send_request(self, request: HttpRequest, *, stream: bool = False, **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
         >>> request = HttpRequest("GET", "https://www.example.org/")
         <HttpRequest [GET], url: 'https://www.example.org/'>
-        >>> response = client._send_request(request)
+        >>> response = client.send_request(request)
         <HttpResponse: 200 OK>
 
         For more information on this code flow, see https://aka.ms/azsdk/dpcodegen/python/send_request
@@ -149,7 +126,11 @@ def _send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs:
         """
 
         request_copy = deepcopy(request)
-        request_copy.url = self._client.format_url(request_copy.url)
+        path_format_arguments = {
+            "endpoint": self._serialize.url("self._config.base_url", self._config.base_url, "str", skip_quote=True),
+        }
+
+        request_copy.url = self._client.format_url(request_copy.url, **path_format_arguments)
         return self._client.send_request(request_copy, stream=stream, **kwargs)  # type: ignore
 
     def close(self) -> None:

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

@@ -2,7 +2,7 @@
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License. See License.txt in the project root for license information.
-# Code generated by Microsoft (R) AutoRest Code Generator.
+# Code generated by Microsoft (R) Python Code Generator.
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
@@ -14,26 +14,34 @@
 from ._version import VERSION
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials import TokenCredential
 
 
-class HardwareSecurityModulesMgmtClientConfiguration:  # pylint: disable=too-many-instance-attributes,name-too-long
-    """Configuration for HardwareSecurityModulesMgmtClient.
+class HardwareSecurityModulesClientConfiguration:  # pylint: disable=too-many-instance-attributes,name-too-long
+    """Configuration for HardwareSecurityModulesClient.
 
     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. Required.
+    :param credential: Credential used to authenticate requests to the service. 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
-    :keyword api_version: Api Version. Default value is "2024-06-30-preview". Note that overriding
-     this default value may result in unsupported behavior.
+    :param base_url: Service host. Default value is "https://management.azure.com".
+    :type base_url: str
+    :keyword api_version: The API version to use for this operation. Default value is
+     "2024-06-30-preview". 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,
+        base_url: str = "https://management.azure.com",
+        **kwargs: Any
+    ) -> None:
         api_version: str = kwargs.pop("api_version", "2024-06-30-preview")
 
         if credential is None:
@@ -43,6 +51,7 @@ def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs
 
         self.credential = credential
         self.subscription_id = subscription_id
+        self.base_url = base_url
         self.api_version = api_version
         self.credential_scopes = kwargs.pop("credential_scopes", ["https://management.azure.com/.default"])
         kwargs.setdefault("sdk_moniker", "mgmt-hardwaresecuritymodules/{}".format(VERSION))

sdk/hardwaresecuritymodules/azure-mgmt-hardwaresecuritymodules/azure/mgmt/hardwaresecuritymodules/_hardware_security_modules_mgmt_client.py renamed to sdk/hardwaresecuritymodules/azure-mgmt-hardwaresecuritymodules/azure/mgmt/hardwaresecuritymodules/_client.py

@@ -1,7 +1,8 @@
-# ------------------------------------
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-# ------------------------------------
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# --------------------------------------------------------------------------
 """Customize generated code here.
 
 Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize

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

@@ -0,0 +1,6 @@
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) Python Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------