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

Adding missing advanced filters (Azure#16997)
AzureSDKAutomation · Jan 5, 2022 · 30d2b62 · 30d2b62
1 parent bc99c22
commit 30d2b62
Show file tree

Hide file tree

Showing 17 changed files with 964 additions and 5,075 deletions.
diff --git a/sdk/eventgrid/azure-mgmt-eventgrid/_meta.json b/sdk/eventgrid/azure-mgmt-eventgrid/_meta.json
@@ -6,6 +6,6 @@
   ],
   "commit": "f3477bd0a7b6101f9c0af243cc0106c7a8e24c71",
   "repository_url": "https://github.com/Azure/azure-rest-api-specs",
-  "autorest_command": "autorest specification/eventgrid/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.12.0 --use=@autorest/modelerfour@4.19.3 --version=3.7.2",
+  "autorest_command": "autorest specification/eventgrid/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/python@5.12.0 --use=@autorest/modelerfour@4.19.3 --version=3.7.2",
   "readme": "specification/eventgrid/resource-manager/readme.md"
 }
diff --git a/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/_configuration.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/_configuration.py
@@ -6,7 +6,7 @@
 # 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
@@ -16,8 +16,6 @@
 
 if TYPE_CHECKING:
     # pylint: disable=unused-import,ungrouped-imports
-    from typing import Any
-
     from azure.core.credentials import TokenCredential
 
 
@@ -35,11 +33,10 @@ class EventGridManagementClientConfiguration(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(EventGridManagementClientConfiguration, self).__init__(**kwargs)
         if credential is None:
             raise ValueError("Parameter 'credential' must not be None.")

diff --git a/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/_event_grid_management_client.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/_event_grid_management_client.py
@@ -7,8 +7,9 @@
 # --------------------------------------------------------------------------
 
 from copy import deepcopy
-from typing import TYPE_CHECKING
+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
 
@@ -18,12 +19,9 @@
 
 if TYPE_CHECKING:
     # pylint: disable=unused-import,ungrouped-imports
-    from typing import Any, Optional
-
     from azure.core.credentials import TokenCredential
-    from azure.core.rest import HttpRequest, HttpResponse
 
-class EventGridManagementClient(object):
+class EventGridManagementClient:
     """Azure EventGrid Management Client.
 
     :ivar domains: DomainsOperations operations
@@ -63,12 +61,11 @@ class EventGridManagementClient(object):
 
     def __init__(
         self,
-        credential,  # type: "TokenCredential"
-        subscription_id,  # type: str
-        base_url="https://management.azure.com",  # type: str
-        **kwargs  # type: Any
-    ):
-        # type: (...) -> None
+        credential: "TokenCredential",
+        subscription_id: str,
+        base_url: str = "https://management.azure.com",
+        **kwargs: Any
+    ) -> None:
         self._config = EventGridManagementClientConfiguration(credential=credential, subscription_id=subscription_id, **kwargs)
         self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
 
@@ -92,9 +89,8 @@ def __init__(
     def _send_request(
         self,
         request,  # type: HttpRequest
-        **kwargs  # type: Any
-    ):
-        # type: (...) -> HttpResponse
+        **kwargs: Any
+    ) -> HttpResponse:
         """Runs the network request through the client's chained policies.
 
         >>> from azure.core.rest import HttpRequest

diff --git a/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/_version.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/_version.py
@@ -6,4 +6,4 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "10.1.0"
+VERSION = "2.2.0"
diff --git a/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/__init__.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/__init__.py
@@ -6,172 +6,89 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-try:
-    from ._models_py3 import AdvancedFilter
-    from ._models_py3 import AzureFunctionEventSubscriptionDestination
-    from ._models_py3 import BoolEqualsAdvancedFilter
-    from ._models_py3 import ConnectionState
-    from ._models_py3 import DeadLetterDestination
-    from ._models_py3 import DeadLetterWithResourceIdentity
-    from ._models_py3 import DeliveryAttributeListResult
-    from ._models_py3 import DeliveryAttributeMapping
-    from ._models_py3 import DeliveryWithResourceIdentity
-    from ._models_py3 import Domain
-    from ._models_py3 import DomainRegenerateKeyRequest
-    from ._models_py3 import DomainSharedAccessKeys
-    from ._models_py3 import DomainTopic
-    from ._models_py3 import DomainTopicsListResult
-    from ._models_py3 import DomainUpdateParameters
-    from ._models_py3 import DomainsListResult
-    from ._models_py3 import DynamicDeliveryAttributeMapping
-    from ._models_py3 import EventHubEventSubscriptionDestination
-    from ._models_py3 import EventSubscription
-    from ._models_py3 import EventSubscriptionDestination
-    from ._models_py3 import EventSubscriptionFilter
-    from ._models_py3 import EventSubscriptionFullUrl
-    from ._models_py3 import EventSubscriptionIdentity
-    from ._models_py3 import EventSubscriptionUpdateParameters
-    from ._models_py3 import EventSubscriptionsListResult
-    from ._models_py3 import EventType
-    from ._models_py3 import EventTypesListResult
-    from ._models_py3 import ExtensionTopic
-    from ._models_py3 import HybridConnectionEventSubscriptionDestination
-    from ._models_py3 import IdentityInfo
-    from ._models_py3 import InboundIpRule
-    from ._models_py3 import InputSchemaMapping
-    from ._models_py3 import IsNotNullAdvancedFilter
-    from ._models_py3 import IsNullOrUndefinedAdvancedFilter
-    from ._models_py3 import JsonField
-    from ._models_py3 import JsonFieldWithDefault
-    from ._models_py3 import JsonInputSchemaMapping
-    from ._models_py3 import NumberGreaterThanAdvancedFilter
-    from ._models_py3 import NumberGreaterThanOrEqualsAdvancedFilter
-    from ._models_py3 import NumberInAdvancedFilter
-    from ._models_py3 import NumberInRangeAdvancedFilter
-    from ._models_py3 import NumberLessThanAdvancedFilter
-    from ._models_py3 import NumberLessThanOrEqualsAdvancedFilter
-    from ._models_py3 import NumberNotInAdvancedFilter
-    from ._models_py3 import NumberNotInRangeAdvancedFilter
-    from ._models_py3 import Operation
-    from ._models_py3 import OperationInfo
-    from ._models_py3 import OperationsListResult
-    from ._models_py3 import PrivateEndpoint
-    from ._models_py3 import PrivateEndpointConnection
-    from ._models_py3 import PrivateEndpointConnectionListResult
-    from ._models_py3 import PrivateLinkResource
-    from ._models_py3 import PrivateLinkResourcesListResult
-    from ._models_py3 import Resource
-    from ._models_py3 import RetryPolicy
-    from ._models_py3 import ServiceBusQueueEventSubscriptionDestination
-    from ._models_py3 import ServiceBusTopicEventSubscriptionDestination
-    from ._models_py3 import StaticDeliveryAttributeMapping
-    from ._models_py3 import StorageBlobDeadLetterDestination
-    from ._models_py3 import StorageQueueEventSubscriptionDestination
-    from ._models_py3 import StringBeginsWithAdvancedFilter
-    from ._models_py3 import StringContainsAdvancedFilter
-    from ._models_py3 import StringEndsWithAdvancedFilter
-    from ._models_py3 import StringInAdvancedFilter
-    from ._models_py3 import StringNotBeginsWithAdvancedFilter
-    from ._models_py3 import StringNotContainsAdvancedFilter
-    from ._models_py3 import StringNotEndsWithAdvancedFilter
-    from ._models_py3 import StringNotInAdvancedFilter
-    from ._models_py3 import SystemData
-    from ._models_py3 import SystemTopic
-    from ._models_py3 import SystemTopicUpdateParameters
-    from ._models_py3 import SystemTopicsListResult
-    from ._models_py3 import Topic
-    from ._models_py3 import TopicRegenerateKeyRequest
-    from ._models_py3 import TopicSharedAccessKeys
-    from ._models_py3 import TopicTypeInfo
-    from ._models_py3 import TopicTypesListResult
-    from ._models_py3 import TopicUpdateParameters
-    from ._models_py3 import TopicsListResult
-    from ._models_py3 import TrackedResource
-    from ._models_py3 import UserIdentityProperties
-    from ._models_py3 import WebHookEventSubscriptionDestination
-except (SyntaxError, ImportError):
-    from ._models import AdvancedFilter  # type: ignore
-    from ._models import AzureFunctionEventSubscriptionDestination  # type: ignore
-    from ._models import BoolEqualsAdvancedFilter  # type: ignore
-    from ._models import ConnectionState  # type: ignore
-    from ._models import DeadLetterDestination  # type: ignore
-    from ._models import DeadLetterWithResourceIdentity  # type: ignore
-    from ._models import DeliveryAttributeListResult  # type: ignore
-    from ._models import DeliveryAttributeMapping  # type: ignore
-    from ._models import DeliveryWithResourceIdentity  # type: ignore
-    from ._models import Domain  # type: ignore
-    from ._models import DomainRegenerateKeyRequest  # type: ignore
-    from ._models import DomainSharedAccessKeys  # type: ignore
-    from ._models import DomainTopic  # type: ignore
-    from ._models import DomainTopicsListResult  # type: ignore
-    from ._models import DomainUpdateParameters  # type: ignore
-    from ._models import DomainsListResult  # type: ignore
-    from ._models import DynamicDeliveryAttributeMapping  # type: ignore
-    from ._models import EventHubEventSubscriptionDestination  # type: ignore
-    from ._models import EventSubscription  # type: ignore
-    from ._models import EventSubscriptionDestination  # type: ignore
-    from ._models import EventSubscriptionFilter  # type: ignore
-    from ._models import EventSubscriptionFullUrl  # type: ignore
-    from ._models import EventSubscriptionIdentity  # type: ignore
-    from ._models import EventSubscriptionUpdateParameters  # type: ignore
-    from ._models import EventSubscriptionsListResult  # type: ignore
-    from ._models import EventType  # type: ignore
-    from ._models import EventTypesListResult  # type: ignore
-    from ._models import ExtensionTopic  # type: ignore
-    from ._models import HybridConnectionEventSubscriptionDestination  # type: ignore
-    from ._models import IdentityInfo  # type: ignore
-    from ._models import InboundIpRule  # type: ignore
-    from ._models import InputSchemaMapping  # type: ignore
-    from ._models import IsNotNullAdvancedFilter  # type: ignore
-    from ._models import IsNullOrUndefinedAdvancedFilter  # type: ignore
-    from ._models import JsonField  # type: ignore
-    from ._models import JsonFieldWithDefault  # type: ignore
-    from ._models import JsonInputSchemaMapping  # type: ignore
-    from ._models import NumberGreaterThanAdvancedFilter  # type: ignore
-    from ._models import NumberGreaterThanOrEqualsAdvancedFilter  # type: ignore
-    from ._models import NumberInAdvancedFilter  # type: ignore
-    from ._models import NumberInRangeAdvancedFilter  # type: ignore
-    from ._models import NumberLessThanAdvancedFilter  # type: ignore
-    from ._models import NumberLessThanOrEqualsAdvancedFilter  # type: ignore
-    from ._models import NumberNotInAdvancedFilter  # type: ignore
-    from ._models import NumberNotInRangeAdvancedFilter  # type: ignore
-    from ._models import Operation  # type: ignore
-    from ._models import OperationInfo  # type: ignore
-    from ._models import OperationsListResult  # type: ignore
-    from ._models import PrivateEndpoint  # type: ignore
-    from ._models import PrivateEndpointConnection  # type: ignore
-    from ._models import PrivateEndpointConnectionListResult  # type: ignore
-    from ._models import PrivateLinkResource  # type: ignore
-    from ._models import PrivateLinkResourcesListResult  # type: ignore
-    from ._models import Resource  # type: ignore
-    from ._models import RetryPolicy  # type: ignore
-    from ._models import ServiceBusQueueEventSubscriptionDestination  # type: ignore
-    from ._models import ServiceBusTopicEventSubscriptionDestination  # type: ignore
-    from ._models import StaticDeliveryAttributeMapping  # type: ignore
-    from ._models import StorageBlobDeadLetterDestination  # type: ignore
-    from ._models import StorageQueueEventSubscriptionDestination  # type: ignore
-    from ._models import StringBeginsWithAdvancedFilter  # type: ignore
-    from ._models import StringContainsAdvancedFilter  # type: ignore
-    from ._models import StringEndsWithAdvancedFilter  # type: ignore
-    from ._models import StringInAdvancedFilter  # type: ignore
-    from ._models import StringNotBeginsWithAdvancedFilter  # type: ignore
-    from ._models import StringNotContainsAdvancedFilter  # type: ignore
-    from ._models import StringNotEndsWithAdvancedFilter  # type: ignore
-    from ._models import StringNotInAdvancedFilter  # type: ignore
-    from ._models import SystemData  # type: ignore
-    from ._models import SystemTopic  # type: ignore
-    from ._models import SystemTopicUpdateParameters  # type: ignore
-    from ._models import SystemTopicsListResult  # type: ignore
-    from ._models import Topic  # type: ignore
-    from ._models import TopicRegenerateKeyRequest  # type: ignore
-    from ._models import TopicSharedAccessKeys  # type: ignore
-    from ._models import TopicTypeInfo  # type: ignore
-    from ._models import TopicTypesListResult  # type: ignore
-    from ._models import TopicUpdateParameters  # type: ignore
-    from ._models import TopicsListResult  # type: ignore
-    from ._models import TrackedResource  # type: ignore
-    from ._models import UserIdentityProperties  # type: ignore
-    from ._models import WebHookEventSubscriptionDestination  # type: ignore
+from ._models_py3 import AdvancedFilter
+from ._models_py3 import AzureFunctionEventSubscriptionDestination
+from ._models_py3 import BoolEqualsAdvancedFilter
+from ._models_py3 import ConnectionState
+from ._models_py3 import DeadLetterDestination
+from ._models_py3 import DeadLetterWithResourceIdentity
+from ._models_py3 import DeliveryAttributeListResult
+from ._models_py3 import DeliveryAttributeMapping
+from ._models_py3 import DeliveryWithResourceIdentity
+from ._models_py3 import Domain
+from ._models_py3 import DomainRegenerateKeyRequest
+from ._models_py3 import DomainSharedAccessKeys
+from ._models_py3 import DomainTopic
+from ._models_py3 import DomainTopicsListResult
+from ._models_py3 import DomainUpdateParameters
+from ._models_py3 import DomainsListResult
+from ._models_py3 import DynamicDeliveryAttributeMapping
+from ._models_py3 import EventHubEventSubscriptionDestination
+from ._models_py3 import EventSubscription
+from ._models_py3 import EventSubscriptionDestination
+from ._models_py3 import EventSubscriptionFilter
+from ._models_py3 import EventSubscriptionFullUrl
+from ._models_py3 import EventSubscriptionIdentity
+from ._models_py3 import EventSubscriptionUpdateParameters
+from ._models_py3 import EventSubscriptionsListResult
+from ._models_py3 import EventType
+from ._models_py3 import EventTypesListResult
+from ._models_py3 import ExtensionTopic
+from ._models_py3 import HybridConnectionEventSubscriptionDestination
+from ._models_py3 import IdentityInfo
+from ._models_py3 import InboundIpRule
+from ._models_py3 import InputSchemaMapping
+from ._models_py3 import IsNotNullAdvancedFilter
+from ._models_py3 import IsNullOrUndefinedAdvancedFilter
+from ._models_py3 import JsonField
+from ._models_py3 import JsonFieldWithDefault
+from ._models_py3 import JsonInputSchemaMapping
+from ._models_py3 import NumberGreaterThanAdvancedFilter
+from ._models_py3 import NumberGreaterThanOrEqualsAdvancedFilter
+from ._models_py3 import NumberInAdvancedFilter
+from ._models_py3 import NumberInRangeAdvancedFilter
+from ._models_py3 import NumberLessThanAdvancedFilter
+from ._models_py3 import NumberLessThanOrEqualsAdvancedFilter
+from ._models_py3 import NumberNotInAdvancedFilter
+from ._models_py3 import NumberNotInRangeAdvancedFilter
+from ._models_py3 import Operation
+from ._models_py3 import OperationInfo
+from ._models_py3 import OperationsListResult
+from ._models_py3 import PrivateEndpoint
+from ._models_py3 import PrivateEndpointConnection
+from ._models_py3 import PrivateEndpointConnectionListResult
+from ._models_py3 import PrivateLinkResource
+from ._models_py3 import PrivateLinkResourcesListResult
+from ._models_py3 import Resource
+from ._models_py3 import RetryPolicy
+from ._models_py3 import ServiceBusQueueEventSubscriptionDestination
+from ._models_py3 import ServiceBusTopicEventSubscriptionDestination
+from ._models_py3 import StaticDeliveryAttributeMapping
+from ._models_py3 import StorageBlobDeadLetterDestination
+from ._models_py3 import StorageQueueEventSubscriptionDestination
+from ._models_py3 import StringBeginsWithAdvancedFilter
+from ._models_py3 import StringContainsAdvancedFilter
+from ._models_py3 import StringEndsWithAdvancedFilter
+from ._models_py3 import StringInAdvancedFilter
+from ._models_py3 import StringNotBeginsWithAdvancedFilter
+from ._models_py3 import StringNotContainsAdvancedFilter
+from ._models_py3 import StringNotEndsWithAdvancedFilter
+from ._models_py3 import StringNotInAdvancedFilter
+from ._models_py3 import SystemData
+from ._models_py3 import SystemTopic
+from ._models_py3 import SystemTopicUpdateParameters
+from ._models_py3 import SystemTopicsListResult
+from ._models_py3 import Topic
+from ._models_py3 import TopicRegenerateKeyRequest
+from ._models_py3 import TopicSharedAccessKeys
+from ._models_py3 import TopicTypeInfo
+from ._models_py3 import TopicTypesListResult
+from ._models_py3 import TopicUpdateParameters
+from ._models_py3 import TopicsListResult
+from ._models_py3 import TrackedResource
+from ._models_py3 import UserIdentityProperties
+from ._models_py3 import WebHookEventSubscriptionDestination
+
 
 from ._event_grid_management_client_enums import (
     AdvancedFilterOperatorType,