[AutoRelease] t2-selfhelp-2024-05-27-04042(can only be merged by SDK owner) (#35772)

* code and test

* Update assets.json

* Update CHANGELOG.md

---------

Co-authored-by: azure-sdk <PythonSdkPipelines>
Co-authored-by: ChenxiJiang333 <[email protected]>
Co-authored-by: ChenxiJiang333 <[email protected]>

Author: azure-sdk

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

@@ -1,5 +1,18 @@
 # Release History
 
+## 2.0.0b4 (2024-05-27)
+
+### Features Added
+
+  - Added operation CheckNameAvailabilityOperations.check_availability
+  - Added operation group DiscoverySolutionNLPOperations
+
+### Breaking Changes
+
+  - Removed operation CheckNameAvailabilityOperations.post
+  - Removed operation group DiscoverySolutionNLPSubscriptionScopeOperations
+  - Removed operation group DiscoverySolutionNLPTenantScopeOperations
+
 ## 2.0.0b3 (2024-04-22)
 
 ### Features Added

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

@@ -1,11 +1,11 @@
 {
-  "commit": "835b124ff8160d23823c0e770b4989ca79e7418c",
+  "commit": "c3cc9abe085093ba880ee3eeb792edb4fa789553",
   "repository_url": "https://github.com/Azure/azure-rest-api-specs",
-  "autorest": "3.9.7",
+  "autorest": "3.10.2",
   "use": [
-    "@autorest/[email protected].7",
+    "@autorest/[email protected].16",
     "@autorest/[email protected]"
   ],
-  "autorest_command": "autorest specification/help/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/[email protected].7 --use=@autorest/[email protected] --version=3.9.7 --version-tolerant=False",
+  "autorest_command": "autorest specification/help/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/[email protected].16 --use=@autorest/[email protected] --version=3.10.2 --version-tolerant=False",
   "readme": "specification/help/resource-manager/readme.md"
 }

sdk/selfhelp/azure-mgmt-selfhelp/assets.json

@@ -2,5 +2,5 @@
     "AssetsRepo": "Azure/azure-sdk-assets",
     "AssetsRepoPrefixPath": "python",
     "TagPrefix": "python/selfhelp/azure-mgmt-selfhelp",
-    "Tag": "python/selfhelp/azure-mgmt-selfhelp_a64311aadc"
+    "Tag": "python/selfhelp/azure-mgmt-selfhelp_548dd1d9f4"
 }

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

@@ -26,23 +26,18 @@ class SelfHelpMgmtClientConfiguration:  # pylint: disable=too-many-instance-attr
 
     :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
     :keyword api_version: Api Version. Default value is "2024-03-01-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", **kwargs: Any) -> None:
         api_version: str = kwargs.pop("api_version", "2024-03-01-preview")
 
         if credential is None:
             raise ValueError("Parameter 'credential' must not be None.")
-        if subscription_id is None:
-            raise ValueError("Parameter 'subscription_id' must not be None.")
 
         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-selfhelp/{}".format(VERSION))

sdk/selfhelp/azure-mgmt-selfhelp/azure/mgmt/selfhelp/_self_help_mgmt_client.py

@@ -20,8 +20,7 @@
 from .operations import (
     CheckNameAvailabilityOperations,
     DiagnosticsOperations,
-    DiscoverySolutionNLPSubscriptionScopeOperations,
-    DiscoverySolutionNLPTenantScopeOperations,
+    DiscoverySolutionNLPOperations,
     DiscoverySolutionOperations,
     Operations,
     SimplifiedSolutionsOperations,
@@ -55,17 +54,10 @@ class SelfHelpMgmtClient:  # pylint: disable=client-accepts-api-version-keyword,
     :vartype troubleshooters: azure.mgmt.selfhelp.operations.TroubleshootersOperations
     :ivar solution_self_help: SolutionSelfHelpOperations operations
     :vartype solution_self_help: azure.mgmt.selfhelp.operations.SolutionSelfHelpOperations
-    :ivar discovery_solution_nlp_tenant_scope: DiscoverySolutionNLPTenantScopeOperations operations
-    :vartype discovery_solution_nlp_tenant_scope:
-     azure.mgmt.selfhelp.operations.DiscoverySolutionNLPTenantScopeOperations
-    :ivar discovery_solution_nlp_subscription_scope:
-     DiscoverySolutionNLPSubscriptionScopeOperations operations
-    :vartype discovery_solution_nlp_subscription_scope:
-     azure.mgmt.selfhelp.operations.DiscoverySolutionNLPSubscriptionScopeOperations
+    :ivar discovery_solution_nlp: DiscoverySolutionNLPOperations operations
+    :vartype discovery_solution_nlp: azure.mgmt.selfhelp.operations.DiscoverySolutionNLPOperations
     :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 base_url: Service URL. Default value is "https://management.azure.com".
     :type base_url: str
     :keyword api_version: Api Version. Default value is "2024-03-01-preview". Note that overriding
@@ -76,13 +68,9 @@ class SelfHelpMgmtClient:  # pylint: disable=client-accepts-api-version-keyword,
     """
 
     def __init__(
-        self,
-        credential: "TokenCredential",
-        subscription_id: str,
-        base_url: str = "https://management.azure.com",
-        **kwargs: Any
+        self, credential: "TokenCredential", base_url: str = "https://management.azure.com", **kwargs: Any
     ) -> None:
-        self._config = SelfHelpMgmtClientConfiguration(credential=credential, subscription_id=subscription_id, **kwargs)
+        self._config = SelfHelpMgmtClientConfiguration(credential=credential, **kwargs)
         _policies = kwargs.pop("policies", None)
         if _policies is None:
             _policies = [
@@ -123,10 +111,7 @@ def __init__(
         self.solution_self_help = SolutionSelfHelpOperations(
             self._client, self._config, self._serialize, self._deserialize
         )
-        self.discovery_solution_nlp_tenant_scope = DiscoverySolutionNLPTenantScopeOperations(
-            self._client, self._config, self._serialize, self._deserialize
-        )
-        self.discovery_solution_nlp_subscription_scope = DiscoverySolutionNLPSubscriptionScopeOperations(
+        self.discovery_solution_nlp = DiscoverySolutionNLPOperations(
             self._client, self._config, self._serialize, self._deserialize
         )
 

sdk/selfhelp/azure-mgmt-selfhelp/azure/mgmt/selfhelp/_version.py

@@ -6,4 +6,4 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "2.0.0b3"
+VERSION = "2.0.0b4"

sdk/selfhelp/azure-mgmt-selfhelp/azure/mgmt/selfhelp/aio/_configuration.py

@@ -26,23 +26,18 @@ class SelfHelpMgmtClientConfiguration:  # pylint: disable=too-many-instance-attr
 
     :param credential: Credential needed for the client to connect to Azure. Required.
     :type credential: ~azure.core.credentials_async.AsyncTokenCredential
-    :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-03-01-preview". Note that overriding
      this default value may result in unsupported behavior.
     :paramtype api_version: str
     """
 
-    def __init__(self, credential: "AsyncTokenCredential", subscription_id: str, **kwargs: Any) -> None:
+    def __init__(self, credential: "AsyncTokenCredential", **kwargs: Any) -> None:
         api_version: str = kwargs.pop("api_version", "2024-03-01-preview")
 
         if credential is None:
             raise ValueError("Parameter 'credential' must not be None.")
-        if subscription_id is None:
-            raise ValueError("Parameter 'subscription_id' must not be None.")
 
         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-selfhelp/{}".format(VERSION))

sdk/selfhelp/azure-mgmt-selfhelp/azure/mgmt/selfhelp/aio/_self_help_mgmt_client.py

@@ -20,8 +20,7 @@
 from .operations import (
     CheckNameAvailabilityOperations,
     DiagnosticsOperations,
-    DiscoverySolutionNLPSubscriptionScopeOperations,
-    DiscoverySolutionNLPTenantScopeOperations,
+    DiscoverySolutionNLPOperations,
     DiscoverySolutionOperations,
     Operations,
     SimplifiedSolutionsOperations,
@@ -55,17 +54,11 @@ class SelfHelpMgmtClient:  # pylint: disable=client-accepts-api-version-keyword,
     :vartype troubleshooters: azure.mgmt.selfhelp.aio.operations.TroubleshootersOperations
     :ivar solution_self_help: SolutionSelfHelpOperations operations
     :vartype solution_self_help: azure.mgmt.selfhelp.aio.operations.SolutionSelfHelpOperations
-    :ivar discovery_solution_nlp_tenant_scope: DiscoverySolutionNLPTenantScopeOperations operations
-    :vartype discovery_solution_nlp_tenant_scope:
-     azure.mgmt.selfhelp.aio.operations.DiscoverySolutionNLPTenantScopeOperations
-    :ivar discovery_solution_nlp_subscription_scope:
-     DiscoverySolutionNLPSubscriptionScopeOperations operations
-    :vartype discovery_solution_nlp_subscription_scope:
-     azure.mgmt.selfhelp.aio.operations.DiscoverySolutionNLPSubscriptionScopeOperations
+    :ivar discovery_solution_nlp: DiscoverySolutionNLPOperations operations
+    :vartype discovery_solution_nlp:
+     azure.mgmt.selfhelp.aio.operations.DiscoverySolutionNLPOperations
     :param credential: Credential needed for the client to connect to Azure. Required.
     :type credential: ~azure.core.credentials_async.AsyncTokenCredential
-    :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".
     :type base_url: str
     :keyword api_version: Api Version. Default value is "2024-03-01-preview". Note that overriding
@@ -76,13 +69,9 @@ class SelfHelpMgmtClient:  # pylint: disable=client-accepts-api-version-keyword,
     """
 
     def __init__(
-        self,
-        credential: "AsyncTokenCredential",
-        subscription_id: str,
-        base_url: str = "https://management.azure.com",
-        **kwargs: Any
+        self, credential: "AsyncTokenCredential", base_url: str = "https://management.azure.com", **kwargs: Any
     ) -> None:
-        self._config = SelfHelpMgmtClientConfiguration(credential=credential, subscription_id=subscription_id, **kwargs)
+        self._config = SelfHelpMgmtClientConfiguration(credential=credential, **kwargs)
         _policies = kwargs.pop("policies", None)
         if _policies is None:
             _policies = [
@@ -123,10 +112,7 @@ def __init__(
         self.solution_self_help = SolutionSelfHelpOperations(
             self._client, self._config, self._serialize, self._deserialize
         )
-        self.discovery_solution_nlp_tenant_scope = DiscoverySolutionNLPTenantScopeOperations(
-            self._client, self._config, self._serialize, self._deserialize
-        )
-        self.discovery_solution_nlp_subscription_scope = DiscoverySolutionNLPSubscriptionScopeOperations(
+        self.discovery_solution_nlp = DiscoverySolutionNLPOperations(
             self._client, self._config, self._serialize, self._deserialize
         )
 

sdk/selfhelp/azure-mgmt-selfhelp/azure/mgmt/selfhelp/aio/operations/__init__.py

@@ -14,8 +14,7 @@
 from ._simplified_solutions_operations import SimplifiedSolutionsOperations
 from ._troubleshooters_operations import TroubleshootersOperations
 from ._solution_self_help_operations import SolutionSelfHelpOperations
-from ._discovery_solution_nlp_tenant_scope_operations import DiscoverySolutionNLPTenantScopeOperations
-from ._discovery_solution_nlp_subscription_scope_operations import DiscoverySolutionNLPSubscriptionScopeOperations
+from ._discovery_solution_nlp_operations import DiscoverySolutionNLPOperations
 
 from ._patch import __all__ as _patch_all
 from ._patch import *  # pylint: disable=unused-wildcard-import
@@ -30,8 +29,7 @@
     "SimplifiedSolutionsOperations",
     "TroubleshootersOperations",
     "SolutionSelfHelpOperations",
-    "DiscoverySolutionNLPTenantScopeOperations",
-    "DiscoverySolutionNLPSubscriptionScopeOperations",
+    "DiscoverySolutionNLPOperations",
 ]
 __all__.extend([p for p in _patch_all if p not in __all__])
 _patch_sdk()

sdk/selfhelp/azure-mgmt-selfhelp/azure/mgmt/selfhelp/aio/operations/_check_name_availability_operations.py

@@ -7,7 +7,8 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 from io import IOBase
-from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload
+import sys
+from typing import Any, Callable, Dict, IO, Optional, Type, TypeVar, Union, overload
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -26,8 +27,12 @@
 
 from ... import models as _models
 from ..._vendor import _convert_request
-from ...operations._check_name_availability_operations import build_post_request
+from ...operations._check_name_availability_operations import build_check_availability_request
 
+if sys.version_info >= (3, 9):
+    from collections.abc import MutableMapping
+else:
+    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -52,7 +57,7 @@ def __init__(self, *args, **kwargs) -> None:
         self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
 
     @overload
-    async def post(
+    async def check_availability(
         self,
         scope: str,
         check_name_availability_request: Optional[_models.CheckNameAvailabilityRequest] = None,
@@ -79,7 +84,7 @@ async def post(
         """
 
     @overload
-    async def post(
+    async def check_availability(
         self,
         scope: str,
         check_name_availability_request: Optional[IO[bytes]] = None,
@@ -106,7 +111,7 @@ async def post(
         """
 
     @distributed_trace_async
-    async def post(
+    async def check_availability(
         self,
         scope: str,
         check_name_availability_request: Optional[Union[_models.CheckNameAvailabilityRequest, IO[bytes]]] = None,
@@ -127,7 +132,7 @@ async def post(
         :rtype: ~azure.mgmt.selfhelp.models.CheckNameAvailabilityResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map = {
+        error_map: MutableMapping[int, Type[HttpResponseError]] = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -153,7 +158,7 @@ async def post(
             else:
                 _json = None
 
-        _request = build_post_request(
+        _request = build_check_availability_request(
             scope=scope,
             api_version=api_version,
             content_type=content_type,