From 48f5da4b7dce507764d358c750916f6cf0ccc300 Mon Sep 17 00:00:00 2001 From: l0lawrence Date: Tue, 19 Apr 2022 14:26:56 -0700 Subject: [PATCH 1/4] pylint enum fix --- .../azure/keyvault/keys/crypto/_enums.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/crypto/_enums.py b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/crypto/_enums.py index a458a9525271..e2d8733cce19 100644 --- a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/crypto/_enums.py +++ b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/crypto/_enums.py @@ -2,10 +2,12 @@ # Copyright (c) Microsoft Corporation. # Licensed under the MIT License. # ------------------------------------ +from dataclasses import make_dataclass from enum import Enum +from azure.core import CaseInsensitiveEnumMeta - -class KeyWrapAlgorithm(str, Enum): +# pylint: disable=enum-must-be-uppercase +class KeyWrapAlgorithm(str, Enum, metaclass=CaseInsensitiveEnumMeta): """Key wrapping algorithms""" aes_128 = "A128KW" @@ -16,7 +18,7 @@ class KeyWrapAlgorithm(str, Enum): rsa1_5 = "RSA1_5" -class EncryptionAlgorithm(str, Enum): +class EncryptionAlgorithm(str, Enum, metaclass=CaseInsensitiveEnumMeta): """Encryption algorithms""" rsa_oaep = "RSA-OAEP" @@ -33,7 +35,7 @@ class EncryptionAlgorithm(str, Enum): a256_cbcpad = "A256CBCPAD" -class SignatureAlgorithm(str, Enum): +class SignatureAlgorithm(str, Enum, metaclass=CaseInsensitiveEnumMeta): """Signature algorithms, described in https://tools.ietf.org/html/rfc7518""" ps256 = "PS256" #: RSASSA-PSS using SHA-256 and MGF1 with SHA-256 From 83320acb2f70f43af66f7c22043fc19694b747d9 Mon Sep 17 00:00:00 2001 From: l0lawrence Date: Tue, 19 Apr 2022 14:30:51 -0700 Subject: [PATCH 2/4] pylint enum --- .../azure-keyvault-keys/azure/keyvault/keys/crypto/_enums.py | 1 - 1 file changed, 1 deletion(-) diff --git a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/crypto/_enums.py b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/crypto/_enums.py index e2d8733cce19..de0f19154879 100644 --- a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/crypto/_enums.py +++ b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/crypto/_enums.py @@ -2,7 +2,6 @@ # Copyright (c) Microsoft Corporation. # Licensed under the MIT License. # ------------------------------------ -from dataclasses import make_dataclass from enum import Enum from azure.core import CaseInsensitiveEnumMeta From b8e6c4d4abf2aac13d82d5e3eb31e0534f5fc1aa Mon Sep 17 00:00:00 2001 From: l0lawrence Date: Tue, 19 Apr 2022 14:47:30 -0700 Subject: [PATCH 3/4] admin enum fix --- .../azure/keyvault/administration/_internal/api_version.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_internal/api_version.py b/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_internal/api_version.py index ce44867820f8..d5036ac662c7 100644 --- a/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_internal/api_version.py +++ b/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_internal/api_version.py @@ -3,9 +3,10 @@ # Licensed under the MIT License. # ------------------------------------ from enum import Enum +from azure.core import CaseInsensitiveEnumMeta - -class ApiVersion(str, Enum): +# pylint:disable=enum-must-be-uppercase +class ApiVersion(str, Enum, metaclass=CaseInsensitiveEnumMeta): """Key Vault API versions supported by this package""" #: this is the default version From c7e629e4599697120ca6220a7d825f999b72de48 Mon Sep 17 00:00:00 2001 From: l0lawrence Date: Tue, 19 Apr 2022 14:59:54 -0700 Subject: [PATCH 4/4] deleting file --- .../administration/_internal/api_version.py | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_internal/api_version.py diff --git a/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_internal/api_version.py b/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_internal/api_version.py deleted file mode 100644 index d5036ac662c7..000000000000 --- a/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_internal/api_version.py +++ /dev/null @@ -1,16 +0,0 @@ -# ------------------------------------ -# Copyright (c) Microsoft Corporation. -# Licensed under the MIT License. -# ------------------------------------ -from enum import Enum -from azure.core import CaseInsensitiveEnumMeta - -# pylint:disable=enum-must-be-uppercase -class ApiVersion(str, Enum, metaclass=CaseInsensitiveEnumMeta): - """Key Vault API versions supported by this package""" - - #: this is the default version - V7_2_preview = "7.2-preview" - - -DEFAULT_VERSION = ApiVersion.V7_2_preview