Skip to content

Commit cf1df01

Browse files
AutorestCIlmazuel
AutorestCI
authored and
lmazuel
committed
[AutoPR] eventgrid/resource-manager (#2902)
* Generated from e1fc2e1bdad54c396693d98c655354fc82f8f36b (#2885) 1) Fix for linter error "Properties of a PATCH request body must not be default-valued. PATCH operation: 'EventSubscriptions_Update' Model Definition: 'EventSubscriptionUpdateParameters' Property: 'eventDeliverySchema'". 2) Updated the default value of EventDeliverySchema to the correct value used by the service. * Generated from b4273ec0b368f83e73154dec7bfcffc5b9135f5f (#3229) Swagger changes for 2018-09-15-preview API version. * Packaging update of azure-mgmt-eventgrid * [AutoPR eventgrid/resource-manager] EventGrid: Updated README.MD configuration to include the new preview API version. (#3292) * Generated from 569674609f3c16360c668e5b0693bdd4385700ec Merge remote-tracking branch 'upstream/master' * Generated from f05cde9aaf9ffa3a4a72406033a5d6527cd94fab Added two new operatorTypes to AdvancedFilter + marked a couple of properties readOnly. * Generated from 731d3b6b72a89918dcd03171a26854c8e55b4147 (#3364) README.md changes: Updated default tag for global settings and updates to multi-api settings. * [AutoPR eventgrid/resource-manager] EventGrid: Update README files to include the current new preview api… (#3615) * Generated from ce8469266acf934b97b1cc71b6610123b24710b6 EventGrid: Update README files to include the current new preview api version 2018-09-preview * Packaging update of azure-mgmt-eventgrid * Packaging update of azure-mgmt-eventgrid * Packaging update of azure-mgmt-eventgrid * EventGrid 2.0.0rc2 * Added a new test + re-recorded all tests.
1 parent ce09935 commit cf1df01

File tree

72 files changed

+3247
-259
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+3247
-259
lines changed

‎azure-mgmt-eventgrid/HISTORY.rst

+17-3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,20 @@
33
Release History
44
===============
55

6+
2.0.0rc2 (2018-10-24)
7+
+++++++++++++++++++++
8+
9+
**Features**
10+
11+
- Model EventSubscriptionFilter has a new parameter advanced_filters
12+
- Model EventSubscriptionUpdateParameters has a new parameter expiration_time_utc
13+
- Model EventSubscription has a new parameter expiration_time_utc
14+
- Added operation EventSubscriptionsOperations.list_by_domain_topic
15+
- Added operation group DomainTopicsOperations
16+
- Added operation group DomainsOperations
17+
18+
Internal API version is 2018-09-15-preview
19+
620
2.0.0rc1 (2018-05-04)
721
+++++++++++++++++++++
822

@@ -14,9 +28,9 @@ Release History
1428
- delivering events to Azure Storage queue and Azure hybrid connections
1529
- deadlettering
1630
- retry policies
17-
- manual subscription validation handshake validation.
31+
- manual subscription validation handshake validation.
1832

19-
Internal API version is 2018-05-01-preview
33+
Internal API version is 2018-05-01-preview
2034

2135
1.0.0 (2018-04-26)
2236
++++++++++++++++++
@@ -39,7 +53,7 @@ This version uses a next-generation code generator that *might* introduce breaki
3953

4054
- Return type changes from `msrestazure.azure_operation.AzureOperationPoller` to `msrest.polling.LROPoller`. External API is the same.
4155
- Return type is now **always** a `msrest.polling.LROPoller`, regardless of the optional parameters used.
42-
- The behavior has changed when using `raw=True`. Instead of returning the initial call result as `ClientRawResponse`,
56+
- The behavior has changed when using `raw=True`. Instead of returning the initial call result as `ClientRawResponse`,
4357
without polling, now this returns an LROPoller. After polling, the final resource will be returned as a `ClientRawResponse`.
4458
- New `polling` parameter. The default behavior is `Polling=True` which will poll using ARM algorithm. When `Polling=False`,
4559
the response of the initial call will be returned without polling.

‎azure-mgmt-eventgrid/MANIFEST.in

+3
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
11
include *.rst
2+
include azure/__init__.py
3+
include azure/mgmt/__init__.py
4+

‎azure-mgmt-eventgrid/azure/mgmt/eventgrid/event_grid_management_client.py

+11-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
from msrest import Serializer, Deserializer
1414
from msrestazure import AzureConfiguration
1515
from .version import VERSION
16+
from .operations.domains_operations import DomainsOperations
17+
from .operations.domain_topics_operations import DomainTopicsOperations
1618
from .operations.event_subscriptions_operations import EventSubscriptionsOperations
1719
from .operations.operations import Operations
1820
from .operations.topics_operations import TopicsOperations
@@ -60,6 +62,10 @@ class EventGridManagementClient(SDKClient):
6062
:ivar config: Configuration for client.
6163
:vartype config: EventGridManagementClientConfiguration
6264
65+
:ivar domains: Domains operations
66+
:vartype domains: azure.mgmt.eventgrid.operations.DomainsOperations
67+
:ivar domain_topics: DomainTopics operations
68+
:vartype domain_topics: azure.mgmt.eventgrid.operations.DomainTopicsOperations
6369
:ivar event_subscriptions: EventSubscriptions operations
6470
:vartype event_subscriptions: azure.mgmt.eventgrid.operations.EventSubscriptionsOperations
6571
:ivar operations: Operations operations
@@ -86,10 +92,14 @@ def __init__(
8692
super(EventGridManagementClient, self).__init__(self.config.credentials, self.config)
8793

8894
client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
89-
self.api_version = '2018-05-01-preview'
95+
self.api_version = '2018-09-15-preview'
9096
self._serialize = Serializer(client_models)
9197
self._deserialize = Deserializer(client_models)
9298

99+
self.domains = DomainsOperations(
100+
self._client, self.config, self._serialize, self._deserialize)
101+
self.domain_topics = DomainTopicsOperations(
102+
self._client, self.config, self._serialize, self._deserialize)
93103
self.event_subscriptions = EventSubscriptionsOperations(
94104
self._client, self.config, self._serialize, self._deserialize)
95105
self.operations = Operations(

‎azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/__init__.py

+65-5
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,31 @@
1010
# --------------------------------------------------------------------------
1111

1212
try:
13+
from .input_schema_mapping_py3 import InputSchemaMapping
14+
from .domain_py3 import Domain
15+
from .domain_update_parameters_py3 import DomainUpdateParameters
16+
from .domain_shared_access_keys_py3 import DomainSharedAccessKeys
17+
from .domain_regenerate_key_request_py3 import DomainRegenerateKeyRequest
18+
from .domain_topic_py3 import DomainTopic
1319
from .event_subscription_destination_py3 import EventSubscriptionDestination
20+
from .advanced_filter_py3 import AdvancedFilter
1421
from .event_subscription_filter_py3 import EventSubscriptionFilter
1522
from .retry_policy_py3 import RetryPolicy
1623
from .dead_letter_destination_py3 import DeadLetterDestination
1724
from .resource_py3 import Resource
25+
from .number_in_advanced_filter_py3 import NumberInAdvancedFilter
1826
from .storage_blob_dead_letter_destination_py3 import StorageBlobDeadLetterDestination
27+
from .number_not_in_advanced_filter_py3 import NumberNotInAdvancedFilter
28+
from .number_less_than_advanced_filter_py3 import NumberLessThanAdvancedFilter
29+
from .number_greater_than_advanced_filter_py3 import NumberGreaterThanAdvancedFilter
30+
from .number_less_than_or_equals_advanced_filter_py3 import NumberLessThanOrEqualsAdvancedFilter
31+
from .number_greater_than_or_equals_advanced_filter_py3 import NumberGreaterThanOrEqualsAdvancedFilter
32+
from .bool_equals_advanced_filter_py3 import BoolEqualsAdvancedFilter
33+
from .string_in_advanced_filter_py3 import StringInAdvancedFilter
34+
from .string_not_in_advanced_filter_py3 import StringNotInAdvancedFilter
35+
from .string_begins_with_advanced_filter_py3 import StringBeginsWithAdvancedFilter
36+
from .string_ends_with_advanced_filter_py3 import StringEndsWithAdvancedFilter
37+
from .string_contains_advanced_filter_py3 import StringContainsAdvancedFilter
1938
from .web_hook_event_subscription_destination_py3 import WebHookEventSubscriptionDestination
2039
from .event_hub_event_subscription_destination_py3 import EventHubEventSubscriptionDestination
2140
from .storage_queue_event_subscription_destination_py3 import StorageQueueEventSubscriptionDestination
@@ -25,7 +44,6 @@
2544
from .event_subscription_full_url_py3 import EventSubscriptionFullUrl
2645
from .operation_info_py3 import OperationInfo
2746
from .operation_py3 import Operation
28-
from .input_schema_mapping_py3 import InputSchemaMapping
2947
from .json_field_py3 import JsonField
3048
from .json_field_with_default_py3 import JsonFieldWithDefault
3149
from .json_input_schema_mapping_py3 import JsonInputSchemaMapping
@@ -37,12 +55,31 @@
3755
from .event_type_py3 import EventType
3856
from .topic_type_info_py3 import TopicTypeInfo
3957
except (SyntaxError, ImportError):
58+
from .input_schema_mapping import InputSchemaMapping
59+
from .domain import Domain
60+
from .domain_update_parameters import DomainUpdateParameters
61+
from .domain_shared_access_keys import DomainSharedAccessKeys
62+
from .domain_regenerate_key_request import DomainRegenerateKeyRequest
63+
from .domain_topic import DomainTopic
4064
from .event_subscription_destination import EventSubscriptionDestination
65+
from .advanced_filter import AdvancedFilter
4166
from .event_subscription_filter import EventSubscriptionFilter
4267
from .retry_policy import RetryPolicy
4368
from .dead_letter_destination import DeadLetterDestination
4469
from .resource import Resource
70+
from .number_in_advanced_filter import NumberInAdvancedFilter
4571
from .storage_blob_dead_letter_destination import StorageBlobDeadLetterDestination
72+
from .number_not_in_advanced_filter import NumberNotInAdvancedFilter
73+
from .number_less_than_advanced_filter import NumberLessThanAdvancedFilter
74+
from .number_greater_than_advanced_filter import NumberGreaterThanAdvancedFilter
75+
from .number_less_than_or_equals_advanced_filter import NumberLessThanOrEqualsAdvancedFilter
76+
from .number_greater_than_or_equals_advanced_filter import NumberGreaterThanOrEqualsAdvancedFilter
77+
from .bool_equals_advanced_filter import BoolEqualsAdvancedFilter
78+
from .string_in_advanced_filter import StringInAdvancedFilter
79+
from .string_not_in_advanced_filter import StringNotInAdvancedFilter
80+
from .string_begins_with_advanced_filter import StringBeginsWithAdvancedFilter
81+
from .string_ends_with_advanced_filter import StringEndsWithAdvancedFilter
82+
from .string_contains_advanced_filter import StringContainsAdvancedFilter
4683
from .web_hook_event_subscription_destination import WebHookEventSubscriptionDestination
4784
from .event_hub_event_subscription_destination import EventHubEventSubscriptionDestination
4885
from .storage_queue_event_subscription_destination import StorageQueueEventSubscriptionDestination
@@ -52,7 +89,6 @@
5289
from .event_subscription_full_url import EventSubscriptionFullUrl
5390
from .operation_info import OperationInfo
5491
from .operation import Operation
55-
from .input_schema_mapping import InputSchemaMapping
5692
from .json_field import JsonField
5793
from .json_field_with_default import JsonFieldWithDefault
5894
from .json_input_schema_mapping import JsonInputSchemaMapping
@@ -63,27 +99,49 @@
6399
from .topic_regenerate_key_request import TopicRegenerateKeyRequest
64100
from .event_type import EventType
65101
from .topic_type_info import TopicTypeInfo
102+
from .domain_paged import DomainPaged
103+
from .domain_topic_paged import DomainTopicPaged
66104
from .event_subscription_paged import EventSubscriptionPaged
67105
from .operation_paged import OperationPaged
68106
from .topic_paged import TopicPaged
69107
from .event_type_paged import EventTypePaged
70108
from .topic_type_info_paged import TopicTypeInfoPaged
71109
from .event_grid_management_client_enums import (
110+
DomainProvisioningState,
111+
InputSchema,
72112
EventSubscriptionProvisioningState,
73113
EventDeliverySchema,
74114
TopicProvisioningState,
75-
InputSchema,
76115
ResourceRegionType,
77116
TopicTypeProvisioningState,
78117
)
79118

80119
__all__ = [
120+
'InputSchemaMapping',
121+
'Domain',
122+
'DomainUpdateParameters',
123+
'DomainSharedAccessKeys',
124+
'DomainRegenerateKeyRequest',
125+
'DomainTopic',
81126
'EventSubscriptionDestination',
127+
'AdvancedFilter',
82128
'EventSubscriptionFilter',
83129
'RetryPolicy',
84130
'DeadLetterDestination',
85131
'Resource',
132+
'NumberInAdvancedFilter',
86133
'StorageBlobDeadLetterDestination',
134+
'NumberNotInAdvancedFilter',
135+
'NumberLessThanAdvancedFilter',
136+
'NumberGreaterThanAdvancedFilter',
137+
'NumberLessThanOrEqualsAdvancedFilter',
138+
'NumberGreaterThanOrEqualsAdvancedFilter',
139+
'BoolEqualsAdvancedFilter',
140+
'StringInAdvancedFilter',
141+
'StringNotInAdvancedFilter',
142+
'StringBeginsWithAdvancedFilter',
143+
'StringEndsWithAdvancedFilter',
144+
'StringContainsAdvancedFilter',
87145
'WebHookEventSubscriptionDestination',
88146
'EventHubEventSubscriptionDestination',
89147
'StorageQueueEventSubscriptionDestination',
@@ -93,7 +151,6 @@
93151
'EventSubscriptionFullUrl',
94152
'OperationInfo',
95153
'Operation',
96-
'InputSchemaMapping',
97154
'JsonField',
98155
'JsonFieldWithDefault',
99156
'JsonInputSchemaMapping',
@@ -104,15 +161,18 @@
104161
'TopicRegenerateKeyRequest',
105162
'EventType',
106163
'TopicTypeInfo',
164+
'DomainPaged',
165+
'DomainTopicPaged',
107166
'EventSubscriptionPaged',
108167
'OperationPaged',
109168
'TopicPaged',
110169
'EventTypePaged',
111170
'TopicTypeInfoPaged',
171+
'DomainProvisioningState',
172+
'InputSchema',
112173
'EventSubscriptionProvisioningState',
113174
'EventDeliverySchema',
114175
'TopicProvisioningState',
115-
'InputSchema',
116176
'ResourceRegionType',
117177
'TopicTypeProvisioningState',
118178
]

‎azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/advanced_filter.py

+53
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
# coding=utf-8
2+
# --------------------------------------------------------------------------
3+
# Copyright (c) Microsoft Corporation. All rights reserved.
4+
# Licensed under the MIT License. See License.txt in the project root for
5+
# license information.
6+
#
7+
# Code generated by Microsoft (R) AutoRest Code Generator.
8+
# Changes may cause incorrect behavior and will be lost if the code is
9+
# regenerated.
10+
# --------------------------------------------------------------------------
11+
12+
from msrest.serialization import Model
13+
14+
15+
class AdvancedFilter(Model):
16+
"""Represents an advanced filter that can be used to filter events based on
17+
various event envelope/data fields.
18+
19+
You probably want to use the sub-classes and not this class directly. Known
20+
sub-classes are: NumberInAdvancedFilter, NumberNotInAdvancedFilter,
21+
NumberLessThanAdvancedFilter, NumberGreaterThanAdvancedFilter,
22+
NumberLessThanOrEqualsAdvancedFilter,
23+
NumberGreaterThanOrEqualsAdvancedFilter, BoolEqualsAdvancedFilter,
24+
StringInAdvancedFilter, StringNotInAdvancedFilter,
25+
StringBeginsWithAdvancedFilter, StringEndsWithAdvancedFilter,
26+
StringContainsAdvancedFilter
27+
28+
All required parameters must be populated in order to send to Azure.
29+
30+
:param key: The filter key. Represents an event property with upto two
31+
levels of nesting.
32+
:type key: str
33+
:param operator_type: Required. Constant filled by server.
34+
:type operator_type: str
35+
"""
36+
37+
_validation = {
38+
'operator_type': {'required': True},
39+
}
40+
41+
_attribute_map = {
42+
'key': {'key': 'key', 'type': 'str'},
43+
'operator_type': {'key': 'operatorType', 'type': 'str'},
44+
}
45+
46+
_subtype_map = {
47+
'operator_type': {'NumberIn': 'NumberInAdvancedFilter', 'NumberNotIn': 'NumberNotInAdvancedFilter', 'NumberLessThan': 'NumberLessThanAdvancedFilter', 'NumberGreaterThan': 'NumberGreaterThanAdvancedFilter', 'NumberLessThanOrEquals': 'NumberLessThanOrEqualsAdvancedFilter', 'NumberGreaterThanOrEquals': 'NumberGreaterThanOrEqualsAdvancedFilter', 'BoolEquals': 'BoolEqualsAdvancedFilter', 'StringIn': 'StringInAdvancedFilter', 'StringNotIn': 'StringNotInAdvancedFilter', 'StringBeginsWith': 'StringBeginsWithAdvancedFilter', 'StringEndsWith': 'StringEndsWithAdvancedFilter', 'StringContains': 'StringContainsAdvancedFilter'}
48+
}
49+
50+
def __init__(self, **kwargs):
51+
super(AdvancedFilter, self).__init__(**kwargs)
52+
self.key = kwargs.get('key', None)
53+
self.operator_type = None

‎azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/advanced_filter_py3.py

+53
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
# coding=utf-8
2+
# --------------------------------------------------------------------------
3+
# Copyright (c) Microsoft Corporation. All rights reserved.
4+
# Licensed under the MIT License. See License.txt in the project root for
5+
# license information.
6+
#
7+
# Code generated by Microsoft (R) AutoRest Code Generator.
8+
# Changes may cause incorrect behavior and will be lost if the code is
9+
# regenerated.
10+
# --------------------------------------------------------------------------
11+
12+
from msrest.serialization import Model
13+
14+
15+
class AdvancedFilter(Model):
16+
"""Represents an advanced filter that can be used to filter events based on
17+
various event envelope/data fields.
18+
19+
You probably want to use the sub-classes and not this class directly. Known
20+
sub-classes are: NumberInAdvancedFilter, NumberNotInAdvancedFilter,
21+
NumberLessThanAdvancedFilter, NumberGreaterThanAdvancedFilter,
22+
NumberLessThanOrEqualsAdvancedFilter,
23+
NumberGreaterThanOrEqualsAdvancedFilter, BoolEqualsAdvancedFilter,
24+
StringInAdvancedFilter, StringNotInAdvancedFilter,
25+
StringBeginsWithAdvancedFilter, StringEndsWithAdvancedFilter,
26+
StringContainsAdvancedFilter
27+
28+
All required parameters must be populated in order to send to Azure.
29+
30+
:param key: The filter key. Represents an event property with upto two
31+
levels of nesting.
32+
:type key: str
33+
:param operator_type: Required. Constant filled by server.
34+
:type operator_type: str
35+
"""
36+
37+
_validation = {
38+
'operator_type': {'required': True},
39+
}
40+
41+
_attribute_map = {
42+
'key': {'key': 'key', 'type': 'str'},
43+
'operator_type': {'key': 'operatorType', 'type': 'str'},
44+
}
45+
46+
_subtype_map = {
47+
'operator_type': {'NumberIn': 'NumberInAdvancedFilter', 'NumberNotIn': 'NumberNotInAdvancedFilter', 'NumberLessThan': 'NumberLessThanAdvancedFilter', 'NumberGreaterThan': 'NumberGreaterThanAdvancedFilter', 'NumberLessThanOrEquals': 'NumberLessThanOrEqualsAdvancedFilter', 'NumberGreaterThanOrEquals': 'NumberGreaterThanOrEqualsAdvancedFilter', 'BoolEquals': 'BoolEqualsAdvancedFilter', 'StringIn': 'StringInAdvancedFilter', 'StringNotIn': 'StringNotInAdvancedFilter', 'StringBeginsWith': 'StringBeginsWithAdvancedFilter', 'StringEndsWith': 'StringEndsWithAdvancedFilter', 'StringContains': 'StringContainsAdvancedFilter'}
48+
}
49+
50+
def __init__(self, *, key: str=None, **kwargs) -> None:
51+
super(AdvancedFilter, self).__init__(**kwargs)
52+
self.key = key
53+
self.operator_type = None

‎azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/bool_equals_advanced_filter.py

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# coding=utf-8
2+
# --------------------------------------------------------------------------
3+
# Copyright (c) Microsoft Corporation. All rights reserved.
4+
# Licensed under the MIT License. See License.txt in the project root for
5+
# license information.
6+
#
7+
# Code generated by Microsoft (R) AutoRest Code Generator.
8+
# Changes may cause incorrect behavior and will be lost if the code is
9+
# regenerated.
10+
# --------------------------------------------------------------------------
11+
12+
from .advanced_filter import AdvancedFilter
13+
14+
15+
class BoolEqualsAdvancedFilter(AdvancedFilter):
16+
"""BoolEquals Filter.
17+
18+
All required parameters must be populated in order to send to Azure.
19+
20+
:param key: The filter key. Represents an event property with upto two
21+
levels of nesting.
22+
:type key: str
23+
:param operator_type: Required. Constant filled by server.
24+
:type operator_type: str
25+
:param value: The filter value
26+
:type value: bool
27+
"""
28+
29+
_validation = {
30+
'operator_type': {'required': True},
31+
}
32+
33+
_attribute_map = {
34+
'key': {'key': 'key', 'type': 'str'},
35+
'operator_type': {'key': 'operatorType', 'type': 'str'},
36+
'value': {'key': 'value', 'type': 'bool'},
37+
}
38+
39+
def __init__(self, **kwargs):
40+
super(BoolEqualsAdvancedFilter, self).__init__(**kwargs)
41+
self.value = kwargs.get('value', None)
42+
self.operator_type = 'BoolEquals'

0 commit comments

Comments
 (0)