From 3ddd7f1825f5804bc32b21d71e600a94d7b7d224 Mon Sep 17 00:00:00 2001 From: SDK Automation Date: Wed, 13 May 2020 01:03:48 +0000 Subject: [PATCH] Generated from 835890299e9c1aa4e937d885122919c49897fcca fix prettier --- .../azure-mgmt-eventgrid/CHANGELOG.md | 13 +++ .../azure/mgmt/eventgrid/models/__init__.py | 2 + .../_event_grid_management_client_enums.py | 8 ++ .../azure/mgmt/eventgrid/models/_models.py | 102 +++++++++++----- .../mgmt/eventgrid/models/_models_py3.py | 110 ++++++++++++------ .../azure/mgmt/eventgrid/version.py | 2 +- sdk/eventgrid/azure-mgmt-eventgrid/setup.py | 4 +- 7 files changed, 175 insertions(+), 66 deletions(-) diff --git a/sdk/eventgrid/azure-mgmt-eventgrid/CHANGELOG.md b/sdk/eventgrid/azure-mgmt-eventgrid/CHANGELOG.md index e40fb4c092ad..d6f493f24e78 100644 --- a/sdk/eventgrid/azure-mgmt-eventgrid/CHANGELOG.md +++ b/sdk/eventgrid/azure-mgmt-eventgrid/CHANGELOG.md @@ -1,5 +1,18 @@ # Release History +## 3.0.0rc6 (2020-04-03) + +**Features** + + - Model PartnerRegistrationUpdateParameters has a new parameter tags + - Model EventChannel has a new parameter filter + +**Breaking changes** + + - Operation PrivateEndpointConnectionsOperations.update has a new signature + - Operation SystemTopicEventSubscriptionsOperations.list_by_system_topic has a new signature + - Operation PartnerTopicEventSubscriptionsOperations.list_by_partner_topic has a new signature + ## 3.0.0rc5 (2020-03-19) **Features** 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 index 0db3105c7c08..8c67cc73bd6a 100644 --- a/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/__init__.py +++ b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/__init__.py @@ -188,6 +188,7 @@ IdentityType, DomainTopicProvisioningState, EventChannelProvisioningState, + PartnerTopicReadinessState, EventSubscriptionProvisioningState, EventSubscriptionIdentityType, EventDeliverySchema, @@ -303,6 +304,7 @@ 'IdentityType', 'DomainTopicProvisioningState', 'EventChannelProvisioningState', + 'PartnerTopicReadinessState', 'EventSubscriptionProvisioningState', 'EventSubscriptionIdentityType', 'EventDeliverySchema', diff --git a/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/_event_grid_management_client_enums.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/_event_grid_management_client_enums.py index f798c2958b9e..99687c96b4e7 100644 --- a/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/_event_grid_management_client_enums.py +++ b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/_event_grid_management_client_enums.py @@ -92,6 +92,14 @@ class EventChannelProvisioningState(str, Enum): failed = "Failed" +class PartnerTopicReadinessState(str, Enum): + + not_activated_by_user_yet = "NotActivatedByUserYet" + activated_by_user = "ActivatedByUser" + deactivated_by_user = "DeactivatedByUser" + deleted_by_user = "DeletedByUser" + + class EventSubscriptionProvisioningState(str, Enum): creating = "Creating" diff --git a/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/_models.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/_models.py index d772c9ac0366..abaa4eba8cac 100644 --- a/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/_models.py +++ b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/_models.py @@ -587,8 +587,25 @@ class EventChannel(Resource): 'Canceled', 'Failed' :vartype provisioning_state: str or ~azure.mgmt.eventgrid.models.EventChannelProvisioningState + :ivar partner_topic_readiness_state: The readiness state of the + corresponding partner topic. Possible values include: + 'NotActivatedByUserYet', 'ActivatedByUser', 'DeactivatedByUser', + 'DeletedByUser' + :vartype partner_topic_readiness_state: str or + ~azure.mgmt.eventgrid.models.PartnerTopicReadinessState + :param expiration_time_if_not_activated_utc: Expiration time of the event + channel. If this timer expires while the corresponding partner topic is + never activated, + the event channel and corresponding partner topic are deleted. + :type expiration_time_if_not_activated_utc: datetime :param filter: Information about the filter for the event channel. :type filter: ~azure.mgmt.eventgrid.models.EventChannelFilter + :param partner_topic_friendly_description: Friendly description about the + topic. This can be set by the publisher/partner to show custom description + for the customer partner topic. + This will be helpful to remove any ambiguity of the origin of creation of + the partner topic for the customer. + :type partner_topic_friendly_description: str """ _validation = { @@ -596,6 +613,7 @@ class EventChannel(Resource): 'name': {'readonly': True}, 'type': {'readonly': True}, 'provisioning_state': {'readonly': True}, + 'partner_topic_readiness_state': {'readonly': True}, } _attribute_map = { @@ -605,7 +623,10 @@ class EventChannel(Resource): 'source': {'key': 'properties.source', 'type': 'EventChannelSource'}, 'destination': {'key': 'properties.destination', 'type': 'EventChannelDestination'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, + 'partner_topic_readiness_state': {'key': 'properties.partnerTopicReadinessState', 'type': 'str'}, + 'expiration_time_if_not_activated_utc': {'key': 'properties.expirationTimeIfNotActivatedUtc', 'type': 'iso-8601'}, 'filter': {'key': 'properties.filter', 'type': 'EventChannelFilter'}, + 'partner_topic_friendly_description': {'key': 'properties.partnerTopicFriendlyDescription', 'type': 'str'}, } def __init__(self, **kwargs): @@ -613,7 +634,10 @@ def __init__(self, **kwargs): self.source = kwargs.get('source', None) self.destination = kwargs.get('destination', None) self.provisioning_state = None + self.partner_topic_readiness_state = None + self.expiration_time_if_not_activated_utc = kwargs.get('expiration_time_if_not_activated_utc', None) self.filter = kwargs.get('filter', None) + self.partner_topic_friendly_description = kwargs.get('partner_topic_friendly_description', None) class EventChannelDestination(Model): @@ -650,42 +674,17 @@ def __init__(self, **kwargs): class EventChannelFilter(Model): """Filter for the Event Channel. - :param subject_begins_with: An optional string to filter events for an - event channel based on a resource path prefix. - The format of this depends on the publisher of the events. Wildcard - characters are not supported in this path. - :type subject_begins_with: str - :param subject_ends_with: An optional string to filter events for an event - channel based on a resource path suffix. - Wildcard characters are not supported in this path. - :type subject_ends_with: str - :param included_event_types: A list of applicable event types that need to - be part of the event channel. If it is desired to subscribe to all default - event types, set the IncludedEventTypes to null. - :type included_event_types: list[str] - :param is_subject_case_sensitive: Specifies if the SubjectBeginsWith and - SubjectEndsWith properties of the filter - should be compared in a case sensitive manner. - :type is_subject_case_sensitive: bool :param advanced_filters: An array of advanced filters that are used for filtering event channels. :type advanced_filters: list[~azure.mgmt.eventgrid.models.AdvancedFilter] """ _attribute_map = { - 'subject_begins_with': {'key': 'subjectBeginsWith', 'type': 'str'}, - 'subject_ends_with': {'key': 'subjectEndsWith', 'type': 'str'}, - 'included_event_types': {'key': 'includedEventTypes', 'type': '[str]'}, - 'is_subject_case_sensitive': {'key': 'isSubjectCaseSensitive', 'type': 'bool'}, 'advanced_filters': {'key': 'advancedFilters', 'type': '[AdvancedFilter]'}, } def __init__(self, **kwargs): super(EventChannelFilter, self).__init__(**kwargs) - self.subject_begins_with = kwargs.get('subject_begins_with', None) - self.subject_ends_with = kwargs.get('subject_ends_with', None) - self.included_event_types = kwargs.get('included_event_types', None) - self.is_subject_case_sensitive = kwargs.get('is_subject_case_sensitive', None) self.advanced_filters = kwargs.get('advanced_filters', None) @@ -1686,9 +1685,30 @@ class PartnerRegistration(TrackedResource): :param partner_resource_type_display_name: Display name of the partner resource type. :type partner_resource_type_display_name: str - :param partner_resource_type_description: Description of the partner - resource type. + :param partner_resource_type_description: Short description of the partner + resource type. The length of this description should not exceed 256 + characters. :type partner_resource_type_description: str + :param long_description: Long description for the custom scenarios and + integration to be displayed in the portal if needed. + Length of this description should not exceed 2048 characters. + :type long_description: str + :param partner_customer_service_number: The customer service number of the + publisher. The expected phone format should start with a '+' sign + followed by the country code. The remaining digits are then followed. Only + digits and spaces are allowed and its + length cannot exceed 16 digits including country code. Examples of valid + phone numbers are: +1 515 123 4567 and + +966 7 5115 2471. Examples of invalid phone numbers are: +1 (515) + 123-4567, 1 515 123 4567 and +966 121 5115 24 7 551 1234 43 + :type partner_customer_service_number: str + :param partner_customer_service_extension: The extension of the customer + service number of the publisher. Only digits are allowed and number of + digits should not exceed 10. + :type partner_customer_service_extension: str + :param customer_service_uri: The extension of the customer service URI of + the publisher. + :type customer_service_uri: str :param setup_uri: URI of the partner website that can be used by Azure customers to setup Event Grid integration on an event source. @@ -1728,6 +1748,10 @@ class PartnerRegistration(TrackedResource): 'partner_resource_type_name': {'key': 'properties.partnerResourceTypeName', 'type': 'str'}, 'partner_resource_type_display_name': {'key': 'properties.partnerResourceTypeDisplayName', 'type': 'str'}, 'partner_resource_type_description': {'key': 'properties.partnerResourceTypeDescription', 'type': 'str'}, + 'long_description': {'key': 'properties.longDescription', 'type': 'str'}, + 'partner_customer_service_number': {'key': 'properties.partnerCustomerServiceNumber', 'type': 'str'}, + 'partner_customer_service_extension': {'key': 'properties.partnerCustomerServiceExtension', 'type': 'str'}, + 'customer_service_uri': {'key': 'properties.customerServiceUri', 'type': 'str'}, 'setup_uri': {'key': 'properties.setupUri', 'type': 'str'}, 'logo_uri': {'key': 'properties.logoUri', 'type': 'str'}, 'visibility_state': {'key': 'properties.visibilityState', 'type': 'str'}, @@ -1741,6 +1765,10 @@ def __init__(self, **kwargs): self.partner_resource_type_name = kwargs.get('partner_resource_type_name', None) self.partner_resource_type_display_name = kwargs.get('partner_resource_type_display_name', None) self.partner_resource_type_description = kwargs.get('partner_resource_type_description', None) + self.long_description = kwargs.get('long_description', None) + self.partner_customer_service_number = kwargs.get('partner_customer_service_number', None) + self.partner_customer_service_extension = kwargs.get('partner_customer_service_extension', None) + self.customer_service_uri = kwargs.get('customer_service_uri', None) self.setup_uri = kwargs.get('setup_uri', None) self.logo_uri = kwargs.get('logo_uri', None) self.visibility_state = kwargs.get('visibility_state', None) @@ -1839,6 +1867,11 @@ class PartnerTopic(TrackedResource): :param source: Source associated with this partner topic. This represents a unique partner resource. :type source: str + :param expiration_time_if_not_activated_utc: Expiration time of the + partner topic. If this timer expires while the partner topic is still + never activated, + the partner topic and corresponding event channel are deleted. + :type expiration_time_if_not_activated_utc: datetime :ivar provisioning_state: Provisioning state of the partner topic. Possible values include: 'Creating', 'Updating', 'Deleting', 'Succeeded', 'Canceled', 'Failed' @@ -1848,6 +1881,12 @@ class PartnerTopic(TrackedResource): values include: 'NeverActivated', 'Activated', 'Deactivated' :type activation_state: str or ~azure.mgmt.eventgrid.models.PartnerTopicActivationState + :param partner_topic_friendly_description: Friendly description about the + topic. This can be set by the publisher/partner to show custom description + for the customer partner topic. + This will be helpful to remove any ambiguity of the origin of creation of + the partner topic for the customer. + :type partner_topic_friendly_description: str """ _validation = { @@ -1865,15 +1904,19 @@ class PartnerTopic(TrackedResource): 'location': {'key': 'location', 'type': 'str'}, 'tags': {'key': 'tags', 'type': '{str}'}, 'source': {'key': 'properties.source', 'type': 'str'}, + 'expiration_time_if_not_activated_utc': {'key': 'properties.expirationTimeIfNotActivatedUtc', 'type': 'iso-8601'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, 'activation_state': {'key': 'properties.activationState', 'type': 'str'}, + 'partner_topic_friendly_description': {'key': 'properties.partnerTopicFriendlyDescription', 'type': 'str'}, } def __init__(self, **kwargs): super(PartnerTopic, self).__init__(**kwargs) self.source = kwargs.get('source', None) + self.expiration_time_if_not_activated_utc = kwargs.get('expiration_time_if_not_activated_utc', None) self.provisioning_state = None self.activation_state = kwargs.get('activation_state', None) + self.partner_topic_friendly_description = kwargs.get('partner_topic_friendly_description', None) class PartnerTopicType(Resource): @@ -2080,9 +2123,8 @@ def __init__(self, **kwargs): class ResourceSku(Model): """Describes an EventGrid Resource Sku. - :param name: the Sku name of the resource. - the possible values: Basic; Premium. Possible values include: 'Basic', - 'Premium' + :param name: The Sku name of the resource. The possible values are: Basic + or Premium. Possible values include: 'Basic', 'Premium' :type name: str or ~azure.mgmt.eventgrid.models.Sku """ diff --git a/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/_models_py3.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/_models_py3.py index 72d8e5795f90..202b84a676aa 100644 --- a/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/_models_py3.py +++ b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/_models_py3.py @@ -587,8 +587,25 @@ class EventChannel(Resource): 'Canceled', 'Failed' :vartype provisioning_state: str or ~azure.mgmt.eventgrid.models.EventChannelProvisioningState + :ivar partner_topic_readiness_state: The readiness state of the + corresponding partner topic. Possible values include: + 'NotActivatedByUserYet', 'ActivatedByUser', 'DeactivatedByUser', + 'DeletedByUser' + :vartype partner_topic_readiness_state: str or + ~azure.mgmt.eventgrid.models.PartnerTopicReadinessState + :param expiration_time_if_not_activated_utc: Expiration time of the event + channel. If this timer expires while the corresponding partner topic is + never activated, + the event channel and corresponding partner topic are deleted. + :type expiration_time_if_not_activated_utc: datetime :param filter: Information about the filter for the event channel. :type filter: ~azure.mgmt.eventgrid.models.EventChannelFilter + :param partner_topic_friendly_description: Friendly description about the + topic. This can be set by the publisher/partner to show custom description + for the customer partner topic. + This will be helpful to remove any ambiguity of the origin of creation of + the partner topic for the customer. + :type partner_topic_friendly_description: str """ _validation = { @@ -596,6 +613,7 @@ class EventChannel(Resource): 'name': {'readonly': True}, 'type': {'readonly': True}, 'provisioning_state': {'readonly': True}, + 'partner_topic_readiness_state': {'readonly': True}, } _attribute_map = { @@ -605,15 +623,21 @@ class EventChannel(Resource): 'source': {'key': 'properties.source', 'type': 'EventChannelSource'}, 'destination': {'key': 'properties.destination', 'type': 'EventChannelDestination'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, + 'partner_topic_readiness_state': {'key': 'properties.partnerTopicReadinessState', 'type': 'str'}, + 'expiration_time_if_not_activated_utc': {'key': 'properties.expirationTimeIfNotActivatedUtc', 'type': 'iso-8601'}, 'filter': {'key': 'properties.filter', 'type': 'EventChannelFilter'}, + 'partner_topic_friendly_description': {'key': 'properties.partnerTopicFriendlyDescription', 'type': 'str'}, } - def __init__(self, *, source=None, destination=None, filter=None, **kwargs) -> None: + def __init__(self, *, source=None, destination=None, expiration_time_if_not_activated_utc=None, filter=None, partner_topic_friendly_description: str=None, **kwargs) -> None: super(EventChannel, self).__init__(**kwargs) self.source = source self.destination = destination self.provisioning_state = None + self.partner_topic_readiness_state = None + self.expiration_time_if_not_activated_utc = expiration_time_if_not_activated_utc self.filter = filter + self.partner_topic_friendly_description = partner_topic_friendly_description class EventChannelDestination(Model): @@ -650,42 +674,17 @@ def __init__(self, *, azure_subscription_id: str=None, resource_group: str=None, class EventChannelFilter(Model): """Filter for the Event Channel. - :param subject_begins_with: An optional string to filter events for an - event channel based on a resource path prefix. - The format of this depends on the publisher of the events. Wildcard - characters are not supported in this path. - :type subject_begins_with: str - :param subject_ends_with: An optional string to filter events for an event - channel based on a resource path suffix. - Wildcard characters are not supported in this path. - :type subject_ends_with: str - :param included_event_types: A list of applicable event types that need to - be part of the event channel. If it is desired to subscribe to all default - event types, set the IncludedEventTypes to null. - :type included_event_types: list[str] - :param is_subject_case_sensitive: Specifies if the SubjectBeginsWith and - SubjectEndsWith properties of the filter - should be compared in a case sensitive manner. - :type is_subject_case_sensitive: bool :param advanced_filters: An array of advanced filters that are used for filtering event channels. :type advanced_filters: list[~azure.mgmt.eventgrid.models.AdvancedFilter] """ _attribute_map = { - 'subject_begins_with': {'key': 'subjectBeginsWith', 'type': 'str'}, - 'subject_ends_with': {'key': 'subjectEndsWith', 'type': 'str'}, - 'included_event_types': {'key': 'includedEventTypes', 'type': '[str]'}, - 'is_subject_case_sensitive': {'key': 'isSubjectCaseSensitive', 'type': 'bool'}, 'advanced_filters': {'key': 'advancedFilters', 'type': '[AdvancedFilter]'}, } - def __init__(self, *, subject_begins_with: str=None, subject_ends_with: str=None, included_event_types=None, is_subject_case_sensitive: bool=None, advanced_filters=None, **kwargs) -> None: + def __init__(self, *, advanced_filters=None, **kwargs) -> None: super(EventChannelFilter, self).__init__(**kwargs) - self.subject_begins_with = subject_begins_with - self.subject_ends_with = subject_ends_with - self.included_event_types = included_event_types - self.is_subject_case_sensitive = is_subject_case_sensitive self.advanced_filters = advanced_filters @@ -1686,9 +1685,30 @@ class PartnerRegistration(TrackedResource): :param partner_resource_type_display_name: Display name of the partner resource type. :type partner_resource_type_display_name: str - :param partner_resource_type_description: Description of the partner - resource type. + :param partner_resource_type_description: Short description of the partner + resource type. The length of this description should not exceed 256 + characters. :type partner_resource_type_description: str + :param long_description: Long description for the custom scenarios and + integration to be displayed in the portal if needed. + Length of this description should not exceed 2048 characters. + :type long_description: str + :param partner_customer_service_number: The customer service number of the + publisher. The expected phone format should start with a '+' sign + followed by the country code. The remaining digits are then followed. Only + digits and spaces are allowed and its + length cannot exceed 16 digits including country code. Examples of valid + phone numbers are: +1 515 123 4567 and + +966 7 5115 2471. Examples of invalid phone numbers are: +1 (515) + 123-4567, 1 515 123 4567 and +966 121 5115 24 7 551 1234 43 + :type partner_customer_service_number: str + :param partner_customer_service_extension: The extension of the customer + service number of the publisher. Only digits are allowed and number of + digits should not exceed 10. + :type partner_customer_service_extension: str + :param customer_service_uri: The extension of the customer service URI of + the publisher. + :type customer_service_uri: str :param setup_uri: URI of the partner website that can be used by Azure customers to setup Event Grid integration on an event source. @@ -1728,19 +1748,27 @@ class PartnerRegistration(TrackedResource): 'partner_resource_type_name': {'key': 'properties.partnerResourceTypeName', 'type': 'str'}, 'partner_resource_type_display_name': {'key': 'properties.partnerResourceTypeDisplayName', 'type': 'str'}, 'partner_resource_type_description': {'key': 'properties.partnerResourceTypeDescription', 'type': 'str'}, + 'long_description': {'key': 'properties.longDescription', 'type': 'str'}, + 'partner_customer_service_number': {'key': 'properties.partnerCustomerServiceNumber', 'type': 'str'}, + 'partner_customer_service_extension': {'key': 'properties.partnerCustomerServiceExtension', 'type': 'str'}, + 'customer_service_uri': {'key': 'properties.customerServiceUri', 'type': 'str'}, 'setup_uri': {'key': 'properties.setupUri', 'type': 'str'}, 'logo_uri': {'key': 'properties.logoUri', 'type': 'str'}, 'visibility_state': {'key': 'properties.visibilityState', 'type': 'str'}, 'authorized_azure_subscription_ids': {'key': 'properties.authorizedAzureSubscriptionIds', 'type': '[str]'}, } - def __init__(self, *, location: str, tags=None, partner_name: str=None, partner_resource_type_name: str=None, partner_resource_type_display_name: str=None, partner_resource_type_description: str=None, setup_uri: str=None, logo_uri: str=None, visibility_state=None, authorized_azure_subscription_ids=None, **kwargs) -> None: + def __init__(self, *, location: str, tags=None, partner_name: str=None, partner_resource_type_name: str=None, partner_resource_type_display_name: str=None, partner_resource_type_description: str=None, long_description: str=None, partner_customer_service_number: str=None, partner_customer_service_extension: str=None, customer_service_uri: str=None, setup_uri: str=None, logo_uri: str=None, visibility_state=None, authorized_azure_subscription_ids=None, **kwargs) -> None: super(PartnerRegistration, self).__init__(location=location, tags=tags, **kwargs) self.provisioning_state = None self.partner_name = partner_name self.partner_resource_type_name = partner_resource_type_name self.partner_resource_type_display_name = partner_resource_type_display_name self.partner_resource_type_description = partner_resource_type_description + self.long_description = long_description + self.partner_customer_service_number = partner_customer_service_number + self.partner_customer_service_extension = partner_customer_service_extension + self.customer_service_uri = customer_service_uri self.setup_uri = setup_uri self.logo_uri = logo_uri self.visibility_state = visibility_state @@ -1839,6 +1867,11 @@ class PartnerTopic(TrackedResource): :param source: Source associated with this partner topic. This represents a unique partner resource. :type source: str + :param expiration_time_if_not_activated_utc: Expiration time of the + partner topic. If this timer expires while the partner topic is still + never activated, + the partner topic and corresponding event channel are deleted. + :type expiration_time_if_not_activated_utc: datetime :ivar provisioning_state: Provisioning state of the partner topic. Possible values include: 'Creating', 'Updating', 'Deleting', 'Succeeded', 'Canceled', 'Failed' @@ -1848,6 +1881,12 @@ class PartnerTopic(TrackedResource): values include: 'NeverActivated', 'Activated', 'Deactivated' :type activation_state: str or ~azure.mgmt.eventgrid.models.PartnerTopicActivationState + :param partner_topic_friendly_description: Friendly description about the + topic. This can be set by the publisher/partner to show custom description + for the customer partner topic. + This will be helpful to remove any ambiguity of the origin of creation of + the partner topic for the customer. + :type partner_topic_friendly_description: str """ _validation = { @@ -1865,15 +1904,19 @@ class PartnerTopic(TrackedResource): 'location': {'key': 'location', 'type': 'str'}, 'tags': {'key': 'tags', 'type': '{str}'}, 'source': {'key': 'properties.source', 'type': 'str'}, + 'expiration_time_if_not_activated_utc': {'key': 'properties.expirationTimeIfNotActivatedUtc', 'type': 'iso-8601'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, 'activation_state': {'key': 'properties.activationState', 'type': 'str'}, + 'partner_topic_friendly_description': {'key': 'properties.partnerTopicFriendlyDescription', 'type': 'str'}, } - def __init__(self, *, location: str, tags=None, source: str=None, activation_state=None, **kwargs) -> None: + def __init__(self, *, location: str, tags=None, source: str=None, expiration_time_if_not_activated_utc=None, activation_state=None, partner_topic_friendly_description: str=None, **kwargs) -> None: super(PartnerTopic, self).__init__(location=location, tags=tags, **kwargs) self.source = source + self.expiration_time_if_not_activated_utc = expiration_time_if_not_activated_utc self.provisioning_state = None self.activation_state = activation_state + self.partner_topic_friendly_description = partner_topic_friendly_description class PartnerTopicType(Resource): @@ -2080,9 +2123,8 @@ def __init__(self, *, group_id: str=None, display_name: str=None, required_membe class ResourceSku(Model): """Describes an EventGrid Resource Sku. - :param name: the Sku name of the resource. - the possible values: Basic; Premium. Possible values include: 'Basic', - 'Premium' + :param name: The Sku name of the resource. The possible values are: Basic + or Premium. Possible values include: 'Basic', 'Premium' :type name: str or ~azure.mgmt.eventgrid.models.Sku """ diff --git a/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/version.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/version.py index 936dbeb88fea..29bcdffc352b 100644 --- a/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/version.py +++ b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/version.py @@ -9,4 +9,4 @@ # regenerated. # -------------------------------------------------------------------------- -VERSION = "3.0.0rc5" +VERSION = "3.0.0rc6" diff --git a/sdk/eventgrid/azure-mgmt-eventgrid/setup.py b/sdk/eventgrid/azure-mgmt-eventgrid/setup.py index 933c996ccb30..8ff291500f8c 100644 --- a/sdk/eventgrid/azure-mgmt-eventgrid/setup.py +++ b/sdk/eventgrid/azure-mgmt-eventgrid/setup.py @@ -36,7 +36,9 @@ pass # Version extraction inspired from 'requests' -with open(os.path.join(package_folder_path, 'version.py'), 'r') as fd: +with open(os.path.join(package_folder_path, 'version.py') + if os.path.exists(os.path.join(package_folder_path, 'version.py')) + else os.path.join(package_folder_path, '_version.py'), 'r') as fd: version = re.search(r'^VERSION\s*=\s*[\'"]([^\'"]*)[\'"]', fd.read(), re.MULTILINE).group(1)