From 691ce71e86e52da9751c8fa3ea8e7fcb395d9fb9 Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Mon, 21 Jun 2021 02:56:19 +0000 Subject: [PATCH] CodeGen from PR 14868 in Azure/azure-rest-api-specs Webpubsub 2021-06-01-preview (#14868) * init api version 2021-06-01-preview for from 2021-04-01-preview * update example * update readme * update swagger file Co-authored-by: Binjie Qian --- sdk/webpubsub/azure-mgmt-webpubsub/_meta.json | 11 +- .../azure/mgmt/webpubsub/_configuration.py | 2 +- .../azure/mgmt/webpubsub/_metadata.json | 4 +- .../azure/mgmt/webpubsub/_version.py | 2 +- .../mgmt/webpubsub/aio/_configuration.py | 2 +- .../webpubsub/aio/operations/_operations.py | 4 +- .../aio/operations/_usages_operations.py | 4 +- .../aio/operations/_web_pub_sub_operations.py | 70 +++++----- ...private_endpoint_connections_operations.py | 22 +-- ...b_sub_private_link_resources_operations.py | 4 +- ...hared_private_link_resources_operations.py | 28 ++-- .../azure/mgmt/webpubsub/models/__init__.py | 8 +- .../azure/mgmt/webpubsub/models/_models.py | 113 ++++++++-------- .../mgmt/webpubsub/models/_models_py3.py | 125 +++++++++--------- .../_web_pub_sub_management_client_enums.py | 19 --- .../mgmt/webpubsub/operations/_operations.py | 2 +- .../operations/_usages_operations.py | 2 +- .../operations/_web_pub_sub_operations.py | 40 +++--- ...private_endpoint_connections_operations.py | 12 +- ...b_sub_private_link_resources_operations.py | 2 +- ...hared_private_link_resources_operations.py | 16 +-- 21 files changed, 233 insertions(+), 259 deletions(-) diff --git a/sdk/webpubsub/azure-mgmt-webpubsub/_meta.json b/sdk/webpubsub/azure-mgmt-webpubsub/_meta.json index cedc06806454..2b1c0839fa4f 100644 --- a/sdk/webpubsub/azure-mgmt-webpubsub/_meta.json +++ b/sdk/webpubsub/azure-mgmt-webpubsub/_meta.json @@ -1,8 +1,11 @@ { - "autorest": "3.3.0", - "use": "@autorest/python@5.6.6", - "commit": "a4f67651dcaef459afabb647a05a45a5fbb72ffe", + "autorest": "3.4.2", + "use": [ + "@autorest/python@5.8.1", + "@autorest/modelerfour@4.19.2" + ], + "commit": "0c057560083bfdfd50202f0e79cfac8ec054d56a", "repository_url": "https://github.com/Azure/azure-rest-api-specs", - "autorest_command": "autorest specification/webpubsub/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.6.6 --version=3.3.0", + "autorest_command": "autorest specification/webpubsub/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.1 --use=@autorest/modelerfour@4.19.2 --version=3.4.2", "readme": "specification/webpubsub/resource-manager/readme.md" } \ No newline at end of file diff --git a/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/_configuration.py b/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/_configuration.py index 179c5575f107..6225e0e9b78e 100644 --- a/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/_configuration.py +++ b/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/_configuration.py @@ -48,7 +48,7 @@ def __init__( self.credential = credential self.subscription_id = subscription_id - self.api_version = "2021-04-01-preview" + self.api_version = "2021-06-01-preview" self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default']) kwargs.setdefault('sdk_moniker', 'mgmt-webpubsub/{}'.format(VERSION)) self._configure(**kwargs) diff --git a/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/_metadata.json b/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/_metadata.json index ddf514dc80da..1baf2218d7bc 100644 --- a/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/_metadata.json +++ b/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/_metadata.json @@ -1,6 +1,6 @@ { - "chosen_version": "2021-04-01-preview", - "total_api_version_list": ["2021-04-01-preview"], + "chosen_version": "2021-06-01-preview", + "total_api_version_list": ["2021-06-01-preview"], "client": { "name": "WebPubSubManagementClient", "filename": "_web_pub_sub_management_client", diff --git a/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/_version.py b/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/_version.py index e5754a47ce68..eae7c95b6fbd 100644 --- a/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/_version.py +++ b/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/_version.py @@ -6,4 +6,4 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -VERSION = "1.0.0b1" +VERSION = "0.1.0" diff --git a/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/aio/_configuration.py b/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/aio/_configuration.py index 1d8e95d4b445..60a3c1eea34d 100644 --- a/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/aio/_configuration.py +++ b/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/aio/_configuration.py @@ -45,7 +45,7 @@ def __init__( self.credential = credential self.subscription_id = subscription_id - self.api_version = "2021-04-01-preview" + self.api_version = "2021-06-01-preview" self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default']) kwargs.setdefault('sdk_moniker', 'mgmt-webpubsub/{}'.format(VERSION)) self._configure(**kwargs) diff --git a/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/aio/operations/_operations.py b/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/aio/operations/_operations.py index f80f89b348cc..8e28d16eef21 100644 --- a/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/aio/operations/_operations.py +++ b/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/aio/operations/_operations.py @@ -43,7 +43,7 @@ def __init__(self, client, config, serializer, deserializer) -> None: def list( self, - **kwargs + **kwargs: Any ) -> AsyncIterable["_models.OperationList"]: """Lists all of the available REST API operations of the Microsoft.SignalRService provider. @@ -57,7 +57,7 @@ def list( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2021-04-01-preview" + api_version = "2021-06-01-preview" accept = "application/json" def prepare_request(next_link=None): diff --git a/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/aio/operations/_usages_operations.py b/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/aio/operations/_usages_operations.py index ff20eed613dd..839ad6af9f79 100644 --- a/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/aio/operations/_usages_operations.py +++ b/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/aio/operations/_usages_operations.py @@ -44,7 +44,7 @@ def __init__(self, client, config, serializer, deserializer) -> None: def list( self, location: str, - **kwargs + **kwargs: Any ) -> AsyncIterable["_models.SignalRServiceUsageList"]: """List resource usage quotas by location. @@ -60,7 +60,7 @@ def list( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2021-04-01-preview" + api_version = "2021-06-01-preview" accept = "application/json" def prepare_request(next_link=None): diff --git a/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/aio/operations/_web_pub_sub_operations.py b/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/aio/operations/_web_pub_sub_operations.py index 6baefcc1c96c..84c6fdbdfc2a 100644 --- a/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/aio/operations/_web_pub_sub_operations.py +++ b/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/aio/operations/_web_pub_sub_operations.py @@ -47,7 +47,7 @@ async def check_name_availability( self, location: str, parameters: "_models.NameAvailabilityParameters", - **kwargs + **kwargs: Any ) -> "_models.NameAvailability": """Checks that the resource name is valid and is not already in use. @@ -65,7 +65,7 @@ async def check_name_availability( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2021-04-01-preview" + api_version = "2021-06-01-preview" content_type = kwargs.pop("content_type", "application/json") accept = "application/json" @@ -108,7 +108,7 @@ async def check_name_availability( def list_by_subscription( self, - **kwargs + **kwargs: Any ) -> AsyncIterable["_models.WebPubSubResourceList"]: """Handles requests to list all resources in a subscription. @@ -122,7 +122,7 @@ def list_by_subscription( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2021-04-01-preview" + api_version = "2021-06-01-preview" accept = "application/json" def prepare_request(next_link=None): @@ -176,7 +176,7 @@ async def get_next(next_link=None): def list_by_resource_group( self, resource_group_name: str, - **kwargs + **kwargs: Any ) -> AsyncIterable["_models.WebPubSubResourceList"]: """Handles requests to list all resources in a resource group. @@ -193,7 +193,7 @@ def list_by_resource_group( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2021-04-01-preview" + api_version = "2021-06-01-preview" accept = "application/json" def prepare_request(next_link=None): @@ -249,7 +249,7 @@ async def get( self, resource_group_name: str, resource_name: str, - **kwargs + **kwargs: Any ) -> "_models.WebPubSubResource": """Get the resource and its properties. @@ -268,7 +268,7 @@ async def get( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2021-04-01-preview" + api_version = "2021-06-01-preview" accept = "application/json" # Construct URL @@ -310,14 +310,14 @@ async def _create_or_update_initial( resource_group_name: str, resource_name: str, parameters: "_models.WebPubSubResource", - **kwargs + **kwargs: Any ) -> Optional["_models.WebPubSubResource"]: cls = kwargs.pop('cls', None) # type: ClsType[Optional["_models.WebPubSubResource"]] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2021-04-01-preview" + api_version = "2021-06-01-preview" content_type = kwargs.pop("content_type", "application/json") accept = "application/json" @@ -369,7 +369,7 @@ async def begin_create_or_update( resource_group_name: str, resource_name: str, parameters: "_models.WebPubSubResource", - **kwargs + **kwargs: Any ) -> AsyncLROPoller["_models.WebPubSubResource"]: """Create or update a resource. @@ -382,8 +382,8 @@ async def begin_create_or_update( :type parameters: ~azure.mgmt.webpubsub.models.WebPubSubResource :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: Pass in True if you'd like the AsyncARMPolling polling method, - False for no polling, or your own initialized polling object for a personal polling strategy. + :keyword polling: By default, your polling method will be AsyncARMPolling. + Pass in False for this operation to not poll, or pass in your own initialized polling object for a personal polling strategy. :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. :return: An instance of AsyncLROPoller that returns either WebPubSubResource or the result of cls(response) @@ -440,14 +440,14 @@ async def _delete_initial( self, resource_group_name: str, resource_name: str, - **kwargs + **kwargs: Any ) -> None: cls = kwargs.pop('cls', None) # type: ClsType[None] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2021-04-01-preview" + api_version = "2021-06-01-preview" accept = "application/json" # Construct URL @@ -485,7 +485,7 @@ async def begin_delete( self, resource_group_name: str, resource_name: str, - **kwargs + **kwargs: Any ) -> AsyncLROPoller[None]: """Operation to delete a resource. @@ -496,8 +496,8 @@ async def begin_delete( :type resource_name: str :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: Pass in True if you'd like the AsyncARMPolling polling method, - False for no polling, or your own initialized polling object for a personal polling strategy. + :keyword polling: By default, your polling method will be AsyncARMPolling. + Pass in False for this operation to not poll, or pass in your own initialized polling object for a personal polling strategy. :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. :return: An instance of AsyncLROPoller that returns either None or the result of cls(response) @@ -551,14 +551,14 @@ async def _update_initial( resource_group_name: str, resource_name: str, parameters: "_models.WebPubSubResource", - **kwargs + **kwargs: Any ) -> Optional["_models.WebPubSubResource"]: cls = kwargs.pop('cls', None) # type: ClsType[Optional["_models.WebPubSubResource"]] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2021-04-01-preview" + api_version = "2021-06-01-preview" content_type = kwargs.pop("content_type", "application/json") accept = "application/json" @@ -607,7 +607,7 @@ async def begin_update( resource_group_name: str, resource_name: str, parameters: "_models.WebPubSubResource", - **kwargs + **kwargs: Any ) -> AsyncLROPoller["_models.WebPubSubResource"]: """Operation to update an exiting resource. @@ -620,8 +620,8 @@ async def begin_update( :type parameters: ~azure.mgmt.webpubsub.models.WebPubSubResource :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: Pass in True if you'd like the AsyncARMPolling polling method, - False for no polling, or your own initialized polling object for a personal polling strategy. + :keyword polling: By default, your polling method will be AsyncARMPolling. + Pass in False for this operation to not poll, or pass in your own initialized polling object for a personal polling strategy. :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. :return: An instance of AsyncLROPoller that returns either WebPubSubResource or the result of cls(response) @@ -678,7 +678,7 @@ async def list_keys( self, resource_group_name: str, resource_name: str, - **kwargs + **kwargs: Any ) -> "_models.WebPubSubKeys": """Get the access keys of the resource. @@ -697,7 +697,7 @@ async def list_keys( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2021-04-01-preview" + api_version = "2021-06-01-preview" accept = "application/json" # Construct URL @@ -739,14 +739,14 @@ async def _regenerate_key_initial( resource_group_name: str, resource_name: str, parameters: "_models.RegenerateKeyParameters", - **kwargs + **kwargs: Any ) -> "_models.WebPubSubKeys": cls = kwargs.pop('cls', None) # type: ClsType["_models.WebPubSubKeys"] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2021-04-01-preview" + api_version = "2021-06-01-preview" content_type = kwargs.pop("content_type", "application/json") accept = "application/json" @@ -793,7 +793,7 @@ async def begin_regenerate_key( resource_group_name: str, resource_name: str, parameters: "_models.RegenerateKeyParameters", - **kwargs + **kwargs: Any ) -> AsyncLROPoller["_models.WebPubSubKeys"]: """Regenerate the access key for the resource. PrimaryKey and SecondaryKey cannot be regenerated at the same time. @@ -807,8 +807,8 @@ async def begin_regenerate_key( :type parameters: ~azure.mgmt.webpubsub.models.RegenerateKeyParameters :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: Pass in True if you'd like the AsyncARMPolling polling method, - False for no polling, or your own initialized polling object for a personal polling strategy. + :keyword polling: By default, your polling method will be AsyncARMPolling. + Pass in False for this operation to not poll, or pass in your own initialized polling object for a personal polling strategy. :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. :return: An instance of AsyncLROPoller that returns either WebPubSubKeys or the result of cls(response) @@ -865,14 +865,14 @@ async def _restart_initial( self, resource_group_name: str, resource_name: str, - **kwargs + **kwargs: Any ) -> None: cls = kwargs.pop('cls', None) # type: ClsType[None] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2021-04-01-preview" + api_version = "2021-06-01-preview" accept = "application/json" # Construct URL @@ -910,7 +910,7 @@ async def begin_restart( self, resource_group_name: str, resource_name: str, - **kwargs + **kwargs: Any ) -> AsyncLROPoller[None]: """Operation to restart a resource. @@ -921,8 +921,8 @@ async def begin_restart( :type resource_name: str :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: Pass in True if you'd like the AsyncARMPolling polling method, - False for no polling, or your own initialized polling object for a personal polling strategy. + :keyword polling: By default, your polling method will be AsyncARMPolling. + Pass in False for this operation to not poll, or pass in your own initialized polling object for a personal polling strategy. :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. :return: An instance of AsyncLROPoller that returns either None or the result of cls(response) diff --git a/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/aio/operations/_web_pub_sub_private_endpoint_connections_operations.py b/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/aio/operations/_web_pub_sub_private_endpoint_connections_operations.py index 001f9cd692da..fdc697265cf1 100644 --- a/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/aio/operations/_web_pub_sub_private_endpoint_connections_operations.py +++ b/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/aio/operations/_web_pub_sub_private_endpoint_connections_operations.py @@ -47,7 +47,7 @@ def list( self, resource_group_name: str, resource_name: str, - **kwargs + **kwargs: Any ) -> AsyncIterable["_models.PrivateEndpointConnectionList"]: """List private endpoint connections. @@ -66,7 +66,7 @@ def list( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2021-04-01-preview" + api_version = "2021-06-01-preview" accept = "application/json" def prepare_request(next_link=None): @@ -124,7 +124,7 @@ async def get( private_endpoint_connection_name: str, resource_group_name: str, resource_name: str, - **kwargs + **kwargs: Any ) -> "_models.PrivateEndpointConnection": """Get the specified private endpoint connection. @@ -145,7 +145,7 @@ async def get( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2021-04-01-preview" + api_version = "2021-06-01-preview" accept = "application/json" # Construct URL @@ -189,7 +189,7 @@ async def update( resource_group_name: str, resource_name: str, parameters: "_models.PrivateEndpointConnection", - **kwargs + **kwargs: Any ) -> "_models.PrivateEndpointConnection": """Update the state of specified private endpoint connection. @@ -212,7 +212,7 @@ async def update( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2021-04-01-preview" + api_version = "2021-06-01-preview" content_type = kwargs.pop("content_type", "application/json") accept = "application/json" @@ -260,14 +260,14 @@ async def _delete_initial( private_endpoint_connection_name: str, resource_group_name: str, resource_name: str, - **kwargs + **kwargs: Any ) -> None: cls = kwargs.pop('cls', None) # type: ClsType[None] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2021-04-01-preview" + api_version = "2021-06-01-preview" accept = "application/json" # Construct URL @@ -307,7 +307,7 @@ async def begin_delete( private_endpoint_connection_name: str, resource_group_name: str, resource_name: str, - **kwargs + **kwargs: Any ) -> AsyncLROPoller[None]: """Delete the specified private endpoint connection. @@ -320,8 +320,8 @@ async def begin_delete( :type resource_name: str :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: Pass in True if you'd like the AsyncARMPolling polling method, - False for no polling, or your own initialized polling object for a personal polling strategy. + :keyword polling: By default, your polling method will be AsyncARMPolling. + Pass in False for this operation to not poll, or pass in your own initialized polling object for a personal polling strategy. :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. :return: An instance of AsyncLROPoller that returns either None or the result of cls(response) diff --git a/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/aio/operations/_web_pub_sub_private_link_resources_operations.py b/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/aio/operations/_web_pub_sub_private_link_resources_operations.py index e2355dbd1922..146e4bcc1bb3 100644 --- a/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/aio/operations/_web_pub_sub_private_link_resources_operations.py +++ b/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/aio/operations/_web_pub_sub_private_link_resources_operations.py @@ -45,7 +45,7 @@ def list( self, resource_group_name: str, resource_name: str, - **kwargs + **kwargs: Any ) -> AsyncIterable["_models.PrivateLinkResourceList"]: """Get the private link resources that need to be created for a resource. @@ -64,7 +64,7 @@ def list( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2021-04-01-preview" + api_version = "2021-06-01-preview" accept = "application/json" def prepare_request(next_link=None): diff --git a/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/aio/operations/_web_pub_sub_shared_private_link_resources_operations.py b/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/aio/operations/_web_pub_sub_shared_private_link_resources_operations.py index f1e47adef675..150ad1b345f0 100644 --- a/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/aio/operations/_web_pub_sub_shared_private_link_resources_operations.py +++ b/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/aio/operations/_web_pub_sub_shared_private_link_resources_operations.py @@ -47,7 +47,7 @@ def list( self, resource_group_name: str, resource_name: str, - **kwargs + **kwargs: Any ) -> AsyncIterable["_models.SharedPrivateLinkResourceList"]: """List shared private link resources. @@ -66,7 +66,7 @@ def list( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2021-04-01-preview" + api_version = "2021-06-01-preview" accept = "application/json" def prepare_request(next_link=None): @@ -124,7 +124,7 @@ async def get( shared_private_link_resource_name: str, resource_group_name: str, resource_name: str, - **kwargs + **kwargs: Any ) -> "_models.SharedPrivateLinkResource": """Get the specified shared private link resource. @@ -145,7 +145,7 @@ async def get( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2021-04-01-preview" + api_version = "2021-06-01-preview" accept = "application/json" # Construct URL @@ -189,14 +189,14 @@ async def _create_or_update_initial( resource_group_name: str, resource_name: str, parameters: "_models.SharedPrivateLinkResource", - **kwargs + **kwargs: Any ) -> "_models.SharedPrivateLinkResource": cls = kwargs.pop('cls', None) # type: ClsType["_models.SharedPrivateLinkResource"] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2021-04-01-preview" + api_version = "2021-06-01-preview" content_type = kwargs.pop("content_type", "application/json") accept = "application/json" @@ -249,7 +249,7 @@ async def begin_create_or_update( resource_group_name: str, resource_name: str, parameters: "_models.SharedPrivateLinkResource", - **kwargs + **kwargs: Any ) -> AsyncLROPoller["_models.SharedPrivateLinkResource"]: """Create or update a shared private link resource. @@ -264,8 +264,8 @@ async def begin_create_or_update( :type parameters: ~azure.mgmt.webpubsub.models.SharedPrivateLinkResource :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: Pass in True if you'd like the AsyncARMPolling polling method, - False for no polling, or your own initialized polling object for a personal polling strategy. + :keyword polling: By default, your polling method will be AsyncARMPolling. + Pass in False for this operation to not poll, or pass in your own initialized polling object for a personal polling strategy. :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. :return: An instance of AsyncLROPoller that returns either SharedPrivateLinkResource or the result of cls(response) @@ -325,14 +325,14 @@ async def _delete_initial( shared_private_link_resource_name: str, resource_group_name: str, resource_name: str, - **kwargs + **kwargs: Any ) -> None: cls = kwargs.pop('cls', None) # type: ClsType[None] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2021-04-01-preview" + api_version = "2021-06-01-preview" accept = "application/json" # Construct URL @@ -372,7 +372,7 @@ async def begin_delete( shared_private_link_resource_name: str, resource_group_name: str, resource_name: str, - **kwargs + **kwargs: Any ) -> AsyncLROPoller[None]: """Delete the specified shared private link resource. @@ -385,8 +385,8 @@ async def begin_delete( :type resource_name: str :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: Pass in True if you'd like the AsyncARMPolling polling method, - False for no polling, or your own initialized polling object for a personal polling strategy. + :keyword polling: By default, your polling method will be AsyncARMPolling. + Pass in False for this operation to not poll, or pass in your own initialized polling object for a personal polling strategy. :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. :return: An instance of AsyncLROPoller that returns either None or the result of cls(response) diff --git a/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/models/__init__.py b/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/models/__init__.py index 3ce5731380a1..a1b93929aa51 100644 --- a/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/models/__init__.py +++ b/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/models/__init__.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- try: + from ._models_py3 import DiagnosticConfiguration from ._models_py3 import Dimension from ._models_py3 import ErrorAdditionalInfo from ._models_py3 import ErrorDetail @@ -47,13 +48,13 @@ from ._models_py3 import TrackedResource from ._models_py3 import UpstreamAuthSettings from ._models_py3 import UserAssignedIdentityProperty - from ._models_py3 import WebPubSubFeature from ._models_py3 import WebPubSubKeys from ._models_py3 import WebPubSubNetworkACLs from ._models_py3 import WebPubSubResource from ._models_py3 import WebPubSubResourceList from ._models_py3 import WebPubSubTlsSettings except (SyntaxError, ImportError): + from ._models import DiagnosticConfiguration # type: ignore from ._models import Dimension # type: ignore from ._models import ErrorAdditionalInfo # type: ignore from ._models import ErrorDetail # type: ignore @@ -94,7 +95,6 @@ from ._models import TrackedResource # type: ignore from ._models import UpstreamAuthSettings # type: ignore from ._models import UserAssignedIdentityProperty # type: ignore - from ._models import WebPubSubFeature # type: ignore from ._models import WebPubSubKeys # type: ignore from ._models import WebPubSubNetworkACLs # type: ignore from ._models import WebPubSubResource # type: ignore @@ -104,7 +104,6 @@ from ._web_pub_sub_management_client_enums import ( ACLAction, CreatedByType, - FeatureFlags, KeyType, ManagedIdentityType, PrivateLinkServiceConnectionStatus, @@ -116,6 +115,7 @@ ) __all__ = [ + 'DiagnosticConfiguration', 'Dimension', 'ErrorAdditionalInfo', 'ErrorDetail', @@ -156,7 +156,6 @@ 'TrackedResource', 'UpstreamAuthSettings', 'UserAssignedIdentityProperty', - 'WebPubSubFeature', 'WebPubSubKeys', 'WebPubSubNetworkACLs', 'WebPubSubResource', @@ -164,7 +163,6 @@ 'WebPubSubTlsSettings', 'ACLAction', 'CreatedByType', - 'FeatureFlags', 'KeyType', 'ManagedIdentityType', 'PrivateLinkServiceConnectionStatus', diff --git a/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/models/_models.py b/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/models/_models.py index ea0fcacc179a..ac54a0f28339 100644 --- a/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/models/_models.py +++ b/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/models/_models.py @@ -10,6 +10,42 @@ import msrest.serialization +class DiagnosticConfiguration(msrest.serialization.Model): + """Diagnostic configuration of a Microsoft.SignalRService resource. Used together with Azure monitor DiagnosticSettings. + + :param enable_connectivity_logs: Indicate whether or not enable Connectivity logs. + Available values: Enabled, Disabled. + Case insensitive. + :type enable_connectivity_logs: str + :param enable_messaging_logs: Indicate whether or not enable Messaging logs. + Available values: Enabled, Disabled. + Case insensitive. + :type enable_messaging_logs: str + :param enable_live_trace: Indicate whether or not enable Live Trace. + Available values: Enabled, Disabled. + Case insensitive. + Live Trace allows you to know what's happening inside Azure SignalR service, it will give you + live traces in real time, it will be helpful when you developing your own Azure SignalR based + web application or self-troubleshooting some issues. + :type enable_live_trace: str + """ + + _attribute_map = { + 'enable_connectivity_logs': {'key': 'enableConnectivityLogs', 'type': 'str'}, + 'enable_messaging_logs': {'key': 'enableMessagingLogs', 'type': 'str'}, + 'enable_live_trace': {'key': 'enableLiveTrace', 'type': 'str'}, + } + + def __init__( + self, + **kwargs + ): + super(DiagnosticConfiguration, self).__init__(**kwargs) + self.enable_connectivity_logs = kwargs.get('enable_connectivity_logs', None) + self.enable_messaging_logs = kwargs.get('enable_messaging_logs', None) + self.enable_live_trace = kwargs.get('enable_live_trace', None) + + class Dimension(msrest.serialization.Model): """Specifications of the Dimension of metrics. @@ -50,7 +86,7 @@ class ErrorAdditionalInfo(msrest.serialization.Model): :ivar type: The additional info type. :vartype type: str :ivar info: The additional info. - :vartype info: object + :vartype info: any """ _validation = { @@ -1310,53 +1346,6 @@ def __init__( self.client_id = None -class WebPubSubFeature(msrest.serialization.Model): - """Feature of a resource, which controls the runtime behavior. - - All required parameters must be populated in order to send to Azure. - - :param flag: Required. FeatureFlags is the supported features of Azure SignalR service. - - - * EnableConnectivityLogs: "true"/"false", to enable/disable the connectivity log category - respectively. - * EnableMessagingLogs: "true"/"false", to enable/disable the connectivity log category - respectively. - * EnableLiveTrace: Live Trace allows you to know what's happening inside Azure SignalR - service, it will give you live traces in real time, it will be helpful when you developing your - own Azure SignalR based web application or self-troubleshooting some issues. Please note that - live traces are counted as outbound messages that will be charged. Values allowed: - "true"/"false", to enable/disable live trace feature. Possible values include: - "EnableConnectivityLogs", "EnableMessagingLogs", "EnableLiveTrace". - :type flag: str or ~azure.mgmt.webpubsub.models.FeatureFlags - :param value: Required. Value of the feature flag. See Azure SignalR service document - https://docs.microsoft.com/azure/azure-signalr/ for allowed values. - :type value: str - :param properties: Optional properties related to this feature. - :type properties: dict[str, str] - """ - - _validation = { - 'flag': {'required': True}, - 'value': {'required': True, 'max_length': 128, 'min_length': 1}, - } - - _attribute_map = { - 'flag': {'key': 'flag', 'type': 'str'}, - 'value': {'key': 'value', 'type': 'str'}, - 'properties': {'key': 'properties', 'type': '{str}'}, - } - - def __init__( - self, - **kwargs - ): - super(WebPubSubFeature, self).__init__(**kwargs) - self.flag = kwargs['flag'] - self.value = kwargs['value'] - self.properties = kwargs.get('properties', None) - - class WebPubSubKeys(msrest.serialization.Model): """A class represents the access keys of the resource. @@ -1464,15 +1453,9 @@ class WebPubSubResource(TrackedResource): list[~azure.mgmt.webpubsub.models.SharedPrivateLinkResource] :param tls: TLS settings. :type tls: ~azure.mgmt.webpubsub.models.WebPubSubTlsSettings - :param features: List of the featureFlags. - - FeatureFlags that are not included in the parameters for the update operation will not be - modified. - And the response will only include featureFlags that are explicitly set. - When a featureFlag is not explicitly set, its globally default value will be used - But keep in mind, the default value doesn't mean "false". It varies in terms of different - FeatureFlags. - :type features: list[~azure.mgmt.webpubsub.models.WebPubSubFeature] + :param diagnostic_configuration: Diagnostic configuration of a Microsoft.SignalRService + resource. Used together with Azure monitor DiagnosticSettings. + :type diagnostic_configuration: ~azure.mgmt.webpubsub.models.DiagnosticConfiguration :param event_handler: The settings for event handler in webpubsub service. :type event_handler: ~azure.mgmt.webpubsub.models.EventHandlerSettings :param network_ac_ls: Network ACLs. @@ -1482,6 +1465,14 @@ class WebPubSubResource(TrackedResource): When it's Disabled, public network access is always disabled no matter what you set in network ACLs. :type public_network_access: str + :param disable_local_auth: DisableLocalAuth + Enable or disable local auth with AccessKey + When set as true, connection with AccessKey=xxx won't work. + :type disable_local_auth: bool + :param disable_aad_auth: DisableLocalAuth + Enable or disable aad auth + When set as true, connection with AuthType=aad won't work. + :type disable_aad_auth: bool """ _validation = { @@ -1517,10 +1508,12 @@ class WebPubSubResource(TrackedResource): 'private_endpoint_connections': {'key': 'properties.privateEndpointConnections', 'type': '[PrivateEndpointConnection]'}, 'shared_private_link_resources': {'key': 'properties.sharedPrivateLinkResources', 'type': '[SharedPrivateLinkResource]'}, 'tls': {'key': 'properties.tls', 'type': 'WebPubSubTlsSettings'}, - 'features': {'key': 'properties.features', 'type': '[WebPubSubFeature]'}, + 'diagnostic_configuration': {'key': 'properties.diagnosticConfiguration', 'type': 'DiagnosticConfiguration'}, 'event_handler': {'key': 'properties.eventHandler', 'type': 'EventHandlerSettings'}, 'network_ac_ls': {'key': 'properties.networkACLs', 'type': 'WebPubSubNetworkACLs'}, 'public_network_access': {'key': 'properties.publicNetworkAccess', 'type': 'str'}, + 'disable_local_auth': {'key': 'properties.disableLocalAuth', 'type': 'bool'}, + 'disable_aad_auth': {'key': 'properties.disableAadAuth', 'type': 'bool'}, } def __init__( @@ -1540,10 +1533,12 @@ def __init__( self.private_endpoint_connections = None self.shared_private_link_resources = None self.tls = kwargs.get('tls', None) - self.features = kwargs.get('features', None) + self.diagnostic_configuration = kwargs.get('diagnostic_configuration', None) self.event_handler = kwargs.get('event_handler', None) self.network_ac_ls = kwargs.get('network_ac_ls', None) self.public_network_access = kwargs.get('public_network_access', "Enabled") + self.disable_local_auth = kwargs.get('disable_local_auth', False) + self.disable_aad_auth = kwargs.get('disable_aad_auth', False) class WebPubSubResourceList(msrest.serialization.Model): diff --git a/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/models/_models_py3.py b/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/models/_models_py3.py index f6b68d18a2e9..74594602109f 100644 --- a/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/models/_models_py3.py +++ b/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/models/_models_py3.py @@ -15,6 +15,46 @@ from ._web_pub_sub_management_client_enums import * +class DiagnosticConfiguration(msrest.serialization.Model): + """Diagnostic configuration of a Microsoft.SignalRService resource. Used together with Azure monitor DiagnosticSettings. + + :param enable_connectivity_logs: Indicate whether or not enable Connectivity logs. + Available values: Enabled, Disabled. + Case insensitive. + :type enable_connectivity_logs: str + :param enable_messaging_logs: Indicate whether or not enable Messaging logs. + Available values: Enabled, Disabled. + Case insensitive. + :type enable_messaging_logs: str + :param enable_live_trace: Indicate whether or not enable Live Trace. + Available values: Enabled, Disabled. + Case insensitive. + Live Trace allows you to know what's happening inside Azure SignalR service, it will give you + live traces in real time, it will be helpful when you developing your own Azure SignalR based + web application or self-troubleshooting some issues. + :type enable_live_trace: str + """ + + _attribute_map = { + 'enable_connectivity_logs': {'key': 'enableConnectivityLogs', 'type': 'str'}, + 'enable_messaging_logs': {'key': 'enableMessagingLogs', 'type': 'str'}, + 'enable_live_trace': {'key': 'enableLiveTrace', 'type': 'str'}, + } + + def __init__( + self, + *, + enable_connectivity_logs: Optional[str] = None, + enable_messaging_logs: Optional[str] = None, + enable_live_trace: Optional[str] = None, + **kwargs + ): + super(DiagnosticConfiguration, self).__init__(**kwargs) + self.enable_connectivity_logs = enable_connectivity_logs + self.enable_messaging_logs = enable_messaging_logs + self.enable_live_trace = enable_live_trace + + class Dimension(msrest.serialization.Model): """Specifications of the Dimension of metrics. @@ -60,7 +100,7 @@ class ErrorAdditionalInfo(msrest.serialization.Model): :ivar type: The additional info type. :vartype type: str :ivar info: The additional info. - :vartype info: object + :vartype info: any """ _validation = { @@ -1444,57 +1484,6 @@ def __init__( self.client_id = None -class WebPubSubFeature(msrest.serialization.Model): - """Feature of a resource, which controls the runtime behavior. - - All required parameters must be populated in order to send to Azure. - - :param flag: Required. FeatureFlags is the supported features of Azure SignalR service. - - - * EnableConnectivityLogs: "true"/"false", to enable/disable the connectivity log category - respectively. - * EnableMessagingLogs: "true"/"false", to enable/disable the connectivity log category - respectively. - * EnableLiveTrace: Live Trace allows you to know what's happening inside Azure SignalR - service, it will give you live traces in real time, it will be helpful when you developing your - own Azure SignalR based web application or self-troubleshooting some issues. Please note that - live traces are counted as outbound messages that will be charged. Values allowed: - "true"/"false", to enable/disable live trace feature. Possible values include: - "EnableConnectivityLogs", "EnableMessagingLogs", "EnableLiveTrace". - :type flag: str or ~azure.mgmt.webpubsub.models.FeatureFlags - :param value: Required. Value of the feature flag. See Azure SignalR service document - https://docs.microsoft.com/azure/azure-signalr/ for allowed values. - :type value: str - :param properties: Optional properties related to this feature. - :type properties: dict[str, str] - """ - - _validation = { - 'flag': {'required': True}, - 'value': {'required': True, 'max_length': 128, 'min_length': 1}, - } - - _attribute_map = { - 'flag': {'key': 'flag', 'type': 'str'}, - 'value': {'key': 'value', 'type': 'str'}, - 'properties': {'key': 'properties', 'type': '{str}'}, - } - - def __init__( - self, - *, - flag: Union[str, "FeatureFlags"], - value: str, - properties: Optional[Dict[str, str]] = None, - **kwargs - ): - super(WebPubSubFeature, self).__init__(**kwargs) - self.flag = flag - self.value = value - self.properties = properties - - class WebPubSubKeys(msrest.serialization.Model): """A class represents the access keys of the resource. @@ -1611,15 +1600,9 @@ class WebPubSubResource(TrackedResource): list[~azure.mgmt.webpubsub.models.SharedPrivateLinkResource] :param tls: TLS settings. :type tls: ~azure.mgmt.webpubsub.models.WebPubSubTlsSettings - :param features: List of the featureFlags. - - FeatureFlags that are not included in the parameters for the update operation will not be - modified. - And the response will only include featureFlags that are explicitly set. - When a featureFlag is not explicitly set, its globally default value will be used - But keep in mind, the default value doesn't mean "false". It varies in terms of different - FeatureFlags. - :type features: list[~azure.mgmt.webpubsub.models.WebPubSubFeature] + :param diagnostic_configuration: Diagnostic configuration of a Microsoft.SignalRService + resource. Used together with Azure monitor DiagnosticSettings. + :type diagnostic_configuration: ~azure.mgmt.webpubsub.models.DiagnosticConfiguration :param event_handler: The settings for event handler in webpubsub service. :type event_handler: ~azure.mgmt.webpubsub.models.EventHandlerSettings :param network_ac_ls: Network ACLs. @@ -1629,6 +1612,14 @@ class WebPubSubResource(TrackedResource): When it's Disabled, public network access is always disabled no matter what you set in network ACLs. :type public_network_access: str + :param disable_local_auth: DisableLocalAuth + Enable or disable local auth with AccessKey + When set as true, connection with AccessKey=xxx won't work. + :type disable_local_auth: bool + :param disable_aad_auth: DisableLocalAuth + Enable or disable aad auth + When set as true, connection with AuthType=aad won't work. + :type disable_aad_auth: bool """ _validation = { @@ -1664,10 +1655,12 @@ class WebPubSubResource(TrackedResource): 'private_endpoint_connections': {'key': 'properties.privateEndpointConnections', 'type': '[PrivateEndpointConnection]'}, 'shared_private_link_resources': {'key': 'properties.sharedPrivateLinkResources', 'type': '[SharedPrivateLinkResource]'}, 'tls': {'key': 'properties.tls', 'type': 'WebPubSubTlsSettings'}, - 'features': {'key': 'properties.features', 'type': '[WebPubSubFeature]'}, + 'diagnostic_configuration': {'key': 'properties.diagnosticConfiguration', 'type': 'DiagnosticConfiguration'}, 'event_handler': {'key': 'properties.eventHandler', 'type': 'EventHandlerSettings'}, 'network_ac_ls': {'key': 'properties.networkACLs', 'type': 'WebPubSubNetworkACLs'}, 'public_network_access': {'key': 'properties.publicNetworkAccess', 'type': 'str'}, + 'disable_local_auth': {'key': 'properties.disableLocalAuth', 'type': 'bool'}, + 'disable_aad_auth': {'key': 'properties.disableAadAuth', 'type': 'bool'}, } def __init__( @@ -1678,10 +1671,12 @@ def __init__( sku: Optional["ResourceSku"] = None, identity: Optional["ManagedIdentity"] = None, tls: Optional["WebPubSubTlsSettings"] = None, - features: Optional[List["WebPubSubFeature"]] = None, + diagnostic_configuration: Optional["DiagnosticConfiguration"] = None, event_handler: Optional["EventHandlerSettings"] = None, network_ac_ls: Optional["WebPubSubNetworkACLs"] = None, public_network_access: Optional[str] = "Enabled", + disable_local_auth: Optional[bool] = False, + disable_aad_auth: Optional[bool] = False, **kwargs ): super(WebPubSubResource, self).__init__(location=location, tags=tags, **kwargs) @@ -1697,10 +1692,12 @@ def __init__( self.private_endpoint_connections = None self.shared_private_link_resources = None self.tls = tls - self.features = features + self.diagnostic_configuration = diagnostic_configuration self.event_handler = event_handler self.network_ac_ls = network_ac_ls self.public_network_access = public_network_access + self.disable_local_auth = disable_local_auth + self.disable_aad_auth = disable_aad_auth class WebPubSubResourceList(msrest.serialization.Model): diff --git a/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/models/_web_pub_sub_management_client_enums.py b/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/models/_web_pub_sub_management_client_enums.py index c9da1141c856..84fc1f70d40d 100644 --- a/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/models/_web_pub_sub_management_client_enums.py +++ b/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/models/_web_pub_sub_management_client_enums.py @@ -42,25 +42,6 @@ class CreatedByType(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)): MANAGED_IDENTITY = "ManagedIdentity" KEY = "Key" -class FeatureFlags(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)): - """FeatureFlags is the supported features of Azure SignalR service. - - - * EnableConnectivityLogs: "true"/"false", to enable/disable the connectivity log category - respectively. - * EnableMessagingLogs: "true"/"false", to enable/disable the connectivity log category - respectively. - * EnableLiveTrace: Live Trace allows you to know what's happening inside Azure SignalR service, - it will give you live traces in real time, it will be helpful when you developing your own - Azure SignalR based web application or self-troubleshooting some issues. Please note that live - traces are counted as outbound messages that will be charged. Values allowed: "true"/"false", - to enable/disable live trace feature. - """ - - ENABLE_CONNECTIVITY_LOGS = "EnableConnectivityLogs" - ENABLE_MESSAGING_LOGS = "EnableMessagingLogs" - ENABLE_LIVE_TRACE = "EnableLiveTrace" - class KeyType(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)): """The keyType to regenerate. Must be either 'primary' or 'secondary'(case-insensitive). """ diff --git a/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/operations/_operations.py b/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/operations/_operations.py index 64427f6bef1f..6c30beb26ce6 100644 --- a/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/operations/_operations.py +++ b/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/operations/_operations.py @@ -62,7 +62,7 @@ def list( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2021-04-01-preview" + api_version = "2021-06-01-preview" accept = "application/json" def prepare_request(next_link=None): diff --git a/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/operations/_usages_operations.py b/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/operations/_usages_operations.py index 11ad7ba94ed8..2f7563b5dc6e 100644 --- a/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/operations/_usages_operations.py +++ b/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/operations/_usages_operations.py @@ -65,7 +65,7 @@ def list( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2021-04-01-preview" + api_version = "2021-06-01-preview" accept = "application/json" def prepare_request(next_link=None): diff --git a/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/operations/_web_pub_sub_operations.py b/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/operations/_web_pub_sub_operations.py index 582c57d4e186..e1297fc28af1 100644 --- a/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/operations/_web_pub_sub_operations.py +++ b/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/operations/_web_pub_sub_operations.py @@ -70,7 +70,7 @@ def check_name_availability( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2021-04-01-preview" + api_version = "2021-06-01-preview" content_type = kwargs.pop("content_type", "application/json") accept = "application/json" @@ -128,7 +128,7 @@ def list_by_subscription( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2021-04-01-preview" + api_version = "2021-06-01-preview" accept = "application/json" def prepare_request(next_link=None): @@ -200,7 +200,7 @@ def list_by_resource_group( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2021-04-01-preview" + api_version = "2021-06-01-preview" accept = "application/json" def prepare_request(next_link=None): @@ -276,7 +276,7 @@ def get( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2021-04-01-preview" + api_version = "2021-06-01-preview" accept = "application/json" # Construct URL @@ -326,7 +326,7 @@ def _create_or_update_initial( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2021-04-01-preview" + api_version = "2021-06-01-preview" content_type = kwargs.pop("content_type", "application/json") accept = "application/json" @@ -392,8 +392,8 @@ def begin_create_or_update( :type parameters: ~azure.mgmt.webpubsub.models.WebPubSubResource :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: Pass in True if you'd like the ARMPolling polling method, - False for no polling, or your own initialized polling object for a personal polling strategy. + :keyword polling: By default, your polling method will be ARMPolling. + Pass in False for this operation to not poll, or pass in your own initialized polling object for a personal polling strategy. :paramtype polling: bool or ~azure.core.polling.PollingMethod :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. :return: An instance of LROPoller that returns either WebPubSubResource or the result of cls(response) @@ -458,7 +458,7 @@ def _delete_initial( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2021-04-01-preview" + api_version = "2021-06-01-preview" accept = "application/json" # Construct URL @@ -508,8 +508,8 @@ def begin_delete( :type resource_name: str :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: Pass in True if you'd like the ARMPolling polling method, - False for no polling, or your own initialized polling object for a personal polling strategy. + :keyword polling: By default, your polling method will be ARMPolling. + Pass in False for this operation to not poll, or pass in your own initialized polling object for a personal polling strategy. :paramtype polling: bool or ~azure.core.polling.PollingMethod :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. :return: An instance of LROPoller that returns either None or the result of cls(response) @@ -571,7 +571,7 @@ def _update_initial( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2021-04-01-preview" + api_version = "2021-06-01-preview" content_type = kwargs.pop("content_type", "application/json") accept = "application/json" @@ -634,8 +634,8 @@ def begin_update( :type parameters: ~azure.mgmt.webpubsub.models.WebPubSubResource :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: Pass in True if you'd like the ARMPolling polling method, - False for no polling, or your own initialized polling object for a personal polling strategy. + :keyword polling: By default, your polling method will be ARMPolling. + Pass in False for this operation to not poll, or pass in your own initialized polling object for a personal polling strategy. :paramtype polling: bool or ~azure.core.polling.PollingMethod :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. :return: An instance of LROPoller that returns either WebPubSubResource or the result of cls(response) @@ -712,7 +712,7 @@ def list_keys( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2021-04-01-preview" + api_version = "2021-06-01-preview" accept = "application/json" # Construct URL @@ -762,7 +762,7 @@ def _regenerate_key_initial( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2021-04-01-preview" + api_version = "2021-06-01-preview" content_type = kwargs.pop("content_type", "application/json") accept = "application/json" @@ -824,8 +824,8 @@ def begin_regenerate_key( :type parameters: ~azure.mgmt.webpubsub.models.RegenerateKeyParameters :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: Pass in True if you'd like the ARMPolling polling method, - False for no polling, or your own initialized polling object for a personal polling strategy. + :keyword polling: By default, your polling method will be ARMPolling. + Pass in False for this operation to not poll, or pass in your own initialized polling object for a personal polling strategy. :paramtype polling: bool or ~azure.core.polling.PollingMethod :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. :return: An instance of LROPoller that returns either WebPubSubKeys or the result of cls(response) @@ -890,7 +890,7 @@ def _restart_initial( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2021-04-01-preview" + api_version = "2021-06-01-preview" accept = "application/json" # Construct URL @@ -940,8 +940,8 @@ def begin_restart( :type resource_name: str :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: Pass in True if you'd like the ARMPolling polling method, - False for no polling, or your own initialized polling object for a personal polling strategy. + :keyword polling: By default, your polling method will be ARMPolling. + Pass in False for this operation to not poll, or pass in your own initialized polling object for a personal polling strategy. :paramtype polling: bool or ~azure.core.polling.PollingMethod :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. :return: An instance of LROPoller that returns either None or the result of cls(response) diff --git a/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/operations/_web_pub_sub_private_endpoint_connections_operations.py b/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/operations/_web_pub_sub_private_endpoint_connections_operations.py index c5c64a5ce78d..b19b2ae081d3 100644 --- a/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/operations/_web_pub_sub_private_endpoint_connections_operations.py +++ b/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/operations/_web_pub_sub_private_endpoint_connections_operations.py @@ -71,7 +71,7 @@ def list( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2021-04-01-preview" + api_version = "2021-06-01-preview" accept = "application/json" def prepare_request(next_link=None): @@ -151,7 +151,7 @@ def get( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2021-04-01-preview" + api_version = "2021-06-01-preview" accept = "application/json" # Construct URL @@ -219,7 +219,7 @@ def update( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2021-04-01-preview" + api_version = "2021-06-01-preview" content_type = kwargs.pop("content_type", "application/json") accept = "application/json" @@ -275,7 +275,7 @@ def _delete_initial( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2021-04-01-preview" + api_version = "2021-06-01-preview" accept = "application/json" # Construct URL @@ -329,8 +329,8 @@ def begin_delete( :type resource_name: str :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: Pass in True if you'd like the ARMPolling polling method, - False for no polling, or your own initialized polling object for a personal polling strategy. + :keyword polling: By default, your polling method will be ARMPolling. + Pass in False for this operation to not poll, or pass in your own initialized polling object for a personal polling strategy. :paramtype polling: bool or ~azure.core.polling.PollingMethod :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. :return: An instance of LROPoller that returns either None or the result of cls(response) diff --git a/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/operations/_web_pub_sub_private_link_resources_operations.py b/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/operations/_web_pub_sub_private_link_resources_operations.py index a4ba2bff4eeb..b4b13c2f2ca7 100644 --- a/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/operations/_web_pub_sub_private_link_resources_operations.py +++ b/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/operations/_web_pub_sub_private_link_resources_operations.py @@ -69,7 +69,7 @@ def list( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2021-04-01-preview" + api_version = "2021-06-01-preview" accept = "application/json" def prepare_request(next_link=None): diff --git a/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/operations/_web_pub_sub_shared_private_link_resources_operations.py b/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/operations/_web_pub_sub_shared_private_link_resources_operations.py index 403ef3945665..7bf5a48c56d0 100644 --- a/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/operations/_web_pub_sub_shared_private_link_resources_operations.py +++ b/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/operations/_web_pub_sub_shared_private_link_resources_operations.py @@ -71,7 +71,7 @@ def list( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2021-04-01-preview" + api_version = "2021-06-01-preview" accept = "application/json" def prepare_request(next_link=None): @@ -151,7 +151,7 @@ def get( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2021-04-01-preview" + api_version = "2021-06-01-preview" accept = "application/json" # Construct URL @@ -203,7 +203,7 @@ def _create_or_update_initial( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2021-04-01-preview" + api_version = "2021-06-01-preview" content_type = kwargs.pop("content_type", "application/json") accept = "application/json" @@ -272,8 +272,8 @@ def begin_create_or_update( :type parameters: ~azure.mgmt.webpubsub.models.SharedPrivateLinkResource :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: Pass in True if you'd like the ARMPolling polling method, - False for no polling, or your own initialized polling object for a personal polling strategy. + :keyword polling: By default, your polling method will be ARMPolling. + Pass in False for this operation to not poll, or pass in your own initialized polling object for a personal polling strategy. :paramtype polling: bool or ~azure.core.polling.PollingMethod :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. :return: An instance of LROPoller that returns either SharedPrivateLinkResource or the result of cls(response) @@ -341,7 +341,7 @@ def _delete_initial( 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - api_version = "2021-04-01-preview" + api_version = "2021-06-01-preview" accept = "application/json" # Construct URL @@ -395,8 +395,8 @@ def begin_delete( :type resource_name: str :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: Pass in True if you'd like the ARMPolling polling method, - False for no polling, or your own initialized polling object for a personal polling strategy. + :keyword polling: By default, your polling method will be ARMPolling. + Pass in False for this operation to not poll, or pass in your own initialized polling object for a personal polling strategy. :paramtype polling: bool or ~azure.core.polling.PollingMethod :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. :return: An instance of LROPoller that returns either None or the result of cls(response)