[Key Vault] Resolve failures on pylint 3.0.3 (#35551)

mccoyp · web-flow · commit cda953caf8a6 · 2024-05-08T16:26:30.000-07:00
diff --git a/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_access_control_client.py b/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_access_control_client.py
@@ -2,15 +2,15 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 # ------------------------------------
-from typing import Any, Union
+from typing import Any, List, Optional, Union
 from uuid import UUID, uuid4
 
 from azure.core.exceptions import ResourceNotFoundError
 from azure.core.paging import ItemPaged
 from azure.core.tracing.decorator import distributed_trace
 
 from ._enums import KeyVaultRoleScope
-from ._models import KeyVaultRoleAssignment, KeyVaultRoleDefinition
+from ._models import KeyVaultPermission, KeyVaultRoleAssignment, KeyVaultRoleDefinition
 from ._internal import KeyVaultClientBase
 
 
@@ -34,7 +34,13 @@ class KeyVaultAccessControlClient(KeyVaultClientBase):
 
     @distributed_trace
     def create_role_assignment(
-        self, scope: Union[str, KeyVaultRoleScope], definition_id: str, principal_id: str, **kwargs: Any
+        self,
+        scope: Union[str, KeyVaultRoleScope],
+        definition_id: str,
+        principal_id: str,
+        *,
+        name: Optional[Union[str, UUID]] = None,
+        **kwargs: Any,
     ) -> KeyVaultRoleAssignment:
         """Create a role assignment.
 
@@ -51,7 +57,7 @@ def create_role_assignment(
         :returns: The created role assignment.
         :rtype: ~azure.keyvault.administration.KeyVaultRoleAssignment
         """
-        name = kwargs.pop("name", None) or uuid4()
+        assignment_name = name or uuid4()
 
         create_parameters = self._client.role_assignments.models.RoleAssignmentCreateParameters(
             properties=self._client.role_assignments.models.RoleAssignmentProperties(
@@ -61,7 +67,7 @@ def create_role_assignment(
         assignment = self._client.role_assignments.create(
             vault_base_url=self._vault_url,
             scope=scope,
-            role_assignment_name=str(name),
+            role_assignment_name=str(assignment_name),
             parameters=create_parameters,
             **kwargs
         )
@@ -131,7 +137,15 @@ def list_role_assignments(
 
     @distributed_trace
     def set_role_definition(
-        self, scope: Union[str, KeyVaultRoleScope], **kwargs: Any
+        self,
+        scope: Union[str, KeyVaultRoleScope],
+        *,
+        name: Optional[Union[str, UUID]] = None,
+        role_name: Optional[str] = None,
+        description: Optional[str] = None,
+        permissions: Optional[List[KeyVaultPermission]] = None,
+        assignable_scopes: Optional[Union[List[str], List[KeyVaultRoleScope]]] = None,
+        **kwargs: Any,
     ) -> KeyVaultRoleDefinition:
         """Creates or updates a custom role definition.
 
@@ -160,28 +174,28 @@ def set_role_definition(
         :returns: The created or updated role definition
         :rtype: ~azure.keyvault.administration.KeyVaultRoleDefinition
         """
-        permissions = [
+        role_permissions = [
             self._client.role_definitions.models.Permission(
                 actions=p.actions,
                 not_actions=p.not_actions,
                 data_actions=p.data_actions,
                 not_data_actions=p.not_data_actions,
             )
-            for p in kwargs.pop("permissions", None) or []
+            for p in permissions or []
         ]
 
         properties = self._client.role_definitions.models.RoleDefinitionProperties(
-            role_name=kwargs.pop("role_name", None),
-            description=kwargs.pop("description", None),
-            permissions=permissions,
-            assignable_scopes=kwargs.pop("assignable_scopes", None),
+            role_name=role_name,
+            description=description,
+            permissions=role_permissions,
+            assignable_scopes=assignable_scopes,
         )
         parameters = self._client.role_definitions.models.RoleDefinitionCreateParameters(properties=properties)
 
         definition = self._client.role_definitions.create_or_update(
             vault_base_url=self._vault_url,
             scope=scope,
-            role_definition_name=str(kwargs.pop("name", None) or uuid4()),
+            role_definition_name=str(name or uuid4()),
             parameters=parameters,
             **kwargs
         )
diff --git a/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_backup_client.py b/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_backup_client.py
@@ -62,8 +62,11 @@ def begin_backup(
     ) -> LROPoller[KeyVaultBackupResult]:
         ...
 
+    # Disabling pylint checks because they don't correctly handle overloads
     @distributed_trace
-    def begin_backup(self, blob_storage_url: str, *args: str, **kwargs: Any) -> LROPoller[KeyVaultBackupResult]:
+    def begin_backup(  # pylint: disable=docstring-missing-param,docstring-keyword-should-match-keyword-only
+        self, blob_storage_url: str, *args: str, **kwargs: Any
+    ) -> LROPoller[KeyVaultBackupResult]:
         """Begin a full backup of the Key Vault.
 
         :param str blob_storage_url: URL of the blob storage container in which the backup will be stored, for example
@@ -154,8 +157,11 @@ def begin_restore(
     ) -> LROPoller[None]:
         ...
 
+    # Disabling pylint checks because they don't correctly handle overloads
     @distributed_trace
-    def begin_restore(self, folder_url: str, *args: str, **kwargs: Any) -> LROPoller[None]:
+    def begin_restore(  # pylint: disable=docstring-missing-param,docstring-keyword-should-match-keyword-only
+        self, folder_url: str, *args: str, **kwargs: Any
+    ) -> LROPoller[None]:
         """Restore a Key Vault backup.
 
         This method restores either a complete Key Vault backup or when ``key_name`` has a value, a single key.
diff --git a/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/aio/_access_control_client.py b/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/aio/_access_control_client.py
@@ -2,7 +2,7 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 # ------------------------------------
-from typing import Any, Union
+from typing import Any, List, Optional, Union
 from uuid import UUID, uuid4
 
 from azure.core.async_paging import AsyncItemPaged
@@ -11,7 +11,7 @@
 from azure.core.tracing.decorator_async import distributed_trace_async
 
 from .._enums import KeyVaultRoleScope
-from .._models import KeyVaultRoleAssignment, KeyVaultRoleDefinition
+from .._models import KeyVaultPermission, KeyVaultRoleAssignment, KeyVaultRoleDefinition
 from .._internal import AsyncKeyVaultClientBase
 
 
@@ -35,7 +35,13 @@ class KeyVaultAccessControlClient(AsyncKeyVaultClientBase):
 
     @distributed_trace_async
     async def create_role_assignment(
-        self, scope: Union[str, KeyVaultRoleScope], definition_id: str, principal_id: str, **kwargs: Any
+        self,
+        scope: Union[str, KeyVaultRoleScope],
+        definition_id: str,
+        principal_id: str,
+        *,
+        name: Optional[Union[str, UUID]] = None,
+        **kwargs: Any,
     ) -> KeyVaultRoleAssignment:
         """Create a role assignment.
 
@@ -52,7 +58,7 @@ async def create_role_assignment(
         :returns: The created role assignment.
         :rtype: ~azure.keyvault.administration.KeyVaultRoleAssignment
         """
-        name = kwargs.pop("name", None) or uuid4()
+        assignment_name = name or uuid4()
 
         create_parameters = self._client.role_assignments.models.RoleAssignmentCreateParameters(
             properties=self._client.role_assignments.models.RoleAssignmentProperties(
@@ -62,7 +68,7 @@ async def create_role_assignment(
         assignment = await self._client.role_assignments.create(
             vault_base_url=self._vault_url,
             scope=scope,
-            role_assignment_name=str(name),
+            role_assignment_name=str(assignment_name),
             parameters=create_parameters,
             **kwargs
         )
@@ -132,7 +138,15 @@ def list_role_assignments(
 
     @distributed_trace_async
     async def set_role_definition(
-        self, scope: Union[str, KeyVaultRoleScope], **kwargs: Any
+        self,
+        scope: Union[str, KeyVaultRoleScope],
+        *,
+        name: Optional[Union[str, UUID]] = None,
+        role_name: Optional[str] = None,
+        description: Optional[str] = None,
+        permissions: Optional[List[KeyVaultPermission]] = None,
+        assignable_scopes: Optional[Union[List[str], List[KeyVaultRoleScope]]] = None,
+        **kwargs: Any,
     ) -> KeyVaultRoleDefinition:
         """Creates or updates a custom role definition.
 
@@ -161,28 +175,28 @@ async def set_role_definition(
         :returns: The created or updated role definition
         :rtype: ~azure.keyvault.administration.KeyVaultRoleDefinition
         """
-        permissions = [
+        role_permissions = [
             self._client.role_definitions.models.Permission(
                 actions=p.actions,
                 not_actions=p.not_actions,
                 data_actions=p.data_actions,
                 not_data_actions=p.not_data_actions,
             )
-            for p in kwargs.pop("permissions", None) or []
+            for p in permissions or []
         ]
 
         properties = self._client.role_definitions.models.RoleDefinitionProperties(
-            role_name=kwargs.pop("role_name", None),
-            description=kwargs.pop("description", None),
-            permissions=permissions,
-            assignable_scopes=kwargs.pop("assignable_scopes", None),
+            role_name=role_name,
+            description=description,
+            permissions=role_permissions,
+            assignable_scopes=assignable_scopes,
         )
         parameters = self._client.role_definitions.models.RoleDefinitionCreateParameters(properties=properties)
 
         definition = await self._client.role_definitions.create_or_update(
             vault_base_url=self._vault_url,
             scope=scope,
-            role_definition_name=str(kwargs.pop("name", None) or uuid4()),
+            role_definition_name=str(name or uuid4()),
             parameters=parameters,
             **kwargs
         )
diff --git a/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/aio/_backup_client.py b/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/aio/_backup_client.py
@@ -57,8 +57,9 @@ async def begin_backup(
     ) -> AsyncLROPoller[KeyVaultBackupResult]:
         ...
 
+    # Disabling pylint checks because they don't correctly handle overloads
     @distributed_trace_async
-    async def begin_backup(
+    async def begin_backup(  # pylint: disable=docstring-missing-param,docstring-keyword-should-match-keyword-only
         self, blob_storage_url: str, *args: str, **kwargs: Any
     ) -> AsyncLROPoller[KeyVaultBackupResult]:
         """Begin a full backup of the Key Vault.
@@ -150,8 +151,11 @@ async def begin_restore(
     ) -> AsyncLROPoller[None]:
         ...
 
+    # Disabling pylint checks because they don't correctly handle overloads
     @distributed_trace_async
-    async def begin_restore(self, folder_url: str, *args: str, **kwargs: Any) -> AsyncLROPoller[None]:
+    async def begin_restore(  # pylint: disable=docstring-missing-param,docstring-keyword-should-match-keyword-only
+        self, folder_url: str, *args: str, **kwargs: Any
+    ) -> AsyncLROPoller[None]:
         """Restore a Key Vault backup.
 
         This method restores either a complete Key Vault backup or when ``key_name`` has a value, a single key.
