[AutoPR track2_azure-mgmt-cdn] Merge upstream commits on main onto cognitiveservices-Language-2022-04-01-preview

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

@@ -0,0 +1,11 @@
+{
+  "autorest": "3.7.2",
+  "use": [
+    "@autorest/[email protected]",
+    "@autorest/[email protected]"
+  ],
+  "commit": "46ad97970c9c2050396de6d1d0f586166b8d0417",
+  "repository_url": "https://github.com/Azure/azure-rest-api-specs",
+  "autorest_command": "autorest specification/cdn/resource-manager/readme.md --multiapi --python --python-mode=update --python-sdks-folder=/home/vsts/work/1/s/azure-sdk-for-python/sdk --python3-only --track2 --use=@autorest/[email protected] --use=@autorest/[email protected] --version=3.7.2",
+  "readme": "specification/cdn/resource-manager/readme.md"
+}

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

@@ -12,8 +12,7 @@
 __version__ = VERSION
 __all__ = ['CdnManagementClient']
 
-try:
-    from ._patch import patch_sdk  # type: ignore
-    patch_sdk()
-except ImportError:
-    pass
+# `._patch.py` 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
+from ._patch import patch_sdk
+patch_sdk()

sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/_cdn_management_client.py

@@ -6,63 +6,24 @@
 # 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, Optional, 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 CdnManagementClientConfiguration
+from .operations import AFDCustomDomainsOperations, AFDEndpointsOperations, AFDOriginGroupsOperations, AFDOriginsOperations, AFDProfilesOperations, CdnManagementClientOperationsMixin, CustomDomainsOperations, EdgeNodesOperations, EndpointsOperations, LogAnalyticsOperations, ManagedRuleSetsOperations, Operations, OriginGroupsOperations, OriginsOperations, PoliciesOperations, ProfilesOperations, ResourceUsageOperations, RoutesOperations, RuleSetsOperations, RulesOperations, SecretsOperations, SecurityPoliciesOperations, ValidateOperations
+
 if TYPE_CHECKING:
     # pylint: disable=unused-import,ungrouped-imports
-    from typing import Any, Optional
-
     from azure.core.credentials import TokenCredential
 
-from ._configuration import CdnManagementClientConfiguration
-from .operations import ProfilesOperations
-from .operations import EndpointsOperations
-from .operations import OriginsOperations
-from .operations import OriginGroupsOperations
-from .operations import CustomDomainsOperations
-from .operations import CdnManagementClientOperationsMixin
-from .operations import ResourceUsageOperations
-from .operations import Operations
-from .operations import EdgeNodesOperations
-from .operations import AFDProfilesOperations
-from .operations import AFDCustomDomainsOperations
-from .operations import AFDEndpointsOperations
-from .operations import AFDOriginGroupsOperations
-from .operations import AFDOriginsOperations
-from .operations import RoutesOperations
-from .operations import RuleSetsOperations
-from .operations import RulesOperations
-from .operations import SecurityPoliciesOperations
-from .operations import SecretsOperations
-from .operations import ValidateOperations
-from .operations import LogAnalyticsOperations
-from .operations import PoliciesOperations
-from .operations import ManagedRuleSetsOperations
-from . import models
-
-
 class CdnManagementClient(CdnManagementClientOperationsMixin):
     """Cdn Management Client.
 
-    :ivar profiles: ProfilesOperations operations
-    :vartype profiles: azure.mgmt.cdn.operations.ProfilesOperations
-    :ivar endpoints: EndpointsOperations operations
-    :vartype endpoints: azure.mgmt.cdn.operations.EndpointsOperations
-    :ivar origins: OriginsOperations operations
-    :vartype origins: azure.mgmt.cdn.operations.OriginsOperations
-    :ivar origin_groups: OriginGroupsOperations operations
-    :vartype origin_groups: azure.mgmt.cdn.operations.OriginGroupsOperations
-    :ivar custom_domains: CustomDomainsOperations operations
-    :vartype custom_domains: azure.mgmt.cdn.operations.CustomDomainsOperations
-    :ivar resource_usage: ResourceUsageOperations operations
-    :vartype resource_usage: azure.mgmt.cdn.operations.ResourceUsageOperations
-    :ivar operations: Operations operations
-    :vartype operations: azure.mgmt.cdn.operations.Operations
-    :ivar edge_nodes: EdgeNodesOperations operations
-    :vartype edge_nodes: azure.mgmt.cdn.operations.EdgeNodesOperations
     :ivar afd_profiles: AFDProfilesOperations operations
     :vartype afd_profiles: azure.mgmt.cdn.operations.AFDProfilesOperations
     :ivar afd_custom_domains: AFDCustomDomainsOperations operations
@@ -87,6 +48,22 @@ class CdnManagementClient(CdnManagementClientOperationsMixin):
     :vartype validate: azure.mgmt.cdn.operations.ValidateOperations
     :ivar log_analytics: LogAnalyticsOperations operations
     :vartype log_analytics: azure.mgmt.cdn.operations.LogAnalyticsOperations
+    :ivar profiles: ProfilesOperations operations
+    :vartype profiles: azure.mgmt.cdn.operations.ProfilesOperations
+    :ivar endpoints: EndpointsOperations operations
+    :vartype endpoints: azure.mgmt.cdn.operations.EndpointsOperations
+    :ivar origins: OriginsOperations operations
+    :vartype origins: azure.mgmt.cdn.operations.OriginsOperations
+    :ivar origin_groups: OriginGroupsOperations operations
+    :vartype origin_groups: azure.mgmt.cdn.operations.OriginGroupsOperations
+    :ivar custom_domains: CustomDomainsOperations operations
+    :vartype custom_domains: azure.mgmt.cdn.operations.CustomDomainsOperations
+    :ivar resource_usage: ResourceUsageOperations operations
+    :vartype resource_usage: azure.mgmt.cdn.operations.ResourceUsageOperations
+    :ivar operations: Operations operations
+    :vartype operations: azure.mgmt.cdn.operations.Operations
+    :ivar edge_nodes: EdgeNodesOperations operations
+    :vartype edge_nodes: azure.mgmt.cdn.operations.EdgeNodesOperations
     :ivar policies: PoliciesOperations operations
     :vartype policies: azure.mgmt.cdn.operations.PoliciesOperations
     :ivar managed_rule_sets: ManagedRuleSetsOperations operations
@@ -95,72 +72,75 @@ class CdnManagementClient(CdnManagementClientOperationsMixin):
     :type credential: ~azure.core.credentials.TokenCredential
     :param subscription_id: Azure Subscription ID.
     :type subscription_id: str
-    :param str base_url: Service URL
-    :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present.
+    :param base_url: Service URL. Default value is 'https://management.azure.com'.
+    :type base_url: 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,  # 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 = CdnManagementClientConfiguration(credential, subscription_id, **kwargs)
+        credential: "TokenCredential",
+        subscription_id: str,
+        base_url: str = "https://management.azure.com",
+        **kwargs: Any
+    ) -> None:
+        self._config = CdnManagementClientConfiguration(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._serialize.client_side_validation = False
+        self.afd_profiles = AFDProfilesOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.afd_custom_domains = AFDCustomDomainsOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.afd_endpoints = AFDEndpointsOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.afd_origin_groups = AFDOriginGroupsOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.afd_origins = AFDOriginsOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.routes = RoutesOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.rule_sets = RuleSetsOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.rules = RulesOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.security_policies = SecurityPoliciesOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.secrets = SecretsOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.validate = ValidateOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.log_analytics = LogAnalyticsOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.profiles = ProfilesOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.endpoints = EndpointsOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.origins = OriginsOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.origin_groups = OriginGroupsOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.custom_domains = CustomDomainsOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.resource_usage = ResourceUsageOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
+        self.edge_nodes = EdgeNodesOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.policies = PoliciesOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.managed_rule_sets = ManagedRuleSetsOperations(self._client, self._config, self._serialize, self._deserialize)
+
+
+    def _send_request(
+        self,
+        request,  # type: HttpRequest
+        **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)
+        <HttpResponse: 200 OK>
+
+        For more information on this code flow, see https://aka.ms/azsdk/python/protocol/quickstart
+
+        :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.rest.HttpResponse
+        """
 
-        self.profiles = ProfilesOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.endpoints = EndpointsOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.origins = OriginsOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.origin_groups = OriginGroupsOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.custom_domains = CustomDomainsOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.resource_usage = ResourceUsageOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.operations = Operations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.edge_nodes = EdgeNodesOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.afd_profiles = AFDProfilesOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.afd_custom_domains = AFDCustomDomainsOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.afd_endpoints = AFDEndpointsOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.afd_origin_groups = AFDOriginGroupsOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.afd_origins = AFDOriginsOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.routes = RoutesOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.rule_sets = RuleSetsOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.rules = RulesOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.security_policies = SecurityPoliciesOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.secrets = SecretsOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.validate = ValidateOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.log_analytics = LogAnalyticsOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.policies = PoliciesOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.managed_rule_sets = ManagedRuleSetsOperations(
-            self._client, self._config, self._serialize, self._deserialize)
+        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

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

@@ -6,18 +6,16 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import TYPE_CHECKING
+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 TYPE_CHECKING:
     # pylint: disable=unused-import,ungrouped-imports
-    from typing import Any
-
     from azure.core.credentials import TokenCredential
 
 
@@ -35,20 +33,19 @@ class CdnManagementClientConfiguration(Configuration):
 
     def __init__(
         self,
-        credential,  # type: "TokenCredential"
-        subscription_id,  # type: str
-        **kwargs  # type: Any
-    ):
-        # type: (...) -> None
+        credential: "TokenCredential",
+        subscription_id: str,
+        **kwargs: Any
+    ) -> None:
+        super(CdnManagementClientConfiguration, self).__init__(**kwargs)
         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(CdnManagementClientConfiguration, self).__init__(**kwargs)
 
         self.credential = credential
         self.subscription_id = subscription_id
-        self.api_version = "2020-09-01"
+        self.api_version = "2021-06-01"
         self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default'])
         kwargs.setdefault('sdk_moniker', 'mgmt-cdn/{}'.format(VERSION))
         self._configure(**kwargs)
@@ -68,4 +65,4 @@ def _configure(
         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)