diff --git a/sdk/trustedsigning/azure-mgmt-trustedsigning/CHANGELOG.md b/sdk/trustedsigning/azure-mgmt-trustedsigning/CHANGELOG.md index 0850f630d10c..0ad000108392 100644 --- a/sdk/trustedsigning/azure-mgmt-trustedsigning/CHANGELOG.md +++ b/sdk/trustedsigning/azure-mgmt-trustedsigning/CHANGELOG.md @@ -1,5 +1,30 @@ # Release History +## 1.0.0b2 (2025-05-13) + +### Features Added + + - Model `Certificate` added property `enhanced_key_usage` + - Added model `AccountSkuPatch` + - Method `Certificate.__init__` has a new overload `def __init__(self: None, serial_number: Optional[str], enhanced_key_usage: Optional[str], subject_name: Optional[str], thumbprint: Optional[str], created_date: Optional[str], expiry_date: Optional[str], status: Optional[Union[str, _models.CertificateStatus]], revocation: Optional[_models.Revocation])` + - Method `CertificateProfileProperties.__init__` has a new overload `def __init__(self: None, profile_type: Union[str, _models.ProfileType], identity_validation_id: str, include_street_address: Optional[bool], include_city: Optional[bool], include_state: Optional[bool], include_country: Optional[bool], include_postal_code: Optional[bool])` + - Method `CodeSigningAccountPatchProperties.__init__` has a new overload `def __init__(self: None, sku: Optional[_models.AccountSkuPatch])` + - Method `Operation.__init__` has a new overload `def __init__(self: None, display: Optional[_models.OperationDisplay])` + - Method `AccountSkuPatch.__init__` has a new overload `def __init__(self: None, name: Optional[Union[str, _models.SkuName]])` + - Method `AccountSkuPatch.__init__` has a new overload `def __init__(self: None, mapping: Mapping[str, Any])` + +### Breaking Changes + + - Model `CertificateProfileProperties` deleted or renamed its instance variable `common_name` + - Model `CertificateProfileProperties` deleted or renamed its instance variable `organization` + - Model `CertificateProfileProperties` deleted or renamed its instance variable `organization_unit` + - Model `CertificateProfileProperties` deleted or renamed its instance variable `street_address` + - Model `CertificateProfileProperties` deleted or renamed its instance variable `city` + - Model `CertificateProfileProperties` deleted or renamed its instance variable `state` + - Model `CertificateProfileProperties` deleted or renamed its instance variable `country` + - Model `CertificateProfileProperties` deleted or renamed its instance variable `postal_code` + - Model `CertificateProfileProperties` deleted or renamed its instance variable `enhanced_key_usage` + ## 1.0.0b1 (2024-09-27) ### Other Changes diff --git a/sdk/trustedsigning/azure-mgmt-trustedsigning/README.md b/sdk/trustedsigning/azure-mgmt-trustedsigning/README.md index 8d943b4a5cd7..ebd79ba1afaa 100644 --- a/sdk/trustedsigning/azure-mgmt-trustedsigning/README.md +++ b/sdk/trustedsigning/azure-mgmt-trustedsigning/README.md @@ -1,7 +1,7 @@ # Microsoft Azure SDK for Python This is the Microsoft Azure Trustedsigning Management Client Library. -This package has been tested with Python 3.8+. +This package has been tested with Python 3.9+. For a more complete view of Azure libraries, see the [azure sdk python release](https://aka.ms/azsdk/python/all). ## _Disclaimer_ @@ -12,7 +12,7 @@ _Azure SDK Python packages support for Python 2.7 has ended 01 January 2022. For ### Prerequisites -- Python 3.8+ is required to use this package. +- Python 3.9+ is required to use this package. - [Azure subscription](https://azure.microsoft.com/free/) ### Install the package @@ -24,7 +24,7 @@ pip install azure-identity ### Authentication -By default, [Azure Active Directory](https://aka.ms/awps/aad) token authentication depends on correct configure of following environment variables. +By default, [Azure Active Directory](https://aka.ms/awps/aad) token authentication depends on correct configuration of the following environment variables. - `AZURE_CLIENT_ID` for Azure client ID. - `AZURE_TENANT_ID` for Azure tenant ID. diff --git a/sdk/trustedsigning/azure-mgmt-trustedsigning/_meta.json b/sdk/trustedsigning/azure-mgmt-trustedsigning/_meta.json index fde7aa5f8cd8..c3582ce4ea31 100644 --- a/sdk/trustedsigning/azure-mgmt-trustedsigning/_meta.json +++ b/sdk/trustedsigning/azure-mgmt-trustedsigning/_meta.json @@ -1,6 +1,6 @@ { - "commit": "e6fde2ac19d0202f0e72217a3e0f9edb63dba273", + "commit": "079f70d6f2b754db6b736e117196104efd2dd496", "repository_url": "https://github.com/Azure/azure-rest-api-specs", "typespec_src": "specification/codesigning/CodeSigning.Management", - "@azure-tools/typespec-python": "0.33.0" + "@azure-tools/typespec-python": "0.44.2" } \ No newline at end of file diff --git a/sdk/trustedsigning/azure-mgmt-trustedsigning/apiview-properties.json b/sdk/trustedsigning/azure-mgmt-trustedsigning/apiview-properties.json new file mode 100644 index 000000000000..9c81ebcc743f --- /dev/null +++ b/sdk/trustedsigning/azure-mgmt-trustedsigning/apiview-properties.json @@ -0,0 +1,63 @@ +{ + "CrossLanguagePackageId": "Microsoft.CodeSigning", + "CrossLanguageDefinitionId": { + "azure.mgmt.trustedsigning.models.AccountSku": "Microsoft.CodeSigning.AccountSku", + "azure.mgmt.trustedsigning.models.AccountSkuPatch": "Microsoft.CodeSigning.AccountSkuPatch", + "azure.mgmt.trustedsigning.models.Certificate": "Microsoft.CodeSigning.Certificate", + "azure.mgmt.trustedsigning.models.Resource": "Azure.ResourceManager.CommonTypes.Resource", + "azure.mgmt.trustedsigning.models.ProxyResource": "Azure.ResourceManager.CommonTypes.ProxyResource", + "azure.mgmt.trustedsigning.models.CertificateProfile": "Microsoft.CodeSigning.CertificateProfile", + "azure.mgmt.trustedsigning.models.CertificateProfileProperties": "Microsoft.CodeSigning.CertificateProfileProperties", + "azure.mgmt.trustedsigning.models.CheckNameAvailability": "Microsoft.CodeSigning.CheckNameAvailability", + "azure.mgmt.trustedsigning.models.CheckNameAvailabilityResult": "Microsoft.CodeSigning.CheckNameAvailabilityResult", + "azure.mgmt.trustedsigning.models.TrackedResource": "Azure.ResourceManager.CommonTypes.TrackedResource", + "azure.mgmt.trustedsigning.models.CodeSigningAccount": "Microsoft.CodeSigning.CodeSigningAccount", + "azure.mgmt.trustedsigning.models.CodeSigningAccountPatch": "Microsoft.CodeSigning.CodeSigningAccountPatch", + "azure.mgmt.trustedsigning.models.CodeSigningAccountPatchProperties": "Microsoft.CodeSigning.CodeSigningAccountPatchProperties", + "azure.mgmt.trustedsigning.models.CodeSigningAccountProperties": "Microsoft.CodeSigning.CodeSigningAccountProperties", + "azure.mgmt.trustedsigning.models.ErrorAdditionalInfo": "Azure.ResourceManager.CommonTypes.ErrorAdditionalInfo", + "azure.mgmt.trustedsigning.models.ErrorDetail": "Azure.ResourceManager.CommonTypes.ErrorDetail", + "azure.mgmt.trustedsigning.models.ErrorResponse": "Azure.ResourceManager.CommonTypes.ErrorResponse", + "azure.mgmt.trustedsigning.models.Operation": "Azure.ResourceManager.CommonTypes.Operation", + "azure.mgmt.trustedsigning.models.OperationDisplay": "Azure.ResourceManager.CommonTypes.OperationDisplay", + "azure.mgmt.trustedsigning.models.Revocation": "Microsoft.CodeSigning.Revocation", + "azure.mgmt.trustedsigning.models.RevokeCertificate": "Microsoft.CodeSigning.RevokeCertificate", + "azure.mgmt.trustedsigning.models.SystemData": "Azure.ResourceManager.CommonTypes.SystemData", + "azure.mgmt.trustedsigning.models.Origin": "Azure.ResourceManager.CommonTypes.Origin", + "azure.mgmt.trustedsigning.models.ActionType": "Azure.ResourceManager.CommonTypes.ActionType", + "azure.mgmt.trustedsigning.models.CreatedByType": "Azure.ResourceManager.CommonTypes.createdByType", + "azure.mgmt.trustedsigning.models.SkuName": "Microsoft.CodeSigning.SkuName", + "azure.mgmt.trustedsigning.models.ProvisioningState": "Microsoft.CodeSigning.ProvisioningState", + "azure.mgmt.trustedsigning.models.NameUnavailabilityReason": "Microsoft.CodeSigning.NameUnavailabilityReason", + "azure.mgmt.trustedsigning.models.ProfileType": "Microsoft.CodeSigning.ProfileType", + "azure.mgmt.trustedsigning.models.CertificateProfileStatus": "Microsoft.CodeSigning.CertificateProfileStatus", + "azure.mgmt.trustedsigning.models.CertificateStatus": "Microsoft.CodeSigning.CertificateStatus", + "azure.mgmt.trustedsigning.models.RevocationStatus": "Microsoft.CodeSigning.RevocationStatus", + "azure.mgmt.trustedsigning.operations.Operations.list": "Azure.ResourceManager.Operations.list", + "azure.mgmt.trustedsigning.aio.operations.Operations.list": "Azure.ResourceManager.Operations.list", + "azure.mgmt.trustedsigning.operations.CodeSigningAccountsOperations.get": "Microsoft.CodeSigning.CodeSigningAccounts.get", + "azure.mgmt.trustedsigning.aio.operations.CodeSigningAccountsOperations.get": "Microsoft.CodeSigning.CodeSigningAccounts.get", + "azure.mgmt.trustedsigning.operations.CodeSigningAccountsOperations.begin_create": "Microsoft.CodeSigning.CodeSigningAccounts.create", + "azure.mgmt.trustedsigning.aio.operations.CodeSigningAccountsOperations.begin_create": "Microsoft.CodeSigning.CodeSigningAccounts.create", + "azure.mgmt.trustedsigning.operations.CodeSigningAccountsOperations.begin_update": "Microsoft.CodeSigning.CodeSigningAccounts.update", + "azure.mgmt.trustedsigning.aio.operations.CodeSigningAccountsOperations.begin_update": "Microsoft.CodeSigning.CodeSigningAccounts.update", + "azure.mgmt.trustedsigning.operations.CodeSigningAccountsOperations.begin_delete": "Microsoft.CodeSigning.CodeSigningAccounts.delete", + "azure.mgmt.trustedsigning.aio.operations.CodeSigningAccountsOperations.begin_delete": "Microsoft.CodeSigning.CodeSigningAccounts.delete", + "azure.mgmt.trustedsigning.operations.CodeSigningAccountsOperations.list_by_resource_group": "Microsoft.CodeSigning.CodeSigningAccounts.listByResourceGroup", + "azure.mgmt.trustedsigning.aio.operations.CodeSigningAccountsOperations.list_by_resource_group": "Microsoft.CodeSigning.CodeSigningAccounts.listByResourceGroup", + "azure.mgmt.trustedsigning.operations.CodeSigningAccountsOperations.list_by_subscription": "Microsoft.CodeSigning.CodeSigningAccounts.listBySubscription", + "azure.mgmt.trustedsigning.aio.operations.CodeSigningAccountsOperations.list_by_subscription": "Microsoft.CodeSigning.CodeSigningAccounts.listBySubscription", + "azure.mgmt.trustedsigning.operations.CodeSigningAccountsOperations.check_name_availability": "Microsoft.CodeSigning.CodeSigningAccounts.checkNameAvailability", + "azure.mgmt.trustedsigning.aio.operations.CodeSigningAccountsOperations.check_name_availability": "Microsoft.CodeSigning.CodeSigningAccounts.checkNameAvailability", + "azure.mgmt.trustedsigning.operations.CertificateProfilesOperations.get": "Microsoft.CodeSigning.CertificateProfiles.get", + "azure.mgmt.trustedsigning.aio.operations.CertificateProfilesOperations.get": "Microsoft.CodeSigning.CertificateProfiles.get", + "azure.mgmt.trustedsigning.operations.CertificateProfilesOperations.begin_create": "Microsoft.CodeSigning.CertificateProfiles.create", + "azure.mgmt.trustedsigning.aio.operations.CertificateProfilesOperations.begin_create": "Microsoft.CodeSigning.CertificateProfiles.create", + "azure.mgmt.trustedsigning.operations.CertificateProfilesOperations.begin_delete": "Microsoft.CodeSigning.CertificateProfiles.delete", + "azure.mgmt.trustedsigning.aio.operations.CertificateProfilesOperations.begin_delete": "Microsoft.CodeSigning.CertificateProfiles.delete", + "azure.mgmt.trustedsigning.operations.CertificateProfilesOperations.list_by_code_signing_account": "Microsoft.CodeSigning.CertificateProfiles.listByCodeSigningAccount", + "azure.mgmt.trustedsigning.aio.operations.CertificateProfilesOperations.list_by_code_signing_account": "Microsoft.CodeSigning.CertificateProfiles.listByCodeSigningAccount", + "azure.mgmt.trustedsigning.operations.CertificateProfilesOperations.revoke_certificate": "Microsoft.CodeSigning.CertificateProfiles.revokeCertificate", + "azure.mgmt.trustedsigning.aio.operations.CertificateProfilesOperations.revoke_certificate": "Microsoft.CodeSigning.CertificateProfiles.revokeCertificate" + } +} \ No newline at end of file diff --git a/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/__init__.py b/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/__init__.py index c873a5e57c01..641dd2bfe3e5 100644 --- a/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/__init__.py +++ b/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/__init__.py @@ -5,15 +5,21 @@ # Code generated by Microsoft (R) Python Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +# pylint: disable=wrong-import-position -from ._client import TrustedSigningMgmtClient +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from ._patch import * # pylint: disable=unused-wildcard-import + +from ._client import TrustedSigningMgmtClient # type: ignore from ._version import VERSION __version__ = VERSION try: from ._patch import __all__ as _patch_all - from ._patch import * # pylint: disable=unused-wildcard-import + from ._patch import * except ImportError: _patch_all = [] from ._patch import patch_sdk as _patch_sdk @@ -21,6 +27,6 @@ __all__ = [ "TrustedSigningMgmtClient", ] -__all__.extend([p for p in _patch_all if p not in __all__]) +__all__.extend([p for p in _patch_all if p not in __all__]) # pyright: ignore _patch_sdk() diff --git a/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/_client.py b/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/_client.py index cfda86b3c57a..0cce17d64b28 100644 --- a/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/_client.py +++ b/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/_client.py @@ -7,24 +7,25 @@ # -------------------------------------------------------------------------- from copy import deepcopy -from typing import Any, TYPE_CHECKING +from typing import Any, Optional, TYPE_CHECKING, cast from typing_extensions import Self from azure.core.pipeline import policies from azure.core.rest import HttpRequest, HttpResponse +from azure.core.settings import settings from azure.mgmt.core import ARMPipelineClient from azure.mgmt.core.policies import ARMAutoResourceProviderRegistrationPolicy +from azure.mgmt.core.tools import get_arm_endpoints from ._configuration import TrustedSigningMgmtClientConfiguration -from ._serialization import Deserializer, Serializer +from ._utils.serialization import Deserializer, Serializer from .operations import CertificateProfilesOperations, CodeSigningAccountsOperations, Operations if TYPE_CHECKING: - # pylint: disable=unused-import,ungrouped-imports from azure.core.credentials import TokenCredential -class TrustedSigningMgmtClient: # pylint: disable=client-accepts-api-version-keyword +class TrustedSigningMgmtClient: """Code Signing resource provider api. :ivar operations: Operations operations @@ -39,10 +40,10 @@ class TrustedSigningMgmtClient: # pylint: disable=client-accepts-api-version-ke :type credential: ~azure.core.credentials.TokenCredential :param subscription_id: The ID of the target subscription. The value must be an UUID. Required. :type subscription_id: str - :param base_url: Service host. Default value is "https://management.azure.com". + :param base_url: Service host. Default value is None. :type base_url: str :keyword api_version: The API version to use for this operation. Default value is - "2024-02-05-preview". Note that overriding this default value may result in unsupported + "2024-09-30-preview". Note that overriding this default value may result in unsupported behavior. :paramtype api_version: str :keyword int polling_interval: Default waiting time between two polls for LRO operations if no @@ -50,16 +51,22 @@ class TrustedSigningMgmtClient: # pylint: disable=client-accepts-api-version-ke """ def __init__( - self, - credential: "TokenCredential", - subscription_id: str, - base_url: str = "https://management.azure.com", - **kwargs: Any + self, credential: "TokenCredential", subscription_id: str, base_url: Optional[str] = None, **kwargs: Any ) -> None: _endpoint = "{endpoint}" + _cloud = kwargs.pop("cloud_setting", None) or settings.current.azure_cloud # type: ignore + _endpoints = get_arm_endpoints(_cloud) + if not base_url: + base_url = _endpoints["resource_manager"] + credential_scopes = kwargs.pop("credential_scopes", _endpoints["credential_scopes"]) self._config = TrustedSigningMgmtClientConfiguration( - credential=credential, subscription_id=subscription_id, base_url=base_url, **kwargs + credential=credential, + subscription_id=subscription_id, + base_url=cast(str, base_url), + credential_scopes=credential_scopes, + **kwargs ) + _policies = kwargs.pop("policies", None) if _policies is None: _policies = [ @@ -78,7 +85,7 @@ def __init__( policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None, self._config.http_logging_policy, ] - self._client: ARMPipelineClient = ARMPipelineClient(base_url=_endpoint, policies=_policies, **kwargs) + self._client: ARMPipelineClient = ARMPipelineClient(base_url=cast(str, _endpoint), policies=_policies, **kwargs) self._serialize = Serializer() self._deserialize = Deserializer() diff --git a/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/_configuration.py b/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/_configuration.py index d9b0d50c2869..e18e24faac39 100644 --- a/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/_configuration.py +++ b/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/_configuration.py @@ -14,11 +14,10 @@ from ._version import VERSION if TYPE_CHECKING: - # pylint: disable=unused-import,ungrouped-imports from azure.core.credentials import TokenCredential -class TrustedSigningMgmtClientConfiguration: # pylint: disable=too-many-instance-attributes,name-too-long +class TrustedSigningMgmtClientConfiguration: # pylint: disable=too-many-instance-attributes """Configuration for TrustedSigningMgmtClient. Note that all parameters used to create this instance are saved as instance @@ -31,7 +30,7 @@ class TrustedSigningMgmtClientConfiguration: # pylint: disable=too-many-instanc :param base_url: Service host. Default value is "https://management.azure.com". :type base_url: str :keyword api_version: The API version to use for this operation. Default value is - "2024-02-05-preview". Note that overriding this default value may result in unsupported + "2024-09-30-preview". Note that overriding this default value may result in unsupported behavior. :paramtype api_version: str """ @@ -43,7 +42,7 @@ def __init__( base_url: str = "https://management.azure.com", **kwargs: Any ) -> None: - api_version: str = kwargs.pop("api_version", "2024-02-05-preview") + api_version: str = kwargs.pop("api_version", "2024-09-30-preview") if credential is None: raise ValueError("Parameter 'credential' must not be None.") diff --git a/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/_patch.py b/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/_patch.py index f7dd32510333..8bcb627aa475 100644 --- a/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/_patch.py +++ b/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/_patch.py @@ -1,7 +1,8 @@ -# ------------------------------------ -# Copyright (c) Microsoft Corporation. -# Licensed under the MIT License. -# ------------------------------------ +# 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. +# -------------------------------------------------------------------------- """Customize generated code here. Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize diff --git a/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/_utils/__init__.py b/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/_utils/__init__.py new file mode 100644 index 000000000000..8026245c2abc --- /dev/null +++ b/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/_utils/__init__.py @@ -0,0 +1,6 @@ +# -------------------------------------------------------------------------- +# 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) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- diff --git a/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/_model_base.py b/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/_utils/model_base.py similarity index 91% rename from sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/_model_base.py rename to sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/_utils/model_base.py index 12ad7f29c71e..49d5c7259389 100644 --- a/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/_model_base.py +++ b/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/_utils/model_base.py @@ -1,10 +1,12 @@ +# 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. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -# pylint: disable=protected-access, arguments-differ, signature-differs, broad-except, too-many-lines +# pylint: disable=protected-access, broad-except import copy import calendar @@ -20,6 +22,7 @@ from datetime import datetime, date, time, timedelta, timezone from json import JSONEncoder import xml.etree.ElementTree as ET +from collections.abc import MutableMapping from typing_extensions import Self import isodate from azure.core.exceptions import DeserializationError @@ -27,11 +30,6 @@ from azure.core.pipeline import PipelineResponse from azure.core.serialization import _Null -if sys.version_info >= (3, 9): - from collections.abc import MutableMapping -else: - from typing import MutableMapping - _LOGGER = logging.getLogger(__name__) __all__ = ["SdkJSONEncoder", "Model", "rest_field", "rest_discriminator"] @@ -346,7 +344,7 @@ def _get_model(module_name: str, model_name: str): _UNSET = object() -class _MyMutableMapping(MutableMapping[str, typing.Any]): # pylint: disable=unsubscriptable-object +class _MyMutableMapping(MutableMapping[str, typing.Any]): def __init__(self, data: typing.Dict[str, typing.Any]) -> None: self._data = data @@ -372,50 +370,97 @@ def __ne__(self, other: typing.Any) -> bool: return not self.__eq__(other) def keys(self) -> typing.KeysView[str]: + """ + :returns: a set-like object providing a view on D's keys + :rtype: ~typing.KeysView + """ return self._data.keys() def values(self) -> typing.ValuesView[typing.Any]: + """ + :returns: an object providing a view on D's values + :rtype: ~typing.ValuesView + """ return self._data.values() def items(self) -> typing.ItemsView[str, typing.Any]: + """ + :returns: set-like object providing a view on D's items + :rtype: ~typing.ItemsView + """ return self._data.items() def get(self, key: str, default: typing.Any = None) -> typing.Any: + """ + Get the value for key if key is in the dictionary, else default. + :param str key: The key to look up. + :param any default: The value to return if key is not in the dictionary. Defaults to None + :returns: D[k] if k in D, else d. + :rtype: any + """ try: return self[key] except KeyError: return default @typing.overload - def pop(self, key: str) -> typing.Any: ... + def pop(self, key: str) -> typing.Any: ... # pylint: disable=arguments-differ @typing.overload - def pop(self, key: str, default: _T) -> _T: ... + def pop(self, key: str, default: _T) -> _T: ... # pylint: disable=signature-differs @typing.overload - def pop(self, key: str, default: typing.Any) -> typing.Any: ... + def pop(self, key: str, default: typing.Any) -> typing.Any: ... # pylint: disable=signature-differs def pop(self, key: str, default: typing.Any = _UNSET) -> typing.Any: + """ + Removes specified key and return the corresponding value. + :param str key: The key to pop. + :param any default: The value to return if key is not in the dictionary + :returns: The value corresponding to the key. + :rtype: any + :raises KeyError: If key is not found and default is not given. + """ if default is _UNSET: return self._data.pop(key) return self._data.pop(key, default) def popitem(self) -> typing.Tuple[str, typing.Any]: + """ + Removes and returns some (key, value) pair + :returns: The (key, value) pair. + :rtype: tuple + :raises KeyError: if D is empty. + """ return self._data.popitem() def clear(self) -> None: + """ + Remove all items from D. + """ self._data.clear() - def update(self, *args: typing.Any, **kwargs: typing.Any) -> None: + def update(self, *args: typing.Any, **kwargs: typing.Any) -> None: # pylint: disable=arguments-differ + """ + Updates D from mapping/iterable E and F. + :param any args: Either a mapping object or an iterable of key-value pairs. + """ self._data.update(*args, **kwargs) @typing.overload def setdefault(self, key: str, default: None = None) -> None: ... @typing.overload - def setdefault(self, key: str, default: typing.Any) -> typing.Any: ... + def setdefault(self, key: str, default: typing.Any) -> typing.Any: ... # pylint: disable=signature-differs def setdefault(self, key: str, default: typing.Any = _UNSET) -> typing.Any: + """ + Same as calling D.get(k, d), and setting D[k]=d if k not found + :param str key: The key to look up. + :param any default: The value to set if key is not in the dictionary + :returns: D[k] if k in D, else d. + :rtype: any + """ if default is _UNSET: return self._data.setdefault(key) return self._data.setdefault(key, default) @@ -573,7 +618,7 @@ def __init__(self, *args: typing.Any, **kwargs: typing.Any) -> None: def copy(self) -> "Model": return Model(self.__dict__) - def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: # pylint: disable=unused-argument + def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: if f"{cls.__module__}.{cls.__qualname__}" not in cls._calculated: # we know the last nine classes in mro are going to be 'Model', '_MyMutableMapping', 'MutableMapping', # 'Mapping', 'Collection', 'Sized', 'Iterable', 'Container' and 'object' @@ -584,8 +629,8 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: # pylint: di annotations = { k: v for mro_class in mros - if hasattr(mro_class, "__annotations__") # pylint: disable=no-member - for k, v in mro_class.__annotations__.items() # pylint: disable=no-member + if hasattr(mro_class, "__annotations__") + for k, v in mro_class.__annotations__.items() } for attr, rf in attr_to_rest_field.items(): rf._module = cls.__module__ @@ -596,12 +641,12 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: # pylint: di cls._attr_to_rest_field: typing.Dict[str, _RestField] = dict(attr_to_rest_field.items()) cls._calculated.add(f"{cls.__module__}.{cls.__qualname__}") - return super().__new__(cls) # pylint: disable=no-value-for-parameter + return super().__new__(cls) def __init_subclass__(cls, discriminator: typing.Optional[str] = None) -> None: for base in cls.__bases__: - if hasattr(base, "__mapping__"): # pylint: disable=no-member - base.__mapping__[discriminator or cls.__name__] = cls # type: ignore # pylint: disable=no-member + if hasattr(base, "__mapping__"): + base.__mapping__[discriminator or cls.__name__] = cls # type: ignore @classmethod def _get_discriminator(cls, exist_discriminators) -> typing.Optional["_RestField"]: @@ -612,7 +657,7 @@ def _get_discriminator(cls, exist_discriminators) -> typing.Optional["_RestField @classmethod def _deserialize(cls, data, exist_discriminators): - if not hasattr(cls, "__mapping__"): # pylint: disable=no-member + if not hasattr(cls, "__mapping__"): return cls(data) discriminator = cls._get_discriminator(exist_discriminators) if discriminator is None: @@ -636,7 +681,7 @@ def _deserialize(cls, data, exist_discriminators): return mapped_cls._deserialize(data, exist_discriminators) def as_dict(self, *, exclude_readonly: bool = False) -> typing.Dict[str, typing.Any]: - """Return a dict that can be JSONify using json.dump. + """Return a dict that can be turned into json using json.dump. :keyword bool exclude_readonly: Whether to remove the readonly properties. :returns: A dict JSON compatible object @@ -733,7 +778,7 @@ def _sorted_annotations(types: typing.List[typing.Any]) -> typing.List[typing.An ) -def _get_deserialize_callable_from_annotation( # pylint: disable=R0911, R0915, R0912 +def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-return-statements, too-many-branches annotation: typing.Any, module: typing.Optional[str], rf: typing.Optional["_RestField"] = None, @@ -753,7 +798,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=R0911, R0915, except AttributeError: model_name = annotation if module is not None: - annotation = _get_model(module, model_name) + annotation = _get_model(module, model_name) # type: ignore try: if module and _is_model(annotation): @@ -893,6 +938,35 @@ def _deserialize( return _deserialize_with_callable(deserializer, value) +def _failsafe_deserialize( + deserializer: typing.Any, + value: typing.Any, + module: typing.Optional[str] = None, + rf: typing.Optional["_RestField"] = None, + format: typing.Optional[str] = None, +) -> typing.Any: + try: + return _deserialize(deserializer, value, module, rf, format) + except DeserializationError: + _LOGGER.warning( + "Ran into a deserialization error. Ignoring since this is failsafe deserialization", exc_info=True + ) + return None + + +def _failsafe_deserialize_xml( + deserializer: typing.Any, + value: typing.Any, +) -> typing.Any: + try: + return _deserialize_xml(deserializer, value) + except DeserializationError: + _LOGGER.warning( + "Ran into a deserialization error. Ignoring since this is failsafe deserialization", exc_info=True + ) + return None + + class _RestField: def __init__( self, diff --git a/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/_serialization.py b/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/_utils/serialization.py similarity index 93% rename from sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/_serialization.py rename to sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/_utils/serialization.py index 01a226bd7f14..eb86ea23c965 100644 --- a/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/_serialization.py +++ b/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/_utils/serialization.py @@ -1,28 +1,10 @@ -# pylint: disable=too-many-lines +# pylint: disable=line-too-long,useless-suppression,too-many-lines +# coding=utf-8 # -------------------------------------------------------------------------- -# # 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. -# +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) Python Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- # pyright: reportUnnecessaryTypeIgnoreComment=false @@ -48,9 +30,7 @@ IO, Mapping, Callable, - TypeVar, MutableMapping, - Type, List, ) @@ -61,13 +41,13 @@ import xml.etree.ElementTree as ET import isodate # type: ignore +from typing_extensions import Self from azure.core.exceptions import DeserializationError, SerializationError from azure.core.serialization import NULL as CoreNull _BOM = codecs.BOM_UTF8.decode(encoding="utf-8") -ModelType = TypeVar("ModelType", bound="Model") JSON = MutableMapping[str, Any] @@ -185,73 +165,7 @@ def deserialize_from_http_generics(cls, body_bytes: Optional[Union[AnyStr, IO]], 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. - - :param datetime.datetime dt: The datetime - :returns: The offset - :rtype: datetime.timedelta - """ - return datetime.timedelta(0) - - def tzname(self, dt): - """Timestamp representation. - - :param datetime.datetime dt: The datetime - :returns: The timestamp representation - :rtype: str - """ - return "Z" - - def dst(self, dt): - """No daylight saving for UTC. - - :param datetime.datetime dt: The datetime - :returns: The daylight saving time - :rtype: datetime.timedelta - """ - return datetime.timedelta(hours=1) - - -try: - from datetime import timezone as _FixedOffset # type: ignore -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 -except ImportError: - TZ_UTC = UTC() # type: ignore +TZ_UTC = datetime.timezone.utc _FLATTEN = re.compile(r"(? ModelType: + def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: """Parse a str using the RestAPI syntax and return a model. :param str data: A str using RestAPI structure. JSON by default. :param str content_type: JSON by default, set application/xml if XML. :returns: An instance of this model - :raises: DeserializationError if something went wrong - :rtype: ModelType + :raises DeserializationError: if something went wrong + :rtype: Self """ deserializer = Deserializer(cls._infer_class_models()) return deserializer(cls.__name__, data, content_type=content_type) # type: ignore @classmethod def from_dict( - cls: Type[ModelType], + cls, data: Any, key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, - ) -> ModelType: + ) -> Self: """Parse a dict using given key extractor return a model. By default consider key @@ -479,8 +393,8 @@ def from_dict( :param function key_extractors: A key extractor function. :param str content_type: JSON by default, set application/xml if XML. :returns: An instance of this model - :raises: DeserializationError if something went wrong - :rtype: ModelType + :raises DeserializationError: if something went wrong + :rtype: Self """ deserializer = Deserializer(cls._infer_class_models()) deserializer.key_extractors = ( # type: ignore @@ -507,7 +421,6 @@ def _flatten_subtype(cls, key, objects): def _classify(cls, response, objects): """Check the class _subtype_map for any child classes. We want to ignore any inherited _subtype_maps. - Remove the polymorphic key from the initial data. :param dict response: The initial data :param dict objects: The class objects @@ -519,7 +432,7 @@ def _classify(cls, response, objects): if not isinstance(response, ET.Element): rest_api_response_key = cls._get_rest_key_parts(subtype_key)[-1] - subtype_value = response.pop(rest_api_response_key, None) or response.pop(subtype_key, None) + subtype_value = response.get(rest_api_response_key, None) or response.get(subtype_key, None) else: subtype_value = xml_key_extractor(subtype_key, cls._attribute_map[subtype_key], response) if subtype_value: @@ -564,7 +477,7 @@ def _decode_attribute_map_key(key): return key.replace("\\.", ".") -class Serializer(object): # pylint: disable=too-many-public-methods +class Serializer: # pylint: disable=too-many-public-methods """Request object model serializer.""" basic_types = {str: "str", int: "int", bool: "bool", float: "float"} @@ -599,7 +512,7 @@ class Serializer(object): # pylint: disable=too-many-public-methods "multiple": lambda x, y: x % y != 0, } - def __init__(self, classes: Optional[Mapping[str, type]] = None): + def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: self.serialize_type = { "iso-8601": Serializer.serialize_iso, "rfc-1123": Serializer.serialize_rfc, @@ -627,7 +540,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to :param object 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. + :raises SerializationError: if serialization fails. :returns: The serialized data. """ key_transformer = kwargs.get("key_transformer", self.key_transformer) @@ -737,8 +650,8 @@ def body(self, data, data_type, **kwargs): :param object 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 + :raises SerializationError: if serialization fails. + :raises ValueError: if data is None :returns: The serialized request body """ @@ -782,8 +695,8 @@ def url(self, name, data, data_type, **kwargs): :param str data_type: The type to be serialized from. :rtype: str :returns: The serialized URL path - :raises: TypeError if serialization fails. - :raises: ValueError if data is None + :raises TypeError: if serialization fails. + :raises ValueError: if data is None """ try: output = self.serialize_data(data, data_type, **kwargs) @@ -806,8 +719,8 @@ def query(self, name, data, data_type, **kwargs): :param object data: The data to be serialized. :param str data_type: The type to be serialized from. :rtype: str, list - :raises: TypeError if serialization fails. - :raises: ValueError if data is None + :raises TypeError: if serialization fails. + :raises ValueError: if data is None :returns: The serialized query parameter """ try: @@ -836,8 +749,8 @@ def header(self, name, data, data_type, **kwargs): :param object 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 + :raises TypeError: if serialization fails. + :raises ValueError: if data is None :returns: The serialized header """ try: @@ -856,9 +769,9 @@ def serialize_data(self, data, data_type, **kwargs): :param object data: The data to be serialized. :param str data_type: The type to be serialized from. - :raises: AttributeError if required data is None. - :raises: ValueError if data is None - :raises: SerializationError if serialization fails. + :raises AttributeError: if required data is None. + :raises ValueError: if data is None + :raises SerializationError: if serialization fails. :returns: The serialized data. :rtype: str, int, float, bool, dict, list """ @@ -1193,7 +1106,7 @@ def serialize_rfc(attr, **kwargs): # pylint: disable=unused-argument :param Datetime attr: Object to be serialized. :rtype: str - :raises: TypeError if format invalid. + :raises TypeError: if format invalid. :return: serialized rfc """ try: @@ -1219,7 +1132,7 @@ def serialize_iso(attr, **kwargs): # pylint: disable=unused-argument :param Datetime attr: Object to be serialized. :rtype: str - :raises: SerializationError if format invalid. + :raises SerializationError: if format invalid. :return: serialized iso """ if isinstance(attr, str): @@ -1252,7 +1165,7 @@ def serialize_unix(attr, **kwargs): # pylint: disable=unused-argument :param Datetime attr: Object to be serialized. :rtype: int - :raises: SerializationError if format invalid + :raises SerializationError: if format invalid :return: serialied unix """ if isinstance(attr, int): @@ -1430,7 +1343,7 @@ def xml_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argument # 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( # pylint: disable=line-too-long + "Tried to deserialize an array not wrapped, and found several nodes '{}'. Maybe you should declare this array as wrapped?".format( xml_name ) ) @@ -1442,7 +1355,7 @@ def xml_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argument return children[0] -class Deserializer(object): +class Deserializer: """Response object model deserializer. :param dict classes: Class type dictionary for deserializing complex types. @@ -1453,7 +1366,7 @@ class Deserializer(object): valid_date = re.compile(r"\d{4}[-]\d{2}[-]\d{2}T\d{2}:\d{2}:\d{2}\.?\d*Z?[-+]?[\d{2}]?:?[\d{2}]?") - def __init__(self, classes: Optional[Mapping[str, type]] = None): + def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: self.deserialize_type = { "iso-8601": Deserializer.deserialize_iso, "rfc-1123": Deserializer.deserialize_rfc, @@ -1489,7 +1402,7 @@ def __call__(self, target_obj, response_data, content_type=None): :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. + :raises DeserializationError: if deserialization fails. :return: Deserialized object. :rtype: object """ @@ -1503,7 +1416,7 @@ def _deserialize(self, target_obj, data): # pylint: disable=inconsistent-return :param str target_obj: Target data type to deserialize to. :param object data: Object to deserialize. - :raises: DeserializationError if deserialization fails. + :raises DeserializationError: if deserialization fails. :return: Deserialized object. :rtype: object """ @@ -1684,17 +1597,21 @@ def _instantiate_model(self, response, attrs, additional_properties=None): subtype = getattr(response, "_subtype_map", {}) try: readonly = [ - k for k, v in response._validation.items() if v.get("readonly") # pylint: disable=protected-access + k + for k, v in response._validation.items() # pylint: disable=protected-access # type: ignore + if v.get("readonly") ] const = [ - k for k, v in response._validation.items() if v.get("constant") # pylint: disable=protected-access + k + for k, v in response._validation.items() # pylint: disable=protected-access # type: ignore + 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 + response_obj.additional_properties = additional_properties # type: ignore return response_obj except TypeError as err: msg = "Unable to deserialize {} into model {}. ".format(kwargs, response) # type: ignore @@ -1714,7 +1631,7 @@ def deserialize_data(self, data, data_type): # pylint: disable=too-many-return- :param str data: The response string to be deserialized. :param str data_type: The type to deserialize to. - :raises: DeserializationError if deserialization fails. + :raises DeserializationError: if deserialization fails. :return: Deserialized object. :rtype: object """ @@ -1796,7 +1713,7 @@ def deserialize_object(self, attr, **kwargs): # pylint: disable=too-many-return :param dict attr: Dictionary to be deserialized. :return: Deserialized object. :rtype: dict - :raises: TypeError if non-builtin datatype encountered. + :raises TypeError: if non-builtin datatype encountered. """ if attr is None: return None @@ -1842,7 +1759,7 @@ def deserialize_basic(self, attr, data_type): # pylint: disable=too-many-return :param str data_type: deserialization data type. :return: Deserialized basic type. :rtype: str, int, float or bool - :raises: TypeError if string format is not valid. + :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 @@ -1933,7 +1850,7 @@ def deserialize_bytearray(attr): :param str attr: response string to be deserialized. :return: Deserialized bytearray :rtype: bytearray - :raises: TypeError if string format invalid. + :raises TypeError: if string format invalid. """ if isinstance(attr, ET.Element): attr = attr.text @@ -1946,7 +1863,7 @@ def deserialize_base64(attr): :param str attr: response string to be deserialized. :return: Deserialized base64 string :rtype: bytearray - :raises: TypeError if string format invalid. + :raises TypeError: if string format invalid. """ if isinstance(attr, ET.Element): attr = attr.text @@ -1961,7 +1878,7 @@ def deserialize_decimal(attr): :param str attr: response string to be deserialized. :return: Deserialized decimal - :raises: DeserializationError if string format invalid. + :raises DeserializationError: if string format invalid. :rtype: decimal """ if isinstance(attr, ET.Element): @@ -1979,7 +1896,7 @@ def deserialize_long(attr): :param str attr: response string to be deserialized. :return: Deserialized int :rtype: long or int - :raises: ValueError if string format invalid. + :raises ValueError: if string format invalid. """ if isinstance(attr, ET.Element): attr = attr.text @@ -1992,7 +1909,7 @@ def deserialize_duration(attr): :param str attr: response string to be deserialized. :return: Deserialized duration :rtype: TimeDelta - :raises: DeserializationError if string format invalid. + :raises DeserializationError: if string format invalid. """ if isinstance(attr, ET.Element): attr = attr.text @@ -2010,7 +1927,7 @@ def deserialize_date(attr): :param str attr: response string to be deserialized. :return: Deserialized date :rtype: Date - :raises: DeserializationError if string format invalid. + :raises DeserializationError: if string format invalid. """ if isinstance(attr, ET.Element): attr = attr.text @@ -2026,7 +1943,7 @@ def deserialize_time(attr): :param str attr: response string to be deserialized. :return: Deserialized time :rtype: datetime.time - :raises: DeserializationError if string format invalid. + :raises DeserializationError: if string format invalid. """ if isinstance(attr, ET.Element): attr = attr.text @@ -2041,14 +1958,14 @@ def deserialize_rfc(attr): :param str attr: response string to be deserialized. :return: Deserialized RFC datetime :rtype: Datetime - :raises: DeserializationError if string format invalid. + :raises DeserializationError: if string format invalid. """ if isinstance(attr, ET.Element): attr = attr.text try: parsed_date = email.utils.parsedate_tz(attr) # type: ignore date_obj = datetime.datetime( - *parsed_date[:6], tzinfo=_FixedOffset(datetime.timedelta(minutes=(parsed_date[9] or 0) / 60)) + *parsed_date[:6], tzinfo=datetime.timezone(datetime.timedelta(minutes=(parsed_date[9] or 0) / 60)) ) if not date_obj.tzinfo: date_obj = date_obj.astimezone(tz=TZ_UTC) @@ -2064,7 +1981,7 @@ def deserialize_iso(attr): :param str attr: response string to be deserialized. :return: Deserialized ISO datetime :rtype: Datetime - :raises: DeserializationError if string format invalid. + :raises DeserializationError: if string format invalid. """ if isinstance(attr, ET.Element): attr = attr.text @@ -2102,7 +2019,7 @@ def deserialize_unix(attr): :param int attr: Object to be serialized. :return: Deserialized datetime :rtype: Datetime - :raises: DeserializationError if format invalid + :raises DeserializationError: if format invalid """ if isinstance(attr, ET.Element): attr = int(attr.text) # type: ignore diff --git a/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/_version.py b/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/_version.py index be71c81bd282..bbcd28b4aa67 100644 --- a/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/_version.py +++ b/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/_version.py @@ -6,4 +6,4 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -VERSION = "1.0.0b1" +VERSION = "1.0.0b2" diff --git a/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/aio/__init__.py b/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/aio/__init__.py index 6f788afcc13d..f5f450833278 100644 --- a/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/aio/__init__.py +++ b/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/aio/__init__.py @@ -5,12 +5,18 @@ # Code generated by Microsoft (R) Python Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +# pylint: disable=wrong-import-position -from ._client import TrustedSigningMgmtClient +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from ._patch import * # pylint: disable=unused-wildcard-import + +from ._client import TrustedSigningMgmtClient # type: ignore try: from ._patch import __all__ as _patch_all - from ._patch import * # pylint: disable=unused-wildcard-import + from ._patch import * except ImportError: _patch_all = [] from ._patch import patch_sdk as _patch_sdk @@ -18,6 +24,6 @@ __all__ = [ "TrustedSigningMgmtClient", ] -__all__.extend([p for p in _patch_all if p not in __all__]) +__all__.extend([p for p in _patch_all if p not in __all__]) # pyright: ignore _patch_sdk() diff --git a/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/aio/_client.py b/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/aio/_client.py index 30a4f46b28d5..9d7fbb8fd57f 100644 --- a/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/aio/_client.py +++ b/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/aio/_client.py @@ -7,24 +7,25 @@ # -------------------------------------------------------------------------- from copy import deepcopy -from typing import Any, Awaitable, TYPE_CHECKING +from typing import Any, Awaitable, Optional, TYPE_CHECKING, cast from typing_extensions import Self from azure.core.pipeline import policies from azure.core.rest import AsyncHttpResponse, HttpRequest +from azure.core.settings import settings from azure.mgmt.core import AsyncARMPipelineClient from azure.mgmt.core.policies import AsyncARMAutoResourceProviderRegistrationPolicy +from azure.mgmt.core.tools import get_arm_endpoints -from .._serialization import Deserializer, Serializer +from .._utils.serialization import Deserializer, Serializer from ._configuration import TrustedSigningMgmtClientConfiguration from .operations import CertificateProfilesOperations, CodeSigningAccountsOperations, Operations if TYPE_CHECKING: - # pylint: disable=unused-import,ungrouped-imports from azure.core.credentials_async import AsyncTokenCredential -class TrustedSigningMgmtClient: # pylint: disable=client-accepts-api-version-keyword +class TrustedSigningMgmtClient: """Code Signing resource provider api. :ivar operations: Operations operations @@ -39,10 +40,10 @@ class TrustedSigningMgmtClient: # pylint: disable=client-accepts-api-version-ke :type credential: ~azure.core.credentials_async.AsyncTokenCredential :param subscription_id: The ID of the target subscription. The value must be an UUID. Required. :type subscription_id: str - :param base_url: Service host. Default value is "https://management.azure.com". + :param base_url: Service host. Default value is None. :type base_url: str :keyword api_version: The API version to use for this operation. Default value is - "2024-02-05-preview". Note that overriding this default value may result in unsupported + "2024-09-30-preview". Note that overriding this default value may result in unsupported behavior. :paramtype api_version: str :keyword int polling_interval: Default waiting time between two polls for LRO operations if no @@ -50,16 +51,22 @@ class TrustedSigningMgmtClient: # pylint: disable=client-accepts-api-version-ke """ def __init__( - self, - credential: "AsyncTokenCredential", - subscription_id: str, - base_url: str = "https://management.azure.com", - **kwargs: Any + self, credential: "AsyncTokenCredential", subscription_id: str, base_url: Optional[str] = None, **kwargs: Any ) -> None: _endpoint = "{endpoint}" + _cloud = kwargs.pop("cloud_setting", None) or settings.current.azure_cloud # type: ignore + _endpoints = get_arm_endpoints(_cloud) + if not base_url: + base_url = _endpoints["resource_manager"] + credential_scopes = kwargs.pop("credential_scopes", _endpoints["credential_scopes"]) self._config = TrustedSigningMgmtClientConfiguration( - credential=credential, subscription_id=subscription_id, base_url=base_url, **kwargs + credential=credential, + subscription_id=subscription_id, + base_url=cast(str, base_url), + credential_scopes=credential_scopes, + **kwargs ) + _policies = kwargs.pop("policies", None) if _policies is None: _policies = [ @@ -78,7 +85,9 @@ def __init__( policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None, self._config.http_logging_policy, ] - self._client: AsyncARMPipelineClient = AsyncARMPipelineClient(base_url=_endpoint, policies=_policies, **kwargs) + self._client: AsyncARMPipelineClient = AsyncARMPipelineClient( + base_url=cast(str, _endpoint), policies=_policies, **kwargs + ) self._serialize = Serializer() self._deserialize = Deserializer() diff --git a/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/aio/_configuration.py b/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/aio/_configuration.py index 5eedbe25918c..8d3bdaf3fcdd 100644 --- a/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/aio/_configuration.py +++ b/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/aio/_configuration.py @@ -14,11 +14,10 @@ from .._version import VERSION if TYPE_CHECKING: - # pylint: disable=unused-import,ungrouped-imports from azure.core.credentials_async import AsyncTokenCredential -class TrustedSigningMgmtClientConfiguration: # pylint: disable=too-many-instance-attributes,name-too-long +class TrustedSigningMgmtClientConfiguration: # pylint: disable=too-many-instance-attributes """Configuration for TrustedSigningMgmtClient. Note that all parameters used to create this instance are saved as instance @@ -31,7 +30,7 @@ class TrustedSigningMgmtClientConfiguration: # pylint: disable=too-many-instanc :param base_url: Service host. Default value is "https://management.azure.com". :type base_url: str :keyword api_version: The API version to use for this operation. Default value is - "2024-02-05-preview". Note that overriding this default value may result in unsupported + "2024-09-30-preview". Note that overriding this default value may result in unsupported behavior. :paramtype api_version: str """ @@ -43,7 +42,7 @@ def __init__( base_url: str = "https://management.azure.com", **kwargs: Any ) -> None: - api_version: str = kwargs.pop("api_version", "2024-02-05-preview") + api_version: str = kwargs.pop("api_version", "2024-09-30-preview") if credential is None: raise ValueError("Parameter 'credential' must not be None.") diff --git a/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/aio/_patch.py b/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/aio/_patch.py index f7dd32510333..8bcb627aa475 100644 --- a/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/aio/_patch.py +++ b/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/aio/_patch.py @@ -1,7 +1,8 @@ -# ------------------------------------ -# Copyright (c) Microsoft Corporation. -# Licensed under the MIT License. -# ------------------------------------ +# 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. +# -------------------------------------------------------------------------- """Customize generated code here. Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize diff --git a/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/aio/operations/__init__.py b/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/aio/operations/__init__.py index 935a86f04db7..2a2e37254230 100644 --- a/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/aio/operations/__init__.py +++ b/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/aio/operations/__init__.py @@ -5,13 +5,19 @@ # Code generated by Microsoft (R) Python Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +# pylint: disable=wrong-import-position -from ._operations import Operations -from ._operations import CodeSigningAccountsOperations -from ._operations import CertificateProfilesOperations +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from ._patch import * # pylint: disable=unused-wildcard-import + +from ._operations import Operations # type: ignore +from ._operations import CodeSigningAccountsOperations # type: ignore +from ._operations import CertificateProfilesOperations # type: ignore from ._patch import __all__ as _patch_all -from ._patch import * # pylint: disable=unused-wildcard-import +from ._patch import * from ._patch import patch_sdk as _patch_sdk __all__ = [ @@ -19,5 +25,5 @@ "CodeSigningAccountsOperations", "CertificateProfilesOperations", ] -__all__.extend([p for p in _patch_all if p not in __all__]) +__all__.extend([p for p in _patch_all if p not in __all__]) # pyright: ignore _patch_sdk() diff --git a/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/aio/operations/_operations.py b/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/aio/operations/_operations.py index a79891ffb7f6..6b3e2ae9076d 100644 --- a/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/aio/operations/_operations.py +++ b/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/aio/operations/_operations.py @@ -1,4 +1,4 @@ -# pylint: disable=too-many-lines,too-many-statements +# pylint: disable=too-many-lines # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -6,26 +6,13 @@ # Code generated by Microsoft (R) Python Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from collections.abc import MutableMapping from io import IOBase import json -import sys -from typing import ( - Any, - AsyncIterable, - AsyncIterator, - Callable, - Dict, - IO, - List, - Optional, - Type, - TypeVar, - Union, - cast, - overload, -) +from typing import Any, AsyncIterable, AsyncIterator, Callable, Dict, IO, List, Optional, TypeVar, Union, cast, overload import urllib.parse +from azure.core import AsyncPipelineClient from azure.core.async_paging import AsyncItemPaged, AsyncList from azure.core.exceptions import ( ClientAuthenticationError, @@ -47,7 +34,8 @@ from azure.mgmt.core.polling.async_arm_polling import AsyncARMPolling from ... import models as _models -from ..._model_base import SdkJSONEncoder, _deserialize +from ..._utils.model_base import SdkJSONEncoder, _deserialize, _failsafe_deserialize +from ..._utils.serialization import Deserializer, Serializer from ...operations._operations import ( build_certificate_profiles_create_request, build_certificate_profiles_delete_request, @@ -63,14 +51,11 @@ build_code_signing_accounts_update_request, build_operations_list_request, ) +from .._configuration import TrustedSigningMgmtClientConfiguration -if sys.version_info >= (3, 9): - from collections.abc import MutableMapping -else: - from typing import MutableMapping # type: ignore # pylint: disable=ungrouped-imports T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] -JSON = MutableMapping[str, Any] # pylint: disable=unsubscriptable-object +JSON = MutableMapping[str, Any] class Operations: @@ -85,10 +70,10 @@ class Operations: 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") + self._client: AsyncPipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") + self._config: TrustedSigningMgmtClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config") + self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]: @@ -103,7 +88,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]: cls: ClsType[List[_models.Operation]] = kwargs.pop("cls", None) - error_map: MutableMapping[int, Type[HttpResponseError]] = { # pylint: disable=unsubscriptable-object + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -150,7 +135,7 @@ def prepare_request(next_link=None): async def extract_data(pipeline_response): deserialized = pipeline_response.http_response.json() - list_of_elem = _deserialize(List[_models.Operation], deserialized["value"]) + list_of_elem = _deserialize(List[_models.Operation], deserialized.get("value", [])) if cls: list_of_elem = cls(list_of_elem) # type: ignore return deserialized.get("nextLink") or None, AsyncList(list_of_elem) @@ -166,7 +151,7 @@ async def get_next(next_link=None): if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) - error = _deserialize(_models.ErrorResponse, response.json()) + error = _failsafe_deserialize(_models.ErrorResponse, response.json()) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) return pipeline_response @@ -186,10 +171,10 @@ class CodeSigningAccountsOperations: 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") + self._client: AsyncPipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") + self._config: TrustedSigningMgmtClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config") + self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async async def get(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _models.CodeSigningAccount: @@ -204,7 +189,7 @@ async def get(self, resource_group_name: str, account_name: str, **kwargs: Any) :rtype: ~azure.mgmt.trustedsigning.models.CodeSigningAccount :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { # pylint: disable=unsubscriptable-object + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -244,7 +229,7 @@ async def get(self, resource_group_name: str, account_name: str, **kwargs: Any) except (StreamConsumedError, StreamClosedError): pass map_error(status_code=response.status_code, response=response, error_map=error_map) - error = _deserialize(_models.ErrorResponse, response.json()) + error = _failsafe_deserialize(_models.ErrorResponse, response.json()) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) if _stream: @@ -264,7 +249,7 @@ async def _create_initial( resource: Union[_models.CodeSigningAccount, JSON, IO[bytes]], **kwargs: Any ) -> AsyncIterator[bytes]: - error_map: MutableMapping[int, Type[HttpResponseError]] = { # pylint: disable=unsubscriptable-object + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -313,7 +298,7 @@ async def _create_initial( except (StreamConsumedError, StreamClosedError): pass map_error(status_code=response.status_code, response=response, error_map=error_map) - error = _deserialize(_models.ErrorResponse, response.json()) + error = _failsafe_deserialize(_models.ErrorResponse, response.json()) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) response_headers = {} @@ -497,7 +482,7 @@ async def _update_initial( properties: Union[_models.CodeSigningAccountPatch, JSON, IO[bytes]], **kwargs: Any ) -> AsyncIterator[bytes]: - error_map: MutableMapping[int, Type[HttpResponseError]] = { # pylint: disable=unsubscriptable-object + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -546,7 +531,7 @@ async def _update_initial( except (StreamConsumedError, StreamClosedError): pass map_error(status_code=response.status_code, response=response, error_map=error_map) - error = _deserialize(_models.ErrorResponse, response.json()) + error = _failsafe_deserialize(_models.ErrorResponse, response.json()) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) response_headers = {} @@ -726,7 +711,7 @@ def get_long_running_output(pipeline_response): ) async def _delete_initial(self, resource_group_name: str, account_name: str, **kwargs: Any) -> AsyncIterator[bytes]: - error_map: MutableMapping[int, Type[HttpResponseError]] = { # pylint: disable=unsubscriptable-object + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -765,7 +750,7 @@ async def _delete_initial(self, resource_group_name: str, account_name: str, **k except (StreamConsumedError, StreamClosedError): pass map_error(status_code=response.status_code, response=response, error_map=error_map) - error = _deserialize(_models.ErrorResponse, response.json()) + error = _failsafe_deserialize(_models.ErrorResponse, response.json()) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) response_headers = {} @@ -856,7 +841,7 @@ def list_by_resource_group( cls: ClsType[List[_models.CodeSigningAccount]] = kwargs.pop("cls", None) - error_map: MutableMapping[int, Type[HttpResponseError]] = { # pylint: disable=unsubscriptable-object + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -905,7 +890,7 @@ def prepare_request(next_link=None): async def extract_data(pipeline_response): deserialized = pipeline_response.http_response.json() - list_of_elem = _deserialize(List[_models.CodeSigningAccount], deserialized["value"]) + list_of_elem = _deserialize(List[_models.CodeSigningAccount], deserialized.get("value", [])) if cls: list_of_elem = cls(list_of_elem) # type: ignore return deserialized.get("nextLink") or None, AsyncList(list_of_elem) @@ -921,7 +906,7 @@ async def get_next(next_link=None): if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) - error = _deserialize(_models.ErrorResponse, response.json()) + error = _failsafe_deserialize(_models.ErrorResponse, response.json()) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) return pipeline_response @@ -942,7 +927,7 @@ def list_by_subscription(self, **kwargs: Any) -> AsyncIterable["_models.CodeSign cls: ClsType[List[_models.CodeSigningAccount]] = kwargs.pop("cls", None) - error_map: MutableMapping[int, Type[HttpResponseError]] = { # pylint: disable=unsubscriptable-object + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -990,7 +975,7 @@ def prepare_request(next_link=None): async def extract_data(pipeline_response): deserialized = pipeline_response.http_response.json() - list_of_elem = _deserialize(List[_models.CodeSigningAccount], deserialized["value"]) + list_of_elem = _deserialize(List[_models.CodeSigningAccount], deserialized.get("value", [])) if cls: list_of_elem = cls(list_of_elem) # type: ignore return deserialized.get("nextLink") or None, AsyncList(list_of_elem) @@ -1006,7 +991,7 @@ async def get_next(next_link=None): if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) - error = _deserialize(_models.ErrorResponse, response.json()) + error = _failsafe_deserialize(_models.ErrorResponse, response.json()) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) return pipeline_response @@ -1078,7 +1063,7 @@ async def check_name_availability( :rtype: ~azure.mgmt.trustedsigning.models.CheckNameAvailabilityResult :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { # pylint: disable=unsubscriptable-object + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1126,7 +1111,7 @@ async def check_name_availability( except (StreamConsumedError, StreamClosedError): pass map_error(status_code=response.status_code, response=response, error_map=error_map) - error = _deserialize(_models.ErrorResponse, response.json()) + error = _failsafe_deserialize(_models.ErrorResponse, response.json()) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) if _stream: @@ -1152,10 +1137,10 @@ class CertificateProfilesOperations: 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") + self._client: AsyncPipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") + self._config: TrustedSigningMgmtClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config") + self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async async def get( @@ -1174,7 +1159,7 @@ async def get( :rtype: ~azure.mgmt.trustedsigning.models.CertificateProfile :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { # pylint: disable=unsubscriptable-object + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1215,7 +1200,7 @@ async def get( except (StreamConsumedError, StreamClosedError): pass map_error(status_code=response.status_code, response=response, error_map=error_map) - error = _deserialize(_models.ErrorResponse, response.json()) + error = _failsafe_deserialize(_models.ErrorResponse, response.json()) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) if _stream: @@ -1236,7 +1221,7 @@ async def _create_initial( resource: Union[_models.CertificateProfile, JSON, IO[bytes]], **kwargs: Any ) -> AsyncIterator[bytes]: - error_map: MutableMapping[int, Type[HttpResponseError]] = { # pylint: disable=unsubscriptable-object + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1286,7 +1271,7 @@ async def _create_initial( except (StreamConsumedError, StreamClosedError): pass map_error(status_code=response.status_code, response=response, error_map=error_map) - error = _deserialize(_models.ErrorResponse, response.json()) + error = _failsafe_deserialize(_models.ErrorResponse, response.json()) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) response_headers = {} @@ -1479,7 +1464,7 @@ def get_long_running_output(pipeline_response): async def _delete_initial( self, resource_group_name: str, account_name: str, profile_name: str, **kwargs: Any ) -> AsyncIterator[bytes]: - error_map: MutableMapping[int, Type[HttpResponseError]] = { # pylint: disable=unsubscriptable-object + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1519,7 +1504,7 @@ async def _delete_initial( except (StreamConsumedError, StreamClosedError): pass map_error(status_code=response.status_code, response=response, error_map=error_map) - error = _deserialize(_models.ErrorResponse, response.json()) + error = _failsafe_deserialize(_models.ErrorResponse, response.json()) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) response_headers = {} @@ -1617,7 +1602,7 @@ def list_by_code_signing_account( cls: ClsType[List[_models.CertificateProfile]] = kwargs.pop("cls", None) - error_map: MutableMapping[int, Type[HttpResponseError]] = { # pylint: disable=unsubscriptable-object + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1667,7 +1652,7 @@ def prepare_request(next_link=None): async def extract_data(pipeline_response): deserialized = pipeline_response.http_response.json() - list_of_elem = _deserialize(List[_models.CertificateProfile], deserialized["value"]) + list_of_elem = _deserialize(List[_models.CertificateProfile], deserialized.get("value", [])) if cls: list_of_elem = cls(list_of_elem) # type: ignore return deserialized.get("nextLink") or None, AsyncList(list_of_elem) @@ -1683,7 +1668,7 @@ async def get_next(next_link=None): if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) - error = _deserialize(_models.ErrorResponse, response.json()) + error = _failsafe_deserialize(_models.ErrorResponse, response.json()) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) return pipeline_response @@ -1691,7 +1676,7 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) @overload - async def revoke_certificate( # pylint: disable=inconsistent-return-statements + async def revoke_certificate( self, resource_group_name: str, account_name: str, @@ -1721,7 +1706,7 @@ async def revoke_certificate( # pylint: disable=inconsistent-return-statements """ @overload - async def revoke_certificate( # pylint: disable=inconsistent-return-statements + async def revoke_certificate( self, resource_group_name: str, account_name: str, @@ -1751,7 +1736,7 @@ async def revoke_certificate( # pylint: disable=inconsistent-return-statements """ @overload - async def revoke_certificate( # pylint: disable=inconsistent-return-statements + async def revoke_certificate( self, resource_group_name: str, account_name: str, @@ -1781,7 +1766,7 @@ async def revoke_certificate( # pylint: disable=inconsistent-return-statements """ @distributed_trace_async - async def revoke_certificate( # pylint: disable=inconsistent-return-statements + async def revoke_certificate( self, resource_group_name: str, account_name: str, @@ -1805,7 +1790,7 @@ async def revoke_certificate( # pylint: disable=inconsistent-return-statements :rtype: None :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { # pylint: disable=unsubscriptable-object + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1851,7 +1836,7 @@ async def revoke_certificate( # pylint: disable=inconsistent-return-statements if response.status_code not in [204]: map_error(status_code=response.status_code, response=response, error_map=error_map) - error = _deserialize(_models.ErrorResponse, response.json()) + error = _failsafe_deserialize(_models.ErrorResponse, response.json()) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) if cls: diff --git a/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/aio/operations/_patch.py b/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/aio/operations/_patch.py index f7dd32510333..8bcb627aa475 100644 --- a/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/aio/operations/_patch.py +++ b/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/aio/operations/_patch.py @@ -1,7 +1,8 @@ -# ------------------------------------ -# Copyright (c) Microsoft Corporation. -# Licensed under the MIT License. -# ------------------------------------ +# 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. +# -------------------------------------------------------------------------- """Customize generated code here. Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize diff --git a/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/models/__init__.py b/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/models/__init__.py index 242fee9abd41..8194d8aacdc1 100644 --- a/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/models/__init__.py +++ b/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/models/__init__.py @@ -5,45 +5,58 @@ # Code generated by Microsoft (R) Python Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +# pylint: disable=wrong-import-position -from ._models import AccountSku -from ._models import Certificate -from ._models import CertificateProfile -from ._models import CertificateProfileProperties -from ._models import CheckNameAvailability -from ._models import CheckNameAvailabilityResult -from ._models import CodeSigningAccount -from ._models import CodeSigningAccountPatch -from ._models import CodeSigningAccountPatchProperties -from ._models import CodeSigningAccountProperties -from ._models import ErrorAdditionalInfo -from ._models import ErrorDetail -from ._models import ErrorResponse -from ._models import Operation -from ._models import OperationDisplay -from ._models import ProxyResource -from ._models import Resource -from ._models import Revocation -from ._models import RevokeCertificate -from ._models import SystemData -from ._models import TrackedResource +from typing import TYPE_CHECKING -from ._enums import ActionType -from ._enums import CertificateProfileStatus -from ._enums import CertificateStatus -from ._enums import CreatedByType -from ._enums import NameUnavailabilityReason -from ._enums import Origin -from ._enums import ProfileType -from ._enums import ProvisioningState -from ._enums import RevocationStatus -from ._enums import SkuName +if TYPE_CHECKING: + from ._patch import * # pylint: disable=unused-wildcard-import + + +from ._models import ( # type: ignore + AccountSku, + AccountSkuPatch, + Certificate, + CertificateProfile, + CertificateProfileProperties, + CheckNameAvailability, + CheckNameAvailabilityResult, + CodeSigningAccount, + CodeSigningAccountPatch, + CodeSigningAccountPatchProperties, + CodeSigningAccountProperties, + ErrorAdditionalInfo, + ErrorDetail, + ErrorResponse, + Operation, + OperationDisplay, + ProxyResource, + Resource, + Revocation, + RevokeCertificate, + SystemData, + TrackedResource, +) + +from ._enums import ( # type: ignore + ActionType, + CertificateProfileStatus, + CertificateStatus, + CreatedByType, + NameUnavailabilityReason, + Origin, + ProfileType, + ProvisioningState, + RevocationStatus, + SkuName, +) from ._patch import __all__ as _patch_all -from ._patch import * # pylint: disable=unused-wildcard-import +from ._patch import * from ._patch import patch_sdk as _patch_sdk __all__ = [ "AccountSku", + "AccountSkuPatch", "Certificate", "CertificateProfile", "CertificateProfileProperties", @@ -75,5 +88,5 @@ "RevocationStatus", "SkuName", ] -__all__.extend([p for p in _patch_all if p not in __all__]) +__all__.extend([p for p in _patch_all if p not in __all__]) # pyright: ignore _patch_sdk() diff --git a/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/models/_models.py b/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/models/_models.py index 9c3e111c0a60..d2c0dcf5ea08 100644 --- a/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/models/_models.py +++ b/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/models/_models.py @@ -1,32 +1,30 @@ +# pylint: disable=line-too-long,useless-suppression # coding=utf-8 -# pylint: disable=too-many-lines # -------------------------------------------------------------------------- # 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) Python Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +# pylint: disable=useless-super-delegation import datetime from typing import Any, Dict, List, Mapping, Optional, TYPE_CHECKING, Union, overload -from .. import _model_base -from .._model_base import rest_field +from .._utils.model_base import Model as _Model, rest_field if TYPE_CHECKING: - # pylint: disable=unused-import,ungrouped-imports from .. import models as _models -class AccountSku(_model_base.Model): +class AccountSku(_Model): """SKU of the trusted signing account. - :ivar name: Name of the SKU. Required. Known values are: "Basic" and "Premium". :vartype name: str or ~azure.mgmt.trustedsigning.models.SkuName """ - name: Union[str, "_models.SkuName"] = rest_field() + name: Union[str, "_models.SkuName"] = rest_field(visibility=["read", "create", "update", "delete", "query"]) """Name of the SKU. Required. Known values are: \"Basic\" and \"Premium\".""" @overload @@ -34,24 +32,56 @@ def __init__( self, *, name: Union[str, "_models.SkuName"], - ): ... + ) -> None: ... @overload - def __init__(self, mapping: Mapping[str, Any]): + def __init__(self, mapping: Mapping[str, Any]) -> None: """ :param mapping: raw JSON to initialize the model. :type mapping: Mapping[str, Any] """ - def __init__(self, *args: Any, **kwargs: Any) -> None: # pylint: disable=useless-super-delegation + def __init__(self, *args: Any, **kwargs: Any) -> None: super().__init__(*args, **kwargs) -class Certificate(_model_base.Model): +class AccountSkuPatch(_Model): + """SKU of the trusted signing account. + + :ivar name: Name of the SKU. Known values are: "Basic" and "Premium". + :vartype name: str or ~azure.mgmt.trustedsigning.models.SkuName + """ + + name: Optional[Union[str, "_models.SkuName"]] = rest_field( + visibility=["read", "create", "update", "delete", "query"] + ) + """Name of the SKU. Known values are: \"Basic\" and \"Premium\".""" + + @overload + def __init__( + self, + *, + name: Optional[Union[str, "_models.SkuName"]] = None, + ) -> None: ... + + @overload + def __init__(self, mapping: Mapping[str, Any]) -> None: + """ + :param mapping: raw JSON to initialize the model. + :type mapping: Mapping[str, Any] + """ + + def __init__(self, *args: Any, **kwargs: Any) -> None: + super().__init__(*args, **kwargs) + + +class Certificate(_Model): """Properties of the certificate. :ivar serial_number: Serial number of the certificate. :vartype serial_number: str + :ivar enhanced_key_usage: Enhanced key usage of the certificate. + :vartype enhanced_key_usage: str :ivar subject_name: Subject name of the certificate. :vartype subject_name: str :ivar thumbprint: Thumbprint of the certificate. @@ -66,19 +96,33 @@ class Certificate(_model_base.Model): :vartype revocation: ~azure.mgmt.trustedsigning.models.Revocation """ - serial_number: Optional[str] = rest_field(name="serialNumber") + serial_number: Optional[str] = rest_field( + name="serialNumber", visibility=["read", "create", "update", "delete", "query"] + ) """Serial number of the certificate.""" - subject_name: Optional[str] = rest_field(name="subjectName") + enhanced_key_usage: Optional[str] = rest_field( + name="enhancedKeyUsage", visibility=["read", "create", "update", "delete", "query"] + ) + """Enhanced key usage of the certificate.""" + subject_name: Optional[str] = rest_field( + name="subjectName", visibility=["read", "create", "update", "delete", "query"] + ) """Subject name of the certificate.""" - thumbprint: Optional[str] = rest_field() + thumbprint: Optional[str] = rest_field(visibility=["read", "create", "update", "delete", "query"]) """Thumbprint of the certificate.""" - created_date: Optional[str] = rest_field(name="createdDate") + created_date: Optional[str] = rest_field( + name="createdDate", visibility=["read", "create", "update", "delete", "query"] + ) """Certificate created date.""" - expiry_date: Optional[str] = rest_field(name="expiryDate") + expiry_date: Optional[str] = rest_field( + name="expiryDate", visibility=["read", "create", "update", "delete", "query"] + ) """Certificate expiry date.""" - status: Optional[Union[str, "_models.CertificateStatus"]] = rest_field() + status: Optional[Union[str, "_models.CertificateStatus"]] = rest_field( + visibility=["read", "create", "update", "delete", "query"] + ) """Status of the certificate. Known values are: \"Active\", \"Expired\", and \"Revoked\".""" - revocation: Optional["_models.Revocation"] = rest_field() + revocation: Optional["_models.Revocation"] = rest_field(visibility=["read", "create", "update", "delete", "query"]) """Revocations history of a certificate.""" __flattened_items = ["requested_at", "effective_at", "reason", "remarks", "status", "failure_reason"] @@ -88,22 +132,23 @@ def __init__( self, *, serial_number: Optional[str] = None, + enhanced_key_usage: Optional[str] = None, subject_name: Optional[str] = None, thumbprint: Optional[str] = None, created_date: Optional[str] = None, expiry_date: Optional[str] = None, status: Optional[Union[str, "_models.CertificateStatus"]] = None, revocation: Optional["_models.Revocation"] = None, - ): ... + ) -> None: ... @overload - def __init__(self, mapping: Mapping[str, Any]): + def __init__(self, mapping: Mapping[str, Any]) -> None: """ :param mapping: raw JSON to initialize the model. :type mapping: Mapping[str, Any] """ - def __init__(self, *args: Any, **kwargs: Any) -> None: # pylint: disable=useless-super-delegation + def __init__(self, *args: Any, **kwargs: Any) -> None: _flattened_input = {k: kwargs.pop(k) for k in kwargs.keys() & self.__flattened_items} super().__init__(*args, **kwargs) for k, v in _flattened_input.items(): @@ -125,13 +170,11 @@ def __setattr__(self, key: str, value: Any) -> None: super().__setattr__(key, value) -class Resource(_model_base.Model): - """Common fields that are returned in the response for all Azure Resource Manager resources. - - Readonly variables are only populated by the server, and will be ignored when sending a request. +class Resource(_Model): + """Resource. :ivar id: Fully qualified resource ID for the resource. Ex - - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. # pylint: disable=line-too-long + /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. :vartype id: str :ivar name: The name of the resource. :vartype name: str @@ -145,7 +188,7 @@ class Resource(_model_base.Model): id: Optional[str] = rest_field(visibility=["read"]) """Fully qualified resource ID for the resource. Ex - - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. # pylint: disable=line-too-long""" + /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}.""" name: Optional[str] = rest_field(visibility=["read"]) """The name of the resource.""" type: Optional[str] = rest_field(visibility=["read"]) @@ -156,13 +199,10 @@ class Resource(_model_base.Model): class ProxyResource(Resource): - """The resource model definition for a Azure Resource Manager proxy resource. It will not have - tags and a location. - - Readonly variables are only populated by the server, and will be ignored when sending a request. + """Proxy Resource. :ivar id: Fully qualified resource ID for the resource. Ex - - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. # pylint: disable=line-too-long + /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. :vartype id: str :ivar name: The name of the resource. :vartype name: str @@ -178,10 +218,8 @@ class ProxyResource(Resource): class CertificateProfile(ProxyResource): """Certificate profile resource. - Readonly variables are only populated by the server, and will be ignored when sending a request. - :ivar id: Fully qualified resource ID for the resource. Ex - - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. # pylint: disable=line-too-long + /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. :vartype id: str :ivar name: The name of the resource. :vartype name: str @@ -195,7 +233,9 @@ class CertificateProfile(ProxyResource): :vartype properties: ~azure.mgmt.trustedsigning.models.CertificateProfileProperties """ - properties: Optional["_models.CertificateProfileProperties"] = rest_field() + properties: Optional["_models.CertificateProfileProperties"] = rest_field( + visibility=["read", "create", "update", "delete", "query"] + ) """The resource-specific properties for this resource.""" @overload @@ -203,60 +243,40 @@ def __init__( self, *, properties: Optional["_models.CertificateProfileProperties"] = None, - ): ... + ) -> None: ... @overload - def __init__(self, mapping: Mapping[str, Any]): + def __init__(self, mapping: Mapping[str, Any]) -> None: """ :param mapping: raw JSON to initialize the model. :type mapping: Mapping[str, Any] """ - def __init__(self, *args: Any, **kwargs: Any) -> None: # pylint: disable=useless-super-delegation + def __init__(self, *args: Any, **kwargs: Any) -> None: super().__init__(*args, **kwargs) -class CertificateProfileProperties(_model_base.Model): # pylint: disable=too-many-instance-attributes +class CertificateProfileProperties(_Model): """Properties of the certificate profile. - Readonly variables are only populated by the server, and will be ignored when sending a request. - - :ivar profile_type: Profile type of the certificate. Required. Known values are: "PublicTrust", "PrivateTrust", "PrivateTrustCIPolicy", "VBSEnclave", and "PublicTrustTest". :vartype profile_type: str or ~azure.mgmt.trustedsigning.models.ProfileType - :ivar common_name: Used as CN in the certificate subject name. - :vartype common_name: str - :ivar organization: Used as O in the certificate subject name. - :vartype organization: str - :ivar organization_unit: Used as OU in the private trust certificate subject name. - :vartype organization_unit: str - :ivar street_address: Used as STREET in the certificate subject name. - :vartype street_address: str :ivar include_street_address: Whether to include STREET in the certificate subject name. :vartype include_street_address: bool - :ivar city: Used as L in the certificate subject name. - :vartype city: str :ivar include_city: Whether to include L in the certificate subject name. Applicable only for private trust, private trust ci profile types. :vartype include_city: bool - :ivar state: Used as S in the certificate subject name. - :vartype state: str :ivar include_state: Whether to include S in the certificate subject name. Applicable only for private trust, private trust ci profile types. :vartype include_state: bool - :ivar country: Used as C in the certificate subject name. - :vartype country: str :ivar include_country: Whether to include C in the certificate subject name. Applicable only for private trust, private trust ci profile types. :vartype include_country: bool - :ivar postal_code: Used as PC in the certificate subject name. - :vartype postal_code: str :ivar include_postal_code: Whether to include PC in the certificate subject name. :vartype include_postal_code: bool - :ivar enhanced_key_usage: Enhanced key usage of the certificate. - :vartype enhanced_key_usage: str :ivar identity_validation_id: Identity validation id used for the certificate subject name. + Required. :vartype identity_validation_id: str :ivar provisioning_state: Status of the current operation on certificate profile. Known values are: "Succeeded", "Failed", "Canceled", "Updating", "Deleting", and "Accepted". @@ -268,42 +288,38 @@ class CertificateProfileProperties(_model_base.Model): # pylint: disable=too-ma :vartype certificates: list[~azure.mgmt.trustedsigning.models.Certificate] """ - profile_type: Union[str, "_models.ProfileType"] = rest_field(name="profileType") + profile_type: Union[str, "_models.ProfileType"] = rest_field( + name="profileType", visibility=["read", "create", "update", "delete", "query"] + ) """Profile type of the certificate. Required. Known values are: \"PublicTrust\", \"PrivateTrust\", \"PrivateTrustCIPolicy\", \"VBSEnclave\", and \"PublicTrustTest\".""" - common_name: Optional[str] = rest_field(name="commonName", visibility=["read"]) - """Used as CN in the certificate subject name.""" - organization: Optional[str] = rest_field(visibility=["read"]) - """Used as O in the certificate subject name.""" - organization_unit: Optional[str] = rest_field(name="organizationUnit", visibility=["read"]) - """Used as OU in the private trust certificate subject name.""" - street_address: Optional[str] = rest_field(name="streetAddress", visibility=["read"]) - """Used as STREET in the certificate subject name.""" - include_street_address: Optional[bool] = rest_field(name="includeStreetAddress") + include_street_address: Optional[bool] = rest_field( + name="includeStreetAddress", visibility=["read", "create", "update", "delete", "query"] + ) """Whether to include STREET in the certificate subject name.""" - city: Optional[str] = rest_field(visibility=["read"]) - """Used as L in the certificate subject name.""" - include_city: Optional[bool] = rest_field(name="includeCity") + include_city: Optional[bool] = rest_field( + name="includeCity", visibility=["read", "create", "update", "delete", "query"] + ) """Whether to include L in the certificate subject name. Applicable only for private trust, private trust ci profile types.""" - state: Optional[str] = rest_field(visibility=["read"]) - """Used as S in the certificate subject name.""" - include_state: Optional[bool] = rest_field(name="includeState") + include_state: Optional[bool] = rest_field( + name="includeState", visibility=["read", "create", "update", "delete", "query"] + ) """Whether to include S in the certificate subject name. Applicable only for private trust, private trust ci profile types.""" - country: Optional[str] = rest_field(visibility=["read"]) - """Used as C in the certificate subject name.""" - include_country: Optional[bool] = rest_field(name="includeCountry") + include_country: Optional[bool] = rest_field( + name="includeCountry", visibility=["read", "create", "update", "delete", "query"] + ) """Whether to include C in the certificate subject name. Applicable only for private trust, private trust ci profile types.""" - postal_code: Optional[str] = rest_field(name="postalCode", visibility=["read"]) - """Used as PC in the certificate subject name.""" - include_postal_code: Optional[bool] = rest_field(name="includePostalCode") + include_postal_code: Optional[bool] = rest_field( + name="includePostalCode", visibility=["read", "create", "update", "delete", "query"] + ) """Whether to include PC in the certificate subject name.""" - enhanced_key_usage: Optional[str] = rest_field(name="enhancedKeyUsage", visibility=["read"]) - """Enhanced key usage of the certificate.""" - identity_validation_id: Optional[str] = rest_field(name="identityValidationId") - """Identity validation id used for the certificate subject name.""" + identity_validation_id: str = rest_field( + name="identityValidationId", visibility=["read", "create", "update", "delete", "query"] + ) + """Identity validation id used for the certificate subject name. Required.""" provisioning_state: Optional[Union[str, "_models.ProvisioningState"]] = rest_field( name="provisioningState", visibility=["read"] ) @@ -322,22 +338,22 @@ def __init__( self, *, profile_type: Union[str, "_models.ProfileType"], + identity_validation_id: str, include_street_address: Optional[bool] = None, include_city: Optional[bool] = None, include_state: Optional[bool] = None, include_country: Optional[bool] = None, include_postal_code: Optional[bool] = None, - identity_validation_id: Optional[str] = None, - ): ... + ) -> None: ... @overload - def __init__(self, mapping: Mapping[str, Any]): + def __init__(self, mapping: Mapping[str, Any]) -> None: """ :param mapping: raw JSON to initialize the model. :type mapping: Mapping[str, Any] """ - def __init__(self, *args: Any, **kwargs: Any) -> None: # pylint: disable=useless-super-delegation + def __init__(self, *args: Any, **kwargs: Any) -> None: _flattened_input = {k: kwargs.pop(k) for k in kwargs.keys() & self.__flattened_items} super().__init__(*args, **kwargs) for k, v in _flattened_input.items(): @@ -359,16 +375,14 @@ def __setattr__(self, key: str, value: Any) -> None: super().__setattr__(key, value) -class CheckNameAvailability(_model_base.Model): +class CheckNameAvailability(_Model): """The parameters used to check the availability of the trusted signing account name. - All required parameters must be populated in order to send to server. - :ivar name: Trusted signing account name. Required. :vartype name: str """ - name: str = rest_field() + name: str = rest_field(visibility=["read", "create", "update", "delete", "query"]) """Trusted signing account name. Required.""" @overload @@ -376,24 +390,22 @@ def __init__( self, *, name: str, - ): ... + ) -> None: ... @overload - def __init__(self, mapping: Mapping[str, Any]): + def __init__(self, mapping: Mapping[str, Any]) -> None: """ :param mapping: raw JSON to initialize the model. :type mapping: Mapping[str, Any] """ - def __init__(self, *args: Any, **kwargs: Any) -> None: # pylint: disable=useless-super-delegation + def __init__(self, *args: Any, **kwargs: Any) -> None: super().__init__(*args, **kwargs) -class CheckNameAvailabilityResult(_model_base.Model): +class CheckNameAvailabilityResult(_Model): """The CheckNameAvailability operation response. - Readonly variables are only populated by the server, and will be ignored when sending a request. - :ivar name_available: A boolean value that indicates whether the name is available for you to use. If true, the name is available. If false, the name has already been taken or is invalid and cannot be used. @@ -418,14 +430,10 @@ class CheckNameAvailabilityResult(_model_base.Model): class TrackedResource(Resource): - """The resource model definition for an Azure Resource Manager tracked top level resource which - has 'tags' and a 'location'. - - Readonly variables are only populated by the server, and will be ignored when sending a request. - + """Tracked Resource. :ivar id: Fully qualified resource ID for the resource. Ex - - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. # pylint: disable=line-too-long + /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. :vartype id: str :ivar name: The name of the resource. :vartype name: str @@ -441,7 +449,7 @@ class TrackedResource(Resource): :vartype location: str """ - tags: Optional[Dict[str, str]] = rest_field() + tags: Optional[Dict[str, str]] = rest_field(visibility=["read", "create", "update", "delete", "query"]) """Resource tags.""" location: str = rest_field(visibility=["read", "create"]) """The geo-location where the resource lives. Required.""" @@ -452,27 +460,24 @@ def __init__( *, location: str, tags: Optional[Dict[str, str]] = None, - ): ... + ) -> None: ... @overload - def __init__(self, mapping: Mapping[str, Any]): + def __init__(self, mapping: Mapping[str, Any]) -> None: """ :param mapping: raw JSON to initialize the model. :type mapping: Mapping[str, Any] """ - def __init__(self, *args: Any, **kwargs: Any) -> None: # pylint: disable=useless-super-delegation + def __init__(self, *args: Any, **kwargs: Any) -> None: super().__init__(*args, **kwargs) class CodeSigningAccount(TrackedResource): """Trusted signing account resource. - Readonly variables are only populated by the server, and will be ignored when sending a request. - - :ivar id: Fully qualified resource ID for the resource. Ex - - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. # pylint: disable=line-too-long + /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. :vartype id: str :ivar name: The name of the resource. :vartype name: str @@ -490,7 +495,9 @@ class CodeSigningAccount(TrackedResource): :vartype properties: ~azure.mgmt.trustedsigning.models.CodeSigningAccountProperties """ - properties: Optional["_models.CodeSigningAccountProperties"] = rest_field() + properties: Optional["_models.CodeSigningAccountProperties"] = rest_field( + visibility=["read", "create", "update", "delete", "query"] + ) """The resource-specific properties for this resource.""" @overload @@ -500,20 +507,20 @@ def __init__( location: str, tags: Optional[Dict[str, str]] = None, properties: Optional["_models.CodeSigningAccountProperties"] = None, - ): ... + ) -> None: ... @overload - def __init__(self, mapping: Mapping[str, Any]): + def __init__(self, mapping: Mapping[str, Any]) -> None: """ :param mapping: raw JSON to initialize the model. :type mapping: Mapping[str, Any] """ - def __init__(self, *args: Any, **kwargs: Any) -> None: # pylint: disable=useless-super-delegation + def __init__(self, *args: Any, **kwargs: Any) -> None: super().__init__(*args, **kwargs) -class CodeSigningAccountPatch(_model_base.Model): +class CodeSigningAccountPatch(_Model): """Parameters for creating or updating a trusted signing account. :ivar tags: Resource tags. @@ -522,9 +529,11 @@ class CodeSigningAccountPatch(_model_base.Model): :vartype properties: ~azure.mgmt.trustedsigning.models.CodeSigningAccountPatchProperties """ - tags: Optional[Dict[str, str]] = rest_field() + tags: Optional[Dict[str, str]] = rest_field(visibility=["read", "create", "update", "delete", "query"]) """Resource tags.""" - properties: Optional["_models.CodeSigningAccountPatchProperties"] = rest_field() + properties: Optional["_models.CodeSigningAccountPatchProperties"] = rest_field( + visibility=["read", "create", "update", "delete", "query"] + ) """Properties of the trusted signing account.""" __flattened_items = ["sku"] @@ -535,16 +544,16 @@ def __init__( *, tags: Optional[Dict[str, str]] = None, properties: Optional["_models.CodeSigningAccountPatchProperties"] = None, - ): ... + ) -> None: ... @overload - def __init__(self, mapping: Mapping[str, Any]): + def __init__(self, mapping: Mapping[str, Any]) -> None: """ :param mapping: raw JSON to initialize the model. :type mapping: Mapping[str, Any] """ - def __init__(self, *args: Any, **kwargs: Any) -> None: # pylint: disable=useless-super-delegation + def __init__(self, *args: Any, **kwargs: Any) -> None: _flattened_input = {k: kwargs.pop(k) for k in kwargs.keys() & self.__flattened_items} super().__init__(*args, **kwargs) for k, v in _flattened_input.items(): @@ -566,39 +575,37 @@ def __setattr__(self, key: str, value: Any) -> None: super().__setattr__(key, value) -class CodeSigningAccountPatchProperties(_model_base.Model): +class CodeSigningAccountPatchProperties(_Model): """Properties of the trusted signing account. :ivar sku: SKU of the trusted signing account. - :vartype sku: ~azure.mgmt.trustedsigning.models.AccountSku + :vartype sku: ~azure.mgmt.trustedsigning.models.AccountSkuPatch """ - sku: Optional["_models.AccountSku"] = rest_field() + sku: Optional["_models.AccountSkuPatch"] = rest_field(visibility=["read", "create", "update", "delete", "query"]) """SKU of the trusted signing account.""" @overload def __init__( self, *, - sku: Optional["_models.AccountSku"] = None, - ): ... + sku: Optional["_models.AccountSkuPatch"] = None, + ) -> None: ... @overload - def __init__(self, mapping: Mapping[str, Any]): + def __init__(self, mapping: Mapping[str, Any]) -> None: """ :param mapping: raw JSON to initialize the model. :type mapping: Mapping[str, Any] """ - def __init__(self, *args: Any, **kwargs: Any) -> None: # pylint: disable=useless-super-delegation + def __init__(self, *args: Any, **kwargs: Any) -> None: super().__init__(*args, **kwargs) -class CodeSigningAccountProperties(_model_base.Model): +class CodeSigningAccountProperties(_Model): """Properties of the trusted signing account. - Readonly variables are only populated by the server, and will be ignored when sending a request. - :ivar account_uri: The URI of the trusted signing account which is used during signing files. :vartype account_uri: str :ivar sku: SKU of the trusted signing account. @@ -610,7 +617,7 @@ class CodeSigningAccountProperties(_model_base.Model): account_uri: Optional[str] = rest_field(name="accountUri", visibility=["read"]) """The URI of the trusted signing account which is used during signing files.""" - sku: Optional["_models.AccountSku"] = rest_field() + sku: Optional["_models.AccountSku"] = rest_field(visibility=["read", "create", "update", "delete", "query"]) """SKU of the trusted signing account.""" provisioning_state: Optional[Union[str, "_models.ProvisioningState"]] = rest_field( name="provisioningState", visibility=["read"] @@ -623,24 +630,22 @@ def __init__( self, *, sku: Optional["_models.AccountSku"] = None, - ): ... + ) -> None: ... @overload - def __init__(self, mapping: Mapping[str, Any]): + def __init__(self, mapping: Mapping[str, Any]) -> None: """ :param mapping: raw JSON to initialize the model. :type mapping: Mapping[str, Any] """ - def __init__(self, *args: Any, **kwargs: Any) -> None: # pylint: disable=useless-super-delegation + def __init__(self, *args: Any, **kwargs: Any) -> None: super().__init__(*args, **kwargs) -class ErrorAdditionalInfo(_model_base.Model): +class ErrorAdditionalInfo(_Model): """The resource management error additional info. - Readonly variables are only populated by the server, and will be ignored when sending a request. - :ivar type: The additional info type. :vartype type: str :ivar info: The additional info. @@ -653,11 +658,9 @@ class ErrorAdditionalInfo(_model_base.Model): """The additional info.""" -class ErrorDetail(_model_base.Model): +class ErrorDetail(_Model): """The error detail. - Readonly variables are only populated by the server, and will be ignored when sending a request. - :ivar code: The error code. :vartype code: str :ivar message: The error message. @@ -684,15 +687,14 @@ class ErrorDetail(_model_base.Model): """The error additional info.""" -class ErrorResponse(_model_base.Model): - """Common error response for all Azure Resource Manager APIs to return error details for failed - operations. +class ErrorResponse(_Model): + """Error response. :ivar error: The error object. :vartype error: ~azure.mgmt.trustedsigning.models.ErrorDetail """ - error: Optional["_models.ErrorDetail"] = rest_field() + error: Optional["_models.ErrorDetail"] = rest_field(visibility=["read", "create", "update", "delete", "query"]) """The error object.""" @overload @@ -700,23 +702,21 @@ def __init__( self, *, error: Optional["_models.ErrorDetail"] = None, - ): ... + ) -> None: ... @overload - def __init__(self, mapping: Mapping[str, Any]): + def __init__(self, mapping: Mapping[str, Any]) -> None: """ :param mapping: raw JSON to initialize the model. :type mapping: Mapping[str, Any] """ - def __init__(self, *args: Any, **kwargs: Any) -> None: # pylint: disable=useless-super-delegation + def __init__(self, *args: Any, **kwargs: Any) -> None: super().__init__(*args, **kwargs) -class Operation(_model_base.Model): - """Details of a REST API operation, returned from the Resource Provider Operations API. - - Readonly variables are only populated by the server, and will be ignored when sending a request. +class Operation(_Model): + """REST API Operation. :ivar name: The name of the operation, as per Resource-Based Access Control (RBAC). Examples: "Microsoft.Compute/virtualMachines/write", "Microsoft.Compute/virtualMachines/capture/action". @@ -742,13 +742,15 @@ class Operation(_model_base.Model): is_data_action: Optional[bool] = rest_field(name="isDataAction", visibility=["read"]) """Whether the operation applies to data-plane. This is \"true\" for data-plane operations and \"false\" for Azure Resource Manager/control-plane operations.""" - display: Optional["_models.OperationDisplay"] = rest_field(visibility=["read"]) + display: Optional["_models.OperationDisplay"] = rest_field( + visibility=["read", "create", "update", "delete", "query"] + ) """Localized display information for this particular operation.""" origin: Optional[Union[str, "_models.Origin"]] = rest_field(visibility=["read"]) """The intended executor of the operation; as in Resource Based Access Control (RBAC) and audit logs UX. Default value is \"user,system\". Known values are: \"user\", \"system\", and \"user,system\".""" - action_type: Optional[Union[str, "_models.ActionType"]] = rest_field(name="actionType") + action_type: Optional[Union[str, "_models.ActionType"]] = rest_field(name="actionType", visibility=["read"]) """Extensible enum. Indicates the action type. \"Internal\" refers to actions that are for internal only APIs. \"Internal\"""" @@ -756,25 +758,23 @@ class Operation(_model_base.Model): def __init__( self, *, - action_type: Optional[Union[str, "_models.ActionType"]] = None, - ): ... + display: Optional["_models.OperationDisplay"] = None, + ) -> None: ... @overload - def __init__(self, mapping: Mapping[str, Any]): + def __init__(self, mapping: Mapping[str, Any]) -> None: """ :param mapping: raw JSON to initialize the model. :type mapping: Mapping[str, Any] """ - def __init__(self, *args: Any, **kwargs: Any) -> None: # pylint: disable=useless-super-delegation + def __init__(self, *args: Any, **kwargs: Any) -> None: super().__init__(*args, **kwargs) -class OperationDisplay(_model_base.Model): +class OperationDisplay(_Model): """Localized display information for and operation. - Readonly variables are only populated by the server, and will be ignored when sending a request. - :ivar provider: The localized friendly form of the resource provider name, e.g. "Microsoft Monitoring Insights" or "Microsoft Compute". :vartype provider: str @@ -803,7 +803,7 @@ class OperationDisplay(_model_base.Model): views.""" -class Revocation(_model_base.Model): +class Revocation(_Model): """Revocation details of the certificate. :ivar requested_at: The timestamp when the revocation is requested. @@ -821,17 +821,25 @@ class Revocation(_model_base.Model): :vartype failure_reason: str """ - requested_at: Optional[datetime.datetime] = rest_field(name="requestedAt", format="rfc3339") + requested_at: Optional[datetime.datetime] = rest_field( + name="requestedAt", visibility=["read", "create", "update", "delete", "query"], format="rfc3339" + ) """The timestamp when the revocation is requested.""" - effective_at: Optional[datetime.datetime] = rest_field(name="effectiveAt", format="rfc3339") + effective_at: Optional[datetime.datetime] = rest_field( + name="effectiveAt", visibility=["read", "create", "update", "delete", "query"], format="rfc3339" + ) """The timestamp when the revocation is effective.""" - reason: Optional[str] = rest_field() + reason: Optional[str] = rest_field(visibility=["read", "create", "update", "delete", "query"]) """Reason for revocation.""" - remarks: Optional[str] = rest_field() + remarks: Optional[str] = rest_field(visibility=["read", "create", "update", "delete", "query"]) """Remarks for the revocation.""" - status: Optional[Union[str, "_models.RevocationStatus"]] = rest_field() + status: Optional[Union[str, "_models.RevocationStatus"]] = rest_field( + visibility=["read", "create", "update", "delete", "query"] + ) """Status of the revocation. Known values are: \"Succeeded\", \"InProgress\", and \"Failed\".""" - failure_reason: Optional[str] = rest_field(name="failureReason") + failure_reason: Optional[str] = rest_field( + name="failureReason", visibility=["read", "create", "update", "delete", "query"] + ) """Reason for the revocation failure.""" @overload @@ -844,24 +852,22 @@ def __init__( remarks: Optional[str] = None, status: Optional[Union[str, "_models.RevocationStatus"]] = None, failure_reason: Optional[str] = None, - ): ... + ) -> None: ... @overload - def __init__(self, mapping: Mapping[str, Any]): + def __init__(self, mapping: Mapping[str, Any]) -> None: """ :param mapping: raw JSON to initialize the model. :type mapping: Mapping[str, Any] """ - def __init__(self, *args: Any, **kwargs: Any) -> None: # pylint: disable=useless-super-delegation + def __init__(self, *args: Any, **kwargs: Any) -> None: super().__init__(*args, **kwargs) -class RevokeCertificate(_model_base.Model): +class RevokeCertificate(_Model): """Defines the certificate revocation properties. - All required parameters must be populated in order to send to server. - :ivar serial_number: Serial number of the certificate. Required. :vartype serial_number: str :ivar thumbprint: Thumbprint of the certificate. Required. @@ -874,15 +880,17 @@ class RevokeCertificate(_model_base.Model): :vartype remarks: str """ - serial_number: str = rest_field(name="serialNumber") + serial_number: str = rest_field(name="serialNumber", visibility=["read", "create", "update", "delete", "query"]) """Serial number of the certificate. Required.""" - thumbprint: str = rest_field() + thumbprint: str = rest_field(visibility=["read", "create", "update", "delete", "query"]) """Thumbprint of the certificate. Required.""" - effective_at: datetime.datetime = rest_field(name="effectiveAt", format="rfc3339") + effective_at: datetime.datetime = rest_field( + name="effectiveAt", visibility=["read", "create", "update", "delete", "query"], format="rfc3339" + ) """The timestamp when the revocation is effective. Required.""" - reason: str = rest_field() + reason: str = rest_field(visibility=["read", "create", "update", "delete", "query"]) """Reason for the revocation. Required.""" - remarks: Optional[str] = rest_field() + remarks: Optional[str] = rest_field(visibility=["read", "create", "update", "delete", "query"]) """Remarks for the revocation.""" @overload @@ -894,20 +902,20 @@ def __init__( effective_at: datetime.datetime, reason: str, remarks: Optional[str] = None, - ): ... + ) -> None: ... @overload - def __init__(self, mapping: Mapping[str, Any]): + def __init__(self, mapping: Mapping[str, Any]) -> None: """ :param mapping: raw JSON to initialize the model. :type mapping: Mapping[str, Any] """ - def __init__(self, *args: Any, **kwargs: Any) -> None: # pylint: disable=useless-super-delegation + def __init__(self, *args: Any, **kwargs: Any) -> None: super().__init__(*args, **kwargs) -class SystemData(_model_base.Model): +class SystemData(_Model): """Metadata pertaining to creation and last modification of the resource. :ivar created_by: The identity that created the resource. @@ -926,19 +934,29 @@ class SystemData(_model_base.Model): :vartype last_modified_at: ~datetime.datetime """ - created_by: Optional[str] = rest_field(name="createdBy") + created_by: Optional[str] = rest_field(name="createdBy", visibility=["read", "create", "update", "delete", "query"]) """The identity that created the resource.""" - created_by_type: Optional[Union[str, "_models.CreatedByType"]] = rest_field(name="createdByType") + created_by_type: Optional[Union[str, "_models.CreatedByType"]] = rest_field( + name="createdByType", visibility=["read", "create", "update", "delete", "query"] + ) """The type of identity that created the resource. Known values are: \"User\", \"Application\", \"ManagedIdentity\", and \"Key\".""" - created_at: Optional[datetime.datetime] = rest_field(name="createdAt", format="rfc3339") + created_at: Optional[datetime.datetime] = rest_field( + name="createdAt", visibility=["read", "create", "update", "delete", "query"], format="rfc3339" + ) """The timestamp of resource creation (UTC).""" - last_modified_by: Optional[str] = rest_field(name="lastModifiedBy") + last_modified_by: Optional[str] = rest_field( + name="lastModifiedBy", visibility=["read", "create", "update", "delete", "query"] + ) """The identity that last modified the resource.""" - last_modified_by_type: Optional[Union[str, "_models.CreatedByType"]] = rest_field(name="lastModifiedByType") + last_modified_by_type: Optional[Union[str, "_models.CreatedByType"]] = rest_field( + name="lastModifiedByType", visibility=["read", "create", "update", "delete", "query"] + ) """The type of identity that last modified the resource. Known values are: \"User\", \"Application\", \"ManagedIdentity\", and \"Key\".""" - last_modified_at: Optional[datetime.datetime] = rest_field(name="lastModifiedAt", format="rfc3339") + last_modified_at: Optional[datetime.datetime] = rest_field( + name="lastModifiedAt", visibility=["read", "create", "update", "delete", "query"], format="rfc3339" + ) """The timestamp of resource last modification (UTC).""" @overload @@ -951,14 +969,14 @@ def __init__( last_modified_by: Optional[str] = None, last_modified_by_type: Optional[Union[str, "_models.CreatedByType"]] = None, last_modified_at: Optional[datetime.datetime] = None, - ): ... + ) -> None: ... @overload - def __init__(self, mapping: Mapping[str, Any]): + def __init__(self, mapping: Mapping[str, Any]) -> None: """ :param mapping: raw JSON to initialize the model. :type mapping: Mapping[str, Any] """ - def __init__(self, *args: Any, **kwargs: Any) -> None: # pylint: disable=useless-super-delegation + def __init__(self, *args: Any, **kwargs: Any) -> None: super().__init__(*args, **kwargs) diff --git a/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/models/_patch.py b/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/models/_patch.py index f7dd32510333..8bcb627aa475 100644 --- a/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/models/_patch.py +++ b/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/models/_patch.py @@ -1,7 +1,8 @@ -# ------------------------------------ -# Copyright (c) Microsoft Corporation. -# Licensed under the MIT License. -# ------------------------------------ +# 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. +# -------------------------------------------------------------------------- """Customize generated code here. Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize diff --git a/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/operations/__init__.py b/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/operations/__init__.py index 935a86f04db7..2a2e37254230 100644 --- a/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/operations/__init__.py +++ b/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/operations/__init__.py @@ -5,13 +5,19 @@ # Code generated by Microsoft (R) Python Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +# pylint: disable=wrong-import-position -from ._operations import Operations -from ._operations import CodeSigningAccountsOperations -from ._operations import CertificateProfilesOperations +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from ._patch import * # pylint: disable=unused-wildcard-import + +from ._operations import Operations # type: ignore +from ._operations import CodeSigningAccountsOperations # type: ignore +from ._operations import CertificateProfilesOperations # type: ignore from ._patch import __all__ as _patch_all -from ._patch import * # pylint: disable=unused-wildcard-import +from ._patch import * from ._patch import patch_sdk as _patch_sdk __all__ = [ @@ -19,5 +25,5 @@ "CodeSigningAccountsOperations", "CertificateProfilesOperations", ] -__all__.extend([p for p in _patch_all if p not in __all__]) +__all__.extend([p for p in _patch_all if p not in __all__]) # pyright: ignore _patch_sdk() diff --git a/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/operations/_operations.py b/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/operations/_operations.py index b2b4ecd86433..1e46e27d8c5a 100644 --- a/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/operations/_operations.py +++ b/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/operations/_operations.py @@ -1,4 +1,4 @@ -# pylint: disable=too-many-lines,too-many-statements +# pylint: disable=line-too-long,useless-suppression,too-many-lines # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -6,12 +6,13 @@ # Code generated by Microsoft (R) Python Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from collections.abc import MutableMapping from io import IOBase import json -import sys -from typing import Any, Callable, Dict, IO, Iterable, Iterator, List, Optional, Type, TypeVar, Union, cast, overload +from typing import Any, Callable, Dict, IO, Iterable, Iterator, List, Optional, TypeVar, Union, cast, overload import urllib.parse +from azure.core import PipelineClient from azure.core.exceptions import ( ClientAuthenticationError, HttpResponseError, @@ -32,16 +33,13 @@ from azure.mgmt.core.polling.arm_polling import ARMPolling from .. import models as _models -from .._model_base import SdkJSONEncoder, _deserialize -from .._serialization import Serializer +from .._configuration import TrustedSigningMgmtClientConfiguration +from .._utils.model_base import SdkJSONEncoder, _deserialize, _failsafe_deserialize +from .._utils.serialization import Deserializer, Serializer -if sys.version_info >= (3, 9): - from collections.abc import MutableMapping -else: - from typing import MutableMapping # type: ignore # pylint: disable=ungrouped-imports T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] -JSON = MutableMapping[str, Any] # pylint: disable=unsubscriptable-object +JSON = MutableMapping[str, Any] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -51,7 +49,7 @@ def build_operations_list_request(**kwargs: Any) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-02-05-preview")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-09-30-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -72,11 +70,11 @@ def build_code_signing_accounts_get_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-02-05-preview")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-09-30-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL - _url = "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CodeSigning/codeSigningAccounts/{accountName}" # pylint: disable=line-too-long + _url = "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CodeSigning/codeSigningAccounts/{accountName}" path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), @@ -101,11 +99,11 @@ def build_code_signing_accounts_create_request( # pylint: disable=name-too-long _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-02-05-preview")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-09-30-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL - _url = "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CodeSigning/codeSigningAccounts/{accountName}" # pylint: disable=line-too-long + _url = "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CodeSigning/codeSigningAccounts/{accountName}" path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), @@ -132,11 +130,11 @@ def build_code_signing_accounts_update_request( # pylint: disable=name-too-long _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-02-05-preview")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-09-30-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL - _url = "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CodeSigning/codeSigningAccounts/{accountName}" # pylint: disable=line-too-long + _url = "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CodeSigning/codeSigningAccounts/{accountName}" path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), @@ -162,11 +160,11 @@ def build_code_signing_accounts_delete_request( # pylint: disable=name-too-long _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-02-05-preview")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-09-30-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL - _url = "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CodeSigning/codeSigningAccounts/{accountName}" # pylint: disable=line-too-long + _url = "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CodeSigning/codeSigningAccounts/{accountName}" path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), @@ -190,11 +188,11 @@ def build_code_signing_accounts_list_by_resource_group_request( # pylint: disab _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-02-05-preview")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-09-30-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL - _url = "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CodeSigning/codeSigningAccounts" # pylint: disable=line-too-long + _url = "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CodeSigning/codeSigningAccounts" path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), @@ -217,7 +215,7 @@ def build_code_signing_accounts_list_by_subscription_request( # pylint: disable _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-02-05-preview")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-09-30-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -244,7 +242,7 @@ def build_code_signing_accounts_check_name_availability_request( # pylint: disa _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-02-05-preview")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-09-30-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -272,11 +270,11 @@ def build_certificate_profiles_get_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-02-05-preview")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-09-30-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL - _url = "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CodeSigning/codeSigningAccounts/{accountName}/certificateProfiles/{profileName}" # pylint: disable=line-too-long + _url = "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CodeSigning/codeSigningAccounts/{accountName}/certificateProfiles/{profileName}" path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), @@ -302,11 +300,11 @@ def build_certificate_profiles_create_request( # pylint: disable=name-too-long _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-02-05-preview")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-09-30-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL - _url = "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CodeSigning/codeSigningAccounts/{accountName}/certificateProfiles/{profileName}" # pylint: disable=line-too-long + _url = "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CodeSigning/codeSigningAccounts/{accountName}/certificateProfiles/{profileName}" path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), @@ -333,11 +331,11 @@ def build_certificate_profiles_delete_request( # pylint: disable=name-too-long _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-02-05-preview")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-09-30-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL - _url = "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CodeSigning/codeSigningAccounts/{accountName}/certificateProfiles/{profileName}" # pylint: disable=line-too-long + _url = "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CodeSigning/codeSigningAccounts/{accountName}/certificateProfiles/{profileName}" path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), @@ -362,11 +360,11 @@ def build_certificate_profiles_list_by_code_signing_account_request( # pylint: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-02-05-preview")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-09-30-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL - _url = "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CodeSigning/codeSigningAccounts/{accountName}/certificateProfiles" # pylint: disable=line-too-long + _url = "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CodeSigning/codeSigningAccounts/{accountName}/certificateProfiles" path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), @@ -391,11 +389,11 @@ def build_certificate_profiles_revoke_certificate_request( # pylint: disable=na _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-02-05-preview")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-09-30-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL - _url = "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CodeSigning/codeSigningAccounts/{accountName}/certificateProfiles/{profileName}/revokeCertificate" # pylint: disable=line-too-long + _url = "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CodeSigning/codeSigningAccounts/{accountName}/certificateProfiles/{profileName}/revokeCertificate" path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), @@ -426,12 +424,12 @@ class Operations: :attr:`operations` attribute. """ - def __init__(self, *args, **kwargs): + 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") + self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") + self._config: TrustedSigningMgmtClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config") + self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace def list(self, **kwargs: Any) -> Iterable["_models.Operation"]: @@ -446,7 +444,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.Operation"]: cls: ClsType[List[_models.Operation]] = kwargs.pop("cls", None) - error_map: MutableMapping[int, Type[HttpResponseError]] = { # pylint: disable=unsubscriptable-object + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -493,7 +491,7 @@ def prepare_request(next_link=None): def extract_data(pipeline_response): deserialized = pipeline_response.http_response.json() - list_of_elem = _deserialize(List[_models.Operation], deserialized["value"]) + list_of_elem = _deserialize(List[_models.Operation], deserialized.get("value", [])) if cls: list_of_elem = cls(list_of_elem) # type: ignore return deserialized.get("nextLink") or None, iter(list_of_elem) @@ -509,7 +507,7 @@ def get_next(next_link=None): if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) - error = _deserialize(_models.ErrorResponse, response.json()) + error = _failsafe_deserialize(_models.ErrorResponse, response.json()) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) return pipeline_response @@ -527,12 +525,12 @@ class CodeSigningAccountsOperations: :attr:`code_signing_accounts` attribute. """ - def __init__(self, *args, **kwargs): + 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") + self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") + self._config: TrustedSigningMgmtClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config") + self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace def get(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _models.CodeSigningAccount: @@ -547,7 +545,7 @@ def get(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _mo :rtype: ~azure.mgmt.trustedsigning.models.CodeSigningAccount :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { # pylint: disable=unsubscriptable-object + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -587,7 +585,7 @@ def get(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _mo except (StreamConsumedError, StreamClosedError): pass map_error(status_code=response.status_code, response=response, error_map=error_map) - error = _deserialize(_models.ErrorResponse, response.json()) + error = _failsafe_deserialize(_models.ErrorResponse, response.json()) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) if _stream: @@ -607,7 +605,7 @@ def _create_initial( resource: Union[_models.CodeSigningAccount, JSON, IO[bytes]], **kwargs: Any ) -> Iterator[bytes]: - error_map: MutableMapping[int, Type[HttpResponseError]] = { # pylint: disable=unsubscriptable-object + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -656,7 +654,7 @@ def _create_initial( except (StreamConsumedError, StreamClosedError): pass map_error(status_code=response.status_code, response=response, error_map=error_map) - error = _deserialize(_models.ErrorResponse, response.json()) + error = _failsafe_deserialize(_models.ErrorResponse, response.json()) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) response_headers = {} @@ -836,7 +834,7 @@ def _update_initial( properties: Union[_models.CodeSigningAccountPatch, JSON, IO[bytes]], **kwargs: Any ) -> Iterator[bytes]: - error_map: MutableMapping[int, Type[HttpResponseError]] = { # pylint: disable=unsubscriptable-object + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -885,7 +883,7 @@ def _update_initial( except (StreamConsumedError, StreamClosedError): pass map_error(status_code=response.status_code, response=response, error_map=error_map) - error = _deserialize(_models.ErrorResponse, response.json()) + error = _failsafe_deserialize(_models.ErrorResponse, response.json()) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) response_headers = {} @@ -1061,7 +1059,7 @@ def get_long_running_output(pipeline_response): ) def _delete_initial(self, resource_group_name: str, account_name: str, **kwargs: Any) -> Iterator[bytes]: - error_map: MutableMapping[int, Type[HttpResponseError]] = { # pylint: disable=unsubscriptable-object + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1100,7 +1098,7 @@ def _delete_initial(self, resource_group_name: str, account_name: str, **kwargs: except (StreamConsumedError, StreamClosedError): pass map_error(status_code=response.status_code, response=response, error_map=error_map) - error = _deserialize(_models.ErrorResponse, response.json()) + error = _failsafe_deserialize(_models.ErrorResponse, response.json()) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) response_headers = {} @@ -1188,7 +1186,7 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite cls: ClsType[List[_models.CodeSigningAccount]] = kwargs.pop("cls", None) - error_map: MutableMapping[int, Type[HttpResponseError]] = { # pylint: disable=unsubscriptable-object + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1237,7 +1235,7 @@ def prepare_request(next_link=None): def extract_data(pipeline_response): deserialized = pipeline_response.http_response.json() - list_of_elem = _deserialize(List[_models.CodeSigningAccount], deserialized["value"]) + list_of_elem = _deserialize(List[_models.CodeSigningAccount], deserialized.get("value", [])) if cls: list_of_elem = cls(list_of_elem) # type: ignore return deserialized.get("nextLink") or None, iter(list_of_elem) @@ -1253,7 +1251,7 @@ def get_next(next_link=None): if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) - error = _deserialize(_models.ErrorResponse, response.json()) + error = _failsafe_deserialize(_models.ErrorResponse, response.json()) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) return pipeline_response @@ -1273,7 +1271,7 @@ def list_by_subscription(self, **kwargs: Any) -> Iterable["_models.CodeSigningAc cls: ClsType[List[_models.CodeSigningAccount]] = kwargs.pop("cls", None) - error_map: MutableMapping[int, Type[HttpResponseError]] = { # pylint: disable=unsubscriptable-object + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1321,7 +1319,7 @@ def prepare_request(next_link=None): def extract_data(pipeline_response): deserialized = pipeline_response.http_response.json() - list_of_elem = _deserialize(List[_models.CodeSigningAccount], deserialized["value"]) + list_of_elem = _deserialize(List[_models.CodeSigningAccount], deserialized.get("value", [])) if cls: list_of_elem = cls(list_of_elem) # type: ignore return deserialized.get("nextLink") or None, iter(list_of_elem) @@ -1337,7 +1335,7 @@ def get_next(next_link=None): if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) - error = _deserialize(_models.ErrorResponse, response.json()) + error = _failsafe_deserialize(_models.ErrorResponse, response.json()) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) return pipeline_response @@ -1409,7 +1407,7 @@ def check_name_availability( :rtype: ~azure.mgmt.trustedsigning.models.CheckNameAvailabilityResult :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { # pylint: disable=unsubscriptable-object + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1457,7 +1455,7 @@ def check_name_availability( except (StreamConsumedError, StreamClosedError): pass map_error(status_code=response.status_code, response=response, error_map=error_map) - error = _deserialize(_models.ErrorResponse, response.json()) + error = _failsafe_deserialize(_models.ErrorResponse, response.json()) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) if _stream: @@ -1481,12 +1479,12 @@ class CertificateProfilesOperations: :attr:`certificate_profiles` attribute. """ - def __init__(self, *args, **kwargs): + 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") + self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") + self._config: TrustedSigningMgmtClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config") + self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace def get( @@ -1505,7 +1503,7 @@ def get( :rtype: ~azure.mgmt.trustedsigning.models.CertificateProfile :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { # pylint: disable=unsubscriptable-object + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1546,7 +1544,7 @@ def get( except (StreamConsumedError, StreamClosedError): pass map_error(status_code=response.status_code, response=response, error_map=error_map) - error = _deserialize(_models.ErrorResponse, response.json()) + error = _failsafe_deserialize(_models.ErrorResponse, response.json()) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) if _stream: @@ -1567,7 +1565,7 @@ def _create_initial( resource: Union[_models.CertificateProfile, JSON, IO[bytes]], **kwargs: Any ) -> Iterator[bytes]: - error_map: MutableMapping[int, Type[HttpResponseError]] = { # pylint: disable=unsubscriptable-object + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1617,7 +1615,7 @@ def _create_initial( except (StreamConsumedError, StreamClosedError): pass map_error(status_code=response.status_code, response=response, error_map=error_map) - error = _deserialize(_models.ErrorResponse, response.json()) + error = _failsafe_deserialize(_models.ErrorResponse, response.json()) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) response_headers = {} @@ -1806,7 +1804,7 @@ def get_long_running_output(pipeline_response): def _delete_initial( self, resource_group_name: str, account_name: str, profile_name: str, **kwargs: Any ) -> Iterator[bytes]: - error_map: MutableMapping[int, Type[HttpResponseError]] = { # pylint: disable=unsubscriptable-object + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1846,7 +1844,7 @@ def _delete_initial( except (StreamConsumedError, StreamClosedError): pass map_error(status_code=response.status_code, response=response, error_map=error_map) - error = _deserialize(_models.ErrorResponse, response.json()) + error = _failsafe_deserialize(_models.ErrorResponse, response.json()) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) response_headers = {} @@ -1943,7 +1941,7 @@ def list_by_code_signing_account( cls: ClsType[List[_models.CertificateProfile]] = kwargs.pop("cls", None) - error_map: MutableMapping[int, Type[HttpResponseError]] = { # pylint: disable=unsubscriptable-object + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1993,7 +1991,7 @@ def prepare_request(next_link=None): def extract_data(pipeline_response): deserialized = pipeline_response.http_response.json() - list_of_elem = _deserialize(List[_models.CertificateProfile], deserialized["value"]) + list_of_elem = _deserialize(List[_models.CertificateProfile], deserialized.get("value", [])) if cls: list_of_elem = cls(list_of_elem) # type: ignore return deserialized.get("nextLink") or None, iter(list_of_elem) @@ -2009,7 +2007,7 @@ def get_next(next_link=None): if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) - error = _deserialize(_models.ErrorResponse, response.json()) + error = _failsafe_deserialize(_models.ErrorResponse, response.json()) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) return pipeline_response @@ -2017,7 +2015,7 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) @overload - def revoke_certificate( # pylint: disable=inconsistent-return-statements + def revoke_certificate( self, resource_group_name: str, account_name: str, @@ -2047,7 +2045,7 @@ def revoke_certificate( # pylint: disable=inconsistent-return-statements """ @overload - def revoke_certificate( # pylint: disable=inconsistent-return-statements + def revoke_certificate( self, resource_group_name: str, account_name: str, @@ -2077,7 +2075,7 @@ def revoke_certificate( # pylint: disable=inconsistent-return-statements """ @overload - def revoke_certificate( # pylint: disable=inconsistent-return-statements + def revoke_certificate( self, resource_group_name: str, account_name: str, @@ -2131,7 +2129,7 @@ def revoke_certificate( # pylint: disable=inconsistent-return-statements :rtype: None :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { # pylint: disable=unsubscriptable-object + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -2177,7 +2175,7 @@ def revoke_certificate( # pylint: disable=inconsistent-return-statements if response.status_code not in [204]: map_error(status_code=response.status_code, response=response, error_map=error_map) - error = _deserialize(_models.ErrorResponse, response.json()) + error = _failsafe_deserialize(_models.ErrorResponse, response.json()) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) if cls: diff --git a/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/operations/_patch.py b/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/operations/_patch.py index f7dd32510333..8bcb627aa475 100644 --- a/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/operations/_patch.py +++ b/sdk/trustedsigning/azure-mgmt-trustedsigning/azure/mgmt/trustedsigning/operations/_patch.py @@ -1,7 +1,8 @@ -# ------------------------------------ -# Copyright (c) Microsoft Corporation. -# Licensed under the MIT License. -# ------------------------------------ +# 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. +# -------------------------------------------------------------------------- """Customize generated code here. Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize diff --git a/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_samples/certificate_profiles_create.py b/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_samples/certificate_profiles_create.py index 452f46c609b7..0aacf102c0d4 100644 --- a/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_samples/certificate_profiles_create.py +++ b/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_samples/certificate_profiles_create.py @@ -46,6 +46,6 @@ def main(): print(response) -# x-ms-original-file: 2024-02-05-preview/CertificateProfiles_Create.json +# x-ms-original-file: 2024-09-30-preview/CertificateProfiles_Create.json if __name__ == "__main__": main() diff --git a/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_samples/certificate_profiles_delete.py b/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_samples/certificate_profiles_delete.py index 5bcb4e7ac485..aa89b0a989aa 100644 --- a/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_samples/certificate_profiles_delete.py +++ b/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_samples/certificate_profiles_delete.py @@ -37,6 +37,6 @@ def main(): ).result() -# x-ms-original-file: 2024-02-05-preview/CertificateProfiles_Delete.json +# x-ms-original-file: 2024-09-30-preview/CertificateProfiles_Delete.json if __name__ == "__main__": main() diff --git a/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_samples/certificate_profiles_get.py b/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_samples/certificate_profiles_get.py index 0095591c96fd..89e3a9d03798 100644 --- a/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_samples/certificate_profiles_get.py +++ b/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_samples/certificate_profiles_get.py @@ -38,6 +38,6 @@ def main(): print(response) -# x-ms-original-file: 2024-02-05-preview/CertificateProfiles_Get.json +# x-ms-original-file: 2024-09-30-preview/CertificateProfiles_Get.json if __name__ == "__main__": main() diff --git a/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_samples/certificate_profiles_list_by_code_signing_account.py b/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_samples/certificate_profiles_list_by_code_signing_account.py index 823435168cdd..ba62e0d3a6f2 100644 --- a/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_samples/certificate_profiles_list_by_code_signing_account.py +++ b/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_samples/certificate_profiles_list_by_code_signing_account.py @@ -38,6 +38,6 @@ def main(): print(item) -# x-ms-original-file: 2024-02-05-preview/CertificateProfiles_ListByCodeSigningAccount.json +# x-ms-original-file: 2024-09-30-preview/CertificateProfiles_ListByCodeSigningAccount.json if __name__ == "__main__": main() diff --git a/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_samples/certificate_profiles_revoke_certificate.py b/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_samples/certificate_profiles_revoke_certificate.py index c107c8a0f788..bf15f0ca3842 100644 --- a/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_samples/certificate_profiles_revoke_certificate.py +++ b/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_samples/certificate_profiles_revoke_certificate.py @@ -44,6 +44,6 @@ def main(): ) -# x-ms-original-file: 2024-02-05-preview/CertificateProfiles_RevokeCertificate.json +# x-ms-original-file: 2024-09-30-preview/CertificateProfiles_RevokeCertificate.json if __name__ == "__main__": main() diff --git a/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_samples/code_signing_accounts_check_name_availability.py b/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_samples/code_signing_accounts_check_name_availability.py index 550c3cc0d816..e07b71ed6f61 100644 --- a/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_samples/code_signing_accounts_check_name_availability.py +++ b/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_samples/code_signing_accounts_check_name_availability.py @@ -36,6 +36,6 @@ def main(): print(response) -# x-ms-original-file: 2024-02-05-preview/CodeSigningAccounts_CheckNameAvailability.json +# x-ms-original-file: 2024-09-30-preview/CodeSigningAccounts_CheckNameAvailability.json if __name__ == "__main__": main() diff --git a/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_samples/code_signing_accounts_create.py b/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_samples/code_signing_accounts_create.py index d6893a999864..e654a663b3c7 100644 --- a/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_samples/code_signing_accounts_create.py +++ b/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_samples/code_signing_accounts_create.py @@ -38,6 +38,6 @@ def main(): print(response) -# x-ms-original-file: 2024-02-05-preview/CodeSigningAccounts_Create.json +# x-ms-original-file: 2024-09-30-preview/CodeSigningAccounts_Create.json if __name__ == "__main__": main() diff --git a/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_samples/code_signing_accounts_delete.py b/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_samples/code_signing_accounts_delete.py index feea1b78a65d..3e540a7d2b09 100644 --- a/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_samples/code_signing_accounts_delete.py +++ b/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_samples/code_signing_accounts_delete.py @@ -36,6 +36,6 @@ def main(): ).result() -# x-ms-original-file: 2024-02-05-preview/CodeSigningAccounts_Delete.json +# x-ms-original-file: 2024-09-30-preview/CodeSigningAccounts_Delete.json if __name__ == "__main__": main() diff --git a/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_samples/code_signing_accounts_get.py b/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_samples/code_signing_accounts_get.py index 9bb3b124c18b..86f7988902f5 100644 --- a/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_samples/code_signing_accounts_get.py +++ b/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_samples/code_signing_accounts_get.py @@ -37,6 +37,6 @@ def main(): print(response) -# x-ms-original-file: 2024-02-05-preview/CodeSigningAccounts_Get.json +# x-ms-original-file: 2024-09-30-preview/CodeSigningAccounts_Get.json if __name__ == "__main__": main() diff --git a/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_samples/code_signing_accounts_list_by_resource_group.py b/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_samples/code_signing_accounts_list_by_resource_group.py index f9980b3f150e..49ed87c4c1bf 100644 --- a/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_samples/code_signing_accounts_list_by_resource_group.py +++ b/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_samples/code_signing_accounts_list_by_resource_group.py @@ -37,6 +37,6 @@ def main(): print(item) -# x-ms-original-file: 2024-02-05-preview/CodeSigningAccounts_ListByResourceGroup.json +# x-ms-original-file: 2024-09-30-preview/CodeSigningAccounts_ListByResourceGroup.json if __name__ == "__main__": main() diff --git a/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_samples/code_signing_accounts_list_by_subscription.py b/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_samples/code_signing_accounts_list_by_subscription.py index 6be993764b5e..415a3ab29ad1 100644 --- a/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_samples/code_signing_accounts_list_by_subscription.py +++ b/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_samples/code_signing_accounts_list_by_subscription.py @@ -35,6 +35,6 @@ def main(): print(item) -# x-ms-original-file: 2024-02-05-preview/CodeSigningAccounts_ListBySubscription.json +# x-ms-original-file: 2024-09-30-preview/CodeSigningAccounts_ListBySubscription.json if __name__ == "__main__": main() diff --git a/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_samples/code_signing_accounts_update.py b/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_samples/code_signing_accounts_update.py index 59c51a2706b7..07bc5a9297a2 100644 --- a/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_samples/code_signing_accounts_update.py +++ b/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_samples/code_signing_accounts_update.py @@ -38,6 +38,6 @@ def main(): print(response) -# x-ms-original-file: 2024-02-05-preview/CodeSigningAccounts_Update.json +# x-ms-original-file: 2024-09-30-preview/CodeSigningAccounts_Update.json if __name__ == "__main__": main() diff --git a/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_samples/operations_list.py b/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_samples/operations_list.py index 0a3aa8c103c2..faeaf74087b6 100644 --- a/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_samples/operations_list.py +++ b/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_samples/operations_list.py @@ -35,6 +35,6 @@ def main(): print(item) -# x-ms-original-file: 2024-02-05-preview/Operations_List.json +# x-ms-original-file: 2024-09-30-preview/Operations_List.json if __name__ == "__main__": main() diff --git a/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_tests/test_trusted_signing_mgmt_certificate_profiles_operations.py b/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_tests/test_trusted_signing_mgmt_certificate_profiles_operations.py index ff713fa8d97e..dabdfc944a48 100644 --- a/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_tests/test_trusted_signing_mgmt_certificate_profiles_operations.py +++ b/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_tests/test_trusted_signing_mgmt_certificate_profiles_operations.py @@ -41,10 +41,12 @@ def test_certificate_profiles_begin_create(self, resource_group): "id": "str", "name": "str", "properties": { + "identityValidationId": "str", "profileType": "str", "certificates": [ { "createdDate": "str", + "enhancedKeyUsage": "str", "expiryDate": "str", "revocation": { "effectiveAt": "2020-02-20 00:00:00", @@ -60,23 +62,13 @@ def test_certificate_profiles_begin_create(self, resource_group): "thumbprint": "str", } ], - "city": "str", - "commonName": "str", - "country": "str", - "enhancedKeyUsage": "str", - "identityValidationId": "str", "includeCity": bool, "includeCountry": bool, "includePostalCode": bool, "includeState": bool, "includeStreetAddress": bool, - "organization": "str", - "organizationUnit": "str", - "postalCode": "str", "provisioningState": "str", - "state": "str", "status": "str", - "streetAddress": "str", }, "systemData": { "createdAt": "2020-02-20 00:00:00", diff --git a/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_tests/test_trusted_signing_mgmt_certificate_profiles_operations_async.py b/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_tests/test_trusted_signing_mgmt_certificate_profiles_operations_async.py index c22949336676..b00ef3d2f86c 100644 --- a/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_tests/test_trusted_signing_mgmt_certificate_profiles_operations_async.py +++ b/sdk/trustedsigning/azure-mgmt-trustedsigning/generated_tests/test_trusted_signing_mgmt_certificate_profiles_operations_async.py @@ -43,10 +43,12 @@ async def test_certificate_profiles_begin_create(self, resource_group): "id": "str", "name": "str", "properties": { + "identityValidationId": "str", "profileType": "str", "certificates": [ { "createdDate": "str", + "enhancedKeyUsage": "str", "expiryDate": "str", "revocation": { "effectiveAt": "2020-02-20 00:00:00", @@ -62,23 +64,13 @@ async def test_certificate_profiles_begin_create(self, resource_group): "thumbprint": "str", } ], - "city": "str", - "commonName": "str", - "country": "str", - "enhancedKeyUsage": "str", - "identityValidationId": "str", "includeCity": bool, "includeCountry": bool, "includePostalCode": bool, "includeState": bool, "includeStreetAddress": bool, - "organization": "str", - "organizationUnit": "str", - "postalCode": "str", "provisioningState": "str", - "state": "str", "status": "str", - "streetAddress": "str", }, "systemData": { "createdAt": "2020-02-20 00:00:00", diff --git a/sdk/trustedsigning/azure-mgmt-trustedsigning/setup.py b/sdk/trustedsigning/azure-mgmt-trustedsigning/setup.py index 79f905384045..57076f1d9591 100644 --- a/sdk/trustedsigning/azure-mgmt-trustedsigning/setup.py +++ b/sdk/trustedsigning/azure-mgmt-trustedsigning/setup.py @@ -53,7 +53,6 @@ "Programming Language :: Python", "Programming Language :: Python :: 3 :: Only", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", @@ -77,7 +76,7 @@ "isodate>=0.6.1", "typing-extensions>=4.6.0", "azure-common>=1.1", - "azure-mgmt-core>=1.3.2", + "azure-mgmt-core>=1.5.0", ], - python_requires=">=3.8", + python_requires=">=3.9", ) diff --git a/sdk/trustedsigning/azure-mgmt-trustedsigning/tests/test_trusted_signing_mgmt_code_signing_accounts_operations_async_test.py b/sdk/trustedsigning/azure-mgmt-trustedsigning/tests/test_trusted_signing_mgmt_code_signing_accounts_operations_async_test.py index cf1fc68ae9d5..bc951803a0a7 100644 --- a/sdk/trustedsigning/azure-mgmt-trustedsigning/tests/test_trusted_signing_mgmt_code_signing_accounts_operations_async_test.py +++ b/sdk/trustedsigning/azure-mgmt-trustedsigning/tests/test_trusted_signing_mgmt_code_signing_accounts_operations_async_test.py @@ -27,7 +27,6 @@ async def test_code_signing_accounts_list_by_resource_group(self, resource_group ) result = [r async for r in response] assert result == [] - @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) @recorded_by_proxy_async diff --git a/sdk/trustedsigning/azure-mgmt-trustedsigning/tests/test_trusted_signing_mgmt_code_signing_accounts_operations_test.py b/sdk/trustedsigning/azure-mgmt-trustedsigning/tests/test_trusted_signing_mgmt_code_signing_accounts_operations_test.py index c43053671d30..208341a6b20f 100644 --- a/sdk/trustedsigning/azure-mgmt-trustedsigning/tests/test_trusted_signing_mgmt_code_signing_accounts_operations_test.py +++ b/sdk/trustedsigning/azure-mgmt-trustedsigning/tests/test_trusted_signing_mgmt_code_signing_accounts_operations_test.py @@ -26,7 +26,6 @@ def test_code_signing_accounts_list_by_resource_group(self, resource_group): ) result = [r for r in response] assert result == [] - @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) @recorded_by_proxy @@ -34,4 +33,3 @@ def test_code_signing_accounts_list_by_subscription(self, resource_group): response = self.client.code_signing_accounts.list_by_subscription() result = [r for r in response] assert response - \ No newline at end of file diff --git a/sdk/trustedsigning/azure-mgmt-trustedsigning/tests/test_trusted_signing_mgmt_operations_async_test.py b/sdk/trustedsigning/azure-mgmt-trustedsigning/tests/test_trusted_signing_mgmt_operations_async_test.py index 9a1e504e192f..3c2ea6c7a829 100644 --- a/sdk/trustedsigning/azure-mgmt-trustedsigning/tests/test_trusted_signing_mgmt_operations_async_test.py +++ b/sdk/trustedsigning/azure-mgmt-trustedsigning/tests/test_trusted_signing_mgmt_operations_async_test.py @@ -25,4 +25,3 @@ async def test_operations_list(self, resource_group): response = self.client.operations.list() result = [r async for r in response] assert result - diff --git a/sdk/trustedsigning/azure-mgmt-trustedsigning/tests/test_trusted_signing_mgmt_operations_test.py b/sdk/trustedsigning/azure-mgmt-trustedsigning/tests/test_trusted_signing_mgmt_operations_test.py index da6e33b7236d..d70823986d33 100644 --- a/sdk/trustedsigning/azure-mgmt-trustedsigning/tests/test_trusted_signing_mgmt_operations_test.py +++ b/sdk/trustedsigning/azure-mgmt-trustedsigning/tests/test_trusted_signing_mgmt_operations_test.py @@ -24,4 +24,3 @@ def test_operations_list(self, resource_group): response = self.client.operations.list() result = [r for r in response] assert result - diff --git a/sdk/trustedsigning/azure-mgmt-trustedsigning/tsp-location.yaml b/sdk/trustedsigning/azure-mgmt-trustedsigning/tsp-location.yaml index 5b1fd4dd2136..ece3d5cf1874 100644 --- a/sdk/trustedsigning/azure-mgmt-trustedsigning/tsp-location.yaml +++ b/sdk/trustedsigning/azure-mgmt-trustedsigning/tsp-location.yaml @@ -1,4 +1,4 @@ directory: specification/codesigning/CodeSigning.Management -commit: e6fde2ac19d0202f0e72217a3e0f9edb63dba273 +commit: 079f70d6f2b754db6b736e117196104efd2dd496 repo: Azure/azure-rest-api-specs additionalDirectories: