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

Release desktopvirtualization microsoft.desktop virtualization 2022 09 09 (Azure#20683)

* Adds base for updating Microsoft.DesktopVirtualization from version preview/2022-04-01-preview to version 2022-09-09

* Updates readme

* Updates API version in new specs and examples

* remove privateLink references

* add agentUpdate back to hostPool

* remove migrationRequest property

* add paginationHelper to workspace

* update pagination helper to be in query

* fix iconContent examples to be base64

* update byte strings to be actual encoded strings so they pass validation

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

@@ -1,11 +1,11 @@
 {
-  "autorest": "3.4.5",
+  "commit": "45765fbbfd14084eb7a12ebd099aaeddb2a13173",
+  "repository_url": "https://github.com/Azure/azure-rest-api-specs",
+  "autorest": "3.9.2",
   "use": [
-    "@autorest/python@5.8.4",
-    "@autorest/modelerfour@4.19.2"
+    "@autorest/python@6.2.1",
+    "@autorest/modelerfour@4.24.3"
   ],
-  "commit": "2b56c8a3da0e04aea6f6d80a9ac04741d1ae5904",
-  "repository_url": "https://github.com/Azure/azure-rest-api-specs",
-  "autorest_command": "autorest specification/desktopvirtualization/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/desktopvirtualization/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/desktopvirtualization/resource-manager/readme.md"
 }

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

@@ -10,10 +10,17 @@
 from ._version import VERSION
 
 __version__ = VERSION
-__all__ = ['DesktopVirtualizationAPIClient']
 
 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__ = [
+    "DesktopVirtualizationAPIClient",
+]
+__all__.extend([p for p in _patch_all if p not in __all__])
+
+_patch_sdk()

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

@@ -6,66 +6,70 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import TYPE_CHECKING
+import sys
+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 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 typing import Any
-
     from azure.core.credentials import TokenCredential
 
 
-class DesktopVirtualizationAPIClientConfiguration(Configuration):
+class DesktopVirtualizationAPIClientConfiguration(Configuration):  # pylint: disable=too-many-instance-attributes
     """Configuration for DesktopVirtualizationAPIClient.
 
     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: The ID of the target subscription.
+    :param subscription_id: The ID of the target subscription. Required.
     :type subscription_id: str
+    :keyword api_version: Api Version. Default value is "2022-09-09". Note that overriding this
+     default value may result in unsupported behavior.
+    :paramtype api_version: str
     """
 
-    def __init__(
-        self,
-        credential,  # type: "TokenCredential"
-        subscription_id,  # type: str
-        **kwargs  # type: Any
-    ):
-        # type: (...) -> None
+    def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None:
+        super(DesktopVirtualizationAPIClientConfiguration, self).__init__(**kwargs)
+        api_version = kwargs.pop("api_version", "2022-09-09")  # type: Literal["2022-09-09"]
+
         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.")
-        super(DesktopVirtualizationAPIClientConfiguration, self).__init__(**kwargs)
 
         self.credential = credential
         self.subscription_id = subscription_id
-        self.api_version = "2021-09-03-preview"
-        self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default'])
-        kwargs.setdefault('sdk_moniker', 'mgmt-desktopvirtualization/{}'.format(VERSION))
+        self.api_version = api_version
+        self.credential_scopes = kwargs.pop("credential_scopes", ["https://management.azure.com/.default"])
+        kwargs.setdefault("sdk_moniker", "mgmt-desktopvirtualization/{}".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/desktopvirtualization/azure-mgmt-desktopvirtualization/azure/mgmt/desktopvirtualization/_desktop_virtualization_api_client.py

@@ -6,138 +6,133 @@
 # 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 DesktopVirtualizationAPIClientConfiguration
+from ._serialization import Deserializer, Serializer
+from .operations import (
+    ApplicationGroupsOperations,
+    ApplicationsOperations,
+    DesktopsOperations,
+    HostPoolsOperations,
+    MSIXPackagesOperations,
+    MsixImagesOperations,
+    Operations,
+    ScalingPlanPooledSchedulesOperations,
+    ScalingPlansOperations,
+    SessionHostsOperations,
+    StartMenuItemsOperations,
+    UserSessionsOperations,
+    WorkspacesOperations,
+)
 
 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 DesktopVirtualizationAPIClientConfiguration
-from .operations import Operations
-from .operations import WorkspacesOperations
-from .operations import ScalingPlansOperations
-from .operations import ApplicationGroupsOperations
-from .operations import StartMenuItemsOperations
-from .operations import ApplicationsOperations
-from .operations import DesktopsOperations
-from .operations import HostPoolsOperations
-from .operations import UserSessionsOperations
-from .operations import SessionHostsOperations
-from .operations import MSIXPackagesOperations
-from .operations import MsixImagesOperations
-from .operations import PrivateEndpointConnectionsOperations
-from .operations import PrivateLinkResourcesOperations
-from . import models
 
 
-class DesktopVirtualizationAPIClient(object):
+class DesktopVirtualizationAPIClient:  # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes
     """DesktopVirtualizationAPIClient.
 
     :ivar operations: Operations operations
-    :vartype operations: desktop_virtualization_api_client.operations.Operations
+    :vartype operations: azure.mgmt.desktopvirtualization.operations.Operations
     :ivar workspaces: WorkspacesOperations operations
-    :vartype workspaces: desktop_virtualization_api_client.operations.WorkspacesOperations
+    :vartype workspaces: azure.mgmt.desktopvirtualization.operations.WorkspacesOperations
     :ivar scaling_plans: ScalingPlansOperations operations
-    :vartype scaling_plans: desktop_virtualization_api_client.operations.ScalingPlansOperations
+    :vartype scaling_plans: azure.mgmt.desktopvirtualization.operations.ScalingPlansOperations
+    :ivar scaling_plan_pooled_schedules: ScalingPlanPooledSchedulesOperations operations
+    :vartype scaling_plan_pooled_schedules:
+     azure.mgmt.desktopvirtualization.operations.ScalingPlanPooledSchedulesOperations
     :ivar application_groups: ApplicationGroupsOperations operations
-    :vartype application_groups: desktop_virtualization_api_client.operations.ApplicationGroupsOperations
+    :vartype application_groups:
+     azure.mgmt.desktopvirtualization.operations.ApplicationGroupsOperations
     :ivar start_menu_items: StartMenuItemsOperations operations
-    :vartype start_menu_items: desktop_virtualization_api_client.operations.StartMenuItemsOperations
+    :vartype start_menu_items: azure.mgmt.desktopvirtualization.operations.StartMenuItemsOperations
     :ivar applications: ApplicationsOperations operations
-    :vartype applications: desktop_virtualization_api_client.operations.ApplicationsOperations
+    :vartype applications: azure.mgmt.desktopvirtualization.operations.ApplicationsOperations
     :ivar desktops: DesktopsOperations operations
-    :vartype desktops: desktop_virtualization_api_client.operations.DesktopsOperations
+    :vartype desktops: azure.mgmt.desktopvirtualization.operations.DesktopsOperations
     :ivar host_pools: HostPoolsOperations operations
-    :vartype host_pools: desktop_virtualization_api_client.operations.HostPoolsOperations
+    :vartype host_pools: azure.mgmt.desktopvirtualization.operations.HostPoolsOperations
     :ivar user_sessions: UserSessionsOperations operations
-    :vartype user_sessions: desktop_virtualization_api_client.operations.UserSessionsOperations
+    :vartype user_sessions: azure.mgmt.desktopvirtualization.operations.UserSessionsOperations
     :ivar session_hosts: SessionHostsOperations operations
-    :vartype session_hosts: desktop_virtualization_api_client.operations.SessionHostsOperations
+    :vartype session_hosts: azure.mgmt.desktopvirtualization.operations.SessionHostsOperations
     :ivar msix_packages: MSIXPackagesOperations operations
-    :vartype msix_packages: desktop_virtualization_api_client.operations.MSIXPackagesOperations
+    :vartype msix_packages: azure.mgmt.desktopvirtualization.operations.MSIXPackagesOperations
     :ivar msix_images: MsixImagesOperations operations
-    :vartype msix_images: desktop_virtualization_api_client.operations.MsixImagesOperations
-    :ivar private_endpoint_connections: PrivateEndpointConnectionsOperations operations
-    :vartype private_endpoint_connections: desktop_virtualization_api_client.operations.PrivateEndpointConnectionsOperations
-    :ivar private_link_resources: PrivateLinkResourcesOperations operations
-    :vartype private_link_resources: desktop_virtualization_api_client.operations.PrivateLinkResourcesOperations
-    :param credential: Credential needed for the client to connect to Azure.
+    :vartype msix_images: azure.mgmt.desktopvirtualization.operations.MsixImagesOperations
+    :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.
+    :param subscription_id: The ID of the target subscription. Required.
     :type subscription_id: str
-    :param str base_url: Service URL
+    :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-09-09". Note that overriding this
+     default value may result in unsupported behavior.
+    :paramtype api_version: str
     """
 
     def __init__(
         self,
-        credential,  # type: "TokenCredential"
-        subscription_id,  # type: str
-        base_url=None,  # type: Optional[str]
-        **kwargs  # type: Any
-    ):
-        # type: (...) -> None
-        if not base_url:
-            base_url = 'https://management.azure.com'
-        self._config = DesktopVirtualizationAPIClientConfiguration(credential, subscription_id, **kwargs)
+        credential: "TokenCredential",
+        subscription_id: str,
+        base_url: str = "https://management.azure.com",
+        **kwargs: Any
+    ) -> None:
+        self._config = DesktopVirtualizationAPIClientConfiguration(
+            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._serialize.client_side_validation = False
         self._deserialize = Deserializer(client_models)
-
-        self.operations = Operations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.workspaces = WorkspacesOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.scaling_plans = ScalingPlansOperations(
-            self._client, self._config, self._serialize, self._deserialize)
+        self._serialize.client_side_validation = False
+        self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
+        self.workspaces = WorkspacesOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.scaling_plans = ScalingPlansOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.scaling_plan_pooled_schedules = ScalingPlanPooledSchedulesOperations(
+            self._client, self._config, self._serialize, self._deserialize
+        )
         self.application_groups = ApplicationGroupsOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.start_menu_items = StartMenuItemsOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.applications = ApplicationsOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.desktops = DesktopsOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.host_pools = HostPoolsOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.user_sessions = UserSessionsOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.session_hosts = SessionHostsOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.msix_packages = MSIXPackagesOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.msix_images = MsixImagesOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.private_endpoint_connections = PrivateEndpointConnectionsOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.private_link_resources = PrivateLinkResourcesOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-
-    def _send_request(self, http_request, **kwargs):
-        # type: (HttpRequest, Any) -> HttpResponse
+            self._client, self._config, self._serialize, self._deserialize
+        )
+        self.start_menu_items = StartMenuItemsOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.applications = ApplicationsOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.desktops = DesktopsOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.host_pools = HostPoolsOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.user_sessions = UserSessionsOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.session_hosts = SessionHostsOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.msix_packages = MSIXPackagesOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.msix_images = MsixImagesOperations(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
         """
-        path_format_arguments = {
-            'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1),
-        }
-        http_request.url = self._client.format_url(http_request.url, **path_format_arguments)
-        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