diff --git a/sdk/schemaregistry/azure-schemaregistry-avroencoder/CHANGELOG.md b/sdk/schemaregistry/azure-schemaregistry-avroencoder/CHANGELOG.md index fcf2ace37ac0..daaf7cdd61c1 100644 --- a/sdk/schemaregistry/azure-schemaregistry-avroencoder/CHANGELOG.md +++ b/sdk/schemaregistry/azure-schemaregistry-avroencoder/CHANGELOG.md @@ -2,13 +2,11 @@ ## 1.0.1 (Unreleased) -### Features Added - -### Breaking Changes +This version and all future versions will require Python 3.7+, Python 3.6 is no longer supported. ### Bugs Fixed -### Other Changes +- Updated `avro` minimum dependency to 1.11.1, which fixed a bug that previously restricted complex types from being used as names. ## 1.0.0 (2022-05-10) diff --git a/sdk/schemaregistry/azure-schemaregistry-avroencoder/README.md b/sdk/schemaregistry/azure-schemaregistry-avroencoder/README.md index 718734b18aeb..d3df507dacd8 100644 --- a/sdk/schemaregistry/azure-schemaregistry-avroencoder/README.md +++ b/sdk/schemaregistry/azure-schemaregistry-avroencoder/README.md @@ -24,7 +24,7 @@ pip install azure-schemaregistry-avroencoder To use this package, you must have: * Azure subscription - [Create a free account][azure_sub] * [Azure Schema Registry][schemaregistry_service] - [Here is the quickstart guide][quickstart_guide] to create a Schema Registry group using the Azure portal. -* Python 3.6 or later - [Install Python][python] +* Python 3.7 or later - [Install Python][python] ### Authenticate the client Interaction with the Schema Registry Avro Encoder starts with an instance of AvroEncoder class, which takes the schema group name and the [Schema Registry Client][schemaregistry_client] class. The client constructor takes the Event Hubs fully qualified namespace and and Azure Active Directory credential: diff --git a/sdk/schemaregistry/azure-schemaregistry-avroencoder/samples/README.md b/sdk/schemaregistry/azure-schemaregistry-avroencoder/samples/README.md index 05f2c4f21f7b..32985752976a 100644 --- a/sdk/schemaregistry/azure-schemaregistry-avroencoder/samples/README.md +++ b/sdk/schemaregistry/azure-schemaregistry-avroencoder/samples/README.md @@ -23,7 +23,7 @@ Several Schema Registry Avro Encoder Python SDK samples are available to you in * Receive `EventData` from Event Hubs and decode the received bytes. ## Prerequisites -- Python 3.6 or later. +- Python 3.7 or later. - **Microsoft Azure Subscription:** To use Azure services, including Azure Schema Registry, you'll need a subscription. If you do not have an existing Azure account, you may sign up for a free trial or use your MSDN subscriber benefits when you [create an account](https://account.windowsazure.com/Home/Index). diff --git a/sdk/schemaregistry/azure-schemaregistry-avroencoder/setup.py b/sdk/schemaregistry/azure-schemaregistry-avroencoder/setup.py index 29bbb64632a1..728133123c4c 100644 --- a/sdk/schemaregistry/azure-schemaregistry-avroencoder/setup.py +++ b/sdk/schemaregistry/azure-schemaregistry-avroencoder/setup.py @@ -34,7 +34,7 @@ install_packages = [ 'azure-schemaregistry>=1.0.0,<2.0.0', - 'avro>=1.11.0', + 'avro>=1.11.1', "typing-extensions>=4.0.1", ] @@ -52,14 +52,13 @@ "Development Status :: 5 - Production/Stable", 'Programming Language :: Python', 'Programming Language :: Python :: 3 :: Only', - 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', 'License :: OSI Approved :: MIT License', ], - python_requires=">=3.6", + python_requires=">=3.7", zip_safe=False, packages=find_namespace_packages( include=['azure.schemaregistry.encoder.*'] # Exclude packages that will be covered by PEP420 or nspkg diff --git a/sdk/schemaregistry/azure-schemaregistry-avroencoder/tests/test_avro_encoder.py b/sdk/schemaregistry/azure-schemaregistry-avroencoder/tests/test_avro_encoder.py index 3d57c13c7e3b..c06a768020ab 100644 --- a/sdk/schemaregistry/azure-schemaregistry-avroencoder/tests/test_avro_encoder.py +++ b/sdk/schemaregistry/azure-schemaregistry-avroencoder/tests/test_avro_encoder.py @@ -26,7 +26,6 @@ import functools import pytest import json -import pdb from azure.schemaregistry import SchemaRegistryClient from azure.schemaregistry.encoder.avroencoder import AvroEncoder @@ -37,7 +36,7 @@ from avro.errors import AvroTypeException from azure.schemaregistry.encoder.avroencoder._apache_avro_encoder import ApacheAvroObjectEncoder as AvroObjectEncoder -from devtools_testutils import AzureTestCase, PowerShellPreparer +from devtools_testutils import AzureTestCase SchemaRegistryEnvironmentVariableLoader = functools.partial(EnvironmentVariableLoader, "schemaregistry", schemaregistry_fully_qualified_namespace="fake_resource.servicebus.windows.net/", schemaregistry_group="fakegroup") @@ -434,7 +433,7 @@ def test_parse_record_name(self, **kwargs): sr_avro_encoder.encode({"name": u"Ben"}, schema=schema_invalid_name_in_fullname) schema_invalid_name_reserved_type = """{ - "name":"record", + "name":"long", "type":"record", "fields":[{"name":"name","type":"string"}] }""" diff --git a/sdk/schemaregistry/azure-schemaregistry-avroencoder/tests/test_avro_encoder_async.py b/sdk/schemaregistry/azure-schemaregistry-avroencoder/tests/test_avro_encoder_async.py index 16e9fc5c2140..6cf9a3243c45 100644 --- a/sdk/schemaregistry/azure-schemaregistry-avroencoder/tests/test_avro_encoder_async.py +++ b/sdk/schemaregistry/azure-schemaregistry-avroencoder/tests/test_avro_encoder_async.py @@ -384,12 +384,12 @@ async def test_parse_record_name(self, schemaregistry_fully_qualified_namespace, await sr_avro_encoder.encode({"name": u"Ben"}, schema=schema_invalid_name_in_fullname) schema_invalid_name_reserved_type = """{ - "name":"record", + "name":"long", "type":"record", "fields":[{"name":"name","type":"string"}] }""" with pytest.raises(InvalidSchemaError): - await sr_avro_encoder.encode({"name": u"Ben"}, schema=schema_invalid_name_reserved_type) + await sr_avro_encoder.encode({"name": u"Ben"}, schema=schema_invalid_name_reserved_type) schema_wrong_type_name = """{ "name":1, diff --git a/sdk/schemaregistry/azure-schemaregistry/CHANGELOG.md b/sdk/schemaregistry/azure-schemaregistry/CHANGELOG.md index 13036afa2d0f..48cec403ec83 100644 --- a/sdk/schemaregistry/azure-schemaregistry/CHANGELOG.md +++ b/sdk/schemaregistry/azure-schemaregistry/CHANGELOG.md @@ -1,15 +1,18 @@ # Release History -## 1.1.1 (Unreleased) +## 1.2.0 (Unreleased) -### Features Added +This version and all future versions will require Python 3.7+, Python 3.6 is no longer supported. -### Breaking Changes +### Features Added -### Bugs Fixed +- `get_schema_by_version` method has been added to the sync and async `SchemaRegistryClient`. +- `version` has been added to `SchemaProperties`. ### Other Changes +- Updated azure-core minimum dependency to 1.24.0. + ## 1.1.0 (2022-05-10) This version and all future versions will require Python 3.6+. Python 2.7 is no longer supported. diff --git a/sdk/schemaregistry/azure-schemaregistry/README.md b/sdk/schemaregistry/azure-schemaregistry/README.md index 5ace121871bb..4a962d7aa0e8 100644 --- a/sdk/schemaregistry/azure-schemaregistry/README.md +++ b/sdk/schemaregistry/azure-schemaregistry/README.md @@ -24,7 +24,7 @@ pip install azure-schemaregistry To use this package, you must have: * Azure subscription - [Create a free account][azure_sub] * [Azure Schema Registry][schemaregistry_service] - [Here is the quickstart guide][quickstart_guide] to create a Schema Registry group using the Azure portal. -* Python 3.6 or later - [Install Python][python] +* Python 3.7 or later - [Install Python][python] ### Authenticate the client @@ -71,6 +71,7 @@ The following sections provide several code snippets covering some of the most c - [Register a schema](#register-a-schema) - [Get the schema by id](#get-the-schema-by-id) +- [Get the schema by version](#get-the-schema-by-version) - [Get the id of a schema](#get-the-id-of-a-schema) ### Register a schema @@ -127,6 +128,29 @@ with schema_registry_client: properties = schema.properties ``` +### Get the schema by version + +Get the schema definition and its properties by schema version. + +```python +import os + +from azure.identity import DefaultAzureCredential +from azure.schemaregistry import SchemaRegistryClient + +token_credential = DefaultAzureCredential() +fully_qualified_namespace = os.environ['SCHEMA_REGISTRY_FULLY_QUALIFIED_NAMESPACE'] +group_name = os.environ["SCHEMAREGISTRY_GROUP"] +name = "your-schema-name" +version = int("") + +schema_registry_client = SchemaRegistryClient(fully_qualified_namespace=fully_qualified_namespace, credential=token_credential) +with schema_registry_client: + schema = schema_registry_client.get_schema_by_version(group_name, name, version) + definition = schema.definition + properties = schema.properties +``` + ### Get the id of a schema Get the schema id of a schema by schema definition and its properties. diff --git a/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_common/_response_handlers.py b/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_common/_response_handlers.py index a3728ded32da..76c6e9a6860f 100644 --- a/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_common/_response_handlers.py +++ b/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_common/_response_handlers.py @@ -31,7 +31,8 @@ def _parse_schema_properties_dict(response): return { "id": response.headers.get("schema-id"), "group_name": response.headers.get("schema-group-name"), - "name": response.headers.get("schema-name") + "name": response.headers.get("schema-name"), + "version": int(response.headers.get("schema-version")) } diff --git a/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_common/_schema.py b/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_common/_schema.py index 11d48229f53e..4fe653ebc83b 100644 --- a/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_common/_schema.py +++ b/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_common/_schema.py @@ -38,6 +38,8 @@ class SchemaProperties(object): :vartype group_name: str :ivar name: Name of schema. :vartype name: str + :ivar version: Version of schema. + :vartype version: int """ def __init__(self, **kwargs): @@ -46,11 +48,12 @@ def __init__(self, **kwargs): self.format = kwargs.pop("format") self.group_name = kwargs.pop("group_name") self.name = kwargs.pop("name") + self.version = kwargs.pop("version") def __repr__(self): return ( f"SchemaProperties(id={self.id}, format={self.format}, " - f"group_name={self.group_name}, name={self.name})"[:1024] + f"group_name={self.group_name}, name={self.name}, version={self.version})"[:1024] ) diff --git a/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/__init__.py b/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/__init__.py index 48de8bb80345..09ff506c07b7 100644 --- a/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/__init__.py +++ b/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/__init__.py @@ -17,7 +17,8 @@ except ImportError: _patch_all = [] from ._patch import patch_sdk as _patch_sdk -__all__ = ['AzureSchemaRegistry'] + +__all__ = ["AzureSchemaRegistry"] __all__.extend([p for p in _patch_all if p not in __all__]) _patch_sdk() diff --git a/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/_client.py b/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/_client.py index 29531b5f798b..108d8b4dcec2 100644 --- a/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/_client.py +++ b/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/_client.py @@ -9,12 +9,12 @@ from copy import deepcopy from typing import Any, TYPE_CHECKING -from msrest import Deserializer, Serializer - from azure.core import PipelineClient from azure.core.rest import HttpRequest, HttpResponse from ._configuration import AzureSchemaRegistryConfiguration +from ._serialization import Deserializer, Serializer +from .operations import SchemaGroupsOperations, SchemaOperations if TYPE_CHECKING: # pylint: disable=unused-import,ungrouped-imports @@ -22,40 +22,37 @@ from azure.core.credentials import TokenCredential -class AzureSchemaRegistry: + +class AzureSchemaRegistry: # pylint: disable=client-accepts-api-version-keyword """Azure Schema Registry is as a central schema repository, with support for versioning, management, compatibility checking, and RBAC. + :ivar schema_groups: SchemaGroupsOperations operations + :vartype schema_groups: azure.schemaregistry._generated.operations.SchemaGroupsOperations + :ivar schema: SchemaOperations operations + :vartype schema: azure.schemaregistry._generated.operations.SchemaOperations :param endpoint: The Schema Registry service endpoint, for example - my-namespace.servicebus.windows.net. + my-namespace.servicebus.windows.net. Required. :type endpoint: str - :param credential: Credential needed for the client to connect to Azure. + :param credential: Credential needed for the client to connect to Azure. Required. :type credential: ~azure.core.credentials.TokenCredential :keyword api_version: Api Version. Default value is "2021-10". Note that overriding this default value may result in unsupported behavior. :paramtype api_version: str """ - def __init__( - self, - endpoint: str, - credential: "TokenCredential", - **kwargs: Any - ) -> None: - _endpoint = 'https://{endpoint}' + def __init__(self, endpoint: str, credential: "TokenCredential", **kwargs: Any) -> None: + _endpoint = "https://{endpoint}" self._config = AzureSchemaRegistryConfiguration(endpoint=endpoint, credential=credential, **kwargs) self._client = PipelineClient(base_url=_endpoint, config=self._config, **kwargs) self._serialize = Serializer() self._deserialize = Deserializer() self._serialize.client_side_validation = False + self.schema_groups = SchemaGroupsOperations(self._client, self._config, self._serialize, self._deserialize) + self.schema = SchemaOperations(self._client, self._config, self._serialize, self._deserialize) - - def send_request( - self, - request: HttpRequest, - **kwargs: Any - ) -> HttpResponse: + def send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse: """Runs the network request through the client's chained policies. We have helper methods to create requests specific to this service in `azure.schemaregistry._generated.rest`. @@ -67,7 +64,7 @@ def send_request( >>> response = client.send_request(request) - For more information on this code flow, see https://aka.ms/azsdk/python/protocol/quickstart + For more information on this code flow, see https://aka.ms/azsdk/dpcodegen/python/send_request :param request: The network request you want to make. Required. :type request: ~azure.core.rest.HttpRequest @@ -78,7 +75,7 @@ def send_request( request_copy = deepcopy(request) path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, 'str', skip_quote=True), + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), } request_copy.url = self._client.format_url(request_copy.url, **path_format_arguments) diff --git a/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/_configuration.py b/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/_configuration.py index 127e72e9da8b..debdc39b6234 100644 --- a/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/_configuration.py +++ b/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/_configuration.py @@ -25,23 +25,18 @@ class AzureSchemaRegistryConfiguration(Configuration): # pylint: disable=too-ma attributes. :param endpoint: The Schema Registry service endpoint, for example - my-namespace.servicebus.windows.net. + my-namespace.servicebus.windows.net. Required. :type endpoint: str - :param credential: Credential needed for the client to connect to Azure. + :param credential: Credential needed for the client to connect to Azure. Required. :type credential: ~azure.core.credentials.TokenCredential :keyword api_version: Api Version. Default value is "2021-10". Note that overriding this default value may result in unsupported behavior. :paramtype api_version: str """ - def __init__( - self, - endpoint: str, - credential: "TokenCredential", - **kwargs: Any - ) -> None: + def __init__(self, endpoint: str, credential: "TokenCredential", **kwargs: Any) -> None: super(AzureSchemaRegistryConfiguration, self).__init__(**kwargs) - api_version = kwargs.pop('api_version', "2021-10") # type: str + api_version = kwargs.pop("api_version", "2021-10") # type: str if endpoint is None: raise ValueError("Parameter 'endpoint' must not be None.") @@ -51,23 +46,24 @@ def __init__( self.endpoint = endpoint self.credential = credential self.api_version = api_version - self.credential_scopes = kwargs.pop('credential_scopes', ['https://eventhubs.azure.net/.default']) - kwargs.setdefault('sdk_moniker', 'azureschemaregistry/{}'.format(VERSION)) + self.credential_scopes = kwargs.pop("credential_scopes", ["https://eventhubs.azure.net/.default"]) + kwargs.setdefault("sdk_moniker", "azureschemaregistry/{}".format(VERSION)) self._configure(**kwargs) def _configure( - self, - **kwargs # type: Any + self, **kwargs # type: Any ): # type: (...) -> None - self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - self.headers_policy = kwargs.get('headers_policy') or policies.HeadersPolicy(**kwargs) - self.proxy_policy = kwargs.get('proxy_policy') or policies.ProxyPolicy(**kwargs) - self.logging_policy = kwargs.get('logging_policy') or policies.NetworkTraceLoggingPolicy(**kwargs) - self.http_logging_policy = kwargs.get('http_logging_policy') or policies.HttpLoggingPolicy(**kwargs) - self.retry_policy = kwargs.get('retry_policy') or policies.RetryPolicy(**kwargs) - self.custom_hook_policy = kwargs.get('custom_hook_policy') or policies.CustomHookPolicy(**kwargs) - self.redirect_policy = kwargs.get('redirect_policy') or policies.RedirectPolicy(**kwargs) - self.authentication_policy = kwargs.get('authentication_policy') + self.user_agent_policy = kwargs.get("user_agent_policy") or policies.UserAgentPolicy(**kwargs) + self.headers_policy = kwargs.get("headers_policy") or policies.HeadersPolicy(**kwargs) + self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs) + self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs) + self.http_logging_policy = kwargs.get("http_logging_policy") or policies.HttpLoggingPolicy(**kwargs) + self.retry_policy = kwargs.get("retry_policy") or policies.RetryPolicy(**kwargs) + self.custom_hook_policy = kwargs.get("custom_hook_policy") or policies.CustomHookPolicy(**kwargs) + self.redirect_policy = kwargs.get("redirect_policy") or policies.RedirectPolicy(**kwargs) + self.authentication_policy = kwargs.get("authentication_policy") if self.credential and not self.authentication_policy: - self.authentication_policy = policies.BearerTokenCredentialPolicy(self.credential, *self.credential_scopes, **kwargs) + self.authentication_policy = policies.BearerTokenCredentialPolicy( + self.credential, *self.credential_scopes, **kwargs + ) diff --git a/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/_patch.py b/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/_patch.py index 0ad201a8c586..f7dd32510333 100644 --- a/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/_patch.py +++ b/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/_patch.py @@ -10,6 +10,7 @@ __all__: List[str] = [] # Add all objects you want publicly available to users at this package level + def patch_sdk(): """Do not remove from this file. diff --git a/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/_serialization.py b/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/_serialization.py new file mode 100644 index 000000000000..7c1dedb5133d --- /dev/null +++ b/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/_serialization.py @@ -0,0 +1,1970 @@ +# -------------------------------------------------------------------------- +# +# Copyright (c) Microsoft Corporation. All rights reserved. +# +# The MIT License (MIT) +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the ""Software""), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +# IN THE SOFTWARE. +# +# -------------------------------------------------------------------------- + +# pylint: skip-file + +from base64 import b64decode, b64encode +import calendar +import datetime +import decimal +import email +from enum import Enum +import json +import logging +import re +import sys +import codecs + +try: + from urllib import quote # type: ignore +except ImportError: + from urllib.parse import quote # type: ignore +import xml.etree.ElementTree as ET + +import isodate + +from typing import Dict, Any, cast, TYPE_CHECKING + +from azure.core.exceptions import DeserializationError, SerializationError, raise_with_traceback + +_BOM = codecs.BOM_UTF8.decode(encoding="utf-8") + +if TYPE_CHECKING: + from typing import Optional, Union, AnyStr, IO, Mapping + + +class RawDeserializer: + + # Accept "text" because we're open minded people... + JSON_REGEXP = re.compile(r"^(application|text)/([a-z+.]+\+)?json$") + + # Name used in context + CONTEXT_NAME = "deserialized_data" + + @classmethod + def deserialize_from_text(cls, data, content_type=None): + # type: (Optional[Union[AnyStr, IO]], Optional[str]) -> Any + """Decode data according to content-type. + + Accept a stream of data as well, but will be load at once in memory for now. + + If no content-type, will return the string version (not bytes, not stream) + + :param data: Input, could be bytes or stream (will be decoded with UTF8) or text + :type data: str or bytes or IO + :param str content_type: The content type. + """ + if hasattr(data, "read"): + # Assume a stream + data = cast(IO, data).read() + + if isinstance(data, bytes): + data_as_str = data.decode(encoding="utf-8-sig") + else: + # Explain to mypy the correct type. + data_as_str = cast(str, data) + + # Remove Byte Order Mark if present in string + data_as_str = data_as_str.lstrip(_BOM) + + if content_type is None: + return data + + if cls.JSON_REGEXP.match(content_type): + try: + return json.loads(data_as_str) + except ValueError as err: + raise DeserializationError("JSON is invalid: {}".format(err), err) + elif "xml" in (content_type or []): + try: + + try: + if isinstance(data, unicode): # type: ignore + # If I'm Python 2.7 and unicode XML will scream if I try a "fromstring" on unicode string + data_as_str = data_as_str.encode(encoding="utf-8") # type: ignore + except NameError: + pass + + return ET.fromstring(data_as_str) # nosec + except ET.ParseError: + # It might be because the server has an issue, and returned JSON with + # content-type XML.... + # So let's try a JSON load, and if it's still broken + # let's flow the initial exception + def _json_attemp(data): + try: + return True, json.loads(data) + except ValueError: + return False, None # Don't care about this one + + success, json_result = _json_attemp(data) + if success: + return json_result + # If i'm here, it's not JSON, it's not XML, let's scream + # and raise the last context in this block (the XML exception) + # The function hack is because Py2.7 messes up with exception + # context otherwise. + _LOGGER.critical("Wasn't XML not JSON, failing") + raise_with_traceback(DeserializationError, "XML is invalid") + raise DeserializationError("Cannot deserialize content-type: {}".format(content_type)) + + @classmethod + def deserialize_from_http_generics(cls, body_bytes, headers): + # type: (Optional[Union[AnyStr, IO]], Mapping) -> Any + """Deserialize from HTTP response. + + Use bytes and headers to NOT use any requests/aiohttp or whatever + specific implementation. + Headers will tested for "content-type" + """ + # Try to use content-type from headers if available + content_type = None + if "content-type" in headers: + content_type = headers["content-type"].split(";")[0].strip().lower() + # Ouch, this server did not declare what it sent... + # Let's guess it's JSON... + # Also, since Autorest was considering that an empty body was a valid JSON, + # need that test as well.... + else: + content_type = "application/json" + + if body_bytes: + return cls.deserialize_from_text(body_bytes, content_type) + return None + + +try: + basestring # type: ignore + unicode_str = unicode # type: ignore +except NameError: + basestring = str # type: ignore + unicode_str = str # type: ignore + +_LOGGER = logging.getLogger(__name__) + +try: + _long_type = long # type: ignore +except NameError: + _long_type = int + + +class UTC(datetime.tzinfo): + """Time Zone info for handling UTC""" + + def utcoffset(self, dt): + """UTF offset for UTC is 0.""" + return datetime.timedelta(0) + + def tzname(self, dt): + """Timestamp representation.""" + return "Z" + + def dst(self, dt): + """No daylight saving for UTC.""" + return datetime.timedelta(hours=1) + + +try: + from datetime import timezone as _FixedOffset +except ImportError: # Python 2.7 + + class _FixedOffset(datetime.tzinfo): # type: ignore + """Fixed offset in minutes east from UTC. + Copy/pasted from Python doc + :param datetime.timedelta offset: offset in timedelta format + """ + + def __init__(self, offset): + self.__offset = offset + + def utcoffset(self, dt): + return self.__offset + + def tzname(self, dt): + return str(self.__offset.total_seconds() / 3600) + + def __repr__(self): + return "".format(self.tzname(None)) + + def dst(self, dt): + return datetime.timedelta(0) + + def __getinitargs__(self): + return (self.__offset,) + + +try: + from datetime import timezone + + TZ_UTC = timezone.utc # type: ignore +except ImportError: + TZ_UTC = UTC() # type: ignore + +_FLATTEN = re.compile(r"(? y, + "minimum": lambda x, y: x < y, + "maximum": lambda x, y: x > y, + "minimum_ex": lambda x, y: x <= y, + "maximum_ex": lambda x, y: x >= y, + "min_items": lambda x, y: len(x) < y, + "max_items": lambda x, y: len(x) > y, + "pattern": lambda x, y: not re.match(y, x, re.UNICODE), + "unique": lambda x, y: len(x) != len(set(x)), + "multiple": lambda x, y: x % y != 0, + } + + def __init__(self, classes=None): + self.serialize_type = { + "iso-8601": Serializer.serialize_iso, + "rfc-1123": Serializer.serialize_rfc, + "unix-time": Serializer.serialize_unix, + "duration": Serializer.serialize_duration, + "date": Serializer.serialize_date, + "time": Serializer.serialize_time, + "decimal": Serializer.serialize_decimal, + "long": Serializer.serialize_long, + "bytearray": Serializer.serialize_bytearray, + "base64": Serializer.serialize_base64, + "object": self.serialize_object, + "[]": self.serialize_iter, + "{}": self.serialize_dict, + } + self.dependencies = dict(classes) if classes else {} + self.key_transformer = full_restapi_key_transformer + self.client_side_validation = True + + def _serialize(self, target_obj, data_type=None, **kwargs): + """Serialize data into a string according to type. + + :param target_obj: The data to be serialized. + :param str data_type: The type to be serialized from. + :rtype: str, dict + :raises: SerializationError if serialization fails. + """ + key_transformer = kwargs.get("key_transformer", self.key_transformer) + keep_readonly = kwargs.get("keep_readonly", False) + if target_obj is None: + return None + + attr_name = None + class_name = target_obj.__class__.__name__ + + if data_type: + return self.serialize_data(target_obj, data_type, **kwargs) + + if not hasattr(target_obj, "_attribute_map"): + data_type = type(target_obj).__name__ + if data_type in self.basic_types.values(): + return self.serialize_data(target_obj, data_type, **kwargs) + + # Force "is_xml" kwargs if we detect a XML model + try: + is_xml_model_serialization = kwargs["is_xml"] + except KeyError: + is_xml_model_serialization = kwargs.setdefault("is_xml", target_obj.is_xml_model()) + + serialized = {} + if is_xml_model_serialization: + serialized = target_obj._create_xml_node() + try: + attributes = target_obj._attribute_map + for attr, attr_desc in attributes.items(): + attr_name = attr + if not keep_readonly and target_obj._validation.get(attr_name, {}).get("readonly", False): + continue + + if attr_name == "additional_properties" and attr_desc["key"] == "": + if target_obj.additional_properties is not None: + serialized.update(target_obj.additional_properties) + continue + try: + + orig_attr = getattr(target_obj, attr) + if is_xml_model_serialization: + pass # Don't provide "transformer" for XML for now. Keep "orig_attr" + else: # JSON + keys, orig_attr = key_transformer(attr, attr_desc.copy(), orig_attr) + keys = keys if isinstance(keys, list) else [keys] + + kwargs["serialization_ctxt"] = attr_desc + new_attr = self.serialize_data(orig_attr, attr_desc["type"], **kwargs) + + if is_xml_model_serialization: + xml_desc = attr_desc.get("xml", {}) + xml_name = xml_desc.get("name", attr_desc["key"]) + xml_prefix = xml_desc.get("prefix", None) + xml_ns = xml_desc.get("ns", None) + if xml_desc.get("attr", False): + if xml_ns: + ET.register_namespace(xml_prefix, xml_ns) + xml_name = "{}{}".format(xml_ns, xml_name) + serialized.set(xml_name, new_attr) + continue + if xml_desc.get("text", False): + serialized.text = new_attr + continue + if isinstance(new_attr, list): + serialized.extend(new_attr) + elif isinstance(new_attr, ET.Element): + # If the down XML has no XML/Name, we MUST replace the tag with the local tag. But keeping the namespaces. + if "name" not in getattr(orig_attr, "_xml_map", {}): + splitted_tag = new_attr.tag.split("}") + if len(splitted_tag) == 2: # Namespace + new_attr.tag = "}".join([splitted_tag[0], xml_name]) + else: + new_attr.tag = xml_name + serialized.append(new_attr) + else: # That's a basic type + # Integrate namespace if necessary + local_node = _create_xml_node(xml_name, xml_prefix, xml_ns) + local_node.text = unicode_str(new_attr) + serialized.append(local_node) + else: # JSON + for k in reversed(keys): + unflattened = {k: new_attr} + new_attr = unflattened + + _new_attr = new_attr + _serialized = serialized + for k in keys: + if k not in _serialized: + _serialized.update(_new_attr) + _new_attr = _new_attr[k] + _serialized = _serialized[k] + except ValueError: + continue + + except (AttributeError, KeyError, TypeError) as err: + msg = "Attribute {} in object {} cannot be serialized.\n{}".format(attr_name, class_name, str(target_obj)) + raise_with_traceback(SerializationError, msg, err) + else: + return serialized + + def body(self, data, data_type, **kwargs): + """Serialize data intended for a request body. + + :param data: The data to be serialized. + :param str data_type: The type to be serialized from. + :rtype: dict + :raises: SerializationError if serialization fails. + :raises: ValueError if data is None + """ + + # Just in case this is a dict + internal_data_type = data_type.strip("[]{}") + internal_data_type = self.dependencies.get(internal_data_type, None) + try: + is_xml_model_serialization = kwargs["is_xml"] + except KeyError: + if internal_data_type and issubclass(internal_data_type, Model): + is_xml_model_serialization = kwargs.setdefault("is_xml", internal_data_type.is_xml_model()) + else: + is_xml_model_serialization = False + if internal_data_type and not isinstance(internal_data_type, Enum): + try: + deserializer = Deserializer(self.dependencies) + # Since it's on serialization, it's almost sure that format is not JSON REST + # We're not able to deal with additional properties for now. + deserializer.additional_properties_detection = False + if is_xml_model_serialization: + deserializer.key_extractors = [ + attribute_key_case_insensitive_extractor, + ] + else: + deserializer.key_extractors = [ + rest_key_case_insensitive_extractor, + attribute_key_case_insensitive_extractor, + last_rest_key_case_insensitive_extractor, + ] + data = deserializer._deserialize(data_type, data) + except DeserializationError as err: + raise_with_traceback(SerializationError, "Unable to build a model: " + str(err), err) + + return self._serialize(data, data_type, **kwargs) + + def url(self, name, data, data_type, **kwargs): + """Serialize data intended for a URL path. + + :param data: The data to be serialized. + :param str data_type: The type to be serialized from. + :rtype: str + :raises: TypeError if serialization fails. + :raises: ValueError if data is None + """ + try: + output = self.serialize_data(data, data_type, **kwargs) + if data_type == "bool": + output = json.dumps(output) + + if kwargs.get("skip_quote") is True: + output = str(output) + else: + output = quote(str(output), safe="") + except SerializationError: + raise TypeError("{} must be type {}.".format(name, data_type)) + else: + return output + + def query(self, name, data, data_type, **kwargs): + """Serialize data intended for a URL query. + + :param data: The data to be serialized. + :param str data_type: The type to be serialized from. + :rtype: str + :raises: TypeError if serialization fails. + :raises: ValueError if data is None + """ + try: + # Treat the list aside, since we don't want to encode the div separator + if data_type.startswith("["): + internal_data_type = data_type[1:-1] + data = [self.serialize_data(d, internal_data_type, **kwargs) if d is not None else "" for d in data] + if not kwargs.get("skip_quote", False): + data = [quote(str(d), safe="") for d in data] + return str(self.serialize_iter(data, internal_data_type, **kwargs)) + + # Not a list, regular serialization + output = self.serialize_data(data, data_type, **kwargs) + if data_type == "bool": + output = json.dumps(output) + if kwargs.get("skip_quote") is True: + output = str(output) + else: + output = quote(str(output), safe="") + except SerializationError: + raise TypeError("{} must be type {}.".format(name, data_type)) + else: + return str(output) + + def header(self, name, data, data_type, **kwargs): + """Serialize data intended for a request header. + + :param data: The data to be serialized. + :param str data_type: The type to be serialized from. + :rtype: str + :raises: TypeError if serialization fails. + :raises: ValueError if data is None + """ + try: + if data_type in ["[str]"]: + data = ["" if d is None else d for d in data] + + output = self.serialize_data(data, data_type, **kwargs) + if data_type == "bool": + output = json.dumps(output) + except SerializationError: + raise TypeError("{} must be type {}.".format(name, data_type)) + else: + return str(output) + + def serialize_data(self, data, data_type, **kwargs): + """Serialize generic data according to supplied data type. + + :param data: The data to be serialized. + :param str data_type: The type to be serialized from. + :param bool required: Whether it's essential that the data not be + empty or None + :raises: AttributeError if required data is None. + :raises: ValueError if data is None + :raises: SerializationError if serialization fails. + """ + if data is None: + raise ValueError("No value for given attribute") + + try: + if data_type in self.basic_types.values(): + return self.serialize_basic(data, data_type, **kwargs) + + elif data_type in self.serialize_type: + return self.serialize_type[data_type](data, **kwargs) + + # If dependencies is empty, try with current data class + # It has to be a subclass of Enum anyway + enum_type = self.dependencies.get(data_type, data.__class__) + if issubclass(enum_type, Enum): + return Serializer.serialize_enum(data, enum_obj=enum_type) + + iter_type = data_type[0] + data_type[-1] + if iter_type in self.serialize_type: + return self.serialize_type[iter_type](data, data_type[1:-1], **kwargs) + + except (ValueError, TypeError) as err: + msg = "Unable to serialize value: {!r} as type: {!r}." + raise_with_traceback(SerializationError, msg.format(data, data_type), err) + else: + return self._serialize(data, **kwargs) + + @classmethod + def _get_custom_serializers(cls, data_type, **kwargs): + custom_serializer = kwargs.get("basic_types_serializers", {}).get(data_type) + if custom_serializer: + return custom_serializer + if kwargs.get("is_xml", False): + return cls._xml_basic_types_serializers.get(data_type) + + @classmethod + def serialize_basic(cls, data, data_type, **kwargs): + """Serialize basic builting data type. + Serializes objects to str, int, float or bool. + + Possible kwargs: + - basic_types_serializers dict[str, callable] : If set, use the callable as serializer + - is_xml bool : If set, use xml_basic_types_serializers + + :param data: Object to be serialized. + :param str data_type: Type of object in the iterable. + """ + custom_serializer = cls._get_custom_serializers(data_type, **kwargs) + if custom_serializer: + return custom_serializer(data) + if data_type == "str": + return cls.serialize_unicode(data) + return eval(data_type)(data) # nosec + + @classmethod + def serialize_unicode(cls, data): + """Special handling for serializing unicode strings in Py2. + Encode to UTF-8 if unicode, otherwise handle as a str. + + :param data: Object to be serialized. + :rtype: str + """ + try: # If I received an enum, return its value + return data.value + except AttributeError: + pass + + try: + if isinstance(data, unicode): + # Don't change it, JSON and XML ElementTree are totally able + # to serialize correctly u'' strings + return data + except NameError: + return str(data) + else: + return str(data) + + def serialize_iter(self, data, iter_type, div=None, **kwargs): + """Serialize iterable. + + Supported kwargs: + - serialization_ctxt dict : The current entry of _attribute_map, or same format. + serialization_ctxt['type'] should be same as data_type. + - is_xml bool : If set, serialize as XML + + :param list attr: Object to be serialized. + :param str iter_type: Type of object in the iterable. + :param bool required: Whether the objects in the iterable must + not be None or empty. + :param str div: If set, this str will be used to combine the elements + in the iterable into a combined string. Default is 'None'. + :rtype: list, str + """ + if isinstance(data, str): + raise SerializationError("Refuse str type as a valid iter type.") + + serialization_ctxt = kwargs.get("serialization_ctxt", {}) + is_xml = kwargs.get("is_xml", False) + + serialized = [] + for d in data: + try: + serialized.append(self.serialize_data(d, iter_type, **kwargs)) + except ValueError: + serialized.append(None) + + if div: + serialized = ["" if s is None else str(s) for s in serialized] + serialized = div.join(serialized) + + if "xml" in serialization_ctxt or is_xml: + # XML serialization is more complicated + xml_desc = serialization_ctxt.get("xml", {}) + xml_name = xml_desc.get("name") + if not xml_name: + xml_name = serialization_ctxt["key"] + + # Create a wrap node if necessary (use the fact that Element and list have "append") + is_wrapped = xml_desc.get("wrapped", False) + node_name = xml_desc.get("itemsName", xml_name) + if is_wrapped: + final_result = _create_xml_node(xml_name, xml_desc.get("prefix", None), xml_desc.get("ns", None)) + else: + final_result = [] + # All list elements to "local_node" + for el in serialized: + if isinstance(el, ET.Element): + el_node = el + else: + el_node = _create_xml_node(node_name, xml_desc.get("prefix", None), xml_desc.get("ns", None)) + if el is not None: # Otherwise it writes "None" :-p + el_node.text = str(el) + final_result.append(el_node) + return final_result + return serialized + + def serialize_dict(self, attr, dict_type, **kwargs): + """Serialize a dictionary of objects. + + :param dict attr: Object to be serialized. + :param str dict_type: Type of object in the dictionary. + :param bool required: Whether the objects in the dictionary must + not be None or empty. + :rtype: dict + """ + serialization_ctxt = kwargs.get("serialization_ctxt", {}) + serialized = {} + for key, value in attr.items(): + try: + serialized[self.serialize_unicode(key)] = self.serialize_data(value, dict_type, **kwargs) + except ValueError: + serialized[self.serialize_unicode(key)] = None + + if "xml" in serialization_ctxt: + # XML serialization is more complicated + xml_desc = serialization_ctxt["xml"] + xml_name = xml_desc["name"] + + final_result = _create_xml_node(xml_name, xml_desc.get("prefix", None), xml_desc.get("ns", None)) + for key, value in serialized.items(): + ET.SubElement(final_result, key).text = value + return final_result + + return serialized + + def serialize_object(self, attr, **kwargs): + """Serialize a generic object. + This will be handled as a dictionary. If object passed in is not + a basic type (str, int, float, dict, list) it will simply be + cast to str. + + :param dict attr: Object to be serialized. + :rtype: dict or str + """ + if attr is None: + return None + if isinstance(attr, ET.Element): + return attr + obj_type = type(attr) + if obj_type in self.basic_types: + return self.serialize_basic(attr, self.basic_types[obj_type], **kwargs) + if obj_type is _long_type: + return self.serialize_long(attr) + if obj_type is unicode_str: + return self.serialize_unicode(attr) + if obj_type is datetime.datetime: + return self.serialize_iso(attr) + if obj_type is datetime.date: + return self.serialize_date(attr) + if obj_type is datetime.time: + return self.serialize_time(attr) + if obj_type is datetime.timedelta: + return self.serialize_duration(attr) + if obj_type is decimal.Decimal: + return self.serialize_decimal(attr) + + # If it's a model or I know this dependency, serialize as a Model + elif obj_type in self.dependencies.values() or isinstance(attr, Model): + return self._serialize(attr) + + if obj_type == dict: + serialized = {} + for key, value in attr.items(): + try: + serialized[self.serialize_unicode(key)] = self.serialize_object(value, **kwargs) + except ValueError: + serialized[self.serialize_unicode(key)] = None + return serialized + + if obj_type == list: + serialized = [] + for obj in attr: + try: + serialized.append(self.serialize_object(obj, **kwargs)) + except ValueError: + pass + return serialized + return str(attr) + + @staticmethod + def serialize_enum(attr, enum_obj=None): + try: + result = attr.value + except AttributeError: + result = attr + try: + enum_obj(result) + return result + except ValueError: + for enum_value in enum_obj: + if enum_value.value.lower() == str(attr).lower(): + return enum_value.value + error = "{!r} is not valid value for enum {!r}" + raise SerializationError(error.format(attr, enum_obj)) + + @staticmethod + def serialize_bytearray(attr, **kwargs): + """Serialize bytearray into base-64 string. + + :param attr: Object to be serialized. + :rtype: str + """ + return b64encode(attr).decode() + + @staticmethod + def serialize_base64(attr, **kwargs): + """Serialize str into base-64 string. + + :param attr: Object to be serialized. + :rtype: str + """ + encoded = b64encode(attr).decode("ascii") + return encoded.strip("=").replace("+", "-").replace("/", "_") + + @staticmethod + def serialize_decimal(attr, **kwargs): + """Serialize Decimal object to float. + + :param attr: Object to be serialized. + :rtype: float + """ + return float(attr) + + @staticmethod + def serialize_long(attr, **kwargs): + """Serialize long (Py2) or int (Py3). + + :param attr: Object to be serialized. + :rtype: int/long + """ + return _long_type(attr) + + @staticmethod + def serialize_date(attr, **kwargs): + """Serialize Date object into ISO-8601 formatted string. + + :param Date attr: Object to be serialized. + :rtype: str + """ + if isinstance(attr, str): + attr = isodate.parse_date(attr) + t = "{:04}-{:02}-{:02}".format(attr.year, attr.month, attr.day) + return t + + @staticmethod + def serialize_time(attr, **kwargs): + """Serialize Time object into ISO-8601 formatted string. + + :param datetime.time attr: Object to be serialized. + :rtype: str + """ + if isinstance(attr, str): + attr = isodate.parse_time(attr) + t = "{:02}:{:02}:{:02}".format(attr.hour, attr.minute, attr.second) + if attr.microsecond: + t += ".{:02}".format(attr.microsecond) + return t + + @staticmethod + def serialize_duration(attr, **kwargs): + """Serialize TimeDelta object into ISO-8601 formatted string. + + :param TimeDelta attr: Object to be serialized. + :rtype: str + """ + if isinstance(attr, str): + attr = isodate.parse_duration(attr) + return isodate.duration_isoformat(attr) + + @staticmethod + def serialize_rfc(attr, **kwargs): + """Serialize Datetime object into RFC-1123 formatted string. + + :param Datetime attr: Object to be serialized. + :rtype: str + :raises: TypeError if format invalid. + """ + try: + if not attr.tzinfo: + _LOGGER.warning("Datetime with no tzinfo will be considered UTC.") + utc = attr.utctimetuple() + except AttributeError: + raise TypeError("RFC1123 object must be valid Datetime object.") + + return "{}, {:02} {} {:04} {:02}:{:02}:{:02} GMT".format( + Serializer.days[utc.tm_wday], + utc.tm_mday, + Serializer.months[utc.tm_mon], + utc.tm_year, + utc.tm_hour, + utc.tm_min, + utc.tm_sec, + ) + + @staticmethod + def serialize_iso(attr, **kwargs): + """Serialize Datetime object into ISO-8601 formatted string. + + :param Datetime attr: Object to be serialized. + :rtype: str + :raises: SerializationError if format invalid. + """ + if isinstance(attr, str): + attr = isodate.parse_datetime(attr) + try: + if not attr.tzinfo: + _LOGGER.warning("Datetime with no tzinfo will be considered UTC.") + utc = attr.utctimetuple() + if utc.tm_year > 9999 or utc.tm_year < 1: + raise OverflowError("Hit max or min date") + + microseconds = str(attr.microsecond).rjust(6, "0").rstrip("0").ljust(3, "0") + if microseconds: + microseconds = "." + microseconds + date = "{:04}-{:02}-{:02}T{:02}:{:02}:{:02}".format( + utc.tm_year, utc.tm_mon, utc.tm_mday, utc.tm_hour, utc.tm_min, utc.tm_sec + ) + return date + microseconds + "Z" + except (ValueError, OverflowError) as err: + msg = "Unable to serialize datetime object." + raise_with_traceback(SerializationError, msg, err) + except AttributeError as err: + msg = "ISO-8601 object must be valid Datetime object." + raise_with_traceback(TypeError, msg, err) + + @staticmethod + def serialize_unix(attr, **kwargs): + """Serialize Datetime object into IntTime format. + This is represented as seconds. + + :param Datetime attr: Object to be serialized. + :rtype: int + :raises: SerializationError if format invalid + """ + if isinstance(attr, int): + return attr + try: + if not attr.tzinfo: + _LOGGER.warning("Datetime with no tzinfo will be considered UTC.") + return int(calendar.timegm(attr.utctimetuple())) + except AttributeError: + raise TypeError("Unix time object must be valid Datetime object.") + + +def rest_key_extractor(attr, attr_desc, data): + key = attr_desc["key"] + working_data = data + + while "." in key: + dict_keys = _FLATTEN.split(key) + if len(dict_keys) == 1: + key = _decode_attribute_map_key(dict_keys[0]) + break + working_key = _decode_attribute_map_key(dict_keys[0]) + working_data = working_data.get(working_key, data) + if working_data is None: + # If at any point while following flatten JSON path see None, it means + # that all properties under are None as well + # https://github.com/Azure/msrest-for-python/issues/197 + return None + key = ".".join(dict_keys[1:]) + + return working_data.get(key) + + +def rest_key_case_insensitive_extractor(attr, attr_desc, data): + key = attr_desc["key"] + working_data = data + + while "." in key: + dict_keys = _FLATTEN.split(key) + if len(dict_keys) == 1: + key = _decode_attribute_map_key(dict_keys[0]) + break + working_key = _decode_attribute_map_key(dict_keys[0]) + working_data = attribute_key_case_insensitive_extractor(working_key, None, working_data) + if working_data is None: + # If at any point while following flatten JSON path see None, it means + # that all properties under are None as well + # https://github.com/Azure/msrest-for-python/issues/197 + return None + key = ".".join(dict_keys[1:]) + + if working_data: + return attribute_key_case_insensitive_extractor(key, None, working_data) + + +def last_rest_key_extractor(attr, attr_desc, data): + """Extract the attribute in "data" based on the last part of the JSON path key.""" + key = attr_desc["key"] + dict_keys = _FLATTEN.split(key) + return attribute_key_extractor(dict_keys[-1], None, data) + + +def last_rest_key_case_insensitive_extractor(attr, attr_desc, data): + """Extract the attribute in "data" based on the last part of the JSON path key. + + This is the case insensitive version of "last_rest_key_extractor" + """ + key = attr_desc["key"] + dict_keys = _FLATTEN.split(key) + return attribute_key_case_insensitive_extractor(dict_keys[-1], None, data) + + +def attribute_key_extractor(attr, _, data): + return data.get(attr) + + +def attribute_key_case_insensitive_extractor(attr, _, data): + found_key = None + lower_attr = attr.lower() + for key in data: + if lower_attr == key.lower(): + found_key = key + break + + return data.get(found_key) + + +def _extract_name_from_internal_type(internal_type): + """Given an internal type XML description, extract correct XML name with namespace. + + :param dict internal_type: An model type + :rtype: tuple + :returns: A tuple XML name + namespace dict + """ + internal_type_xml_map = getattr(internal_type, "_xml_map", {}) + xml_name = internal_type_xml_map.get("name", internal_type.__name__) + xml_ns = internal_type_xml_map.get("ns", None) + if xml_ns: + xml_name = "{}{}".format(xml_ns, xml_name) + return xml_name + + +def xml_key_extractor(attr, attr_desc, data): + if isinstance(data, dict): + return None + + # Test if this model is XML ready first + if not isinstance(data, ET.Element): + return None + + xml_desc = attr_desc.get("xml", {}) + xml_name = xml_desc.get("name", attr_desc["key"]) + + # Look for a children + is_iter_type = attr_desc["type"].startswith("[") + is_wrapped = xml_desc.get("wrapped", False) + internal_type = attr_desc.get("internalType", None) + internal_type_xml_map = getattr(internal_type, "_xml_map", {}) + + # Integrate namespace if necessary + xml_ns = xml_desc.get("ns", internal_type_xml_map.get("ns", None)) + if xml_ns: + xml_name = "{}{}".format(xml_ns, xml_name) + + # If it's an attribute, that's simple + if xml_desc.get("attr", False): + return data.get(xml_name) + + # If it's x-ms-text, that's simple too + if xml_desc.get("text", False): + return data.text + + # Scenario where I take the local name: + # - Wrapped node + # - Internal type is an enum (considered basic types) + # - Internal type has no XML/Name node + if is_wrapped or (internal_type and (issubclass(internal_type, Enum) or "name" not in internal_type_xml_map)): + children = data.findall(xml_name) + # If internal type has a local name and it's not a list, I use that name + elif not is_iter_type and internal_type and "name" in internal_type_xml_map: + xml_name = _extract_name_from_internal_type(internal_type) + children = data.findall(xml_name) + # That's an array + else: + if internal_type: # Complex type, ignore itemsName and use the complex type name + items_name = _extract_name_from_internal_type(internal_type) + else: + items_name = xml_desc.get("itemsName", xml_name) + children = data.findall(items_name) + + if len(children) == 0: + if is_iter_type: + if is_wrapped: + return None # is_wrapped no node, we want None + else: + return [] # not wrapped, assume empty list + return None # Assume it's not there, maybe an optional node. + + # If is_iter_type and not wrapped, return all found children + if is_iter_type: + if not is_wrapped: + return children + else: # Iter and wrapped, should have found one node only (the wrap one) + if len(children) != 1: + raise DeserializationError( + "Tried to deserialize an array not wrapped, and found several nodes '{}'. Maybe you should declare this array as wrapped?".format( + xml_name + ) + ) + return list(children[0]) # Might be empty list and that's ok. + + # Here it's not a itertype, we should have found one element only or empty + if len(children) > 1: + raise DeserializationError("Find several XML '{}' where it was not expected".format(xml_name)) + return children[0] + + +class Deserializer(object): + """Response object model deserializer. + + :param dict classes: Class type dictionary for deserializing complex types. + :ivar list key_extractors: Ordered list of extractors to be used by this deserializer. + """ + + basic_types = {str: "str", int: "int", bool: "bool", float: "float"} + + valid_date = re.compile(r"\d{4}[-]\d{2}[-]\d{2}T\d{2}:\d{2}:\d{2}" r"\.?\d*Z?[-+]?[\d{2}]?:?[\d{2}]?") + + def __init__(self, classes=None): + self.deserialize_type = { + "iso-8601": Deserializer.deserialize_iso, + "rfc-1123": Deserializer.deserialize_rfc, + "unix-time": Deserializer.deserialize_unix, + "duration": Deserializer.deserialize_duration, + "date": Deserializer.deserialize_date, + "time": Deserializer.deserialize_time, + "decimal": Deserializer.deserialize_decimal, + "long": Deserializer.deserialize_long, + "bytearray": Deserializer.deserialize_bytearray, + "base64": Deserializer.deserialize_base64, + "object": self.deserialize_object, + "[]": self.deserialize_iter, + "{}": self.deserialize_dict, + } + self.deserialize_expected_types = { + "duration": (isodate.Duration, datetime.timedelta), + "iso-8601": (datetime.datetime), + } + self.dependencies = dict(classes) if classes else {} + self.key_extractors = [rest_key_extractor, xml_key_extractor] + # Additional properties only works if the "rest_key_extractor" is used to + # extract the keys. Making it to work whatever the key extractor is too much + # complicated, with no real scenario for now. + # So adding a flag to disable additional properties detection. This flag should be + # used if your expect the deserialization to NOT come from a JSON REST syntax. + # Otherwise, result are unexpected + self.additional_properties_detection = True + + def __call__(self, target_obj, response_data, content_type=None): + """Call the deserializer to process a REST response. + + :param str target_obj: Target data type to deserialize to. + :param requests.Response response_data: REST response object. + :param str content_type: Swagger "produces" if available. + :raises: DeserializationError if deserialization fails. + :return: Deserialized object. + """ + data = self._unpack_content(response_data, content_type) + return self._deserialize(target_obj, data) + + def _deserialize(self, target_obj, data): + """Call the deserializer on a model. + + Data needs to be already deserialized as JSON or XML ElementTree + + :param str target_obj: Target data type to deserialize to. + :param object data: Object to deserialize. + :raises: DeserializationError if deserialization fails. + :return: Deserialized object. + """ + # This is already a model, go recursive just in case + if hasattr(data, "_attribute_map"): + constants = [name for name, config in getattr(data, "_validation", {}).items() if config.get("constant")] + try: + for attr, mapconfig in data._attribute_map.items(): + if attr in constants: + continue + value = getattr(data, attr) + if value is None: + continue + local_type = mapconfig["type"] + internal_data_type = local_type.strip("[]{}") + if internal_data_type not in self.dependencies or isinstance(internal_data_type, Enum): + continue + setattr(data, attr, self._deserialize(local_type, value)) + return data + except AttributeError: + return + + response, class_name = self._classify_target(target_obj, data) + + if isinstance(response, basestring): + return self.deserialize_data(data, response) + elif isinstance(response, type) and issubclass(response, Enum): + return self.deserialize_enum(data, response) + + if data is None: + return data + try: + attributes = response._attribute_map + d_attrs = {} + for attr, attr_desc in attributes.items(): + # Check empty string. If it's not empty, someone has a real "additionalProperties"... + if attr == "additional_properties" and attr_desc["key"] == "": + continue + raw_value = None + # Enhance attr_desc with some dynamic data + attr_desc = attr_desc.copy() # Do a copy, do not change the real one + internal_data_type = attr_desc["type"].strip("[]{}") + if internal_data_type in self.dependencies: + attr_desc["internalType"] = self.dependencies[internal_data_type] + + for key_extractor in self.key_extractors: + found_value = key_extractor(attr, attr_desc, data) + if found_value is not None: + if raw_value is not None and raw_value != found_value: + msg = ( + "Ignoring extracted value '%s' from %s for key '%s'" + " (duplicate extraction, follow extractors order)" + ) + _LOGGER.warning(msg, found_value, key_extractor, attr) + continue + raw_value = found_value + + value = self.deserialize_data(raw_value, attr_desc["type"]) + d_attrs[attr] = value + except (AttributeError, TypeError, KeyError) as err: + msg = "Unable to deserialize to object: " + class_name + raise_with_traceback(DeserializationError, msg, err) + else: + additional_properties = self._build_additional_properties(attributes, data) + return self._instantiate_model(response, d_attrs, additional_properties) + + def _build_additional_properties(self, attribute_map, data): + if not self.additional_properties_detection: + return None + if "additional_properties" in attribute_map and attribute_map.get("additional_properties", {}).get("key") != "": + # Check empty string. If it's not empty, someone has a real "additionalProperties" + return None + if isinstance(data, ET.Element): + data = {el.tag: el.text for el in data} + + known_keys = { + _decode_attribute_map_key(_FLATTEN.split(desc["key"])[0]) + for desc in attribute_map.values() + if desc["key"] != "" + } + present_keys = set(data.keys()) + missing_keys = present_keys - known_keys + return {key: data[key] for key in missing_keys} + + def _classify_target(self, target, data): + """Check to see whether the deserialization target object can + be classified into a subclass. + Once classification has been determined, initialize object. + + :param str target: The target object type to deserialize to. + :param str/dict data: The response data to deseralize. + """ + if target is None: + return None, None + + if isinstance(target, basestring): + try: + target = self.dependencies[target] + except KeyError: + return target, target + + try: + target = target._classify(data, self.dependencies) + except AttributeError: + pass # Target is not a Model, no classify + return target, target.__class__.__name__ + + def failsafe_deserialize(self, target_obj, data, content_type=None): + """Ignores any errors encountered in deserialization, + and falls back to not deserializing the object. Recommended + for use in error deserialization, as we want to return the + HttpResponseError to users, and not have them deal with + a deserialization error. + + :param str target_obj: The target object type to deserialize to. + :param str/dict data: The response data to deseralize. + :param str content_type: Swagger "produces" if available. + """ + try: + return self(target_obj, data, content_type=content_type) + except: + _LOGGER.debug( + "Ran into a deserialization error. Ignoring since this is failsafe deserialization", exc_info=True + ) + return None + + @staticmethod + def _unpack_content(raw_data, content_type=None): + """Extract the correct structure for deserialization. + + If raw_data is a PipelineResponse, try to extract the result of RawDeserializer. + if we can't, raise. Your Pipeline should have a RawDeserializer. + + If not a pipeline response and raw_data is bytes or string, use content-type + to decode it. If no content-type, try JSON. + + If raw_data is something else, bypass all logic and return it directly. + + :param raw_data: Data to be processed. + :param content_type: How to parse if raw_data is a string/bytes. + :raises JSONDecodeError: If JSON is requested and parsing is impossible. + :raises UnicodeDecodeError: If bytes is not UTF8 + """ + # Assume this is enough to detect a Pipeline Response without importing it + context = getattr(raw_data, "context", {}) + if context: + if RawDeserializer.CONTEXT_NAME in context: + return context[RawDeserializer.CONTEXT_NAME] + raise ValueError("This pipeline didn't have the RawDeserializer policy; can't deserialize") + + # Assume this is enough to recognize universal_http.ClientResponse without importing it + if hasattr(raw_data, "body"): + return RawDeserializer.deserialize_from_http_generics(raw_data.text(), raw_data.headers) + + # Assume this enough to recognize requests.Response without importing it. + if hasattr(raw_data, "_content_consumed"): + return RawDeserializer.deserialize_from_http_generics(raw_data.text, raw_data.headers) + + if isinstance(raw_data, (basestring, bytes)) or hasattr(raw_data, "read"): + return RawDeserializer.deserialize_from_text(raw_data, content_type) + return raw_data + + def _instantiate_model(self, response, attrs, additional_properties=None): + """Instantiate a response model passing in deserialized args. + + :param response: The response model class. + :param d_attrs: The deserialized response attributes. + """ + if callable(response): + subtype = getattr(response, "_subtype_map", {}) + try: + readonly = [k for k, v in response._validation.items() if v.get("readonly")] + const = [k for k, v in response._validation.items() if v.get("constant")] + kwargs = {k: v for k, v in attrs.items() if k not in subtype and k not in readonly + const} + response_obj = response(**kwargs) + for attr in readonly: + setattr(response_obj, attr, attrs.get(attr)) + if additional_properties: + response_obj.additional_properties = additional_properties + return response_obj + except TypeError as err: + msg = "Unable to deserialize {} into model {}. ".format(kwargs, response) + raise DeserializationError(msg + str(err)) + else: + try: + for attr, value in attrs.items(): + setattr(response, attr, value) + return response + except Exception as exp: + msg = "Unable to populate response model. " + msg += "Type: {}, Error: {}".format(type(response), exp) + raise DeserializationError(msg) + + def deserialize_data(self, data, data_type): + """Process data for deserialization according to data type. + + :param str data: The response string to be deserialized. + :param str data_type: The type to deserialize to. + :raises: DeserializationError if deserialization fails. + :return: Deserialized object. + """ + if data is None: + return data + + try: + if not data_type: + return data + if data_type in self.basic_types.values(): + return self.deserialize_basic(data, data_type) + if data_type in self.deserialize_type: + if isinstance(data, self.deserialize_expected_types.get(data_type, tuple())): + return data + + is_a_text_parsing_type = lambda x: x not in ["object", "[]", r"{}"] + if isinstance(data, ET.Element) and is_a_text_parsing_type(data_type) and not data.text: + return None + data_val = self.deserialize_type[data_type](data) + return data_val + + iter_type = data_type[0] + data_type[-1] + if iter_type in self.deserialize_type: + return self.deserialize_type[iter_type](data, data_type[1:-1]) + + obj_type = self.dependencies[data_type] + if issubclass(obj_type, Enum): + if isinstance(data, ET.Element): + data = data.text + return self.deserialize_enum(data, obj_type) + + except (ValueError, TypeError, AttributeError) as err: + msg = "Unable to deserialize response data." + msg += " Data: {}, {}".format(data, data_type) + raise_with_traceback(DeserializationError, msg, err) + else: + return self._deserialize(obj_type, data) + + def deserialize_iter(self, attr, iter_type): + """Deserialize an iterable. + + :param list attr: Iterable to be deserialized. + :param str iter_type: The type of object in the iterable. + :rtype: list + """ + if attr is None: + return None + if isinstance(attr, ET.Element): # If I receive an element here, get the children + attr = list(attr) + if not isinstance(attr, (list, set)): + raise DeserializationError("Cannot deserialize as [{}] an object of type {}".format(iter_type, type(attr))) + return [self.deserialize_data(a, iter_type) for a in attr] + + def deserialize_dict(self, attr, dict_type): + """Deserialize a dictionary. + + :param dict/list attr: Dictionary to be deserialized. Also accepts + a list of key, value pairs. + :param str dict_type: The object type of the items in the dictionary. + :rtype: dict + """ + if isinstance(attr, list): + return {x["key"]: self.deserialize_data(x["value"], dict_type) for x in attr} + + if isinstance(attr, ET.Element): + # Transform value into {"Key": "value"} + attr = {el.tag: el.text for el in attr} + return {k: self.deserialize_data(v, dict_type) for k, v in attr.items()} + + def deserialize_object(self, attr, **kwargs): + """Deserialize a generic object. + This will be handled as a dictionary. + + :param dict attr: Dictionary to be deserialized. + :rtype: dict + :raises: TypeError if non-builtin datatype encountered. + """ + if attr is None: + return None + if isinstance(attr, ET.Element): + # Do no recurse on XML, just return the tree as-is + return attr + if isinstance(attr, basestring): + return self.deserialize_basic(attr, "str") + obj_type = type(attr) + if obj_type in self.basic_types: + return self.deserialize_basic(attr, self.basic_types[obj_type]) + if obj_type is _long_type: + return self.deserialize_long(attr) + + if obj_type == dict: + deserialized = {} + for key, value in attr.items(): + try: + deserialized[key] = self.deserialize_object(value, **kwargs) + except ValueError: + deserialized[key] = None + return deserialized + + if obj_type == list: + deserialized = [] + for obj in attr: + try: + deserialized.append(self.deserialize_object(obj, **kwargs)) + except ValueError: + pass + return deserialized + + else: + error = "Cannot deserialize generic object with type: " + raise TypeError(error + str(obj_type)) + + def deserialize_basic(self, attr, data_type): + """Deserialize basic builtin data type from string. + Will attempt to convert to str, int, float and bool. + This function will also accept '1', '0', 'true' and 'false' as + valid bool values. + + :param str attr: response string to be deserialized. + :param str data_type: deserialization data type. + :rtype: str, int, float or bool + :raises: TypeError if string format is not valid. + """ + # If we're here, data is supposed to be a basic type. + # If it's still an XML node, take the text + if isinstance(attr, ET.Element): + attr = attr.text + if not attr: + if data_type == "str": + # None or '', node is empty string. + return "" + else: + # None or '', node with a strong type is None. + # Don't try to model "empty bool" or "empty int" + return None + + if data_type == "bool": + if attr in [True, False, 1, 0]: + return bool(attr) + elif isinstance(attr, basestring): + if attr.lower() in ["true", "1"]: + return True + elif attr.lower() in ["false", "0"]: + return False + raise TypeError("Invalid boolean value: {}".format(attr)) + + if data_type == "str": + return self.deserialize_unicode(attr) + return eval(data_type)(attr) # nosec + + @staticmethod + def deserialize_unicode(data): + """Preserve unicode objects in Python 2, otherwise return data + as a string. + + :param str data: response string to be deserialized. + :rtype: str or unicode + """ + # We might be here because we have an enum modeled as string, + # and we try to deserialize a partial dict with enum inside + if isinstance(data, Enum): + return data + + # Consider this is real string + try: + if isinstance(data, unicode): + return data + except NameError: + return str(data) + else: + return str(data) + + @staticmethod + def deserialize_enum(data, enum_obj): + """Deserialize string into enum object. + + If the string is not a valid enum value it will be returned as-is + and a warning will be logged. + + :param str data: Response string to be deserialized. If this value is + None or invalid it will be returned as-is. + :param Enum enum_obj: Enum object to deserialize to. + :rtype: Enum + """ + if isinstance(data, enum_obj) or data is None: + return data + if isinstance(data, Enum): + data = data.value + if isinstance(data, int): + # Workaround. We might consider remove it in the future. + # https://github.com/Azure/azure-rest-api-specs/issues/141 + try: + return list(enum_obj.__members__.values())[data] + except IndexError: + error = "{!r} is not a valid index for enum {!r}" + raise DeserializationError(error.format(data, enum_obj)) + try: + return enum_obj(str(data)) + except ValueError: + for enum_value in enum_obj: + if enum_value.value.lower() == str(data).lower(): + return enum_value + # We don't fail anymore for unknown value, we deserialize as a string + _LOGGER.warning("Deserializer is not able to find %s as valid enum in %s", data, enum_obj) + return Deserializer.deserialize_unicode(data) + + @staticmethod + def deserialize_bytearray(attr): + """Deserialize string into bytearray. + + :param str attr: response string to be deserialized. + :rtype: bytearray + :raises: TypeError if string format invalid. + """ + if isinstance(attr, ET.Element): + attr = attr.text + return bytearray(b64decode(attr)) + + @staticmethod + def deserialize_base64(attr): + """Deserialize base64 encoded string into string. + + :param str attr: response string to be deserialized. + :rtype: bytearray + :raises: TypeError if string format invalid. + """ + if isinstance(attr, ET.Element): + attr = attr.text + padding = "=" * (3 - (len(attr) + 3) % 4) + attr = attr + padding + encoded = attr.replace("-", "+").replace("_", "/") + return b64decode(encoded) + + @staticmethod + def deserialize_decimal(attr): + """Deserialize string into Decimal object. + + :param str attr: response string to be deserialized. + :rtype: Decimal + :raises: DeserializationError if string format invalid. + """ + if isinstance(attr, ET.Element): + attr = attr.text + try: + return decimal.Decimal(attr) + except decimal.DecimalException as err: + msg = "Invalid decimal {}".format(attr) + raise_with_traceback(DeserializationError, msg, err) + + @staticmethod + def deserialize_long(attr): + """Deserialize string into long (Py2) or int (Py3). + + :param str attr: response string to be deserialized. + :rtype: long or int + :raises: ValueError if string format invalid. + """ + if isinstance(attr, ET.Element): + attr = attr.text + return _long_type(attr) + + @staticmethod + def deserialize_duration(attr): + """Deserialize ISO-8601 formatted string into TimeDelta object. + + :param str attr: response string to be deserialized. + :rtype: TimeDelta + :raises: DeserializationError if string format invalid. + """ + if isinstance(attr, ET.Element): + attr = attr.text + try: + duration = isodate.parse_duration(attr) + except (ValueError, OverflowError, AttributeError) as err: + msg = "Cannot deserialize duration object." + raise_with_traceback(DeserializationError, msg, err) + else: + return duration + + @staticmethod + def deserialize_date(attr): + """Deserialize ISO-8601 formatted string into Date object. + + :param str attr: response string to be deserialized. + :rtype: Date + :raises: DeserializationError if string format invalid. + """ + if isinstance(attr, ET.Element): + attr = attr.text + if re.search(r"[^\W\d_]", attr, re.I + re.U): + raise DeserializationError("Date must have only digits and -. Received: %s" % attr) + # This must NOT use defaultmonth/defaultday. Using None ensure this raises an exception. + return isodate.parse_date(attr, defaultmonth=None, defaultday=None) + + @staticmethod + def deserialize_time(attr): + """Deserialize ISO-8601 formatted string into time object. + + :param str attr: response string to be deserialized. + :rtype: datetime.time + :raises: DeserializationError if string format invalid. + """ + if isinstance(attr, ET.Element): + attr = attr.text + if re.search(r"[^\W\d_]", attr, re.I + re.U): + raise DeserializationError("Date must have only digits and -. Received: %s" % attr) + return isodate.parse_time(attr) + + @staticmethod + def deserialize_rfc(attr): + """Deserialize RFC-1123 formatted string into Datetime object. + + :param str attr: response string to be deserialized. + :rtype: Datetime + :raises: DeserializationError if string format invalid. + """ + if isinstance(attr, ET.Element): + attr = attr.text + try: + parsed_date = email.utils.parsedate_tz(attr) + date_obj = datetime.datetime( + *parsed_date[:6], tzinfo=_FixedOffset(datetime.timedelta(minutes=(parsed_date[9] or 0) / 60)) + ) + if not date_obj.tzinfo: + date_obj = date_obj.astimezone(tz=TZ_UTC) + except ValueError as err: + msg = "Cannot deserialize to rfc datetime object." + raise_with_traceback(DeserializationError, msg, err) + else: + return date_obj + + @staticmethod + def deserialize_iso(attr): + """Deserialize ISO-8601 formatted string into Datetime object. + + :param str attr: response string to be deserialized. + :rtype: Datetime + :raises: DeserializationError if string format invalid. + """ + if isinstance(attr, ET.Element): + attr = attr.text + try: + attr = attr.upper() + match = Deserializer.valid_date.match(attr) + if not match: + raise ValueError("Invalid datetime string: " + attr) + + check_decimal = attr.split(".") + if len(check_decimal) > 1: + decimal_str = "" + for digit in check_decimal[1]: + if digit.isdigit(): + decimal_str += digit + else: + break + if len(decimal_str) > 6: + attr = attr.replace(decimal_str, decimal_str[0:6]) + + date_obj = isodate.parse_datetime(attr) + test_utc = date_obj.utctimetuple() + if test_utc.tm_year > 9999 or test_utc.tm_year < 1: + raise OverflowError("Hit max or min date") + except (ValueError, OverflowError, AttributeError) as err: + msg = "Cannot deserialize datetime object." + raise_with_traceback(DeserializationError, msg, err) + else: + return date_obj + + @staticmethod + def deserialize_unix(attr): + """Serialize Datetime object into IntTime format. + This is represented as seconds. + + :param int attr: Object to be serialized. + :rtype: Datetime + :raises: DeserializationError if format invalid + """ + if isinstance(attr, ET.Element): + attr = int(attr.text) + try: + date_obj = datetime.datetime.fromtimestamp(attr, TZ_UTC) + except ValueError as err: + msg = "Cannot deserialize to unix datetime object." + raise_with_traceback(DeserializationError, msg, err) + else: + return date_obj diff --git a/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/_vendor.py b/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/_vendor.py index e12b61dea670..54f238858ed8 100644 --- a/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/_vendor.py +++ b/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/_vendor.py @@ -6,8 +6,6 @@ # -------------------------------------------------------------------------- - - def _format_url_section(template, **kwargs): components = template.split("/") while components: @@ -15,7 +13,5 @@ def _format_url_section(template, **kwargs): return template.format(**kwargs) except KeyError as key: formatted_components = template.split("/") - components = [ - c for c in formatted_components if "{}".format(key.args[0]) not in c - ] + components = [c for c in formatted_components if "{}".format(key.args[0]) not in c] template = "/".join(components) diff --git a/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/aio/__init__.py b/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/aio/__init__.py index ba4168429cff..2dea9144b038 100644 --- a/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/aio/__init__.py +++ b/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/aio/__init__.py @@ -14,7 +14,8 @@ except ImportError: _patch_all = [] from ._patch import patch_sdk as _patch_sdk -__all__ = ['AzureSchemaRegistry'] + +__all__ = ["AzureSchemaRegistry"] __all__.extend([p for p in _patch_all if p not in __all__]) _patch_sdk() diff --git a/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/aio/_client.py b/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/aio/_client.py index 7564f82af790..9555fdad90e1 100644 --- a/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/aio/_client.py +++ b/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/aio/_client.py @@ -9,12 +9,12 @@ from copy import deepcopy from typing import Any, Awaitable, TYPE_CHECKING -from msrest import Deserializer, Serializer - from azure.core import AsyncPipelineClient from azure.core.rest import AsyncHttpResponse, HttpRequest +from .._serialization import Deserializer, Serializer from ._configuration import AzureSchemaRegistryConfiguration +from .operations import SchemaGroupsOperations, SchemaOperations if TYPE_CHECKING: # pylint: disable=unused-import,ungrouped-imports @@ -22,40 +22,37 @@ from azure.core.credentials_async import AsyncTokenCredential -class AzureSchemaRegistry: + +class AzureSchemaRegistry: # pylint: disable=client-accepts-api-version-keyword """Azure Schema Registry is as a central schema repository, with support for versioning, management, compatibility checking, and RBAC. + :ivar schema_groups: SchemaGroupsOperations operations + :vartype schema_groups: azure.schemaregistry._generated.aio.operations.SchemaGroupsOperations + :ivar schema: SchemaOperations operations + :vartype schema: azure.schemaregistry._generated.aio.operations.SchemaOperations :param endpoint: The Schema Registry service endpoint, for example - my-namespace.servicebus.windows.net. + my-namespace.servicebus.windows.net. Required. :type endpoint: str - :param credential: Credential needed for the client to connect to Azure. + :param credential: Credential needed for the client to connect to Azure. Required. :type credential: ~azure.core.credentials_async.AsyncTokenCredential :keyword api_version: Api Version. Default value is "2021-10". Note that overriding this default value may result in unsupported behavior. :paramtype api_version: str """ - def __init__( - self, - endpoint: str, - credential: "AsyncTokenCredential", - **kwargs: Any - ) -> None: - _endpoint = 'https://{endpoint}' + def __init__(self, endpoint: str, credential: "AsyncTokenCredential", **kwargs: Any) -> None: + _endpoint = "https://{endpoint}" self._config = AzureSchemaRegistryConfiguration(endpoint=endpoint, credential=credential, **kwargs) self._client = AsyncPipelineClient(base_url=_endpoint, config=self._config, **kwargs) self._serialize = Serializer() self._deserialize = Deserializer() self._serialize.client_side_validation = False + self.schema_groups = SchemaGroupsOperations(self._client, self._config, self._serialize, self._deserialize) + self.schema = SchemaOperations(self._client, self._config, self._serialize, self._deserialize) - - def send_request( - self, - request: HttpRequest, - **kwargs: Any - ) -> Awaitable[AsyncHttpResponse]: + def send_request(self, request: HttpRequest, **kwargs: Any) -> Awaitable[AsyncHttpResponse]: """Runs the network request through the client's chained policies. We have helper methods to create requests specific to this service in `azure.schemaregistry._generated.rest`. @@ -67,7 +64,7 @@ def send_request( >>> response = await client.send_request(request) - For more information on this code flow, see https://aka.ms/azsdk/python/protocol/quickstart + For more information on this code flow, see https://aka.ms/azsdk/dpcodegen/python/send_request :param request: The network request you want to make. Required. :type request: ~azure.core.rest.HttpRequest @@ -78,7 +75,7 @@ def send_request( request_copy = deepcopy(request) path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, 'str', skip_quote=True), + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), } request_copy.url = self._client.format_url(request_copy.url, **path_format_arguments) diff --git a/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/aio/_configuration.py b/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/aio/_configuration.py index da369b729cce..e4d600abc9ea 100644 --- a/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/aio/_configuration.py +++ b/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/aio/_configuration.py @@ -25,23 +25,18 @@ class AzureSchemaRegistryConfiguration(Configuration): # pylint: disable=too-ma attributes. :param endpoint: The Schema Registry service endpoint, for example - my-namespace.servicebus.windows.net. + my-namespace.servicebus.windows.net. Required. :type endpoint: str - :param credential: Credential needed for the client to connect to Azure. + :param credential: Credential needed for the client to connect to Azure. Required. :type credential: ~azure.core.credentials_async.AsyncTokenCredential :keyword api_version: Api Version. Default value is "2021-10". Note that overriding this default value may result in unsupported behavior. :paramtype api_version: str """ - def __init__( - self, - endpoint: str, - credential: "AsyncTokenCredential", - **kwargs: Any - ) -> None: + def __init__(self, endpoint: str, credential: "AsyncTokenCredential", **kwargs: Any) -> None: super(AzureSchemaRegistryConfiguration, self).__init__(**kwargs) - api_version = kwargs.pop('api_version', "2021-10") # type: str + api_version = kwargs.pop("api_version", "2021-10") # type: str if endpoint is None: raise ValueError("Parameter 'endpoint' must not be None.") @@ -51,22 +46,21 @@ def __init__( self.endpoint = endpoint self.credential = credential self.api_version = api_version - self.credential_scopes = kwargs.pop('credential_scopes', ['https://eventhubs.azure.net/.default']) - kwargs.setdefault('sdk_moniker', 'azureschemaregistry/{}'.format(VERSION)) + self.credential_scopes = kwargs.pop("credential_scopes", ["https://eventhubs.azure.net/.default"]) + kwargs.setdefault("sdk_moniker", "azureschemaregistry/{}".format(VERSION)) self._configure(**kwargs) - def _configure( - self, - **kwargs: Any - ) -> None: - self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - self.headers_policy = kwargs.get('headers_policy') or policies.HeadersPolicy(**kwargs) - self.proxy_policy = kwargs.get('proxy_policy') or policies.ProxyPolicy(**kwargs) - self.logging_policy = kwargs.get('logging_policy') or policies.NetworkTraceLoggingPolicy(**kwargs) - self.http_logging_policy = kwargs.get('http_logging_policy') or policies.HttpLoggingPolicy(**kwargs) - self.retry_policy = kwargs.get('retry_policy') or policies.AsyncRetryPolicy(**kwargs) - self.custom_hook_policy = kwargs.get('custom_hook_policy') or policies.CustomHookPolicy(**kwargs) - self.redirect_policy = kwargs.get('redirect_policy') or policies.AsyncRedirectPolicy(**kwargs) - self.authentication_policy = kwargs.get('authentication_policy') + def _configure(self, **kwargs: Any) -> None: + self.user_agent_policy = kwargs.get("user_agent_policy") or policies.UserAgentPolicy(**kwargs) + self.headers_policy = kwargs.get("headers_policy") or policies.HeadersPolicy(**kwargs) + self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs) + self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs) + self.http_logging_policy = kwargs.get("http_logging_policy") or policies.HttpLoggingPolicy(**kwargs) + self.retry_policy = kwargs.get("retry_policy") or policies.AsyncRetryPolicy(**kwargs) + self.custom_hook_policy = kwargs.get("custom_hook_policy") or policies.CustomHookPolicy(**kwargs) + self.redirect_policy = kwargs.get("redirect_policy") or policies.AsyncRedirectPolicy(**kwargs) + self.authentication_policy = kwargs.get("authentication_policy") if self.credential and not self.authentication_policy: - self.authentication_policy = policies.AsyncBearerTokenCredentialPolicy(self.credential, *self.credential_scopes, **kwargs) + self.authentication_policy = policies.AsyncBearerTokenCredentialPolicy( + self.credential, *self.credential_scopes, **kwargs + ) diff --git a/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/aio/_patch.py b/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/aio/_patch.py index 0ad201a8c586..f7dd32510333 100644 --- a/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/aio/_patch.py +++ b/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/aio/_patch.py @@ -10,6 +10,7 @@ __all__: List[str] = [] # Add all objects you want publicly available to users at this package level + def patch_sdk(): """Do not remove from this file. diff --git a/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/aio/operations/__init__.py b/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/aio/operations/__init__.py new file mode 100644 index 000000000000..3190cc00f080 --- /dev/null +++ b/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/aio/operations/__init__.py @@ -0,0 +1,21 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from ._operations import SchemaGroupsOperations +from ._operations import SchemaOperations + +from ._patch import __all__ as _patch_all +from ._patch import * # type: ignore # pylint: disable=unused-wildcard-import +from ._patch import patch_sdk as _patch_sdk + +__all__ = [ + "SchemaGroupsOperations", + "SchemaOperations", +] +__all__.extend([p for p in _patch_all if p not in __all__]) +_patch_sdk() diff --git a/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/aio/operations/_operations.py b/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/aio/operations/_operations.py new file mode 100644 index 000000000000..0e827420f607 --- /dev/null +++ b/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/aio/operations/_operations.py @@ -0,0 +1,468 @@ +# pylint: disable=too-many-lines +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +import sys +from typing import Any, AsyncIterator, Callable, Dict, IO, Optional, TypeVar, cast + +from azure.core.exceptions import ( + ClientAuthenticationError, + HttpResponseError, + ResourceExistsError, + ResourceNotFoundError, + map_error, +) +from azure.core.pipeline import PipelineResponse +from azure.core.pipeline.transport import AsyncHttpResponse +from azure.core.rest import HttpRequest +from azure.core.tracing.decorator_async import distributed_trace_async + +from ...rest import schema as rest_schema, schema_groups as rest_schema_groups + +if sys.version_info >= (3, 9): + from collections.abc import MutableMapping +else: + from typing import MutableMapping # type: ignore # pylint: disable=ungrouped-imports +JSON = MutableMapping[str, Any] # pylint: disable=unsubscriptable-object +T = TypeVar("T") +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] + + +class SchemaGroupsOperations: + """ + .. warning:: + **DO NOT** instantiate this class directly. + + Instead, you should access the following operations through + :class:`~azure.schemaregistry._generated.aio.AzureSchemaRegistry`'s + :attr:`schema_groups` attribute. + """ + + def __init__(self, *args, **kwargs) -> None: + input_args = list(args) + self._client = input_args.pop(0) if input_args else kwargs.pop("client") + self._config = input_args.pop(0) if input_args else kwargs.pop("config") + self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + + @distributed_trace_async + async def list(self, **kwargs: Any) -> JSON: + """Get list of schema groups. + + Gets the list of schema groups user is authorized to access. + + :return: JSON object + :rtype: JSON + :raises ~azure.core.exceptions.HttpResponseError: + + Example: + .. code-block:: python + + # response body for status code(s): 200 + response == { + "schemaGroups": [ + "str" # Optional. Array of schema groups. + ] + } + """ + error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = kwargs.pop("params", {}) or {} + + cls = kwargs.pop("cls", None) # type: ClsType[JSON] + + request = rest_schema_groups.build_list_request( + api_version=self._config.api_version, + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + request.url = self._client.format_url(request.url, **path_format_arguments) # type: ignore + + pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [200]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + if response.content: + deserialized = response.json() + else: + deserialized = None + + if cls: + return cls(pipeline_response, cast(JSON, deserialized), {}) + + return cast(JSON, deserialized) + + +class SchemaOperations: + """ + .. warning:: + **DO NOT** instantiate this class directly. + + Instead, you should access the following operations through + :class:`~azure.schemaregistry._generated.aio.AzureSchemaRegistry`'s + :attr:`schema` attribute. + """ + + def __init__(self, *args, **kwargs) -> None: + input_args = list(args) + self._client = input_args.pop(0) if input_args else kwargs.pop("client") + self._config = input_args.pop(0) if input_args else kwargs.pop("config") + self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + + @distributed_trace_async + async def get_by_id(self, id: str, **kwargs: Any) -> AsyncIterator[bytes]: + """Get a registered schema by its unique ID reference. + + Gets a registered schema by its unique ID. Azure Schema Registry guarantees that ID is unique + within a namespace. Operation response type is based on serialization of schema requested. + + :param id: References specific schema in registry namespace. Required. + :type id: str + :return: Async iterator of the response bytes + :rtype: AsyncIterator[bytes] + :raises ~azure.core.exceptions.HttpResponseError: + """ + error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = kwargs.pop("params", {}) or {} + + cls = kwargs.pop("cls", None) # type: ClsType[AsyncIterator[bytes]] + + request = rest_schema.build_get_by_id_request( + id=id, + api_version=self._config.api_version, + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + request.url = self._client.format_url(request.url, **path_format_arguments) # type: ignore + + pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=True, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [200]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + response_headers = {} + response_headers["Location"] = self._deserialize("str", response.headers.get("Location")) + response_headers["Content-Type"] = self._deserialize("str", response.headers.get("Content-Type")) + response_headers["Schema-Id"] = self._deserialize("str", response.headers.get("Schema-Id")) + response_headers["Schema-Id-Location"] = self._deserialize("str", response.headers.get("Schema-Id-Location")) + response_headers["Schema-Group-Name"] = self._deserialize("str", response.headers.get("Schema-Group-Name")) + response_headers["Schema-Name"] = self._deserialize("str", response.headers.get("Schema-Name")) + response_headers["Schema-Version"] = self._deserialize("int", response.headers.get("Schema-Version")) + + deserialized = response.iter_bytes() + + if cls: + return cls(pipeline_response, cast(AsyncIterator[bytes], deserialized), response_headers) + + return cast(AsyncIterator[bytes], deserialized) + + @distributed_trace_async + async def get_versions(self, group_name: str, schema_name: str, **kwargs: Any) -> JSON: + """Get list schema versions. + + Gets the list of all versions of one schema. + + :param group_name: Schema group under which schema is registered. Group's serialization type + should match the serialization type specified in the request. Required. + :type group_name: str + :param schema_name: Name of schema. Required. + :type schema_name: str + :return: JSON object + :rtype: JSON + :raises ~azure.core.exceptions.HttpResponseError: + + Example: + .. code-block:: python + + # response body for status code(s): 200 + response == { + "schemaVersions": [ + 0 # Optional. Array of schema groups. + ] + } + """ + error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = kwargs.pop("params", {}) or {} + + cls = kwargs.pop("cls", None) # type: ClsType[JSON] + + request = rest_schema.build_get_versions_request( + group_name=group_name, + schema_name=schema_name, + api_version=self._config.api_version, + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + request.url = self._client.format_url(request.url, **path_format_arguments) # type: ignore + + pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [200]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + if response.content: + deserialized = response.json() + else: + deserialized = None + + if cls: + return cls(pipeline_response, cast(JSON, deserialized), {}) + + return cast(JSON, deserialized) + + @distributed_trace_async + async def get_schema_version( + self, group_name: str, schema_name: str, schema_version: int, **kwargs: Any + ) -> AsyncIterator[bytes]: + """Get specific schema versions. + + Gets one specific version of one schema. + + :param group_name: Schema group under which schema is registered. Group's serialization type + should match the serialization type specified in the request. Required. + :type group_name: str + :param schema_name: Name of schema. Required. + :type schema_name: str + :param schema_version: Version number of specific schema. Required. + :type schema_version: int + :return: Async iterator of the response bytes + :rtype: AsyncIterator[bytes] + :raises ~azure.core.exceptions.HttpResponseError: + """ + error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = kwargs.pop("params", {}) or {} + + cls = kwargs.pop("cls", None) # type: ClsType[AsyncIterator[bytes]] + + request = rest_schema.build_get_schema_version_request( + group_name=group_name, + schema_name=schema_name, + schema_version=schema_version, + api_version=self._config.api_version, + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + request.url = self._client.format_url(request.url, **path_format_arguments) # type: ignore + + pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=True, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [200]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + response_headers = {} + response_headers["Location"] = self._deserialize("str", response.headers.get("Location")) + response_headers["Content-Type"] = self._deserialize("str", response.headers.get("Content-Type")) + response_headers["Schema-Id"] = self._deserialize("str", response.headers.get("Schema-Id")) + response_headers["Schema-Id-Location"] = self._deserialize("str", response.headers.get("Schema-Id-Location")) + response_headers["Schema-Group-Name"] = self._deserialize("str", response.headers.get("Schema-Group-Name")) + response_headers["Schema-Name"] = self._deserialize("str", response.headers.get("Schema-Name")) + response_headers["Schema-Version"] = self._deserialize("int", response.headers.get("Schema-Version")) + + deserialized = response.iter_bytes() + + if cls: + return cls(pipeline_response, cast(AsyncIterator[bytes], deserialized), response_headers) + + return cast(AsyncIterator[bytes], deserialized) + + @distributed_trace_async + async def query_id_by_content( # pylint: disable=inconsistent-return-statements + self, group_name: str, schema_name: str, schema_content: IO, **kwargs: Any + ) -> None: + """Get ID for existing schema. + + Gets the ID referencing an existing schema within the specified schema group, as matched by + schema content comparison. + + :param group_name: Schema group under which schema is registered. Group's serialization type + should match the serialization type specified in the request. Required. + :type group_name: str + :param schema_name: Name of schema. Required. + :type schema_name: str + :param schema_content: String representation (UTF-8) of the registered schema. Required. + :type schema_content: IO + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + error_map = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 415: HttpResponseError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = kwargs.pop("params", {}) or {} + + content_type = kwargs.pop("content_type") # type: str + cls = kwargs.pop("cls", None) # type: ClsType[None] + + _content = schema_content + if not content_type: + raise TypeError( + "Missing required keyword-only argument: content_type. Known values are:" + + "'application/json; serialization=Avro'" + ) + + request = rest_schema.build_query_id_by_content_request( + group_name=group_name, + schema_name=schema_name, + content_type=content_type, + api_version=self._config.api_version, + content=_content, + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + request.url = self._client.format_url(request.url, **path_format_arguments) # type: ignore + + pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [204]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + response_headers = {} + response_headers["Location"] = self._deserialize("str", response.headers.get("Location")) + response_headers["Schema-Id"] = self._deserialize("str", response.headers.get("Schema-Id")) + response_headers["Schema-Id-Location"] = self._deserialize("str", response.headers.get("Schema-Id-Location")) + response_headers["Schema-Group-Name"] = self._deserialize("str", response.headers.get("Schema-Group-Name")) + response_headers["Schema-Name"] = self._deserialize("str", response.headers.get("Schema-Name")) + response_headers["Schema-Version"] = self._deserialize("int", response.headers.get("Schema-Version")) + + if cls: + return cls(pipeline_response, None, response_headers) + + @distributed_trace_async + async def register( # pylint: disable=inconsistent-return-statements + self, group_name: str, schema_name: str, schema_content: IO, **kwargs: Any + ) -> None: + """Register new schema. + + Register new schema. If schema of specified name does not exist in specified group, schema is + created at version 1. If schema of specified name exists already in specified group, schema is + created at latest version + 1. + + :param group_name: Schema group under which schema should be registered. Group's serialization + type should match the serialization type specified in the request. Required. + :type group_name: str + :param schema_name: Name of schema. Required. + :type schema_name: str + :param schema_content: String representation (UTF-8) of the schema being registered. Required. + :type schema_content: IO + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + error_map = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 415: HttpResponseError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = kwargs.pop("params", {}) or {} + + content_type = kwargs.pop("content_type") # type: str + cls = kwargs.pop("cls", None) # type: ClsType[None] + + _content = schema_content + if not content_type: + raise TypeError( + "Missing required keyword-only argument: content_type. Known values are:" + + "'application/json; serialization=Avro'" + ) + + request = rest_schema.build_register_request( + group_name=group_name, + schema_name=schema_name, + content_type=content_type, + api_version=self._config.api_version, + content=_content, + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + request.url = self._client.format_url(request.url, **path_format_arguments) # type: ignore + + pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [204]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + response_headers = {} + response_headers["Location"] = self._deserialize("str", response.headers.get("Location")) + response_headers["Schema-Id"] = self._deserialize("str", response.headers.get("Schema-Id")) + response_headers["Schema-Id-Location"] = self._deserialize("str", response.headers.get("Schema-Id-Location")) + response_headers["Schema-Group-Name"] = self._deserialize("str", response.headers.get("Schema-Group-Name")) + response_headers["Schema-Name"] = self._deserialize("str", response.headers.get("Schema-Name")) + response_headers["Schema-Version"] = self._deserialize("int", response.headers.get("Schema-Version")) + + if cls: + return cls(pipeline_response, None, response_headers) diff --git a/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/aio/operations/_patch.py b/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/aio/operations/_patch.py new file mode 100644 index 000000000000..f7dd32510333 --- /dev/null +++ b/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/aio/operations/_patch.py @@ -0,0 +1,20 @@ +# ------------------------------------ +# Copyright (c) Microsoft Corporation. +# Licensed under the MIT License. +# ------------------------------------ +"""Customize generated code here. + +Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize +""" +from typing import List + +__all__: List[str] = [] # Add all objects you want publicly available to users at this package level + + +def patch_sdk(): + """Do not remove from this file. + + `patch_sdk` is a last resort escape hatch that allows you to do customizations + you can't accomplish using the techniques described in + https://aka.ms/azsdk/python/dpcodegen/python/customize + """ diff --git a/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/operations/__init__.py b/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/operations/__init__.py new file mode 100644 index 000000000000..3190cc00f080 --- /dev/null +++ b/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/operations/__init__.py @@ -0,0 +1,21 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from ._operations import SchemaGroupsOperations +from ._operations import SchemaOperations + +from ._patch import __all__ as _patch_all +from ._patch import * # type: ignore # pylint: disable=unused-wildcard-import +from ._patch import patch_sdk as _patch_sdk + +__all__ = [ + "SchemaGroupsOperations", + "SchemaOperations", +] +__all__.extend([p for p in _patch_all if p not in __all__]) +_patch_sdk() diff --git a/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/operations/_operations.py b/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/operations/_operations.py new file mode 100644 index 000000000000..dd9a619d3743 --- /dev/null +++ b/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/operations/_operations.py @@ -0,0 +1,468 @@ +# pylint: disable=too-many-lines +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +import sys +from typing import Any, Callable, Dict, IO, Iterator, Optional, TypeVar, cast + +from azure.core.exceptions import ( + ClientAuthenticationError, + HttpResponseError, + ResourceExistsError, + ResourceNotFoundError, + map_error, +) +from azure.core.pipeline import PipelineResponse +from azure.core.pipeline.transport import HttpResponse +from azure.core.rest import HttpRequest +from azure.core.tracing.decorator import distributed_trace + +from ..rest import schema as rest_schema, schema_groups as rest_schema_groups + +if sys.version_info >= (3, 9): + from collections.abc import MutableMapping +else: + from typing import MutableMapping # type: ignore # pylint: disable=ungrouped-imports +JSON = MutableMapping[str, Any] # pylint: disable=unsubscriptable-object +T = TypeVar("T") +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] + + +class SchemaGroupsOperations: + """ + .. warning:: + **DO NOT** instantiate this class directly. + + Instead, you should access the following operations through + :class:`~azure.schemaregistry._generated.AzureSchemaRegistry`'s + :attr:`schema_groups` attribute. + """ + + def __init__(self, *args, **kwargs): + input_args = list(args) + self._client = input_args.pop(0) if input_args else kwargs.pop("client") + self._config = input_args.pop(0) if input_args else kwargs.pop("config") + self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + + @distributed_trace + def list(self, **kwargs: Any) -> JSON: + """Get list of schema groups. + + Gets the list of schema groups user is authorized to access. + + :return: JSON object + :rtype: JSON + :raises ~azure.core.exceptions.HttpResponseError: + + Example: + .. code-block:: python + + # response body for status code(s): 200 + response == { + "schemaGroups": [ + "str" # Optional. Array of schema groups. + ] + } + """ + error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = kwargs.pop("params", {}) or {} + + cls = kwargs.pop("cls", None) # type: ClsType[JSON] + + request = rest_schema_groups.build_list_request( + api_version=self._config.api_version, + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + request.url = self._client.format_url(request.url, **path_format_arguments) # type: ignore + + pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [200]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + if response.content: + deserialized = response.json() + else: + deserialized = None + + if cls: + return cls(pipeline_response, cast(JSON, deserialized), {}) + + return cast(JSON, deserialized) + + +class SchemaOperations: + """ + .. warning:: + **DO NOT** instantiate this class directly. + + Instead, you should access the following operations through + :class:`~azure.schemaregistry._generated.AzureSchemaRegistry`'s + :attr:`schema` attribute. + """ + + def __init__(self, *args, **kwargs): + input_args = list(args) + self._client = input_args.pop(0) if input_args else kwargs.pop("client") + self._config = input_args.pop(0) if input_args else kwargs.pop("config") + self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + + @distributed_trace + def get_by_id(self, id: str, **kwargs: Any) -> Iterator[bytes]: + """Get a registered schema by its unique ID reference. + + Gets a registered schema by its unique ID. Azure Schema Registry guarantees that ID is unique + within a namespace. Operation response type is based on serialization of schema requested. + + :param id: References specific schema in registry namespace. Required. + :type id: str + :return: Iterator of the response bytes + :rtype: Iterator[bytes] + :raises ~azure.core.exceptions.HttpResponseError: + """ + error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = kwargs.pop("params", {}) or {} + + cls = kwargs.pop("cls", None) # type: ClsType[Iterator[bytes]] + + request = rest_schema.build_get_by_id_request( + id=id, + api_version=self._config.api_version, + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + request.url = self._client.format_url(request.url, **path_format_arguments) # type: ignore + + pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=True, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [200]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + response_headers = {} + response_headers["Location"] = self._deserialize("str", response.headers.get("Location")) + response_headers["Content-Type"] = self._deserialize("str", response.headers.get("Content-Type")) + response_headers["Schema-Id"] = self._deserialize("str", response.headers.get("Schema-Id")) + response_headers["Schema-Id-Location"] = self._deserialize("str", response.headers.get("Schema-Id-Location")) + response_headers["Schema-Group-Name"] = self._deserialize("str", response.headers.get("Schema-Group-Name")) + response_headers["Schema-Name"] = self._deserialize("str", response.headers.get("Schema-Name")) + response_headers["Schema-Version"] = self._deserialize("int", response.headers.get("Schema-Version")) + + deserialized = response.iter_bytes() + + if cls: + return cls(pipeline_response, cast(Iterator[bytes], deserialized), response_headers) + + return cast(Iterator[bytes], deserialized) + + @distributed_trace + def get_versions(self, group_name: str, schema_name: str, **kwargs: Any) -> JSON: + """Get list schema versions. + + Gets the list of all versions of one schema. + + :param group_name: Schema group under which schema is registered. Group's serialization type + should match the serialization type specified in the request. Required. + :type group_name: str + :param schema_name: Name of schema. Required. + :type schema_name: str + :return: JSON object + :rtype: JSON + :raises ~azure.core.exceptions.HttpResponseError: + + Example: + .. code-block:: python + + # response body for status code(s): 200 + response == { + "schemaVersions": [ + 0 # Optional. Array of schema groups. + ] + } + """ + error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = kwargs.pop("params", {}) or {} + + cls = kwargs.pop("cls", None) # type: ClsType[JSON] + + request = rest_schema.build_get_versions_request( + group_name=group_name, + schema_name=schema_name, + api_version=self._config.api_version, + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + request.url = self._client.format_url(request.url, **path_format_arguments) # type: ignore + + pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [200]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + if response.content: + deserialized = response.json() + else: + deserialized = None + + if cls: + return cls(pipeline_response, cast(JSON, deserialized), {}) + + return cast(JSON, deserialized) + + @distributed_trace + def get_schema_version( + self, group_name: str, schema_name: str, schema_version: int, **kwargs: Any + ) -> Iterator[bytes]: + """Get specific schema versions. + + Gets one specific version of one schema. + + :param group_name: Schema group under which schema is registered. Group's serialization type + should match the serialization type specified in the request. Required. + :type group_name: str + :param schema_name: Name of schema. Required. + :type schema_name: str + :param schema_version: Version number of specific schema. Required. + :type schema_version: int + :return: Iterator of the response bytes + :rtype: Iterator[bytes] + :raises ~azure.core.exceptions.HttpResponseError: + """ + error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = kwargs.pop("params", {}) or {} + + cls = kwargs.pop("cls", None) # type: ClsType[Iterator[bytes]] + + request = rest_schema.build_get_schema_version_request( + group_name=group_name, + schema_name=schema_name, + schema_version=schema_version, + api_version=self._config.api_version, + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + request.url = self._client.format_url(request.url, **path_format_arguments) # type: ignore + + pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=True, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [200]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + response_headers = {} + response_headers["Location"] = self._deserialize("str", response.headers.get("Location")) + response_headers["Content-Type"] = self._deserialize("str", response.headers.get("Content-Type")) + response_headers["Schema-Id"] = self._deserialize("str", response.headers.get("Schema-Id")) + response_headers["Schema-Id-Location"] = self._deserialize("str", response.headers.get("Schema-Id-Location")) + response_headers["Schema-Group-Name"] = self._deserialize("str", response.headers.get("Schema-Group-Name")) + response_headers["Schema-Name"] = self._deserialize("str", response.headers.get("Schema-Name")) + response_headers["Schema-Version"] = self._deserialize("int", response.headers.get("Schema-Version")) + + deserialized = response.iter_bytes() + + if cls: + return cls(pipeline_response, cast(Iterator[bytes], deserialized), response_headers) + + return cast(Iterator[bytes], deserialized) + + @distributed_trace + def query_id_by_content( # pylint: disable=inconsistent-return-statements + self, group_name: str, schema_name: str, schema_content: IO, **kwargs: Any + ) -> None: + """Get ID for existing schema. + + Gets the ID referencing an existing schema within the specified schema group, as matched by + schema content comparison. + + :param group_name: Schema group under which schema is registered. Group's serialization type + should match the serialization type specified in the request. Required. + :type group_name: str + :param schema_name: Name of schema. Required. + :type schema_name: str + :param schema_content: String representation (UTF-8) of the registered schema. Required. + :type schema_content: IO + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + error_map = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 415: HttpResponseError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = kwargs.pop("params", {}) or {} + + content_type = kwargs.pop("content_type") # type: str + cls = kwargs.pop("cls", None) # type: ClsType[None] + + _content = schema_content + if not content_type: + raise TypeError( + "Missing required keyword-only argument: content_type. Known values are:" + + "'application/json; serialization=Avro'" + ) + + request = rest_schema.build_query_id_by_content_request( + group_name=group_name, + schema_name=schema_name, + content_type=content_type, + api_version=self._config.api_version, + content=_content, + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + request.url = self._client.format_url(request.url, **path_format_arguments) # type: ignore + + pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [204]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + response_headers = {} + response_headers["Location"] = self._deserialize("str", response.headers.get("Location")) + response_headers["Schema-Id"] = self._deserialize("str", response.headers.get("Schema-Id")) + response_headers["Schema-Id-Location"] = self._deserialize("str", response.headers.get("Schema-Id-Location")) + response_headers["Schema-Group-Name"] = self._deserialize("str", response.headers.get("Schema-Group-Name")) + response_headers["Schema-Name"] = self._deserialize("str", response.headers.get("Schema-Name")) + response_headers["Schema-Version"] = self._deserialize("int", response.headers.get("Schema-Version")) + + if cls: + return cls(pipeline_response, None, response_headers) + + @distributed_trace + def register( # pylint: disable=inconsistent-return-statements + self, group_name: str, schema_name: str, schema_content: IO, **kwargs: Any + ) -> None: + """Register new schema. + + Register new schema. If schema of specified name does not exist in specified group, schema is + created at version 1. If schema of specified name exists already in specified group, schema is + created at latest version + 1. + + :param group_name: Schema group under which schema should be registered. Group's serialization + type should match the serialization type specified in the request. Required. + :type group_name: str + :param schema_name: Name of schema. Required. + :type schema_name: str + :param schema_content: String representation (UTF-8) of the schema being registered. Required. + :type schema_content: IO + :return: None + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + error_map = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 415: HttpResponseError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = kwargs.pop("params", {}) or {} + + content_type = kwargs.pop("content_type") # type: str + cls = kwargs.pop("cls", None) # type: ClsType[None] + + _content = schema_content + if not content_type: + raise TypeError( + "Missing required keyword-only argument: content_type. Known values are:" + + "'application/json; serialization=Avro'" + ) + + request = rest_schema.build_register_request( + group_name=group_name, + schema_name=schema_name, + content_type=content_type, + api_version=self._config.api_version, + content=_content, + headers=_headers, + params=_params, + ) + path_format_arguments = { + "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), + } + request.url = self._client.format_url(request.url, **path_format_arguments) # type: ignore + + pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [204]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + response_headers = {} + response_headers["Location"] = self._deserialize("str", response.headers.get("Location")) + response_headers["Schema-Id"] = self._deserialize("str", response.headers.get("Schema-Id")) + response_headers["Schema-Id-Location"] = self._deserialize("str", response.headers.get("Schema-Id-Location")) + response_headers["Schema-Group-Name"] = self._deserialize("str", response.headers.get("Schema-Group-Name")) + response_headers["Schema-Name"] = self._deserialize("str", response.headers.get("Schema-Name")) + response_headers["Schema-Version"] = self._deserialize("int", response.headers.get("Schema-Version")) + + if cls: + return cls(pipeline_response, None, response_headers) diff --git a/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/operations/_patch.py b/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/operations/_patch.py new file mode 100644 index 000000000000..f7dd32510333 --- /dev/null +++ b/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/operations/_patch.py @@ -0,0 +1,20 @@ +# ------------------------------------ +# Copyright (c) Microsoft Corporation. +# Licensed under the MIT License. +# ------------------------------------ +"""Customize generated code here. + +Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize +""" +from typing import List + +__all__: List[str] = [] # Add all objects you want publicly available to users at this package level + + +def patch_sdk(): + """Do not remove from this file. + + `patch_sdk` is a last resort escape hatch that allows you to do customizations + you can't accomplish using the techniques described in + https://aka.ms/azsdk/python/dpcodegen/python/customize + """ diff --git a/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/rest/__init__.py b/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/rest/__init__.py index 8e6cf7ef9438..0af9b28f6607 100644 --- a/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/rest/__init__.py +++ b/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/rest/__init__.py @@ -3,4 +3,4 @@ # Licensed under the MIT License. See License.txt in the project root for license information. # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- \ No newline at end of file +# -------------------------------------------------------------------------- diff --git a/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/rest/schema/__init__.py b/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/rest/schema/__init__.py index 6a8648c12d82..7ace94c9c3b1 100644 --- a/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/rest/schema/__init__.py +++ b/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/rest/schema/__init__.py @@ -6,20 +6,16 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -try: - from ._request_builders_py3 import build_get_by_id_request - from ._request_builders_py3 import build_get_versions_request - from ._request_builders_py3 import build_query_id_by_content_request - from ._request_builders_py3 import build_register_request -except (SyntaxError, ImportError): - from ._request_builders import build_get_by_id_request # type: ignore - from ._request_builders import build_get_versions_request # type: ignore - from ._request_builders import build_query_id_by_content_request # type: ignore - from ._request_builders import build_register_request # type: ignore +from ._request_builders import build_get_by_id_request +from ._request_builders import build_get_versions_request +from ._request_builders import build_get_schema_version_request +from ._request_builders import build_query_id_by_content_request +from ._request_builders import build_register_request __all__ = [ - 'build_get_by_id_request', - 'build_get_versions_request', - 'build_query_id_by_content_request', - 'build_register_request', + "build_get_by_id_request", + "build_get_versions_request", + "build_get_schema_version_request", + "build_query_id_by_content_request", + "build_register_request", ] diff --git a/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/rest/schema/_request_builders.py b/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/rest/schema/_request_builders.py index 99d6c49f92d9..71c1300ddc9d 100644 --- a/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/rest/schema/_request_builders.py +++ b/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/rest/schema/_request_builders.py @@ -5,41 +5,31 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import TYPE_CHECKING - -from msrest import Serializer +from typing import Any, IO from azure.core.rest import HttpRequest from azure.core.utils import case_insensitive_dict +from ..._serialization import Serializer from ..._vendor import _format_url_section -if TYPE_CHECKING: - # pylint: disable=unused-import,ungrouped-imports - from typing import Any, Optional - _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False -# fmt: off -def build_get_by_id_request( - id, # type: str - **kwargs # type: Any -): - # type: (...) -> HttpRequest +def build_get_by_id_request(id: str, **kwargs: Any) -> HttpRequest: """Get a registered schema by its unique ID reference. Gets a registered schema by its unique ID. Azure Schema Registry guarantees that ID is unique within a namespace. Operation response type is based on serialization of schema requested. - See https://aka.ms/azsdk/python/protocol/quickstart for how to incorporate this request builder - into your code flow. + See https://aka.ms/azsdk/dpcodegen/python/send_request for how to incorporate this request + builder into your code flow. - :param id: References specific schema in registry namespace. + :param id: References specific schema in registry namespace. Required. :type id: str :return: Returns an :class:`~azure.core.rest.HttpRequest` that you will pass to the client's - `send_request` method. See https://aka.ms/azsdk/python/protocol/quickstart for how to + `send_request` method. See https://aka.ms/azsdk/dpcodegen/python/send_request for how to incorporate this response into your code flow. :rtype: ~azure.core.rest.HttpRequest """ @@ -47,120 +37,139 @@ def build_get_by_id_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop('api_version', _params.pop('api-version', "2021-10")) # type: str - accept = _headers.pop('Accept', "application/json; serialization=Avro") + api_version = kwargs.pop("api_version", _params.pop("api-version", "2021-10")) # type: str + accept = _headers.pop("Accept", "application/json; serialization=Avro") # Construct URL _url = "/$schemaGroups/$schemas/{id}" path_format_arguments = { - "id": _SERIALIZER.url("id", id, 'str'), + "id": _SERIALIZER.url("id", id, "str"), } _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - _params['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers - _headers['Accept'] = _SERIALIZER.header("accept", accept, 'str') - - return HttpRequest( - method="GET", - url=_url, - params=_params, - headers=_headers, - **kwargs - ) - - -def build_get_versions_request( - group_name, # type: str - schema_name, # type: str - **kwargs # type: Any -): - # type: (...) -> HttpRequest + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") + + return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs) + + +def build_get_versions_request(group_name: str, schema_name: str, **kwargs: Any) -> HttpRequest: """Get list schema versions. Gets the list of all versions of one schema. - See https://aka.ms/azsdk/python/protocol/quickstart for how to incorporate this request builder - into your code flow. + See https://aka.ms/azsdk/dpcodegen/python/send_request for how to incorporate this request + builder into your code flow. :param group_name: Schema group under which schema is registered. Group's serialization type - should match the serialization type specified in the request. + should match the serialization type specified in the request. Required. :type group_name: str - :param schema_name: Name of schema. + :param schema_name: Name of schema. Required. :type schema_name: str :return: Returns an :class:`~azure.core.rest.HttpRequest` that you will pass to the client's - `send_request` method. See https://aka.ms/azsdk/python/protocol/quickstart for how to + `send_request` method. See https://aka.ms/azsdk/dpcodegen/python/send_request for how to incorporate this response into your code flow. :rtype: ~azure.core.rest.HttpRequest + """ + + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", "2021-10")) # type: str + accept = _headers.pop("Accept", "application/json") + + # Construct URL + _url = "/$schemaGroups/{groupName}/schemas/{schemaName}/versions" + path_format_arguments = { + "groupName": _SERIALIZER.url("group_name", group_name, "str"), + "schemaName": _SERIALIZER.url( + "schema_name", schema_name, "str", max_length=50, pattern=r"^[A-Za-z0-9][^\\/$:]*$" + ), + } + + _url = _format_url_section(_url, **path_format_arguments) + + # Construct parameters + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") - Example: - .. code-block:: python + # Construct headers + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") + + return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs) + + +def build_get_schema_version_request( + group_name: str, schema_name: str, schema_version: int, **kwargs: Any +) -> HttpRequest: + """Get specific schema versions. + + Gets one specific version of one schema. - # response body for status code(s): 200 - response.json() == { - "schemaVersions": [ - 0 # Optional. Array of schema groups. - ] - } + See https://aka.ms/azsdk/dpcodegen/python/send_request for how to incorporate this request + builder into your code flow. + + :param group_name: Schema group under which schema is registered. Group's serialization type + should match the serialization type specified in the request. Required. + :type group_name: str + :param schema_name: Name of schema. Required. + :type schema_name: str + :param schema_version: Version number of specific schema. Required. + :type schema_version: int + :return: Returns an :class:`~azure.core.rest.HttpRequest` that you will pass to the client's + `send_request` method. See https://aka.ms/azsdk/dpcodegen/python/send_request for how to + incorporate this response into your code flow. + :rtype: ~azure.core.rest.HttpRequest """ _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop('api_version', _params.pop('api-version', "2021-10")) # type: str - accept = _headers.pop('Accept', "application/json") + api_version = kwargs.pop("api_version", _params.pop("api-version", "2021-10")) # type: str + accept = _headers.pop("Accept", "application/json") # Construct URL - _url = "/$schemaGroups/{groupName}/schemas/{schemaName}/versions" + _url = "/$schemaGroups/{groupName}/schemas/{schemaName}/versions/{schemaVersion}" path_format_arguments = { - "groupName": _SERIALIZER.url("group_name", group_name, 'str'), - "schemaName": _SERIALIZER.url("schema_name", schema_name, 'str', max_length=50, min_length=0, pattern=r'^[A-Za-z0-9][^\\/$:]*$'), + "groupName": _SERIALIZER.url("group_name", group_name, "str"), + "schemaName": _SERIALIZER.url( + "schema_name", schema_name, "str", max_length=50, pattern=r"^[A-Za-z0-9][^\\/$:]*$" + ), + "schemaVersion": _SERIALIZER.url("schema_version", schema_version, "int"), } _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - _params['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers - _headers['Accept'] = _SERIALIZER.header("accept", accept, 'str') - - return HttpRequest( - method="GET", - url=_url, - params=_params, - headers=_headers, - **kwargs - ) - - -def build_query_id_by_content_request( - group_name, # type: str - schema_name, # type: str - **kwargs # type: Any -): - # type: (...) -> HttpRequest + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") + + return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs) + + +def build_query_id_by_content_request(group_name: str, schema_name: str, *, content: IO, **kwargs: Any) -> HttpRequest: """Get ID for existing schema. Gets the ID referencing an existing schema within the specified schema group, as matched by schema content comparison. - See https://aka.ms/azsdk/python/protocol/quickstart for how to incorporate this request builder - into your code flow. + See https://aka.ms/azsdk/dpcodegen/python/send_request for how to incorporate this request + builder into your code flow. :param group_name: Schema group under which schema is registered. Group's serialization type - should match the serialization type specified in the request. + should match the serialization type specified in the request. Required. :type group_name: str - :param schema_name: Name of schema. + :param schema_name: Name of schema. Required. :type schema_name: str - :keyword content: Pass in binary content you want in the body of the request (typically bytes, - a byte iterator, or stream input). String representation (UTF-8) of the registered schema. - :paramtype content: any + :keyword content: String representation (UTF-8) of the registered schema. Required. + :paramtype content: IO :return: Returns an :class:`~azure.core.rest.HttpRequest` that you will pass to the client's - `send_request` method. See https://aka.ms/azsdk/python/protocol/quickstart for how to + `send_request` method. See https://aka.ms/azsdk/dpcodegen/python/send_request for how to incorporate this response into your code flow. :rtype: ~azure.core.rest.HttpRequest """ @@ -168,62 +177,50 @@ def build_query_id_by_content_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop('api_version', _params.pop('api-version', "2021-10")) # type: str - content_type = kwargs.pop('content_type', _headers.pop('Content-Type', None)) # type: Optional[str] - accept = _headers.pop('Accept', "application/json") + content_type = kwargs.pop("content_type") # type: str + api_version = kwargs.pop("api_version", _params.pop("api-version", "2021-10")) # type: str + accept = _headers.pop("Accept", "application/json") # Construct URL _url = "/$schemaGroups/{groupName}/schemas/{schemaName}:get-id" path_format_arguments = { - "groupName": _SERIALIZER.url("group_name", group_name, 'str'), - "schemaName": _SERIALIZER.url("schema_name", schema_name, 'str', max_length=50, min_length=0, pattern=r'^[A-Za-z0-9][^\\/$:]*$'), + "groupName": _SERIALIZER.url("group_name", group_name, "str"), + "schemaName": _SERIALIZER.url( + "schema_name", schema_name, "str", max_length=50, pattern=r"^[A-Za-z0-9][^\\/$:]*$" + ), } _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - _params['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers - if content_type is not None: - _headers['Content-Type'] = _SERIALIZER.header("content_type", content_type, 'str') - _headers['Accept'] = _SERIALIZER.header("accept", accept, 'str') - - return HttpRequest( - method="POST", - url=_url, - params=_params, - headers=_headers, - **kwargs - ) - - -def build_register_request( - group_name, # type: str - schema_name, # type: str - **kwargs # type: Any -): - # type: (...) -> HttpRequest + _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str") + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") + + return HttpRequest(method="POST", url=_url, params=_params, headers=_headers, content=content, **kwargs) + + +def build_register_request(group_name: str, schema_name: str, *, content: IO, **kwargs: Any) -> HttpRequest: """Register new schema. Register new schema. If schema of specified name does not exist in specified group, schema is created at version 1. If schema of specified name exists already in specified group, schema is created at latest version + 1. - See https://aka.ms/azsdk/python/protocol/quickstart for how to incorporate this request builder - into your code flow. + See https://aka.ms/azsdk/dpcodegen/python/send_request for how to incorporate this request + builder into your code flow. :param group_name: Schema group under which schema should be registered. Group's serialization - type should match the serialization type specified in the request. + type should match the serialization type specified in the request. Required. :type group_name: str - :param schema_name: Name of schema. + :param schema_name: Name of schema. Required. :type schema_name: str - :keyword content: Pass in binary content you want in the body of the request (typically bytes, - a byte iterator, or stream input). String representation (UTF-8) of the schema being - registered. - :paramtype content: any + :keyword content: String representation (UTF-8) of the schema being registered. Required. + :paramtype content: IO :return: Returns an :class:`~azure.core.rest.HttpRequest` that you will pass to the client's - `send_request` method. See https://aka.ms/azsdk/python/protocol/quickstart for how to + `send_request` method. See https://aka.ms/azsdk/dpcodegen/python/send_request for how to incorporate this response into your code flow. :rtype: ~azure.core.rest.HttpRequest """ @@ -231,32 +228,26 @@ def build_register_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop('api_version', _params.pop('api-version', "2021-10")) # type: str - content_type = kwargs.pop('content_type', _headers.pop('Content-Type', None)) # type: Optional[str] - accept = _headers.pop('Accept', "application/json") + content_type = kwargs.pop("content_type") # type: str + api_version = kwargs.pop("api_version", _params.pop("api-version", "2021-10")) # type: str + accept = _headers.pop("Accept", "application/json") # Construct URL _url = "/$schemaGroups/{groupName}/schemas/{schemaName}" path_format_arguments = { - "groupName": _SERIALIZER.url("group_name", group_name, 'str'), - "schemaName": _SERIALIZER.url("schema_name", schema_name, 'str', max_length=50, min_length=0, pattern=r'^[A-Za-z0-9][^\\/$:]*$'), + "groupName": _SERIALIZER.url("group_name", group_name, "str"), + "schemaName": _SERIALIZER.url( + "schema_name", schema_name, "str", max_length=50, pattern=r"^[A-Za-z0-9][^\\/$:]*$" + ), } _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - _params['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers - if content_type is not None: - _headers['Content-Type'] = _SERIALIZER.header("content_type", content_type, 'str') - _headers['Accept'] = _SERIALIZER.header("accept", accept, 'str') - - return HttpRequest( - method="PUT", - url=_url, - params=_params, - headers=_headers, - **kwargs - ) + _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str") + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") + return HttpRequest(method="PUT", url=_url, params=_params, headers=_headers, content=content, **kwargs) diff --git a/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/rest/schema/_request_builders_py3.py b/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/rest/schema/_request_builders_py3.py index 34a75239c74b..26a4230c51b1 100644 --- a/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/rest/schema/_request_builders_py3.py +++ b/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/rest/schema/_request_builders_py3.py @@ -18,10 +18,7 @@ _SERIALIZER.client_side_validation = False -def build_get_by_id_request( - id: str, - **kwargs: Any -) -> HttpRequest: +def build_get_by_id_request(id: str, **kwargs: Any) -> HttpRequest: """Get a registered schema by its unique ID reference. Gets a registered schema by its unique ID. Azure Schema Registry guarantees that ID is unique @@ -41,37 +38,27 @@ def build_get_by_id_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop('api_version', _params.pop('api-version', "2021-10")) # type: str - accept = _headers.pop('Accept', "application/json; serialization=Avro") + api_version = kwargs.pop("api_version", _params.pop("api-version", "2021-10")) # type: str + accept = _headers.pop("Accept", "application/json; serialization=Avro") # Construct URL _url = "/$schemaGroups/$schemas/{id}" path_format_arguments = { - "id": _SERIALIZER.url("id", id, 'str'), + "id": _SERIALIZER.url("id", id, "str"), } _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - _params['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers - _headers['Accept'] = _SERIALIZER.header("accept", accept, 'str') - - return HttpRequest( - method="GET", - url=_url, - params=_params, - headers=_headers, - **kwargs - ) - - -def build_get_versions_request( - group_name: str, - schema_name: str, - **kwargs: Any -) -> HttpRequest: + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") + + return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs) + + +def build_get_versions_request(group_name: str, schema_name: str, **kwargs: Any) -> HttpRequest: """Get list schema versions. Gets the list of all versions of one schema. @@ -103,40 +90,30 @@ def build_get_versions_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop('api_version', _params.pop('api-version', "2021-10")) # type: str - accept = _headers.pop('Accept', "application/json") + api_version = kwargs.pop("api_version", _params.pop("api-version", "2021-10")) # type: str + accept = _headers.pop("Accept", "application/json") # Construct URL _url = "/$schemaGroups/{groupName}/schemas/{schemaName}/versions" path_format_arguments = { - "groupName": _SERIALIZER.url("group_name", group_name, 'str'), - "schemaName": _SERIALIZER.url("schema_name", schema_name, 'str', max_length=50, min_length=0, pattern=r'^[A-Za-z0-9][^\\/$:]*$'), + "groupName": _SERIALIZER.url("group_name", group_name, "str"), + "schemaName": _SERIALIZER.url( + "schema_name", schema_name, "str", max_length=50, min_length=0, pattern=r"^[A-Za-z0-9][^\\/$:]*$" + ), } _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - _params['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers - _headers['Accept'] = _SERIALIZER.header("accept", accept, 'str') - - return HttpRequest( - method="GET", - url=_url, - params=_params, - headers=_headers, - **kwargs - ) - - -def build_query_id_by_content_request( - group_name: str, - schema_name: str, - *, - content: Any, - **kwargs: Any -) -> HttpRequest: + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") + + return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs) + + +def build_query_id_by_content_request(group_name: str, schema_name: str, *, content: Any, **kwargs: Any) -> HttpRequest: """Get ID for existing schema. Gets the ID referencing an existing schema within the specified schema group, as matched by @@ -162,44 +139,33 @@ def build_query_id_by_content_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop('api_version', _params.pop('api-version', "2021-10")) # type: str - content_type = kwargs.pop('content_type', _headers.pop('Content-Type', None)) # type: Optional[str] - accept = _headers.pop('Accept', "application/json") + api_version = kwargs.pop("api_version", _params.pop("api-version", "2021-10")) # type: str + content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] + accept = _headers.pop("Accept", "application/json") # Construct URL _url = "/$schemaGroups/{groupName}/schemas/{schemaName}:get-id" path_format_arguments = { - "groupName": _SERIALIZER.url("group_name", group_name, 'str'), - "schemaName": _SERIALIZER.url("schema_name", schema_name, 'str', max_length=50, min_length=0, pattern=r'^[A-Za-z0-9][^\\/$:]*$'), + "groupName": _SERIALIZER.url("group_name", group_name, "str"), + "schemaName": _SERIALIZER.url( + "schema_name", schema_name, "str", max_length=50, min_length=0, pattern=r"^[A-Za-z0-9][^\\/$:]*$" + ), } _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - _params['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers if content_type is not None: - _headers['Content-Type'] = _SERIALIZER.header("content_type", content_type, 'str') - _headers['Accept'] = _SERIALIZER.header("accept", accept, 'str') - - return HttpRequest( - method="POST", - url=_url, - params=_params, - headers=_headers, - content=content, - **kwargs - ) - - -def build_register_request( - group_name: str, - schema_name: str, - *, - content: Any, - **kwargs: Any -) -> HttpRequest: + _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str") + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") + + return HttpRequest(method="POST", url=_url, params=_params, headers=_headers, content=content, **kwargs) + + +def build_register_request(group_name: str, schema_name: str, *, content: Any, **kwargs: Any) -> HttpRequest: """Register new schema. Register new schema. If schema of specified name does not exist in specified group, schema is @@ -227,33 +193,27 @@ def build_register_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop('api_version', _params.pop('api-version', "2021-10")) # type: str - content_type = kwargs.pop('content_type', _headers.pop('Content-Type', None)) # type: Optional[str] - accept = _headers.pop('Accept', "application/json") + api_version = kwargs.pop("api_version", _params.pop("api-version", "2021-10")) # type: str + content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] + accept = _headers.pop("Accept", "application/json") # Construct URL _url = "/$schemaGroups/{groupName}/schemas/{schemaName}" path_format_arguments = { - "groupName": _SERIALIZER.url("group_name", group_name, 'str'), - "schemaName": _SERIALIZER.url("schema_name", schema_name, 'str', max_length=50, min_length=0, pattern=r'^[A-Za-z0-9][^\\/$:]*$'), + "groupName": _SERIALIZER.url("group_name", group_name, "str"), + "schemaName": _SERIALIZER.url( + "schema_name", schema_name, "str", max_length=50, min_length=0, pattern=r"^[A-Za-z0-9][^\\/$:]*$" + ), } _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - _params['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers if content_type is not None: - _headers['Content-Type'] = _SERIALIZER.header("content_type", content_type, 'str') - _headers['Accept'] = _SERIALIZER.header("accept", accept, 'str') - - return HttpRequest( - method="PUT", - url=_url, - params=_params, - headers=_headers, - content=content, - **kwargs - ) + _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str") + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") + return HttpRequest(method="PUT", url=_url, params=_params, headers=_headers, content=content, **kwargs) diff --git a/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/rest/schema_groups/__init__.py b/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/rest/schema_groups/__init__.py index c1b19b7971e4..1930355f8e56 100644 --- a/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/rest/schema_groups/__init__.py +++ b/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/rest/schema_groups/__init__.py @@ -6,11 +6,8 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -try: - from ._request_builders_py3 import build_list_request -except (SyntaxError, ImportError): - from ._request_builders import build_list_request # type: ignore +from ._request_builders import build_list_request __all__ = [ - 'build_list_request', + "build_list_request", ] diff --git a/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/rest/schema_groups/_request_builders.py b/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/rest/schema_groups/_request_builders.py index 4e0b3795f0c1..d490711e9972 100644 --- a/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/rest/schema_groups/_request_builders.py +++ b/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/rest/schema_groups/_request_builders.py @@ -5,69 +5,44 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import TYPE_CHECKING - -from msrest import Serializer +from typing import Any from azure.core.rest import HttpRequest from azure.core.utils import case_insensitive_dict -if TYPE_CHECKING: - # pylint: disable=unused-import,ungrouped-imports - from typing import Any +from ..._serialization import Serializer _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False -# fmt: off -def build_list_request( - **kwargs # type: Any -): - # type: (...) -> HttpRequest +def build_list_request(**kwargs: Any) -> HttpRequest: """Get list of schema groups. Gets the list of schema groups user is authorized to access. - See https://aka.ms/azsdk/python/protocol/quickstart for how to incorporate this request builder - into your code flow. + See https://aka.ms/azsdk/dpcodegen/python/send_request for how to incorporate this request + builder into your code flow. :return: Returns an :class:`~azure.core.rest.HttpRequest` that you will pass to the client's - `send_request` method. See https://aka.ms/azsdk/python/protocol/quickstart for how to + `send_request` method. See https://aka.ms/azsdk/dpcodegen/python/send_request for how to incorporate this response into your code flow. :rtype: ~azure.core.rest.HttpRequest - - Example: - .. code-block:: python - - # response body for status code(s): 200 - response.json() == { - "schemaGroups": [ - "str" # Optional. Array of schema groups. - ] - } """ _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop('api_version', _params.pop('api-version', "2021-10")) # type: str - accept = _headers.pop('Accept', "application/json") + api_version = kwargs.pop("api_version", _params.pop("api-version", "2021-10")) # type: str + accept = _headers.pop("Accept", "application/json") # Construct URL _url = "/$schemaGroups" # Construct parameters - _params['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers - _headers['Accept'] = _SERIALIZER.header("accept", accept, 'str') - - return HttpRequest( - method="GET", - url=_url, - params=_params, - headers=_headers, - **kwargs - ) + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") + return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs) diff --git a/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/rest/schema_groups/_request_builders_py3.py b/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/rest/schema_groups/_request_builders_py3.py index 889f1a756d85..8a8b199eddd6 100644 --- a/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/rest/schema_groups/_request_builders_py3.py +++ b/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_generated/rest/schema_groups/_request_builders_py3.py @@ -16,9 +16,7 @@ _SERIALIZER.client_side_validation = False -def build_list_request( - **kwargs: Any -) -> HttpRequest: +def build_list_request(**kwargs: Any) -> HttpRequest: """Get list of schema groups. Gets the list of schema groups user is authorized to access. @@ -45,23 +43,16 @@ def build_list_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop('api_version', _params.pop('api-version', "2021-10")) # type: str - accept = _headers.pop('Accept', "application/json") + api_version = kwargs.pop("api_version", _params.pop("api-version", "2021-10")) # type: str + accept = _headers.pop("Accept", "application/json") # Construct URL _url = "/$schemaGroups" # Construct parameters - _params['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers - _headers['Accept'] = _SERIALIZER.header("accept", accept, 'str') - - return HttpRequest( - method="GET", - url=_url, - params=_params, - headers=_headers, - **kwargs - ) + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") + return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs) diff --git a/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_schema_registry_client.py b/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_schema_registry_client.py index bbfd90329bb6..8892f240f429 100644 --- a/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_schema_registry_client.py +++ b/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_schema_registry_client.py @@ -171,6 +171,34 @@ def get_schema(self, schema_id, **kwargs): response.raise_for_status() return _parse_response_schema(response) + def get_schema_by_version(self, group_name: str, name: str, version: int, **kwargs: Any) -> Schema: + """ + Gets a specific version of a schema within the specified schema group. + + :param str group_name: Name of schema group that contains the registered schema. + :param str name: Name of schema which should be retrieved. + :param int version: Version of schema which should be retrieved. + :rtype: ~azure.schemaregistry.Schema + :raises: :class:`~azure.core.exceptions.HttpResponseError` + + .. admonition:: Example: + + .. literalinclude:: ../samples/sync_samples/sample_code_schemaregistry.py + :start-after: [START get_schema_by_version_sync] + :end-before: [END get_schema_by_version_sync] + :language: python + :dedent: 4 + :caption: Get schema by version. + + """ + http_request_kwargs = get_http_request_kwargs(kwargs) + request = schema_rest.build_get_schema_version_request( + group_name=group_name, schema_name=name, schema_version=version, **http_request_kwargs + ) + response = self._generated_client.send_request(request, **kwargs) + response.raise_for_status() + return _parse_response_schema(response) + def get_schema_properties( self, group_name, diff --git a/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_version.py b/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_version.py index 85406c15e0d7..7190e9ae90c1 100644 --- a/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_version.py +++ b/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/_version.py @@ -24,4 +24,4 @@ # # -------------------------------------------------------------------------- -VERSION = "1.1.1" +VERSION = "1.2.0" diff --git a/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/aio/_schema_registry_client_async.py b/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/aio/_schema_registry_client_async.py index e48790e13a19..5569e896b079 100644 --- a/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/aio/_schema_registry_client_async.py +++ b/sdk/schemaregistry/azure-schemaregistry/azure/schemaregistry/aio/_schema_registry_client_async.py @@ -170,6 +170,34 @@ async def get_schema(self, schema_id: str, **kwargs: Any) -> Schema: response.raise_for_status() return _parse_response_schema(response) + async def get_schema_by_version(self, group_name: str, name: str, version: int, **kwargs: Any) -> Schema: + """ + Gets a specific version of a schema within the specified schema group. + + :param str group_name: Name of schema group that contains the registered schema. + :param str name: Name of schema which should be retrieved. + :param int version: Version of schema which should be retrieved. + :rtype: ~azure.schemaregistry.Schema + :raises: :class:`~azure.core.exceptions.HttpResponseError` + + .. admonition:: Example: + + .. literalinclude:: ../samples/async_samples/sample_code_schemaregistry_async.py + :start-after: [START get_schema_by_version_async] + :end-before: [END get_schema_by_version_async] + :language: python + :dedent: 4 + :caption: Get schema by version. + + """ + http_request_kwargs = get_http_request_kwargs(kwargs) + request = schema_rest.build_get_schema_version_request( + group_name=group_name, schema_name=name, schema_version=version, **http_request_kwargs + ) + response = await self._generated_client.send_request(request, **kwargs) + response.raise_for_status() + return _parse_response_schema(response) + async def get_schema_properties( self, group_name: str, diff --git a/sdk/schemaregistry/azure-schemaregistry/samples/README.md b/sdk/schemaregistry/azure-schemaregistry/samples/README.md index fd178d77a011..efad9fee0d4c 100644 --- a/sdk/schemaregistry/azure-schemaregistry/samples/README.md +++ b/sdk/schemaregistry/azure-schemaregistry/samples/README.md @@ -18,10 +18,11 @@ Several Schema Registry Python SDK samples are available to you in the SDK's Git * [schema_registry.py][schema_registry_sample] ([async version][schema_registry_async_sample]) - Examples for common Schema Registry tasks: * Register a schema * Get schema by id + * Get schema by version * Get schema id ## Prerequisites -- Python 3.6 or later. +- Python 3.7 or later. - **Microsoft Azure Subscription:** To use Azure services, including Azure Schema Registry, you'll need a subscription. If you do not have an existing Azure account, you may sign up for a free trial or use your MSDN subscriber benefits when you [create an account](https://account.windowsazure.com/Home/Index). diff --git a/sdk/schemaregistry/azure-schemaregistry/samples/async_samples/sample_code_schemaregistry_async.py b/sdk/schemaregistry/azure-schemaregistry/samples/async_samples/sample_code_schemaregistry_async.py index f5471ddda41a..df9c1358cebc 100644 --- a/sdk/schemaregistry/azure-schemaregistry/samples/async_samples/sample_code_schemaregistry_async.py +++ b/sdk/schemaregistry/azure-schemaregistry/samples/async_samples/sample_code_schemaregistry_async.py @@ -27,7 +27,7 @@ FILE: sample_code_schemaregistry_async.py DESCRIPTION: This sample demonstrates asynchronously authenticating the SchemaRegistryClient and registering a schema, - retrieving a schema by its ID, and retrieving schema properties. + retrieving a schema by its ID, retrieving a schema by its version, and retrieving schema properties. USAGE: python sample_code_schemaregistry_async.py Set the environment variables with your own values before running the sample: @@ -79,7 +79,7 @@ async def register_schema(schema_registry_client): ) schema_id = schema_properties.id # [END register_schema_async] - return schema_id + return schema_properties async def get_schema(schema_registry_client, schema_id): @@ -93,6 +93,42 @@ async def get_schema(schema_registry_client, schema_id): return definition +async def get_schema_by_version(schema_registry_client, version): + # [START get_schema_by_version_async] + group_name = os.environ["SCHEMAREGISTRY_GROUP"] + name = "your-schema-name" + schema = await schema_registry_client.get_schema_by_version(group_name, name, version) + definition = schema.definition + properties = schema.properties + # [END get_schema_by_version_async] + print(definition) + print(properties) + return schema + +async def get_old_schema_by_version(schema_registry_client): + GROUP_NAME = os.environ["SCHEMAREGISTRY_GROUP"] + NAME = "your-schema-name" + FORMAT = "Avro" + NEW_SCHEMA_JSON = { + "namespace": "example.avro", + "type": "record", + "name": "User2", + "fields": [ + {"name": "name", "type": "string"}, + {"name": "favorite_number", "type": ["int", "null"]}, + {"name": "favorite_color", "type": ["string", "null"]}, + ], + } + NEW_DEFINITION = json.dumps(NEW_SCHEMA_JSON, separators=(",", ":")) + updated_schema_properties = await schema_registry_client.register_schema( + GROUP_NAME, NAME, NEW_DEFINITION, FORMAT + ) + print(f"Updated schema v{updated_schema_properties.version}: {NEW_SCHEMA_JSON}") + old_version = updated_schema_properties.version - 1 + schema = await schema_registry_client.get_schema_by_version(GROUP_NAME, NAME, old_version) + print(f"Retrieving old schema v{schema.properties.version}: {schema.definition}") + return schema + async def get_schema_id(schema_registry_client): # [START get_schema_id_async] group_name = os.environ["SCHEMAREGISTRY_GROUP"] @@ -120,11 +156,12 @@ async def get_schema_id(schema_registry_client): async def main(): client, credential = create_client() async with client, credential: - schema_id = await register_schema(client) - schema = await get_schema(client, schema_id) + schema_properties = await register_schema(client) + schema = await get_schema(client, schema_properties.id) + schema = await get_schema_by_version(client, schema_properties.version) + schema = await get_old_schema_by_version(client) schema_id = await get_schema_id(client) if __name__ == "__main__": - loop = asyncio.get_event_loop() - loop.run_until_complete(main()) + asyncio.run(main()) diff --git a/sdk/schemaregistry/azure-schemaregistry/samples/async_samples/schema_registry_async.py b/sdk/schemaregistry/azure-schemaregistry/samples/async_samples/schema_registry_async.py index eaa9a86e5f39..d4d4493c2d69 100644 --- a/sdk/schemaregistry/azure-schemaregistry/samples/async_samples/schema_registry_async.py +++ b/sdk/schemaregistry/azure-schemaregistry/samples/async_samples/schema_registry_async.py @@ -9,6 +9,7 @@ This sample demonstrates asynchronously authenticating the SchemaRegistryClient and basic usage, including: - registering a schema - getting a schema by its ID + - getting a schema by its version. - getting schema id. USAGE: python schema_registry_async.py @@ -43,7 +44,18 @@ {"name": "favorite_color", "type": ["string", "null"]}, ], } +NEW_SCHEMA_JSON = { + "namespace": "example.avro", + "type": "record", + "name": "User2", + "fields": [ + {"name": "name", "type": "string"}, + {"name": "favorite_number", "type": ["int", "null"]}, + {"name": "favorite_color", "type": ["string", "null"]}, + ], +} DEFINITION = json.dumps(SCHEMA_JSON, separators=(",", ":")) +NEW_DEFINITION = json.dumps(NEW_SCHEMA_JSON, separators=(",", ":")) async def register_schema(client, group_name, name, definition, format): @@ -53,20 +65,38 @@ async def register_schema(client, group_name, name, definition, format): ) print("Schema registered, returned schema id is {}".format(schema_properties.id)) print("Schema properties are {}".format(schema_properties)) - return schema_properties.id + return schema_properties async def get_schema_by_id(client, schema_id): print("Getting schema by id...") schema = await client.get_schema(schema_id) print( - "The schema string of schema id: {} string is {}".format( + "The schema string of schema id: {} is {}".format( schema_id, schema.definition ) ) - print("Schema properties are {}".format(schema_id)) + print("Schema properties are {}".format(schema.properties)) return schema.definition +async def get_schema_by_version(client, group_name, name, version): + print("Getting schema by version...") + schema = await client.get_schema_by_version(group_name, name, version) + print( + "The schema string of schema id: {} is {}".format(schema.properties.id, schema.definition) + ) + print("Schema properties are {}".format(schema.properties)) + return schema.definition + +async def get_old_schema_by_version(client, group_name, name, new_definition): + updated_schema_properties = await client.register_schema( + group_name, name, new_definition, FORMAT + ) + print(f"Registered new schema of version: {updated_schema_properties.version}") + old_version = updated_schema_properties.version - 1 + schema = await client.get_schema_by_version(group_name, name, old_version) + print(f"Retrieving old schema v{schema.properties.version}: {schema.definition}") + return schema.definition async def get_schema_id(client, group_name, name, definition, format): print("Getting schema id...") @@ -84,14 +114,15 @@ async def main(): fully_qualified_namespace=SCHEMAREGISTRY_FQN, credential=token_credential ) async with token_credential, schema_registry_client: - schema_id = await register_schema( + schema_properties = await register_schema( schema_registry_client, GROUP_NAME, NAME, DEFINITION, FORMAT ) - schema_str = await get_schema_by_id(schema_registry_client, schema_id) + schema_str = await get_schema_by_id(schema_registry_client, schema_properties.id) + schema_str = await get_schema_by_version(schema_registry_client, GROUP_NAME, NAME, schema_properties.version) + schema_str = await get_old_schema_by_version(schema_registry_client, GROUP_NAME, NAME, NEW_DEFINITION) schema_id = await get_schema_id( schema_registry_client, GROUP_NAME, NAME, DEFINITION, FORMAT ) -loop = asyncio.get_event_loop() -loop.run_until_complete(main()) +asyncio.run(main()) diff --git a/sdk/schemaregistry/azure-schemaregistry/samples/sync_samples/sample_code_schemaregistry.py b/sdk/schemaregistry/azure-schemaregistry/samples/sync_samples/sample_code_schemaregistry.py index 0ad140718454..806179c6849d 100644 --- a/sdk/schemaregistry/azure-schemaregistry/samples/sync_samples/sample_code_schemaregistry.py +++ b/sdk/schemaregistry/azure-schemaregistry/samples/sync_samples/sample_code_schemaregistry.py @@ -27,7 +27,7 @@ FILE: sample_code_schemaregistry.py DESCRIPTION: This sample demonstrates authenticating the SchemaRegistryClient and registering a schema, - retrieving a schema by its ID, and retrieving schema properties. + retrieving a schema by its ID, retrieving a schema by its version, and retrieving schema properties. USAGE: python sample_code_schemaregistry.py Set the environment variables with your own values before running the sample: @@ -78,7 +78,7 @@ def register_schema(schema_registry_client): ) schema_id = schema_properties.id # [END register_schema_sync] - return schema_id + return schema_properties def get_schema(schema_registry_client, schema_id): @@ -91,6 +91,41 @@ def get_schema(schema_registry_client, schema_id): print(properties) return schema +def get_schema_by_version(schema_registry_client, version): + # [START get_schema_by_version_sync] + group_name = os.environ["SCHEMAREGISTRY_GROUP"] + name = "your-schema-name" + schema = schema_registry_client.get_schema_by_version(group_name, name, version) + definition = schema.definition + properties = schema.properties + # [END get_schema_by_version_sync] + print(definition) + print(properties) + return schema + +def get_old_schema_by_version(schema_registry_client): + GROUP_NAME = os.environ["SCHEMAREGISTRY_GROUP"] + NAME = "your-schema-name" + FORMAT = "Avro" + NEW_SCHEMA_JSON = { + "namespace": "example.avro", + "type": "record", + "name": "User2", + "fields": [ + {"name": "name", "type": "string"}, + {"name": "favorite_number", "type": ["int", "null"]}, + {"name": "favorite_color", "type": ["string", "null"]}, + ], + } + NEW_DEFINTION = json.dumps(NEW_SCHEMA_JSON, separators=(",", ":")) + updated_schema_properties = schema_registry_client.register_schema( + GROUP_NAME, NAME, NEW_DEFINTION, FORMAT + ) + print(f"Updated schema v{updated_schema_properties.version}: {NEW_SCHEMA_JSON}") + old_version = updated_schema_properties.version - 1 + schema = schema_registry_client.get_schema_by_version(GROUP_NAME, NAME, old_version) + print(f"Retrieving old schema v{schema.properties.version}: {schema.definition}") + return schema def get_schema_id(schema_registry_client): # [START get_schema_id_sync] @@ -119,6 +154,8 @@ def get_schema_id(schema_registry_client): if __name__ == "__main__": client = create_client() with client: - schema_id = register_schema(client) - schema = get_schema(client, schema_id) + schema_properties= register_schema(client) + schema = get_schema(client, schema_properties.id) + schema = get_schema_by_version(client, schema_properties.version) + schema = get_old_schema_by_version(client) schema_id = get_schema_id(client) diff --git a/sdk/schemaregistry/azure-schemaregistry/samples/sync_samples/schema_registry.py b/sdk/schemaregistry/azure-schemaregistry/samples/sync_samples/schema_registry.py index daf9b7e5dc50..2768cb53bad4 100644 --- a/sdk/schemaregistry/azure-schemaregistry/samples/sync_samples/schema_registry.py +++ b/sdk/schemaregistry/azure-schemaregistry/samples/sync_samples/schema_registry.py @@ -27,8 +27,9 @@ FILE: schema_registry.py DESCRIPTION: This sample demonstrates authenticating the SchemaRegistryClient and basic usage, including: - - registering a schema - - getting a schema by its ID + - registering a schema. + - getting a schema by its ID. + - getting a schema by its version. - getting schema id. USAGE: python schema_registry.py @@ -63,7 +64,18 @@ {"name": "favorite_color", "type": ["string", "null"]}, ], } +NEW_SCHEMA_JSON = { + "namespace": "example.avro", + "type": "record", + "name": "User2", + "fields": [ + {"name": "name", "type": "string"}, + {"name": "favorite_number", "type": ["int", "null"]}, + {"name": "favorite_color", "type": ["string", "null"]}, + ], +} DEFINITION = json.dumps(SCHEMA_JSON, separators=(",", ":")) +NEW_DEFINITION = json.dumps(NEW_SCHEMA_JSON, separators=(",", ":")) def register_schema(client, group_name, name, definition, format): @@ -71,28 +83,46 @@ def register_schema(client, group_name, name, definition, format): schema_properties = client.register_schema( group_name, name, definition, format ) - print("Schema registered, returned schema id is {}".format(schema_properties.id)) - print("Schema properties are {}".format(schema_properties)) - return schema_properties.id + print(f"Schema registered, returned schema id is {schema_properties.id}") + print(f"Schema properties are {schema_properties}") + return schema_properties def get_schema_by_id(client, schema_id): print("Getting schema by id...") schema = client.get_schema(schema_id) print( - "The schema string of schema id: {} string is {}".format(schema_id, schema.definition) + f"The schema string of schema id: {schema_id} is {schema.definition}" ) - print("Schema properties are {}".format(schema_id)) + print(f"Schema properties are {schema.properties}") return schema.definition +def get_schema_by_version(client, group_name, name, version): + print("Getting schema by version...") + schema = client.get_schema_by_version(group_name, name, version) + print( + f"The schema string of schema id: {schema.properties.id} is {schema.definition}" + ) + print(f"Schema properties are {schema.properties}") + return schema.definition + +def get_old_schema_by_version(client, group_name, name, new_definition): + updated_schema_properties = client.register_schema( + group_name, name, new_definition, FORMAT + ) + print(f"Registered new schema of version: {updated_schema_properties.version}") + old_version = updated_schema_properties.version - 1 + schema = client.get_schema_by_version(group_name, name, old_version) + print(f"Retrieving old schema v{schema.properties.version}: {schema.definition}") + return schema.definition def get_schema_id(client, group_name, name, definition, format): print("Getting schema id...") schema_properties = client.get_schema_properties( group_name, name, definition, format ) - print("The schema id is: {}".format(schema_properties.id)) - print("Schema properties are {}".format(schema_properties)) + print(f"The schema id is: {schema_properties.id}") + print(f"Schema properties are {schema_properties}") return schema_properties.id @@ -102,10 +132,12 @@ def get_schema_id(client, group_name, name, definition, format): fully_qualified_namespace=SCHEMAREGISTRY_FQN, credential=token_credential ) with schema_registry_client: - schema_id = register_schema( + schema_properties = register_schema( schema_registry_client, GROUP_NAME, NAME, DEFINITION, FORMAT ) - schema_str = get_schema_by_id(schema_registry_client, schema_id) + schema_str = get_schema_by_id(schema_registry_client, schema_properties.id) + schema_str = get_schema_by_version(schema_registry_client, GROUP_NAME, NAME, schema_properties.version) + schema_str = get_old_schema_by_version(schema_registry_client, GROUP_NAME, NAME, NEW_DEFINITION) schema_id = get_schema_id( schema_registry_client, GROUP_NAME, NAME, DEFINITION, FORMAT ) diff --git a/sdk/schemaregistry/azure-schemaregistry/setup.py b/sdk/schemaregistry/azure-schemaregistry/setup.py index bc49963b1fcd..910ed507aacb 100644 --- a/sdk/schemaregistry/azure-schemaregistry/setup.py +++ b/sdk/schemaregistry/azure-schemaregistry/setup.py @@ -56,18 +56,17 @@ "Development Status :: 5 - Production/Stable", 'Programming Language :: Python', 'Programming Language :: Python :: 3 :: Only', - 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', 'License :: OSI Approved :: MIT License', ], - python_requires=">=3.6", + python_requires=">=3.7", zip_safe=False, packages=find_packages(exclude=exclude_packages), install_requires=[ 'msrest>=0.6.21', - 'azure-core<2.0.0,>=1.23.0' + 'azure-core<2.0.0,>=1.24.0' ] ) diff --git a/sdk/schemaregistry/azure-schemaregistry/swagger/README.md b/sdk/schemaregistry/azure-schemaregistry/swagger/README.md index bda6a428bc57..a4f2df5974fa 100644 --- a/sdk/schemaregistry/azure-schemaregistry/swagger/README.md +++ b/sdk/schemaregistry/azure-schemaregistry/swagger/README.md @@ -6,7 +6,7 @@ ```ps cd C:\Work\SchemaRegistry\ autorest --reset -autorest --low-level-client --modelerfour.lenient-model-deduplication README.md +autorest --low-level-client --modelerfour.lenient-model-deduplication --show-operations README.md ``` ### Settings ``` yaml diff --git a/sdk/schemaregistry/azure-schemaregistry/tests/async_tests/test_schema_registry_async.py b/sdk/schemaregistry/azure-schemaregistry/tests/async_tests/test_schema_registry_async.py index 369cda969fe6..8d0a61a5c1cd 100644 --- a/sdk/schemaregistry/azure-schemaregistry/tests/async_tests/test_schema_registry_async.py +++ b/sdk/schemaregistry/azure-schemaregistry/tests/async_tests/test_schema_registry_async.py @@ -61,6 +61,15 @@ async def test_schema_basic_async(self, schemaregistry_fully_qualified_namespace assert returned_schema.properties.name == name assert returned_schema.definition == schema_str + returned_version_schema = await client.get_schema_by_version(schemaregistry_group, name, schema_properties.version, logging_enable=True) + + assert returned_version_schema.properties.id == schema_properties.id + assert returned_version_schema.properties.format == "Avro" + assert returned_version_schema.properties.group_name == schemaregistry_group + assert returned_version_schema.properties.name == name + assert returned_version_schema.properties.version == schema_properties.version + assert returned_version_schema.definition == schema_str + returned_schema_properties = await client.get_schema_properties(schemaregistry_group, name, schema_str, format, logging_enable=True) assert returned_schema_properties.id == schema_properties.id @@ -99,6 +108,16 @@ async def test_schema_update_async(self, schemaregistry_fully_qualified_namespac assert new_schema.properties.group_name == schemaregistry_group assert new_schema.properties.name == name + old_schema = await client.get_schema_by_version(schemaregistry_group, name, schema_properties.version, logging_enable=True) + + assert old_schema.properties.id != new_schema_properties.id + assert old_schema.properties.id == schema_properties.id + assert old_schema.definition == schema_str + assert old_schema.properties.format == "Avro" + assert old_schema.properties.group_name == schemaregistry_group + assert old_schema.properties.name == name + assert old_schema.properties.version == schema_properties.version + await client._generated_client._config.credential.close() @SchemaRegistryEnvironmentVariableLoader() @@ -126,7 +145,6 @@ async def test_schema_negative_wrong_credential_async(self, schemaregistry_fully with pytest.raises(ClientAuthenticationError): await client.register_schema(schemaregistry_group, name, schema_str, format) - @pytest.mark.skip("Figure out why live_test_only mark not working for non-live mode") @pytest.mark.live_test_only @SchemaRegistryEnvironmentVariableLoader() @recorded_by_proxy_async @@ -141,7 +159,7 @@ async def test_schema_negative_wrong_endpoint_async(self, schemaregistry_fully_q await client.register_schema(schemaregistry_group, name, schema_str, format) if exc_info.type is HttpResponseError: response_content = json.loads(exc_info.value.response.content) - assert "Name does not resolve" in response_content["Message"] + assert any([(m in response_content["Message"]) for m in ["Name does not resolve", "Unable to find a record"]]) await client._generated_client._config.credential.close() @@ -157,6 +175,22 @@ async def test_schema_negative_no_schema_async(self, schemaregistry_fully_qualif await client.get_schema('a' * 32) await client._generated_client._config.credential.close() + @SchemaRegistryEnvironmentVariableLoader() + @recorded_by_proxy_async + async def test_schema_negative_no_schema_version_async(self, **kwargs): + schemaregistry_fully_qualified_namespace = kwargs.pop("schemaregistry_fully_qualified_namespace") + schemaregistry_group = kwargs.pop("schemaregistry_group") + client = self.create_client(fully_qualified_namespace=schemaregistry_fully_qualified_namespace) + name = self.get_resource_name('test-schema-negative-version') + schema_str = """{"namespace":"example.avro","type":"record","name":"User","fields":[{"name":"name","type":"string"},{"name":"age","type":["int","null"]},{"name":"city","type":["string","null"]}]}""" + format = "Avro" + async with client: + schema_properties = await client.register_schema(schemaregistry_group, name, schema_str, format) + version = schema_properties.version + 1 + with pytest.raises(HttpResponseError): + await client.get_schema_by_version(schemaregistry_group, name, version) + await client._generated_client._config.credential.close() + @SchemaRegistryEnvironmentVariableLoader() @recorded_by_proxy_async async def test_register_schema_errors(self, schemaregistry_fully_qualified_namespace, schemaregistry_group, **kwargs): diff --git a/sdk/schemaregistry/azure-schemaregistry/tests/recordings/async_tests/test_schema_registry_async.pyTestSchemaRegistryAsynctest_schema_basic_async.json b/sdk/schemaregistry/azure-schemaregistry/tests/recordings/async_tests/test_schema_registry_async.pyTestSchemaRegistryAsynctest_schema_basic_async.json index f5988fceddb7..923286090018 100644 --- a/sdk/schemaregistry/azure-schemaregistry/tests/recordings/async_tests/test_schema_registry_async.pyTestSchemaRegistryAsynctest_schema_basic_async.json +++ b/sdk/schemaregistry/azure-schemaregistry/tests/recordings/async_tests/test_schema_registry_async.pyTestSchemaRegistryAsynctest_schema_basic_async.json @@ -6,11 +6,9 @@ "RequestHeaders": { "Accept": "application/json", "Accept-Encoding": "gzip, deflate", - "Authorization": "Sanitized", "Content-Length": "201", "Content-Type": "application/json; serialization=Avro", - "User-Agent": "azsdk-python-azureschemaregistry/1.0.0 Python/3.9.0 (Windows-10-10.0.22000-SP0)", - "x-ms-client-request-id": "2b0e8e90-a159-11ec-9158-9c2976df0bde" + "User-Agent": "azsdk-python-azureschemaregistry/1.0.0 Python/3.10.4 (Windows-10-10.0.22000-SP0)" }, "RequestBody": { "namespace": "example.avro", @@ -40,11 +38,11 @@ "StatusCode": 204, "ResponseHeaders": { "Content-Length": "0", - "Date": "Fri, 11 Mar 2022 16:34:48 GMT", + "Date": "Tue, 13 Sep 2022 17:46:47 GMT", "Location": "https://fake_resource.servicebus.windows.net/$schemagroups/fakegroup/schemas/test-schema-basic-async54a738e0/versions/1?api-version=2021-10", "Schema-Group-Name": "fakegroup", - "Schema-Id": "b2aae1e61e9846a981b9b2580cc121d1", - "Schema-Id-Location": "https://fake_resource.servicebus.windows.net:443/$schemagroups/$schemas/b2aae1e61e9846a981b9b2580cc121d1?api-version=2021-10", + "Schema-Id": "f421a6d979654adc9b99b0d26cfee31e", + "Schema-Id-Location": "https://fake_resource.servicebus.windows.net:443/$schemagroups/$schemas/f421a6d979654adc9b99b0d26cfee31e?api-version=2021-10", "Schema-Name": "test-schema-basic-async54a738e0", "Schema-Version": "1", "Schema-Versions-Location": "https://fake_resource.servicebus.windows.net:443/$schemagroups/fakegroup/schemas/test-schema-basic-async54a738e0/versions?api-version=2021-10", @@ -54,24 +52,72 @@ "ResponseBody": null }, { - "RequestUri": "https://fake_resource.servicebus.windows.net/$schemaGroups/$schemas/b2aae1e61e9846a981b9b2580cc121d1?api-version=2021-10", + "RequestUri": "https://fake_resource.servicebus.windows.net/$schemaGroups/$schemas/f421a6d979654adc9b99b0d26cfee31e?api-version=2021-10", "RequestMethod": "GET", "RequestHeaders": { "Accept": "application/json; serialization=Avro", "Accept-Encoding": "gzip, deflate", - "Authorization": "Sanitized", - "User-Agent": "azsdk-python-azureschemaregistry/1.0.0 Python/3.9.0 (Windows-10-10.0.22000-SP0)", - "x-ms-client-request-id": "2ba04afb-a159-11ec-9994-9c2976df0bde" + "User-Agent": "azsdk-python-azureschemaregistry/1.0.0 Python/3.10.4 (Windows-10-10.0.22000-SP0)" }, "RequestBody": null, "StatusCode": 200, "ResponseHeaders": { "Content-Type": "application/json; serialization=Avro", - "Date": "Fri, 11 Mar 2022 16:34:48 GMT", + "Date": "Tue, 13 Sep 2022 17:46:48 GMT", "Location": "https://fake_resource.servicebus.windows.net/$schemagroups/fakegroup/schemas/test-schema-basic-async54a738e0/versions/1?api-version=2021-10", "Schema-Group-Name": "fakegroup", - "Schema-Id": "b2aae1e61e9846a981b9b2580cc121d1", - "Schema-Id-Location": "https://fake_resource.servicebus.windows.net:443/$schemagroups/$schemas/b2aae1e61e9846a981b9b2580cc121d1?api-version=2021-10", + "Schema-Id": "f421a6d979654adc9b99b0d26cfee31e", + "Schema-Id-Location": "https://fake_resource.servicebus.windows.net:443/$schemagroups/$schemas/f421a6d979654adc9b99b0d26cfee31e?api-version=2021-10", + "Schema-Name": "test-schema-basic-async54a738e0", + "Schema-Version": "1", + "Schema-Versions-Location": "https://fake_resource.servicebus.windows.net:443/$schemagroups/fakegroup/schemas/test-schema-basic-async54a738e0/versions?api-version=2021-10", + "Server": "Microsoft-HTTPAPI/2.0", + "Strict-Transport-Security": "max-age=31536000", + "Transfer-Encoding": "chunked" + }, + "ResponseBody": { + "namespace": "example.avro", + "type": "record", + "name": "User", + "fields": [ + { + "name": "name", + "type": "string" + }, + { + "name": "favorite_number", + "type": [ + "int", + "null" + ] + }, + { + "name": "favorite_color", + "type": [ + "string", + "null" + ] + } + ] + } + }, + { + "RequestUri": "https://fake_resource.servicebus.windows.net/$schemaGroups/fakegroup/schemas/test-schema-basic-async54a738e0/versions/1?api-version=2021-10", + "RequestMethod": "GET", + "RequestHeaders": { + "Accept": "application/json", + "Accept-Encoding": "gzip, deflate", + "User-Agent": "azsdk-python-azureschemaregistry/1.0.0 Python/3.10.4 (Windows-10-10.0.22000-SP0)" + }, + "RequestBody": null, + "StatusCode": 200, + "ResponseHeaders": { + "Content-Type": "application/json; serialization=Avro", + "Date": "Tue, 13 Sep 2022 17:46:48 GMT", + "Location": "https://fake_resource.servicebus.windows.net/$schemagroups/fakegroup/schemas/test-schema-basic-async54a738e0/versions/1?api-version=2021-10", + "Schema-Group-Name": "fakegroup", + "Schema-Id": "f421a6d979654adc9b99b0d26cfee31e", + "Schema-Id-Location": "https://fake_resource.servicebus.windows.net:443/$schemagroups/$schemas/f421a6d979654adc9b99b0d26cfee31e?api-version=2021-10", "Schema-Name": "test-schema-basic-async54a738e0", "Schema-Version": "1", "Schema-Versions-Location": "https://fake_resource.servicebus.windows.net:443/$schemagroups/fakegroup/schemas/test-schema-basic-async54a738e0/versions?api-version=2021-10", @@ -111,11 +157,9 @@ "RequestHeaders": { "Accept": "application/json", "Accept-Encoding": "gzip, deflate", - "Authorization": "Sanitized", "Content-Length": "201", "Content-Type": "application/json; serialization=Avro", - "User-Agent": "azsdk-python-azureschemaregistry/1.0.0 Python/3.9.0 (Windows-10-10.0.22000-SP0)", - "x-ms-client-request-id": "2bf6fb33-a159-11ec-b034-9c2976df0bde" + "User-Agent": "azsdk-python-azureschemaregistry/1.0.0 Python/3.10.4 (Windows-10-10.0.22000-SP0)" }, "RequestBody": { "namespace": "example.avro", @@ -145,11 +189,11 @@ "StatusCode": 204, "ResponseHeaders": { "Content-Length": "0", - "Date": "Fri, 11 Mar 2022 16:34:49 GMT", + "Date": "Tue, 13 Sep 2022 17:46:49 GMT", "Location": "https://fake_resource.servicebus.windows.net/$schemagroups/fakegroup/schemas/test-schema-basic-async54a738e0/versions/1?api-version=2021-10", "Schema-Group-Name": "fakegroup", - "Schema-Id": "b2aae1e61e9846a981b9b2580cc121d1", - "Schema-Id-Location": "https://fake_resource.servicebus.windows.net:443/$schemagroups/$schemas/b2aae1e61e9846a981b9b2580cc121d1?api-version=2021-10", + "Schema-Id": "f421a6d979654adc9b99b0d26cfee31e", + "Schema-Id-Location": "https://fake_resource.servicebus.windows.net:443/$schemagroups/$schemas/f421a6d979654adc9b99b0d26cfee31e?api-version=2021-10", "Schema-Name": "test-schema-basic-async54a738e0", "Schema-Version": "1", "Schema-Versions-Location": "https://fake_resource.servicebus.windows.net:443/$schemagroups/fakegroup/schemas/test-schema-basic-async54a738e0/versions?api-version=2021-10", diff --git a/sdk/schemaregistry/azure-schemaregistry/tests/recordings/async_tests/test_schema_registry_async.pyTestSchemaRegistryAsynctest_schema_negative_no_schema_version_async.json b/sdk/schemaregistry/azure-schemaregistry/tests/recordings/async_tests/test_schema_registry_async.pyTestSchemaRegistryAsynctest_schema_negative_no_schema_version_async.json new file mode 100644 index 000000000000..37507b01f68a --- /dev/null +++ b/sdk/schemaregistry/azure-schemaregistry/tests/recordings/async_tests/test_schema_registry_async.pyTestSchemaRegistryAsynctest_schema_negative_no_schema_version_async.json @@ -0,0 +1,81 @@ +{ + "Entries": [ + { + "RequestUri": "https://fake_resource.servicebus.windows.net/$schemaGroups/fakegroup/schemas/test-schema-negative-version723541a2?api-version=2021-10", + "RequestMethod": "PUT", + "RequestHeaders": { + "Accept": "application/json", + "Accept-Encoding": "gzip, deflate", + "Content-Length": "179", + "Content-Type": "application/json; serialization=Avro", + "User-Agent": "azsdk-python-azureschemaregistry/1.0.0 Python/3.10.4 (Windows-10-10.0.22000-SP0)" + }, + "RequestBody": { + "namespace": "example.avro", + "type": "record", + "name": "User", + "fields": [ + { + "name": "name", + "type": "string" + }, + { + "name": "age", + "type": [ + "int", + "null" + ] + }, + { + "name": "city", + "type": [ + "string", + "null" + ] + } + ] + }, + "StatusCode": 204, + "ResponseHeaders": { + "Content-Length": "0", + "Date": "Tue, 13 Sep 2022 17:47:15 GMT", + "Location": "https://fake_resource.servicebus.windows.net/$schemagroups/fakegroup/schemas/test-schema-negative-version723541a2/versions/1?api-version=2021-10", + "Schema-Group-Name": "fakegroup", + "Schema-Id": "4ecf2a1454dc43198d706f6571e33b90", + "Schema-Id-Location": "https://fake_resource.servicebus.windows.net:443/$schemagroups/$schemas/4ecf2a1454dc43198d706f6571e33b90?api-version=2021-10", + "Schema-Name": "test-schema-negative-version723541a2", + "Schema-Version": "1", + "Schema-Versions-Location": "https://fake_resource.servicebus.windows.net:443/$schemagroups/fakegroup/schemas/test-schema-negative-version723541a2/versions?api-version=2021-10", + "Server": "Microsoft-HTTPAPI/2.0", + "Strict-Transport-Security": "max-age=31536000" + }, + "ResponseBody": null + }, + { + "RequestUri": "https://fake_resource.servicebus.windows.net/$schemaGroups/fakegroup/schemas/test-schema-negative-version723541a2/versions/2?api-version=2021-10", + "RequestMethod": "GET", + "RequestHeaders": { + "Accept": "application/json", + "Accept-Encoding": "gzip, deflate", + "User-Agent": "azsdk-python-azureschemaregistry/1.0.0 Python/3.10.4 (Windows-10-10.0.22000-SP0)" + }, + "RequestBody": null, + "StatusCode": 404, + "ResponseHeaders": { + "Content-Type": "application/json", + "Date": "Tue, 13 Sep 2022 17:47:16 GMT", + "Server": "Microsoft-HTTPAPI/2.0", + "Strict-Transport-Security": "max-age=31536000", + "Transfer-Encoding": "chunked", + "x-ms-error-code": "ItemNotFound" + }, + "ResponseBody": { + "error": { + "code": "ItemNotFound", + "message": "Schema fakegroup/test-schema-negative-version723541a2/ver.2 does not exist. TrackingId:cbc478c7-3b17-4771-8b9d-f852a044f969_G3S3, SystemTracker:fake_resource.servicebus.windows.net/:$schemaGroups/fakegroup/schemas/test-schema-negative-version723541a2/versions/2, Timestamp:2022-09-13T17:47:16" + } + } + } + ], + "Variables": {} +} diff --git a/sdk/schemaregistry/azure-schemaregistry/tests/recordings/async_tests/test_schema_registry_async.pyTestSchemaRegistryAsynctest_schema_update_async.json b/sdk/schemaregistry/azure-schemaregistry/tests/recordings/async_tests/test_schema_registry_async.pyTestSchemaRegistryAsynctest_schema_update_async.json index e8ca55fe763a..07c1a768a52b 100644 --- a/sdk/schemaregistry/azure-schemaregistry/tests/recordings/async_tests/test_schema_registry_async.pyTestSchemaRegistryAsynctest_schema_update_async.json +++ b/sdk/schemaregistry/azure-schemaregistry/tests/recordings/async_tests/test_schema_registry_async.pyTestSchemaRegistryAsynctest_schema_update_async.json @@ -6,11 +6,9 @@ "RequestHeaders": { "Accept": "application/json", "Accept-Encoding": "gzip, deflate", - "Authorization": "Sanitized", "Content-Length": "201", "Content-Type": "application/json; serialization=Avro", - "User-Agent": "azsdk-python-azureschemaregistry/1.0.0 Python/3.9.0 (Windows-10-10.0.22000-SP0)", - "x-ms-client-request-id": "2c58d91f-a159-11ec-b079-9c2976df0bde" + "User-Agent": "azsdk-python-azureschemaregistry/1.0.0 Python/3.10.4 (Windows-10-10.0.22000-SP0)" }, "RequestBody": { "namespace": "example.avro", @@ -40,13 +38,13 @@ "StatusCode": 204, "ResponseHeaders": { "Content-Length": "0", - "Date": "Fri, 11 Mar 2022 16:34:50 GMT", - "Location": "https://fake_resource.servicebus.windows.net/$schemagroups/fakegroup/schemas/test-schema-update-async907a3961/versions/1?api-version=2021-10", + "Date": "Wed, 14 Sep 2022 17:41:56 GMT", + "Location": "https://fake_resource.servicebus.windows.net/$schemagroups/fakegroup/schemas/test-schema-update-async907a3961/versions/5?api-version=2021-10", "Schema-Group-Name": "fakegroup", - "Schema-Id": "bcb07c8021514e9bbb47faaee48a0718", - "Schema-Id-Location": "https://fake_resource.servicebus.windows.net:443/$schemagroups/$schemas/bcb07c8021514e9bbb47faaee48a0718?api-version=2021-10", + "Schema-Id": "1ed5a894b6c4402d870453e131d3223e", + "Schema-Id-Location": "https://fake_resource.servicebus.windows.net:443/$schemagroups/$schemas/1ed5a894b6c4402d870453e131d3223e?api-version=2021-10", "Schema-Name": "test-schema-update-async907a3961", - "Schema-Version": "1", + "Schema-Version": "5", "Schema-Versions-Location": "https://fake_resource.servicebus.windows.net:443/$schemagroups/fakegroup/schemas/test-schema-update-async907a3961/versions?api-version=2021-10", "Server": "Microsoft-HTTPAPI/2.0", "Strict-Transport-Security": "max-age=31536000" @@ -59,11 +57,9 @@ "RequestHeaders": { "Accept": "application/json", "Accept-Encoding": "gzip, deflate", - "Authorization": "Sanitized", "Content-Length": "200", "Content-Type": "application/json; serialization=Avro", - "User-Agent": "azsdk-python-azureschemaregistry/1.0.0 Python/3.9.0 (Windows-10-10.0.22000-SP0)", - "x-ms-client-request-id": "2cfdc214-a159-11ec-bd26-9c2976df0bde" + "User-Agent": "azsdk-python-azureschemaregistry/1.0.0 Python/3.10.4 (Windows-10-10.0.22000-SP0)" }, "RequestBody": { "namespace": "example.avro", @@ -93,13 +89,13 @@ "StatusCode": 204, "ResponseHeaders": { "Content-Length": "0", - "Date": "Fri, 11 Mar 2022 16:34:51 GMT", - "Location": "https://fake_resource.servicebus.windows.net/$schemagroups/fakegroup/schemas/test-schema-update-async907a3961/versions/2?api-version=2021-10", + "Date": "Wed, 14 Sep 2022 17:41:57 GMT", + "Location": "https://fake_resource.servicebus.windows.net/$schemagroups/fakegroup/schemas/test-schema-update-async907a3961/versions/6?api-version=2021-10", "Schema-Group-Name": "fakegroup", - "Schema-Id": "d00c880797074a1b9e8c5ffdba2aeb92", - "Schema-Id-Location": "https://fake_resource.servicebus.windows.net:443/$schemagroups/$schemas/d00c880797074a1b9e8c5ffdba2aeb92?api-version=2021-10", + "Schema-Id": "9b2b312e68c54958b77530bffd67a6ac", + "Schema-Id-Location": "https://fake_resource.servicebus.windows.net:443/$schemagroups/$schemas/9b2b312e68c54958b77530bffd67a6ac?api-version=2021-10", "Schema-Name": "test-schema-update-async907a3961", - "Schema-Version": "2", + "Schema-Version": "6", "Schema-Versions-Location": "https://fake_resource.servicebus.windows.net:443/$schemagroups/fakegroup/schemas/test-schema-update-async907a3961/versions?api-version=2021-10", "Server": "Microsoft-HTTPAPI/2.0", "Strict-Transport-Security": "max-age=31536000" @@ -107,26 +103,24 @@ "ResponseBody": null }, { - "RequestUri": "https://fake_resource.servicebus.windows.net/$schemaGroups/$schemas/d00c880797074a1b9e8c5ffdba2aeb92?api-version=2021-10", + "RequestUri": "https://fake_resource.servicebus.windows.net/$schemaGroups/$schemas/9b2b312e68c54958b77530bffd67a6ac?api-version=2021-10", "RequestMethod": "GET", "RequestHeaders": { "Accept": "application/json; serialization=Avro", "Accept-Encoding": "gzip, deflate", - "Authorization": "Sanitized", - "User-Agent": "azsdk-python-azureschemaregistry/1.0.0 Python/3.9.0 (Windows-10-10.0.22000-SP0)", - "x-ms-client-request-id": "2d5ab6e3-a159-11ec-a4f8-9c2976df0bde" + "User-Agent": "azsdk-python-azureschemaregistry/1.0.0 Python/3.10.4 (Windows-10-10.0.22000-SP0)" }, "RequestBody": null, "StatusCode": 200, "ResponseHeaders": { "Content-Type": "application/json; serialization=Avro", - "Date": "Fri, 11 Mar 2022 16:34:51 GMT", - "Location": "https://fake_resource.servicebus.windows.net/$schemagroups/fakegroup/schemas/test-schema-update-async907a3961/versions/2?api-version=2021-10", + "Date": "Wed, 14 Sep 2022 17:41:58 GMT", + "Location": "https://fake_resource.servicebus.windows.net/$schemagroups/fakegroup/schemas/test-schema-update-async907a3961/versions/6?api-version=2021-10", "Schema-Group-Name": "fakegroup", - "Schema-Id": "d00c880797074a1b9e8c5ffdba2aeb92", - "Schema-Id-Location": "https://fake_resource.servicebus.windows.net:443/$schemagroups/$schemas/d00c880797074a1b9e8c5ffdba2aeb92?api-version=2021-10", + "Schema-Id": "9b2b312e68c54958b77530bffd67a6ac", + "Schema-Id-Location": "https://fake_resource.servicebus.windows.net:443/$schemagroups/$schemas/9b2b312e68c54958b77530bffd67a6ac?api-version=2021-10", "Schema-Name": "test-schema-update-async907a3961", - "Schema-Version": "2", + "Schema-Version": "6", "Schema-Versions-Location": "https://fake_resource.servicebus.windows.net:443/$schemagroups/fakegroup/schemas/test-schema-update-async907a3961/versions?api-version=2021-10", "Server": "Microsoft-HTTPAPI/2.0", "Strict-Transport-Security": "max-age=31536000", @@ -157,6 +151,56 @@ } ] } + }, + { + "RequestUri": "https://fake_resource.servicebus.windows.net/$schemaGroups/fakegroup/schemas/test-schema-update-async907a3961/versions/5?api-version=2021-10", + "RequestMethod": "GET", + "RequestHeaders": { + "Accept": "application/json", + "Accept-Encoding": "gzip, deflate", + "User-Agent": "azsdk-python-azureschemaregistry/1.0.0 Python/3.10.4 (Windows-10-10.0.22000-SP0)" + }, + "RequestBody": null, + "StatusCode": 200, + "ResponseHeaders": { + "Content-Type": "application/json; serialization=Avro", + "Date": "Wed, 14 Sep 2022 17:41:58 GMT", + "Location": "https://fake_resource.servicebus.windows.net/$schemagroups/fakegroup/schemas/test-schema-update-async907a3961/versions/5?api-version=2021-10", + "Schema-Group-Name": "fakegroup", + "Schema-Id": "1ed5a894b6c4402d870453e131d3223e", + "Schema-Id-Location": "https://fake_resource.servicebus.windows.net:443/$schemagroups/$schemas/1ed5a894b6c4402d870453e131d3223e?api-version=2021-10", + "Schema-Name": "test-schema-update-async907a3961", + "Schema-Version": "5", + "Schema-Versions-Location": "https://fake_resource.servicebus.windows.net:443/$schemagroups/fakegroup/schemas/test-schema-update-async907a3961/versions?api-version=2021-10", + "Server": "Microsoft-HTTPAPI/2.0", + "Strict-Transport-Security": "max-age=31536000", + "Transfer-Encoding": "chunked" + }, + "ResponseBody": { + "namespace": "example.avro", + "type": "record", + "name": "User", + "fields": [ + { + "name": "name", + "type": "string" + }, + { + "name": "favorite_number", + "type": [ + "int", + "null" + ] + }, + { + "name": "favorite_color", + "type": [ + "string", + "null" + ] + } + ] + } } ], "Variables": {} diff --git a/sdk/schemaregistry/azure-schemaregistry/tests/recordings/test_schema_registry.pyTestSchemaRegistrytest_schema_basic.json b/sdk/schemaregistry/azure-schemaregistry/tests/recordings/test_schema_registry.pyTestSchemaRegistrytest_schema_basic.json index 10dfa7297796..aa3af631435b 100644 --- a/sdk/schemaregistry/azure-schemaregistry/tests/recordings/test_schema_registry.pyTestSchemaRegistrytest_schema_basic.json +++ b/sdk/schemaregistry/azure-schemaregistry/tests/recordings/test_schema_registry.pyTestSchemaRegistrytest_schema_basic.json @@ -7,7 +7,7 @@ "Accept": "*/*", "Accept-Encoding": "gzip, deflate", "Connection": "keep-alive", - "User-Agent": "azsdk-python-identity/1.9.0b2 Python/3.9.0 (Windows-10-10.0.22000-SP0)" + "User-Agent": "azsdk-python-identity/1.11.0b4 Python/3.10.4 (Windows-10-10.0.22000-SP0)" }, "RequestBody": null, "StatusCode": 200, @@ -17,18 +17,18 @@ "Cache-Control": "max-age=86400, private", "Content-Length": "1753", "Content-Type": "application/json; charset=utf-8", - "Date": "Fri, 11 Mar 2022 16:34:32 GMT", + "Date": "Tue, 13 Sep 2022 17:43:14 GMT", "P3P": "CP=\u0022DSP CUR OTPi IND OTRi ONL FIN\u0022", "Set-Cookie": [ - "fpc=AuTGA0UGvnJPjytarsQ6xUo; expires=Sun, 10-Apr-2022 16:34:33 GMT; path=/; secure; HttpOnly; SameSite=None", - "esctx=AQABAAAAAAD--DLA3VO7QrddgJg7WevrIPXPthX8A6C0fEgiyTQ-agz5bphqDhaRkQ6-tUh05zmJJBT6JPEFNbS4k1ubGu6-1iNhZqWGrvBEzIs8npYfRjOdRm88V03wJWpWEHa5gPXQeZEgR3OlMpS-z58jtg4bFf74a0c_HDWatgDip1OmR9bt8EDefYXwooS6x1z1ujogAA; domain=.login.microsoftonline.com; path=/; secure; HttpOnly; SameSite=None", + "fpc=ApfvugnkHp9Di9JVMV0E2oM; expires=Thu, 13-Oct-2022 17:43:14 GMT; path=/; secure; HttpOnly; SameSite=None", + "esctx=AQABAAAAAAD--DLA3VO7QrddgJg7WevrtvQNWDahkZTrZLrluDZKjI6uzdXLk-vwT2SsR5NiQVgXQWr8Z9Udgg2_Ch8HcgyGlxglW5-8ndh-7k1_h4LCuL25WPqT0c3geOqCK43r8J9nyWE6BppsRdnI9HgctpGTQrnArhLNawq_hKyJZn4dS5QLe_QEu-GvOGlHnQVO1lMgAA; domain=.login.microsoftonline.com; path=/; secure; HttpOnly; SameSite=None", "x-ms-gateway-slice=estsfd; path=/; secure; samesite=none; httponly", "stsservicecookie=estsfd; path=/; secure; samesite=none; httponly" ], "Strict-Transport-Security": "max-age=31536000; includeSubDomains", "X-Content-Type-Options": "nosniff", - "x-ms-ests-server": "2.1.12529.18 - WUS2 ProdSlices", - "x-ms-request-id": "f3f4f440-e2a0-46bb-9dad-8f5cc1871e00" + "x-ms-ests-server": "2.1.13672.7 - SCUS ProdSlices", + "X-XSS-Protection": "0" }, "ResponseBody": { "token_endpoint": "https://login.microsoftonline.com/72f988bf-86f1-41af-91ab-2d7cd011db47/oauth2/v2.0/token", @@ -105,8 +105,8 @@ "Accept": "application/json", "Accept-Encoding": "gzip, deflate", "Connection": "keep-alive", - "Cookie": "fpc=AuTGA0UGvnJPjytarsQ6xUo; stsservicecookie=estsfd; x-ms-gateway-slice=estsfd", - "User-Agent": "azsdk-python-identity/1.9.0b2 Python/3.9.0 (Windows-10-10.0.22000-SP0)" + "Cookie": "fpc=ApfvugnkHp9Di9JVMV0E2oM; stsservicecookie=estsfd; x-ms-gateway-slice=estsfd", + "User-Agent": "azsdk-python-identity/1.11.0b4 Python/3.10.4 (Windows-10-10.0.22000-SP0)" }, "RequestBody": null, "StatusCode": 200, @@ -116,17 +116,17 @@ "Cache-Control": "max-age=86400, private", "Content-Length": "945", "Content-Type": "application/json; charset=utf-8", - "Date": "Fri, 11 Mar 2022 16:34:32 GMT", + "Date": "Tue, 13 Sep 2022 17:43:14 GMT", "P3P": "CP=\u0022DSP CUR OTPi IND OTRi ONL FIN\u0022", "Set-Cookie": [ - "fpc=AuTGA0UGvnJPjytarsQ6xUo; expires=Sun, 10-Apr-2022 16:34:33 GMT; path=/; secure; HttpOnly; SameSite=None", + "fpc=ApfvugnkHp9Di9JVMV0E2oM; expires=Thu, 13-Oct-2022 17:43:14 GMT; path=/; secure; HttpOnly; SameSite=None", "x-ms-gateway-slice=estsfd; path=/; secure; samesite=none; httponly", "stsservicecookie=estsfd; path=/; secure; samesite=none; httponly" ], "Strict-Transport-Security": "max-age=31536000; includeSubDomains", "X-Content-Type-Options": "nosniff", - "x-ms-ests-server": "2.1.12529.17 - EUS ProdSlices", - "x-ms-request-id": "a92c0c4f-bb62-4a12-ac17-7a1cd4677100" + "x-ms-ests-server": "2.1.13622.7 - WUS2 ProdSlices", + "X-XSS-Protection": "0" }, "ResponseBody": { "tenant_discovery_endpoint": "https://login.microsoftonline.com/common/.well-known/openid-configuration", @@ -181,12 +181,10 @@ "RequestHeaders": { "Accept": "application/json", "Accept-Encoding": "gzip, deflate", - "Authorization": "Sanitized", "Connection": "keep-alive", "Content-Length": "201", "Content-Type": "application/json; serialization=Avro", - "User-Agent": "azsdk-python-azureschemaregistry/1.0.0 Python/3.9.0 (Windows-10-10.0.22000-SP0)", - "x-ms-client-request-id": "21c84626-a159-11ec-b494-9c2976df0bde" + "User-Agent": "azsdk-python-azureschemaregistry/1.0.0 Python/3.10.4 (Windows-10-10.0.22000-SP0)" }, "RequestBody": { "namespace": "example.avro", @@ -216,11 +214,11 @@ "StatusCode": 204, "ResponseHeaders": { "Content-Length": "0", - "Date": "Fri, 11 Mar 2022 16:34:34 GMT", + "Date": "Tue, 13 Sep 2022 17:43:16 GMT", "Location": "https://fake_resource.servicebus.windows.net/$schemagroups/fakegroup/schemas/test-schema-basic62b42d09/versions/1?api-version=2021-10", "Schema-Group-Name": "fakegroup", - "Schema-Id": "f899d1f2b7c746dd835a3ec913644c79", - "Schema-Id-Location": "https://fake_resource.servicebus.windows.net:443/$schemagroups/$schemas/f899d1f2b7c746dd835a3ec913644c79?api-version=2021-10", + "Schema-Id": "6d3613ef1ae1438fa662cfa644607556", + "Schema-Id-Location": "https://fake_resource.servicebus.windows.net:443/$schemagroups/$schemas/6d3613ef1ae1438fa662cfa644607556?api-version=2021-10", "Schema-Name": "test-schema-basic62b42d09", "Schema-Version": "1", "Schema-Versions-Location": "https://fake_resource.servicebus.windows.net:443/$schemagroups/fakegroup/schemas/test-schema-basic62b42d09/versions?api-version=2021-10", @@ -230,25 +228,74 @@ "ResponseBody": null }, { - "RequestUri": "https://fake_resource.servicebus.windows.net/$schemaGroups/$schemas/f899d1f2b7c746dd835a3ec913644c79?api-version=2021-10", + "RequestUri": "https://fake_resource.servicebus.windows.net/$schemaGroups/$schemas/6d3613ef1ae1438fa662cfa644607556?api-version=2021-10", "RequestMethod": "GET", "RequestHeaders": { "Accept": "application/json; serialization=Avro", "Accept-Encoding": "gzip, deflate", - "Authorization": "Sanitized", "Connection": "keep-alive", - "User-Agent": "azsdk-python-azureschemaregistry/1.0.0 Python/3.9.0 (Windows-10-10.0.22000-SP0)", - "x-ms-client-request-id": "2309be1f-a159-11ec-aa5d-9c2976df0bde" + "User-Agent": "azsdk-python-azureschemaregistry/1.0.0 Python/3.10.4 (Windows-10-10.0.22000-SP0)" }, "RequestBody": null, "StatusCode": 200, "ResponseHeaders": { "Content-Type": "application/json; serialization=Avro", - "Date": "Fri, 11 Mar 2022 16:34:34 GMT", + "Date": "Tue, 13 Sep 2022 17:43:16 GMT", "Location": "https://fake_resource.servicebus.windows.net/$schemagroups/fakegroup/schemas/test-schema-basic62b42d09/versions/1?api-version=2021-10", "Schema-Group-Name": "fakegroup", - "Schema-Id": "f899d1f2b7c746dd835a3ec913644c79", - "Schema-Id-Location": "https://fake_resource.servicebus.windows.net:443/$schemagroups/$schemas/f899d1f2b7c746dd835a3ec913644c79?api-version=2021-10", + "Schema-Id": "6d3613ef1ae1438fa662cfa644607556", + "Schema-Id-Location": "https://fake_resource.servicebus.windows.net:443/$schemagroups/$schemas/6d3613ef1ae1438fa662cfa644607556?api-version=2021-10", + "Schema-Name": "test-schema-basic62b42d09", + "Schema-Version": "1", + "Schema-Versions-Location": "https://fake_resource.servicebus.windows.net:443/$schemagroups/fakegroup/schemas/test-schema-basic62b42d09/versions?api-version=2021-10", + "Server": "Microsoft-HTTPAPI/2.0", + "Strict-Transport-Security": "max-age=31536000", + "Transfer-Encoding": "chunked" + }, + "ResponseBody": { + "namespace": "example.avro", + "type": "record", + "name": "User", + "fields": [ + { + "name": "name", + "type": "string" + }, + { + "name": "favorite_number", + "type": [ + "int", + "null" + ] + }, + { + "name": "favorite_color", + "type": [ + "string", + "null" + ] + } + ] + } + }, + { + "RequestUri": "https://fake_resource.servicebus.windows.net/$schemaGroups/fakegroup/schemas/test-schema-basic62b42d09/versions/1?api-version=2021-10", + "RequestMethod": "GET", + "RequestHeaders": { + "Accept": "application/json", + "Accept-Encoding": "gzip, deflate", + "Connection": "keep-alive", + "User-Agent": "azsdk-python-azureschemaregistry/1.0.0 Python/3.10.4 (Windows-10-10.0.22000-SP0)" + }, + "RequestBody": null, + "StatusCode": 200, + "ResponseHeaders": { + "Content-Type": "application/json; serialization=Avro", + "Date": "Tue, 13 Sep 2022 17:43:17 GMT", + "Location": "https://fake_resource.servicebus.windows.net/$schemagroups/fakegroup/schemas/test-schema-basic62b42d09/versions/1?api-version=2021-10", + "Schema-Group-Name": "fakegroup", + "Schema-Id": "6d3613ef1ae1438fa662cfa644607556", + "Schema-Id-Location": "https://fake_resource.servicebus.windows.net:443/$schemagroups/$schemas/6d3613ef1ae1438fa662cfa644607556?api-version=2021-10", "Schema-Name": "test-schema-basic62b42d09", "Schema-Version": "1", "Schema-Versions-Location": "https://fake_resource.servicebus.windows.net:443/$schemagroups/fakegroup/schemas/test-schema-basic62b42d09/versions?api-version=2021-10", @@ -288,12 +335,10 @@ "RequestHeaders": { "Accept": "application/json", "Accept-Encoding": "gzip, deflate", - "Authorization": "Sanitized", "Connection": "keep-alive", "Content-Length": "201", "Content-Type": "application/json; serialization=Avro", - "User-Agent": "azsdk-python-azureschemaregistry/1.0.0 Python/3.9.0 (Windows-10-10.0.22000-SP0)", - "x-ms-client-request-id": "23773f5d-a159-11ec-af34-9c2976df0bde" + "User-Agent": "azsdk-python-azureschemaregistry/1.0.0 Python/3.10.4 (Windows-10-10.0.22000-SP0)" }, "RequestBody": { "namespace": "example.avro", @@ -323,11 +368,11 @@ "StatusCode": 204, "ResponseHeaders": { "Content-Length": "0", - "Date": "Fri, 11 Mar 2022 16:34:35 GMT", + "Date": "Tue, 13 Sep 2022 17:43:17 GMT", "Location": "https://fake_resource.servicebus.windows.net/$schemagroups/fakegroup/schemas/test-schema-basic62b42d09/versions/1?api-version=2021-10", "Schema-Group-Name": "fakegroup", - "Schema-Id": "f899d1f2b7c746dd835a3ec913644c79", - "Schema-Id-Location": "https://fake_resource.servicebus.windows.net:443/$schemagroups/$schemas/f899d1f2b7c746dd835a3ec913644c79?api-version=2021-10", + "Schema-Id": "6d3613ef1ae1438fa662cfa644607556", + "Schema-Id-Location": "https://fake_resource.servicebus.windows.net:443/$schemagroups/$schemas/6d3613ef1ae1438fa662cfa644607556?api-version=2021-10", "Schema-Name": "test-schema-basic62b42d09", "Schema-Version": "1", "Schema-Versions-Location": "https://fake_resource.servicebus.windows.net:443/$schemagroups/fakegroup/schemas/test-schema-basic62b42d09/versions?api-version=2021-10", diff --git a/sdk/schemaregistry/azure-schemaregistry/tests/recordings/test_schema_registry.pyTestSchemaRegistrytest_schema_negative_no_schema_version.json b/sdk/schemaregistry/azure-schemaregistry/tests/recordings/test_schema_registry.pyTestSchemaRegistrytest_schema_negative_no_schema_version.json new file mode 100644 index 000000000000..af83ac4d5684 --- /dev/null +++ b/sdk/schemaregistry/azure-schemaregistry/tests/recordings/test_schema_registry.pyTestSchemaRegistrytest_schema_negative_no_schema_version.json @@ -0,0 +1,258 @@ +{ + "Entries": [ + { + "RequestUri": "https://login.microsoftonline.com/72f988bf-86f1-41af-91ab-2d7cd011db47/v2.0/.well-known/openid-configuration", + "RequestMethod": "GET", + "RequestHeaders": { + "Accept": "*/*", + "Accept-Encoding": "gzip, deflate", + "Connection": "keep-alive", + "User-Agent": "azsdk-python-identity/1.11.0b4 Python/3.10.4 (Windows-10-10.0.22000-SP0)" + }, + "RequestBody": null, + "StatusCode": 200, + "ResponseHeaders": { + "Access-Control-Allow-Methods": "GET, OPTIONS", + "Access-Control-Allow-Origin": "*", + "Cache-Control": "max-age=86400, private", + "Content-Length": "1753", + "Content-Type": "application/json; charset=utf-8", + "Date": "Tue, 13 Sep 2022 17:46:25 GMT", + "P3P": "CP=\u0022DSP CUR OTPi IND OTRi ONL FIN\u0022", + "Set-Cookie": [ + "fpc=AqeH_SO5jg5Gjx2XVlwcyeA; expires=Thu, 13-Oct-2022 17:46:26 GMT; path=/; secure; HttpOnly; SameSite=None", + "esctx=AQABAAAAAAD--DLA3VO7QrddgJg7Wevrl-bJhZLcfZNWBUGH4hOwC2F3tggpKOAmolbuWeOboHV60JYPlIvT9TTihxujuBVudwHcPQZJ_LPJN0zdaxMLhlinE-DA_XJy90pJivhoaCb_ss_WCX2FPSq1kk43bxJZenLR8XKy52CX5TtR7kpb2-XPNcuOdpCAu2n7MoZsm0YgAA; domain=.login.microsoftonline.com; path=/; secure; HttpOnly; SameSite=None", + "x-ms-gateway-slice=estsfd; path=/; secure; samesite=none; httponly", + "stsservicecookie=estsfd; path=/; secure; samesite=none; httponly" + ], + "Strict-Transport-Security": "max-age=31536000; includeSubDomains", + "X-Content-Type-Options": "nosniff", + "x-ms-ests-server": "2.1.13672.7 - NCUS ProdSlices", + "X-XSS-Protection": "0" + }, + "ResponseBody": { + "token_endpoint": "https://login.microsoftonline.com/72f988bf-86f1-41af-91ab-2d7cd011db47/oauth2/v2.0/token", + "token_endpoint_auth_methods_supported": [ + "client_secret_post", + "private_key_jwt", + "client_secret_basic" + ], + "jwks_uri": "https://login.microsoftonline.com/72f988bf-86f1-41af-91ab-2d7cd011db47/discovery/v2.0/keys", + "response_modes_supported": [ + "query", + "fragment", + "form_post" + ], + "subject_types_supported": [ + "pairwise" + ], + "id_token_signing_alg_values_supported": [ + "RS256" + ], + "response_types_supported": [ + "code", + "id_token", + "code id_token", + "id_token token" + ], + "scopes_supported": [ + "openid", + "profile", + "email", + "offline_access" + ], + "issuer": "https://login.microsoftonline.com/72f988bf-86f1-41af-91ab-2d7cd011db47/v2.0", + "request_uri_parameter_supported": false, + "userinfo_endpoint": "https://graph.microsoft.com/oidc/userinfo", + "authorization_endpoint": "https://login.microsoftonline.com/72f988bf-86f1-41af-91ab-2d7cd011db47/oauth2/v2.0/authorize", + "device_authorization_endpoint": "https://login.microsoftonline.com/72f988bf-86f1-41af-91ab-2d7cd011db47/oauth2/v2.0/devicecode", + "http_logout_supported": true, + "frontchannel_logout_supported": true, + "end_session_endpoint": "https://login.microsoftonline.com/72f988bf-86f1-41af-91ab-2d7cd011db47/oauth2/v2.0/logout", + "claims_supported": [ + "sub", + "iss", + "cloud_instance_name", + "cloud_instance_host_name", + "cloud_graph_host_name", + "msgraph_host", + "aud", + "exp", + "iat", + "auth_time", + "acr", + "nonce", + "preferred_username", + "name", + "tid", + "ver", + "at_hash", + "c_hash", + "email" + ], + "kerberos_endpoint": "https://login.microsoftonline.com/72f988bf-86f1-41af-91ab-2d7cd011db47/kerberos", + "tenant_region_scope": "WW", + "cloud_instance_name": "microsoftonline.com", + "cloud_graph_host_name": "graph.windows.net", + "msgraph_host": "graph.microsoft.com", + "rbac_url": "https://pas.windows.net" + } + }, + { + "RequestUri": "https://login.microsoftonline.com/common/discovery/instance?api-version=1.1\u0026authorization_endpoint=https://login.microsoftonline.com/common/oauth2/authorize", + "RequestMethod": "GET", + "RequestHeaders": { + "Accept": "application/json", + "Accept-Encoding": "gzip, deflate", + "Connection": "keep-alive", + "Cookie": "fpc=AqeH_SO5jg5Gjx2XVlwcyeA; stsservicecookie=estsfd; x-ms-gateway-slice=estsfd", + "User-Agent": "azsdk-python-identity/1.11.0b4 Python/3.10.4 (Windows-10-10.0.22000-SP0)" + }, + "RequestBody": null, + "StatusCode": 200, + "ResponseHeaders": { + "Access-Control-Allow-Methods": "GET, OPTIONS", + "Access-Control-Allow-Origin": "*", + "Cache-Control": "max-age=86400, private", + "Content-Length": "945", + "Content-Type": "application/json; charset=utf-8", + "Date": "Tue, 13 Sep 2022 17:46:25 GMT", + "P3P": "CP=\u0022DSP CUR OTPi IND OTRi ONL FIN\u0022", + "Set-Cookie": [ + "fpc=AqeH_SO5jg5Gjx2XVlwcyeA; expires=Thu, 13-Oct-2022 17:46:26 GMT; path=/; secure; HttpOnly; SameSite=None", + "x-ms-gateway-slice=estsfd; path=/; secure; samesite=none; httponly", + "stsservicecookie=estsfd; path=/; secure; samesite=none; httponly" + ], + "Strict-Transport-Security": "max-age=31536000; includeSubDomains", + "X-Content-Type-Options": "nosniff", + "x-ms-ests-server": "2.1.13622.7 - NCUS ProdSlices", + "X-XSS-Protection": "0" + }, + "ResponseBody": { + "tenant_discovery_endpoint": "https://login.microsoftonline.com/common/.well-known/openid-configuration", + "api-version": "1.1", + "metadata": [ + { + "preferred_network": "login.microsoftonline.com", + "preferred_cache": "login.windows.net", + "aliases": [ + "login.microsoftonline.com", + "login.windows.net", + "login.microsoft.com", + "sts.windows.net" + ] + }, + { + "preferred_network": "login.partner.microsoftonline.cn", + "preferred_cache": "login.partner.microsoftonline.cn", + "aliases": [ + "login.partner.microsoftonline.cn", + "login.chinacloudapi.cn" + ] + }, + { + "preferred_network": "login.microsoftonline.de", + "preferred_cache": "login.microsoftonline.de", + "aliases": [ + "login.microsoftonline.de" + ] + }, + { + "preferred_network": "login.microsoftonline.us", + "preferred_cache": "login.microsoftonline.us", + "aliases": [ + "login.microsoftonline.us", + "login.usgovcloudapi.net" + ] + }, + { + "preferred_network": "login-us.microsoftonline.com", + "preferred_cache": "login-us.microsoftonline.com", + "aliases": [ + "login-us.microsoftonline.com" + ] + } + ] + } + }, + { + "RequestUri": "https://fake_resource.servicebus.windows.net/$schemaGroups/fakegroup/schemas/test-schema-negative-version874535cb?api-version=2021-10", + "RequestMethod": "PUT", + "RequestHeaders": { + "Accept": "application/json", + "Accept-Encoding": "gzip, deflate", + "Connection": "keep-alive", + "Content-Length": "179", + "Content-Type": "application/json; serialization=Avro", + "User-Agent": "azsdk-python-azureschemaregistry/1.0.0 Python/3.10.4 (Windows-10-10.0.22000-SP0)" + }, + "RequestBody": { + "namespace": "example.avro", + "type": "record", + "name": "User", + "fields": [ + { + "name": "name", + "type": "string" + }, + { + "name": "age", + "type": [ + "int", + "null" + ] + }, + { + "name": "city", + "type": [ + "string", + "null" + ] + } + ] + }, + "StatusCode": 204, + "ResponseHeaders": { + "Content-Length": "0", + "Date": "Tue, 13 Sep 2022 17:46:26 GMT", + "Location": "https://fake_resource.servicebus.windows.net/$schemagroups/fakegroup/schemas/test-schema-negative-version874535cb/versions/1?api-version=2021-10", + "Schema-Group-Name": "fakegroup", + "Schema-Id": "8b9dd12181b34aee9e5a5c7adc9ff212", + "Schema-Id-Location": "https://fake_resource.servicebus.windows.net:443/$schemagroups/$schemas/8b9dd12181b34aee9e5a5c7adc9ff212?api-version=2021-10", + "Schema-Name": "test-schema-negative-version874535cb", + "Schema-Version": "1", + "Schema-Versions-Location": "https://fake_resource.servicebus.windows.net:443/$schemagroups/fakegroup/schemas/test-schema-negative-version874535cb/versions?api-version=2021-10", + "Server": "Microsoft-HTTPAPI/2.0", + "Strict-Transport-Security": "max-age=31536000" + }, + "ResponseBody": null + }, + { + "RequestUri": "https://fake_resource.servicebus.windows.net/$schemaGroups/fakegroup/schemas/test-schema-negative-version874535cb/versions/2?api-version=2021-10", + "RequestMethod": "GET", + "RequestHeaders": { + "Accept": "application/json", + "Accept-Encoding": "gzip, deflate", + "Connection": "keep-alive", + "User-Agent": "azsdk-python-azureschemaregistry/1.0.0 Python/3.10.4 (Windows-10-10.0.22000-SP0)" + }, + "RequestBody": null, + "StatusCode": 404, + "ResponseHeaders": { + "Content-Type": "application/json", + "Date": "Tue, 13 Sep 2022 17:46:27 GMT", + "Server": "Microsoft-HTTPAPI/2.0", + "Strict-Transport-Security": "max-age=31536000", + "Transfer-Encoding": "chunked", + "x-ms-error-code": "ItemNotFound" + }, + "ResponseBody": { + "error": { + "code": "ItemNotFound", + "message": "Schema fakegroup/test-schema-negative-version874535cb/ver.2 does not exist. TrackingId:29786a8d-66d7-463b-b7c8-75efed678795_G5S2, SystemTracker:fake_resource.servicebus.windows.net/:$schemaGroups/fakegroup/schemas/test-schema-negative-version874535cb/versions/2, Timestamp:2022-09-13T17:46:28" + } + } + } + ], + "Variables": {} +} diff --git a/sdk/schemaregistry/azure-schemaregistry/tests/recordings/test_schema_registry.pyTestSchemaRegistrytest_schema_update.json b/sdk/schemaregistry/azure-schemaregistry/tests/recordings/test_schema_registry.pyTestSchemaRegistrytest_schema_update.json index 9f8668e5be6a..959847e8fbb9 100644 --- a/sdk/schemaregistry/azure-schemaregistry/tests/recordings/test_schema_registry.pyTestSchemaRegistrytest_schema_update.json +++ b/sdk/schemaregistry/azure-schemaregistry/tests/recordings/test_schema_registry.pyTestSchemaRegistrytest_schema_update.json @@ -7,7 +7,7 @@ "Accept": "*/*", "Accept-Encoding": "gzip, deflate", "Connection": "keep-alive", - "User-Agent": "azsdk-python-identity/1.9.0b2 Python/3.9.0 (Windows-10-10.0.22000-SP0)" + "User-Agent": "azsdk-python-identity/1.11.0b4 Python/3.10.4 (Windows-10-10.0.22000-SP0)" }, "RequestBody": null, "StatusCode": 200, @@ -17,17 +17,18 @@ "Cache-Control": "max-age=86400, private", "Content-Length": "1753", "Content-Type": "application/json; charset=utf-8", - "Date": "Fri, 11 Mar 2022 16:34:36 GMT", + "Date": "Wed, 14 Sep 2022 17:40:41 GMT", "P3P": "CP=\u0022DSP CUR OTPi IND OTRi ONL FIN\u0022", "Set-Cookie": [ - "fpc=AuTGA0UGvnJPjytarsQ6xUqlEE-xAQAAABhxvdkOAAAA; expires=Sun, 10-Apr-2022 16:34:36 GMT; path=/; secure; HttpOnly; SameSite=None", + "fpc=Aj7D2wR3xUpDrxkgGV4TLmE; expires=Fri, 14-Oct-2022 17:40:41 GMT; path=/; secure; HttpOnly; SameSite=None", + "esctx=AQABAAAAAAD--DLA3VO7QrddgJg7Wevr343QsD0cNEvgEaoI2yN8IjBsaHP5-CfK0A8yI8HrIh4FNLcNTluB0wYeJMyBYnIgYwcFjHXPPVVYW894MynQp0mIJExHuxFUoq5Bl4w5YUilcdUo21zVUwnJ2TtMHIePGsxF_PvT38uS_zfTCuBN7fdTQAwBG434qUqBF7yjuesgAA; domain=.login.microsoftonline.com; path=/; secure; HttpOnly; SameSite=None", "x-ms-gateway-slice=estsfd; path=/; secure; samesite=none; httponly", "stsservicecookie=estsfd; path=/; secure; samesite=none; httponly" ], "Strict-Transport-Security": "max-age=31536000; includeSubDomains", "X-Content-Type-Options": "nosniff", - "x-ms-ests-server": "2.1.12529.18 - EUS ProdSlices", - "x-ms-request-id": "09468a0d-da48-4527-93c6-5c75a7121900" + "x-ms-ests-server": "2.1.13672.7 - EUS ProdSlices", + "X-XSS-Protection": "0" }, "ResponseBody": { "token_endpoint": "https://login.microsoftonline.com/72f988bf-86f1-41af-91ab-2d7cd011db47/oauth2/v2.0/token", @@ -104,8 +105,8 @@ "Accept": "application/json", "Accept-Encoding": "gzip, deflate", "Connection": "keep-alive", - "Cookie": "fpc=AuTGA0UGvnJPjytarsQ6xUqlEE-xAQAAABhxvdkOAAAA; stsservicecookie=estsfd; x-ms-gateway-slice=estsfd", - "User-Agent": "azsdk-python-identity/1.9.0b2 Python/3.9.0 (Windows-10-10.0.22000-SP0)" + "Cookie": "fpc=Aj7D2wR3xUpDrxkgGV4TLmE; stsservicecookie=estsfd; x-ms-gateway-slice=estsfd", + "User-Agent": "azsdk-python-identity/1.11.0b4 Python/3.10.4 (Windows-10-10.0.22000-SP0)" }, "RequestBody": null, "StatusCode": 200, @@ -115,17 +116,17 @@ "Cache-Control": "max-age=86400, private", "Content-Length": "945", "Content-Type": "application/json; charset=utf-8", - "Date": "Fri, 11 Mar 2022 16:34:36 GMT", + "Date": "Wed, 14 Sep 2022 17:40:41 GMT", "P3P": "CP=\u0022DSP CUR OTPi IND OTRi ONL FIN\u0022", "Set-Cookie": [ - "fpc=AuTGA0UGvnJPjytarsQ6xUqlEE-xAQAAABhxvdkOAAAA; expires=Sun, 10-Apr-2022 16:34:36 GMT; path=/; secure; HttpOnly; SameSite=None", + "fpc=Aj7D2wR3xUpDrxkgGV4TLmE; expires=Fri, 14-Oct-2022 17:40:41 GMT; path=/; secure; HttpOnly; SameSite=None", "x-ms-gateway-slice=estsfd; path=/; secure; samesite=none; httponly", "stsservicecookie=estsfd; path=/; secure; samesite=none; httponly" ], "Strict-Transport-Security": "max-age=31536000; includeSubDomains", "X-Content-Type-Options": "nosniff", - "x-ms-ests-server": "2.1.12559.4 - SCUS ProdSlices", - "x-ms-request-id": "e785887f-5c79-4937-b182-deaba7ac3700" + "x-ms-ests-server": "2.1.13622.7 - NCUS ProdSlices", + "X-XSS-Protection": "0" }, "ResponseBody": { "tenant_discovery_endpoint": "https://login.microsoftonline.com/common/.well-known/openid-configuration", @@ -180,12 +181,10 @@ "RequestHeaders": { "Accept": "application/json", "Accept-Encoding": "gzip, deflate", - "Authorization": "Sanitized", "Connection": "keep-alive", "Content-Length": "201", "Content-Type": "application/json; serialization=Avro", - "User-Agent": "azsdk-python-azureschemaregistry/1.0.0 Python/3.9.0 (Windows-10-10.0.22000-SP0)", - "x-ms-client-request-id": "23f5f0cd-a159-11ec-a15f-9c2976df0bde" + "User-Agent": "azsdk-python-azureschemaregistry/1.0.0 Python/3.10.4 (Windows-10-10.0.22000-SP0)" }, "RequestBody": { "namespace": "example.avro", @@ -215,13 +214,13 @@ "StatusCode": 204, "ResponseHeaders": { "Content-Length": "0", - "Date": "Fri, 11 Mar 2022 16:34:36 GMT", - "Location": "https://fake_resource.servicebus.windows.net/$schemagroups/fakegroup/schemas/test-schema-update92272d8a/versions/3?api-version=2021-10", + "Date": "Wed, 14 Sep 2022 17:40:43 GMT", + "Location": "https://fake_resource.servicebus.windows.net/$schemagroups/fakegroup/schemas/test-schema-update92272d8a/versions/5?api-version=2021-10", "Schema-Group-Name": "fakegroup", - "Schema-Id": "79a4e4672c8b4468a29dc2bb3160dc43", - "Schema-Id-Location": "https://fake_resource.servicebus.windows.net:443/$schemagroups/$schemas/79a4e4672c8b4468a29dc2bb3160dc43?api-version=2021-10", + "Schema-Id": "a044a95772824e22a47dceb54f029470", + "Schema-Id-Location": "https://fake_resource.servicebus.windows.net:443/$schemagroups/$schemas/a044a95772824e22a47dceb54f029470?api-version=2021-10", "Schema-Name": "test-schema-update92272d8a", - "Schema-Version": "3", + "Schema-Version": "5", "Schema-Versions-Location": "https://fake_resource.servicebus.windows.net:443/$schemagroups/fakegroup/schemas/test-schema-update92272d8a/versions?api-version=2021-10", "Server": "Microsoft-HTTPAPI/2.0", "Strict-Transport-Security": "max-age=31536000" @@ -234,12 +233,10 @@ "RequestHeaders": { "Accept": "application/json", "Accept-Encoding": "gzip, deflate", - "Authorization": "Sanitized", "Connection": "keep-alive", "Content-Length": "200", "Content-Type": "application/json; serialization=Avro", - "User-Agent": "azsdk-python-azureschemaregistry/1.0.0 Python/3.9.0 (Windows-10-10.0.22000-SP0)", - "x-ms-client-request-id": "24b5bf96-a159-11ec-9531-9c2976df0bde" + "User-Agent": "azsdk-python-azureschemaregistry/1.0.0 Python/3.10.4 (Windows-10-10.0.22000-SP0)" }, "RequestBody": { "namespace": "example.avro", @@ -269,13 +266,13 @@ "StatusCode": 204, "ResponseHeaders": { "Content-Length": "0", - "Date": "Fri, 11 Mar 2022 16:34:37 GMT", - "Location": "https://fake_resource.servicebus.windows.net/$schemagroups/fakegroup/schemas/test-schema-update92272d8a/versions/4?api-version=2021-10", + "Date": "Wed, 14 Sep 2022 17:40:43 GMT", + "Location": "https://fake_resource.servicebus.windows.net/$schemagroups/fakegroup/schemas/test-schema-update92272d8a/versions/6?api-version=2021-10", "Schema-Group-Name": "fakegroup", - "Schema-Id": "114aeeb4f80a43859a6c37976c2c465e", - "Schema-Id-Location": "https://fake_resource.servicebus.windows.net:443/$schemagroups/$schemas/114aeeb4f80a43859a6c37976c2c465e?api-version=2021-10", + "Schema-Id": "91835f3b544a48b79797638b784a512d", + "Schema-Id-Location": "https://fake_resource.servicebus.windows.net:443/$schemagroups/$schemas/91835f3b544a48b79797638b784a512d?api-version=2021-10", "Schema-Name": "test-schema-update92272d8a", - "Schema-Version": "4", + "Schema-Version": "6", "Schema-Versions-Location": "https://fake_resource.servicebus.windows.net:443/$schemagroups/fakegroup/schemas/test-schema-update92272d8a/versions?api-version=2021-10", "Server": "Microsoft-HTTPAPI/2.0", "Strict-Transport-Security": "max-age=31536000" @@ -283,27 +280,25 @@ "ResponseBody": null }, { - "RequestUri": "https://fake_resource.servicebus.windows.net/$schemaGroups/$schemas/114aeeb4f80a43859a6c37976c2c465e?api-version=2021-10", + "RequestUri": "https://fake_resource.servicebus.windows.net/$schemaGroups/$schemas/91835f3b544a48b79797638b784a512d?api-version=2021-10", "RequestMethod": "GET", "RequestHeaders": { "Accept": "application/json; serialization=Avro", "Accept-Encoding": "gzip, deflate", - "Authorization": "Sanitized", "Connection": "keep-alive", - "User-Agent": "azsdk-python-azureschemaregistry/1.0.0 Python/3.9.0 (Windows-10-10.0.22000-SP0)", - "x-ms-client-request-id": "250e85f9-a159-11ec-ad11-9c2976df0bde" + "User-Agent": "azsdk-python-azureschemaregistry/1.0.0 Python/3.10.4 (Windows-10-10.0.22000-SP0)" }, "RequestBody": null, "StatusCode": 200, "ResponseHeaders": { "Content-Type": "application/json; serialization=Avro", - "Date": "Fri, 11 Mar 2022 16:34:38 GMT", - "Location": "https://fake_resource.servicebus.windows.net/$schemagroups/fakegroup/schemas/test-schema-update92272d8a/versions/4?api-version=2021-10", + "Date": "Wed, 14 Sep 2022 17:40:44 GMT", + "Location": "https://fake_resource.servicebus.windows.net/$schemagroups/fakegroup/schemas/test-schema-update92272d8a/versions/6?api-version=2021-10", "Schema-Group-Name": "fakegroup", - "Schema-Id": "114aeeb4f80a43859a6c37976c2c465e", - "Schema-Id-Location": "https://fake_resource.servicebus.windows.net:443/$schemagroups/$schemas/114aeeb4f80a43859a6c37976c2c465e?api-version=2021-10", + "Schema-Id": "91835f3b544a48b79797638b784a512d", + "Schema-Id-Location": "https://fake_resource.servicebus.windows.net:443/$schemagroups/$schemas/91835f3b544a48b79797638b784a512d?api-version=2021-10", "Schema-Name": "test-schema-update92272d8a", - "Schema-Version": "4", + "Schema-Version": "6", "Schema-Versions-Location": "https://fake_resource.servicebus.windows.net:443/$schemagroups/fakegroup/schemas/test-schema-update92272d8a/versions?api-version=2021-10", "Server": "Microsoft-HTTPAPI/2.0", "Strict-Transport-Security": "max-age=31536000", @@ -334,6 +329,57 @@ } ] } + }, + { + "RequestUri": "https://fake_resource.servicebus.windows.net/$schemaGroups/fakegroup/schemas/test-schema-update92272d8a/versions/5?api-version=2021-10", + "RequestMethod": "GET", + "RequestHeaders": { + "Accept": "application/json", + "Accept-Encoding": "gzip, deflate", + "Connection": "keep-alive", + "User-Agent": "azsdk-python-azureschemaregistry/1.0.0 Python/3.10.4 (Windows-10-10.0.22000-SP0)" + }, + "RequestBody": null, + "StatusCode": 200, + "ResponseHeaders": { + "Content-Type": "application/json; serialization=Avro", + "Date": "Wed, 14 Sep 2022 17:40:45 GMT", + "Location": "https://fake_resource.servicebus.windows.net/$schemagroups/fakegroup/schemas/test-schema-update92272d8a/versions/5?api-version=2021-10", + "Schema-Group-Name": "fakegroup", + "Schema-Id": "a044a95772824e22a47dceb54f029470", + "Schema-Id-Location": "https://fake_resource.servicebus.windows.net:443/$schemagroups/$schemas/a044a95772824e22a47dceb54f029470?api-version=2021-10", + "Schema-Name": "test-schema-update92272d8a", + "Schema-Version": "5", + "Schema-Versions-Location": "https://fake_resource.servicebus.windows.net:443/$schemagroups/fakegroup/schemas/test-schema-update92272d8a/versions?api-version=2021-10", + "Server": "Microsoft-HTTPAPI/2.0", + "Strict-Transport-Security": "max-age=31536000", + "Transfer-Encoding": "chunked" + }, + "ResponseBody": { + "namespace": "example.avro", + "type": "record", + "name": "User", + "fields": [ + { + "name": "name", + "type": "string" + }, + { + "name": "favorite_number", + "type": [ + "int", + "null" + ] + }, + { + "name": "favorite_color", + "type": [ + "string", + "null" + ] + } + ] + } } ], "Variables": {} diff --git a/sdk/schemaregistry/azure-schemaregistry/tests/test_schema_registry.py b/sdk/schemaregistry/azure-schemaregistry/tests/test_schema_registry.py index d66b51ee85c7..df6a72ee10ec 100644 --- a/sdk/schemaregistry/azure-schemaregistry/tests/test_schema_registry.py +++ b/sdk/schemaregistry/azure-schemaregistry/tests/test_schema_registry.py @@ -58,6 +58,15 @@ def test_schema_basic(self, **kwargs): assert returned_schema.properties.name == name assert returned_schema.definition == schema_str + returned_version_schema = client.get_schema_by_version(schemaregistry_group, name, schema_properties.version, logging_enable=True) + + assert returned_version_schema.properties.id == schema_properties.id + assert returned_version_schema.properties.format == "Avro" + assert returned_version_schema.properties.group_name == schemaregistry_group + assert returned_version_schema.properties.name == name + assert returned_version_schema.properties.version == schema_properties.version + assert returned_version_schema.definition == schema_str + returned_schema_properties = client.get_schema_properties(schemaregistry_group, name, schema_str, format, logging_enable=True) assert returned_schema_properties.id == schema_properties.id @@ -96,6 +105,16 @@ def test_schema_update(self, **kwargs): assert new_schema.properties.group_name == schemaregistry_group assert new_schema.properties.name == name + old_schema = client.get_schema_by_version(schemaregistry_group, name, schema_properties.version, logging_enable=True) + + assert old_schema.properties.id != new_schema_properties.id + assert old_schema.properties.id == schema_properties.id + assert old_schema.definition == schema_str + assert old_schema.properties.format == "Avro" + assert old_schema.properties.group_name == schemaregistry_group + assert old_schema.properties.name == name + assert old_schema.properties.version == schema_properties.version + @SchemaRegistryEnvironmentVariableLoader() @recorded_by_proxy def test_schema_same_twice(self, **kwargs): @@ -123,7 +142,6 @@ def test_schema_negative_wrong_credential(self, **kwargs): with pytest.raises(ClientAuthenticationError): client.register_schema(schemaregistry_group, name, schema_str, format) - @pytest.mark.skip("Figure out why live_test_only mark not working for non-live mode") @pytest.mark.live_test_only @SchemaRegistryEnvironmentVariableLoader() @recorded_by_proxy @@ -138,7 +156,7 @@ def test_schema_negative_wrong_endpoint(self, **kwargs): client.register_schema(schemaregistry_group, name, schema_str, format) if exc_info.type is HttpResponseError: response_content = json.loads(exc_info.value.response.content) - assert "Name does not resolve" in response_content["Message"] + assert any([(m in response_content["Message"]) for m in ["Name does not resolve", "Unable to find a record"]]) @SchemaRegistryEnvironmentVariableLoader() @recorded_by_proxy @@ -152,6 +170,21 @@ def test_schema_negative_no_schema(self, **kwargs): with pytest.raises(HttpResponseError): client.get_schema('a' * 32) + @SchemaRegistryEnvironmentVariableLoader() + @recorded_by_proxy + def test_schema_negative_no_schema_version(self, **kwargs): + schemaregistry_fully_qualified_namespace = kwargs.pop("schemaregistry_fully_qualified_namespace") + schemaregistry_group = kwargs.pop("schemaregistry_group") + client = self.create_client(fully_qualified_namespace=schemaregistry_fully_qualified_namespace) + name = self.get_resource_name('test-schema-negative-version') + schema_str = """{"namespace":"example.avro","type":"record","name":"User","fields":[{"name":"name","type":"string"},{"name":"age","type":["int","null"]},{"name":"city","type":["string","null"]}]}""" + format = "Avro" + schema_properties = client.register_schema(schemaregistry_group, name, schema_str, format) + version = schema_properties.version + 1 + with pytest.raises(HttpResponseError): + client.get_schema_by_version(schemaregistry_group, name, version) + + @SchemaRegistryEnvironmentVariableLoader() @recorded_by_proxy def test_register_schema_errors(self, schemaregistry_fully_qualified_namespace, schemaregistry_group, **kwargs): diff --git a/shared_requirements.txt b/shared_requirements.txt index 79621f83f1dc..59c3e6a42825 100644 --- a/shared_requirements.txt +++ b/shared_requirements.txt @@ -126,7 +126,7 @@ aiodns>=2.0 python-dateutil>=2.8.0 six>=1.11.0 isodate>=0.6.0 -avro>=1.11.0 +avro>=1.11.1 pyjwt>=1.7.1 chardet<5,>=3.0.2 #override azure-core typing-extensions>=4.0.1 @@ -170,7 +170,7 @@ chardet<5,>=3.0.2 #override azure-storage-file-datalake azure-storage-blob<13.0.0,>=12.14.0b1 #override azure-security-attestation azure-core<2.0.0,>=1.8.2 #override azure-data-tables msrest>=0.6.19 -#override azure-schemaregistry azure-core<2.0.0,>=1.23.0 +#override azure-schemaregistry azure-core<2.0.0,>=1.24.0 #override azure-schemaregistry-avroencoder typing-extensions>=4.0.1 opencensus>=0.6.0 opencensus-ext-threading