Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions sdk/redisenterprise/azure-mgmt-redisenterprise/_meta.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"commit": "3940cd77b8d74b58d4a8b3a80388ff890052be67",
"commit": "cc22db4b6a6b212856e5bb217db68ff1f81a5767",
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
"autorest": "3.9.7",
"autorest": "3.10.2",
"use": [
"@autorest/python@6.13.7",
"@autorest/python@6.19.0",
"@autorest/[email protected]"
],
"autorest_command": "autorest specification/redisenterprise/resource-manager/readme.md --generate-sample=True --include-x-ms-examples-original-file=True --python --python-sdks-folder=/home/vsts/work/1/azure-sdk-for-python/sdk --use=@autorest/python@6.13.7 --use=@autorest/[email protected] --version=3.9.7 --version-tolerant=False",
"autorest_command": "autorest specification/redisenterprise/resource-manager/readme.md --generate-sample=True --generate-test=True --include-x-ms-examples-original-file=True --python --python-sdks-folder=/mnt/vss/_work/1/s/azure-sdk-for-python/sdk --use=@autorest/python@6.19.0 --use=@autorest/[email protected] --version=3.10.2 --version-tolerant=False",
"readme": "specification/redisenterprise/resource-manager/readme.md"
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ class RedisEnterpriseManagementClientConfiguration: # pylint: disable=too-many-
:type credential: ~azure.core.credentials.TokenCredential
:param subscription_id: The ID of the target subscription. Required.
:type subscription_id: str
:keyword api_version: Api Version. Default value is "2024-03-01-preview". Note that overriding
:keyword api_version: Api Version. Default value is "2024-09-01-preview". Note that overriding
this default value may result in unsupported behavior.
:paramtype api_version: str
"""

def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None:
api_version: str = kwargs.pop("api_version", "2024-03-01-preview")
api_version: str = kwargs.pop("api_version", "2024-09-01-preview")

if credential is None:
raise ValueError("Parameter 'credential' must not be None.")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#
# --------------------------------------------------------------------------


# This file is used for handwritten extensions to the generated code. Example:
# https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/customize_code/how-to-patch-sdk-code.md
def patch_sdk():
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

from copy import deepcopy
from typing import Any, TYPE_CHECKING
from typing_extensions import Self

from azure.core.pipeline import policies
from azure.core.rest import HttpRequest, HttpResponse
Expand All @@ -18,6 +19,7 @@
from ._configuration import RedisEnterpriseManagementClientConfiguration
from ._serialization import Deserializer, Serializer
from .operations import (
AccessPolicyAssignmentOperations,
DatabasesOperations,
Operations,
OperationsStatusOperations,
Expand All @@ -31,7 +33,7 @@
from azure.core.credentials import TokenCredential


class RedisEnterpriseManagementClient: # pylint: disable=client-accepts-api-version-keyword
class RedisEnterpriseManagementClient: # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes
"""REST API for managing Redis Enterprise resources in Azure.

:ivar operations: Operations operations
Expand All @@ -42,6 +44,9 @@ class RedisEnterpriseManagementClient: # pylint: disable=client-accepts-api-ver
:vartype redis_enterprise: azure.mgmt.redisenterprise.operations.RedisEnterpriseOperations
:ivar databases: DatabasesOperations operations
:vartype databases: azure.mgmt.redisenterprise.operations.DatabasesOperations
:ivar access_policy_assignment: AccessPolicyAssignmentOperations operations
:vartype access_policy_assignment:
azure.mgmt.redisenterprise.operations.AccessPolicyAssignmentOperations
:ivar private_endpoint_connections: PrivateEndpointConnectionsOperations operations
:vartype private_endpoint_connections:
azure.mgmt.redisenterprise.operations.PrivateEndpointConnectionsOperations
Expand All @@ -54,7 +59,7 @@ class RedisEnterpriseManagementClient: # pylint: disable=client-accepts-api-ver
:type subscription_id: str
:param base_url: Service URL. Default value is "https://management.azure.com".
:type base_url: str
:keyword api_version: Api Version. Default value is "2024-03-01-preview". Note that overriding
:keyword api_version: Api Version. Default value is "2024-09-01-preview". Note that overriding
this default value may result in unsupported behavior.
:paramtype api_version: str
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no
Expand Down Expand Up @@ -103,6 +108,9 @@ def __init__(
self._client, self._config, self._serialize, self._deserialize
)
self.databases = DatabasesOperations(self._client, self._config, self._serialize, self._deserialize)
self.access_policy_assignment = AccessPolicyAssignmentOperations(
self._client, self._config, self._serialize, self._deserialize
)
self.private_endpoint_connections = PrivateEndpointConnectionsOperations(
self._client, self._config, self._serialize, self._deserialize
)
Expand Down Expand Up @@ -135,7 +143,7 @@ def _send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs:
def close(self) -> None:
self._client.close()

def __enter__(self) -> "RedisEnterpriseManagementClient":
def __enter__(self) -> Self:
self._client.__enter__()
return self

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,8 @@ def _json_attemp(data):
# context otherwise.
_LOGGER.critical("Wasn't XML not JSON, failing")
raise DeserializationError("XML is invalid") from err
elif content_type.startswith("text/"):
return data_as_str
raise DeserializationError("Cannot deserialize content-type: {}".format(content_type))

@classmethod
Expand Down Expand Up @@ -1441,7 +1443,7 @@ def _deserialize(self, target_obj, data):
elif isinstance(response, type) and issubclass(response, Enum):
return self.deserialize_enum(data, response)

if data is None:
if data is None or data is CoreNull:
return data
try:
attributes = response._attribute_map # type: ignore
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------

VERSION = "3.1.0b1"
VERSION = "2.0.0"
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ class RedisEnterpriseManagementClientConfiguration: # pylint: disable=too-many-
:type credential: ~azure.core.credentials_async.AsyncTokenCredential
:param subscription_id: The ID of the target subscription. Required.
:type subscription_id: str
:keyword api_version: Api Version. Default value is "2024-03-01-preview". Note that overriding
:keyword api_version: Api Version. Default value is "2024-09-01-preview". Note that overriding
this default value may result in unsupported behavior.
:paramtype api_version: str
"""

def __init__(self, credential: "AsyncTokenCredential", subscription_id: str, **kwargs: Any) -> None:
api_version: str = kwargs.pop("api_version", "2024-03-01-preview")
api_version: str = kwargs.pop("api_version", "2024-09-01-preview")

if credential is None:
raise ValueError("Parameter 'credential' must not be None.")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#
# --------------------------------------------------------------------------


# This file is used for handwritten extensions to the generated code. Example:
# https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/customize_code/how-to-patch-sdk-code.md
def patch_sdk():
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

from copy import deepcopy
from typing import Any, Awaitable, TYPE_CHECKING
from typing_extensions import Self

from azure.core.pipeline import policies
from azure.core.rest import AsyncHttpResponse, HttpRequest
Expand All @@ -18,6 +19,7 @@
from .._serialization import Deserializer, Serializer
from ._configuration import RedisEnterpriseManagementClientConfiguration
from .operations import (
AccessPolicyAssignmentOperations,
DatabasesOperations,
Operations,
OperationsStatusOperations,
Expand All @@ -31,7 +33,7 @@
from azure.core.credentials_async import AsyncTokenCredential


class RedisEnterpriseManagementClient: # pylint: disable=client-accepts-api-version-keyword
class RedisEnterpriseManagementClient: # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes
"""REST API for managing Redis Enterprise resources in Azure.

:ivar operations: Operations operations
Expand All @@ -43,6 +45,9 @@ class RedisEnterpriseManagementClient: # pylint: disable=client-accepts-api-ver
:vartype redis_enterprise: azure.mgmt.redisenterprise.aio.operations.RedisEnterpriseOperations
:ivar databases: DatabasesOperations operations
:vartype databases: azure.mgmt.redisenterprise.aio.operations.DatabasesOperations
:ivar access_policy_assignment: AccessPolicyAssignmentOperations operations
:vartype access_policy_assignment:
azure.mgmt.redisenterprise.aio.operations.AccessPolicyAssignmentOperations
:ivar private_endpoint_connections: PrivateEndpointConnectionsOperations operations
:vartype private_endpoint_connections:
azure.mgmt.redisenterprise.aio.operations.PrivateEndpointConnectionsOperations
Expand All @@ -55,7 +60,7 @@ class RedisEnterpriseManagementClient: # pylint: disable=client-accepts-api-ver
:type subscription_id: str
:param base_url: Service URL. Default value is "https://management.azure.com".
:type base_url: str
:keyword api_version: Api Version. Default value is "2024-03-01-preview". Note that overriding
:keyword api_version: Api Version. Default value is "2024-09-01-preview". Note that overriding
this default value may result in unsupported behavior.
:paramtype api_version: str
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no
Expand Down Expand Up @@ -104,6 +109,9 @@ def __init__(
self._client, self._config, self._serialize, self._deserialize
)
self.databases = DatabasesOperations(self._client, self._config, self._serialize, self._deserialize)
self.access_policy_assignment = AccessPolicyAssignmentOperations(
self._client, self._config, self._serialize, self._deserialize
)
self.private_endpoint_connections = PrivateEndpointConnectionsOperations(
self._client, self._config, self._serialize, self._deserialize
)
Expand Down Expand Up @@ -138,7 +146,7 @@ def _send_request(
async def close(self) -> None:
await self._client.close()

async def __aenter__(self) -> "RedisEnterpriseManagementClient":
async def __aenter__(self) -> Self:
await self._client.__aenter__()
return self

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
from ._operations_status_operations import OperationsStatusOperations
from ._redis_enterprise_operations import RedisEnterpriseOperations
from ._databases_operations import DatabasesOperations
from ._access_policy_assignment_operations import AccessPolicyAssignmentOperations
from ._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations
from ._private_link_resources_operations import PrivateLinkResourcesOperations

Expand All @@ -22,6 +23,7 @@
"OperationsStatusOperations",
"RedisEnterpriseOperations",
"DatabasesOperations",
"AccessPolicyAssignmentOperations",
"PrivateEndpointConnectionsOperations",
"PrivateLinkResourcesOperations",
]
Expand Down
Loading