From 90da0a65c0a9147f5ec930412b2804f997b7713f Mon Sep 17 00:00:00 2001 From: Libba Lawrence Date: Wed, 8 Jan 2025 08:22:03 -0800 Subject: [PATCH] useless-disable (#39064) --- sdk/identity/azure-identity/azure/__init__.py | 1 - .../azure/identity/_credentials/authorization_code.py | 2 +- .../azure-identity/azure/identity/_credentials/azd_cli.py | 2 +- .../azure-identity/azure/identity/_credentials/azure_arc.py | 2 +- .../azure-identity/azure/identity/_credentials/azure_cli.py | 2 +- .../azure/identity/_credentials/azure_powershell.py | 2 +- .../azure-identity/azure/identity/_credentials/imds.py | 4 ++-- .../azure/identity/_internal/auth_code_redirect_handler.py | 2 +- .../azure-identity/azure/identity/_internal/decorators.py | 4 ++-- .../azure-identity/azure/identity/_internal/interactive.py | 2 +- .../azure/identity/_internal/managed_identity_client.py | 1 - .../azure-identity/azure/identity/_internal/msal_client.py | 2 +- .../identity/_internal/msal_managed_identity_client.py | 3 ++- .../azure/identity/_internal/shared_token_cache.py | 6 +++--- .../azure/identity/aio/_credentials/default.py | 2 +- .../azure-identity/azure/identity/aio/_credentials/imds.py | 6 +++--- .../azure/identity/aio/_internal/decorators.py | 4 ++-- .../azure/identity/aio/_internal/managed_identity_client.py | 2 +- 18 files changed, 24 insertions(+), 25 deletions(-) diff --git a/sdk/identity/azure-identity/azure/__init__.py b/sdk/identity/azure-identity/azure/__init__.py index 125860bac907..679ab6995134 100644 --- a/sdk/identity/azure-identity/azure/__init__.py +++ b/sdk/identity/azure-identity/azure/__init__.py @@ -2,5 +2,4 @@ # Copyright (c) Microsoft Corporation. # Licensed under the MIT License. # ------------------------------------ -# pylint:disable=missing-docstring __path__ = __import__("pkgutil").extend_path(__path__, __name__) # type: ignore diff --git a/sdk/identity/azure-identity/azure/identity/_credentials/authorization_code.py b/sdk/identity/azure-identity/azure/identity/_credentials/authorization_code.py index c98aa26c9a09..f6a56ff8df42 100644 --- a/sdk/identity/azure-identity/azure/identity/_credentials/authorization_code.py +++ b/sdk/identity/azure-identity/azure/identity/_credentials/authorization_code.py @@ -85,7 +85,7 @@ def get_token( attribute gives a reason. Any error response from Microsoft Entra ID is available as the error's ``response`` attribute. """ - # pylint:disable=useless-super-delegation + return super(AuthorizationCodeCredential, self).get_token( *scopes, claims=claims, tenant_id=tenant_id, client_secret=self._client_secret, **kwargs ) diff --git a/sdk/identity/azure-identity/azure/identity/_credentials/azd_cli.py b/sdk/identity/azure-identity/azure/identity/_credentials/azd_cli.py index 319569482abd..3ed7bbfc70b2 100644 --- a/sdk/identity/azure-identity/azure/identity/_credentials/azd_cli.py +++ b/sdk/identity/azure-identity/azure/identity/_credentials/azd_cli.py @@ -278,7 +278,7 @@ def _run_command(command: str, timeout: int) -> str: # failed to execute 'cmd' or '/bin/sh' error = CredentialUnavailableError(message="Failed to execute '{}'".format(args[0])) raise error from ex - except Exception as ex: # pylint:disable=broad-except + except Exception as ex: # could be a timeout, for example error = CredentialUnavailableError(message="Failed to invoke the Azure Developer CLI") raise error from ex diff --git a/sdk/identity/azure-identity/azure/identity/_credentials/azure_arc.py b/sdk/identity/azure-identity/azure/identity/_credentials/azure_arc.py index 9c345e9efbf9..765af7bc7cfe 100644 --- a/sdk/identity/azure-identity/azure/identity/_credentials/azure_arc.py +++ b/sdk/identity/azure-identity/azure/identity/_credentials/azure_arc.py @@ -54,7 +54,7 @@ def _get_secret_key(response: PipelineResponse) -> str: with open(key_file, "r", encoding="utf-8") as file: try: return file.read() - except Exception as error: # pylint:disable=broad-except + except Exception as error: # user is expected to have obtained read permission prior to this being called raise ClientAuthenticationError( message="Could not read file {} contents: {}".format(key_file, error) diff --git a/sdk/identity/azure-identity/azure/identity/_credentials/azure_cli.py b/sdk/identity/azure-identity/azure/identity/_credentials/azure_cli.py index b536581d07fa..6dfbcbfe1696 100644 --- a/sdk/identity/azure-identity/azure/identity/_credentials/azure_cli.py +++ b/sdk/identity/azure-identity/azure/identity/_credentials/azure_cli.py @@ -269,7 +269,7 @@ def _run_command(command: str, timeout: int) -> str: # failed to execute 'cmd' or '/bin/sh' error = CredentialUnavailableError(message="Failed to execute '{}'".format(args[0])) raise error from ex - except Exception as ex: # pylint:disable=broad-except + except Exception as ex: # could be a timeout, for example error = CredentialUnavailableError(message="Failed to invoke the Azure CLI") raise error from ex diff --git a/sdk/identity/azure-identity/azure/identity/_credentials/azure_powershell.py b/sdk/identity/azure-identity/azure/identity/_credentials/azure_powershell.py index 92dd0432bce2..09a556ceb113 100644 --- a/sdk/identity/azure-identity/azure/identity/_credentials/azure_powershell.py +++ b/sdk/identity/azure-identity/azure/identity/_credentials/azure_powershell.py @@ -192,7 +192,7 @@ def run_command_line(command_line: List[str], timeout: int) -> str: proc = start_process(command_line) stdout, stderr = proc.communicate(**kwargs) - except Exception as ex: # pylint:disable=broad-except + except Exception as ex: # failed to execute "cmd" or "/bin/sh", or timed out; PowerShell and Az.Account may or may not be installed # (handling Exception here because subprocess.SubprocessError and .TimeoutExpired were added in 3.3) if proc and not proc.returncode: diff --git a/sdk/identity/azure-identity/azure/identity/_credentials/imds.py b/sdk/identity/azure-identity/azure/identity/_credentials/imds.py index 6528f23b83ec..2389c2851f4f 100644 --- a/sdk/identity/azure-identity/azure/identity/_credentials/imds.py +++ b/sdk/identity/azure-identity/azure/identity/_credentials/imds.py @@ -89,7 +89,7 @@ def _request_token(self, *scopes: str, **kwargs: Any) -> AccessTokenInfo: # IMDS responded _check_forbidden_response(ex) self._endpoint_available = True - except Exception as ex: # pylint:disable=broad-except + except Exception as ex: error_message = ( "ManagedIdentityCredential authentication unavailable, no response from the IMDS endpoint." ) @@ -119,7 +119,7 @@ def _request_token(self, *scopes: str, **kwargs: Any) -> AccessTokenInfo: raise ClientAuthenticationError(message=ex.message, response=ex.response) from ex except json.decoder.JSONDecodeError as ex: raise CredentialUnavailableError(message="ManagedIdentityCredential authentication unavailable.") from ex - except Exception as ex: # pylint:disable=broad-except + except Exception as ex: # if anything else was raised, assume the endpoint is unavailable error_message = "ManagedIdentityCredential authentication unavailable, no response from the IMDS endpoint." raise CredentialUnavailableError(error_message) from ex diff --git a/sdk/identity/azure-identity/azure/identity/_internal/auth_code_redirect_handler.py b/sdk/identity/azure-identity/azure/identity/_internal/auth_code_redirect_handler.py index 7883d19dfabd..69095790fecf 100644 --- a/sdk/identity/azure-identity/azure/identity/_internal/auth_code_redirect_handler.py +++ b/sdk/identity/azure-identity/azure/identity/_internal/auth_code_redirect_handler.py @@ -28,7 +28,7 @@ def do_GET(self): self.wfile.write(b"Authentication complete. You can close this window.") - def log_message(self, format, *args): # pylint: disable=redefined-builtin,unused-argument + def log_message(self, format, *args): # pylint: disable=redefined-builtin pass # this prevents server dumping messages to stdout diff --git a/sdk/identity/azure-identity/azure/identity/_internal/decorators.py b/sdk/identity/azure-identity/azure/identity/_internal/decorators.py index ca2ef77a926a..d56edd9efede 100644 --- a/sdk/identity/azure-identity/azure/identity/_internal/decorators.py +++ b/sdk/identity/azure-identity/azure/identity/_internal/decorators.py @@ -42,7 +42,7 @@ def wrapper(*args, **kwargs): except Exception as ex: # pylint: disable=broad-except _LOGGER.debug("Failed to log the account information: %s", ex, exc_info=True) return token - except Exception as ex: # pylint: disable=broad-except + except Exception as ex: _LOGGER.log( logging.DEBUG if within_credential_chain.get() else logging.WARNING, "%s failed: %s", @@ -70,7 +70,7 @@ def wrapper(*args, **kwargs): return fn(*args, **kwargs) except ClientAuthenticationError: raise - except Exception as ex: # pylint:disable=broad-except + except Exception as ex: auth_error = ClientAuthenticationError(message="Authentication failed: {}".format(ex)) raise auth_error from ex diff --git a/sdk/identity/azure-identity/azure/identity/_internal/interactive.py b/sdk/identity/azure-identity/azure/identity/_internal/interactive.py index 953b30dc3919..94040ba5bfe9 100644 --- a/sdk/identity/azure-identity/azure/identity/_internal/interactive.py +++ b/sdk/identity/azure-identity/azure/identity/_internal/interactive.py @@ -224,7 +224,7 @@ def _get_token_base( # this may be the first authentication, or the user may have authenticated a different identity self._auth_record = _build_auth_record(result) - except Exception as ex: # pylint:disable=broad-except + except Exception as ex: _LOGGER.warning( "%s.%s failed: %s", self.__class__.__name__, diff --git a/sdk/identity/azure-identity/azure/identity/_internal/managed_identity_client.py b/sdk/identity/azure-identity/azure/identity/_internal/managed_identity_client.py index 299baad23dca..010c05b43db0 100644 --- a/sdk/identity/azure-identity/azure/identity/_internal/managed_identity_client.py +++ b/sdk/identity/azure-identity/azure/identity/_internal/managed_identity_client.py @@ -19,7 +19,6 @@ class ManagedIdentityClientBase(abc.ABC): - # pylint:disable=missing-client-constructor-parameter-credential def __init__( self, request_factory: Callable[[str, dict], HttpRequest], diff --git a/sdk/identity/azure-identity/azure/identity/_internal/msal_client.py b/sdk/identity/azure-identity/azure/identity/_internal/msal_client.py index 0726488c81ee..a370c71d44c6 100644 --- a/sdk/identity/azure-identity/azure/identity/_internal/msal_client.py +++ b/sdk/identity/azure-identity/azure/identity/_internal/msal_client.py @@ -7,7 +7,7 @@ from azure.core.exceptions import ClientAuthenticationError from azure.core.pipeline.policies import ContentDecodePolicy -from azure.core.pipeline.transport import ( # pylint:disable=unknown-option-value,no-legacy-azure-core-http-response-import +from azure.core.pipeline.transport import ( # pylint:disable=no-legacy-azure-core-http-response-import HttpRequest, HttpResponse, ) diff --git a/sdk/identity/azure-identity/azure/identity/_internal/msal_managed_identity_client.py b/sdk/identity/azure-identity/azure/identity/_internal/msal_managed_identity_client.py index db210c5a13a5..0e9cc7726f74 100644 --- a/sdk/identity/azure-identity/azure/identity/_internal/msal_managed_identity_client.py +++ b/sdk/identity/azure-identity/azure/identity/_internal/msal_managed_identity_client.py @@ -59,6 +59,7 @@ def _request_token(self, *scopes: str, **kwargs: Any) -> AccessTokenInfo: # pyl token_type=result.get("token_type", "Bearer"), refresh_on=refresh_on, ) + error_desc = "" if result and "error" in result: error_desc = cast(str, result["error"]) error_message = self.get_unavailable_message(error_desc) @@ -186,7 +187,7 @@ def _get_token_base( exc_info=_LOGGER.isEnabledFor(logging.DEBUG), ) raise ClientAuthenticationError(self.get_unavailable_message(str(ex))) from ex - except Exception as ex: # pylint:disable=broad-except + except Exception as ex: _LOGGER.log( logging.DEBUG if within_credential_chain.get() else logging.WARNING, "%s.%s failed: %s", diff --git a/sdk/identity/azure-identity/azure/identity/_internal/shared_token_cache.py b/sdk/identity/azure-identity/azure/identity/_internal/shared_token_cache.py index c1c777e47d0c..6f19b1749eb4 100644 --- a/sdk/identity/azure-identity/azure/identity/_internal/shared_token_cache.py +++ b/sdk/identity/azure-identity/azure/identity/_internal/shared_token_cache.py @@ -88,7 +88,7 @@ def __init__( authority: Optional[str] = None, tenant_id: Optional[str] = None, **kwargs: Any - ) -> None: # pylint:disable=unused-argument + ) -> None: self._authority = normalize_authority(authority) if authority else get_default_authority() environment = urlparse(self._authority).netloc self._environment_aliases = KNOWN_ALIASES.get(environment) or frozenset((environment,)) @@ -246,7 +246,7 @@ def _get_cached_access_token( return AccessTokenInfo( token["secret"], expires_on, token_type=token.get("token_type", "Bearer"), refresh_on=refresh_on ) - except Exception as ex: # pylint:disable=broad-except + except Exception as ex: message = "Error accessing cached data: {}".format(ex) raise CredentialUnavailableError(message=message) from ex @@ -262,7 +262,7 @@ def _get_refresh_tokens(self, account, is_cae: bool = False) -> List[str]: msal.TokenCache.CredentialType.REFRESH_TOKEN, query={"home_account_id": account["home_account_id"]} ) return [token["secret"] for token in cache_entries if "secret" in token] - except Exception as ex: # pylint:disable=broad-except + except Exception as ex: message = "Error accessing cached data: {}".format(ex) raise CredentialUnavailableError(message=message) from ex diff --git a/sdk/identity/azure-identity/azure/identity/aio/_credentials/default.py b/sdk/identity/azure-identity/azure/identity/aio/_credentials/default.py index 46fb0bd8b132..2b048735458f 100644 --- a/sdk/identity/azure-identity/azure/identity/aio/_credentials/default.py +++ b/sdk/identity/azure-identity/azure/identity/aio/_credentials/default.py @@ -89,7 +89,7 @@ class DefaultAzureCredential(ChainedTokenCredential): :caption: Create a DefaultAzureCredential. """ - def __init__(self, **kwargs: Any) -> None: # pylint: disable=too-many-statements, too-many-locals + def __init__(self, **kwargs: Any) -> None: # pylint: disable=too-many-statements if "tenant_id" in kwargs: raise TypeError("'tenant_id' is not supported in DefaultAzureCredential.") diff --git a/sdk/identity/azure-identity/azure/identity/aio/_credentials/imds.py b/sdk/identity/azure-identity/azure/identity/aio/_credentials/imds.py index f9286c9f88f6..830c425047dc 100644 --- a/sdk/identity/azure-identity/azure/identity/aio/_credentials/imds.py +++ b/sdk/identity/azure-identity/azure/identity/aio/_credentials/imds.py @@ -37,7 +37,7 @@ async def close(self) -> None: async def _acquire_token_silently(self, *scopes: str, **kwargs: Any) -> Optional[AccessTokenInfo]: return self._client.get_cached_token(*scopes) - async def _request_token(self, *scopes: str, **kwargs: Any) -> AccessTokenInfo: # pylint:disable=unused-argument + async def _request_token(self, *scopes: str, **kwargs: Any) -> AccessTokenInfo: if within_credential_chain.get() and not self._endpoint_available: # If within a chain (e.g. DefaultAzureCredential), we do a quick check to see if the IMDS endpoint @@ -49,7 +49,7 @@ async def _request_token(self, *scopes: str, **kwargs: Any) -> AccessTokenInfo: # IMDS responded _check_forbidden_response(ex) self._endpoint_available = True - except Exception as ex: # pylint:disable=broad-except + except Exception as ex: error_message = ( "ManagedIdentityCredential authentication unavailable, no response from the IMDS endpoint." ) @@ -78,7 +78,7 @@ async def _request_token(self, *scopes: str, **kwargs: Any) -> AccessTokenInfo: _check_forbidden_response(ex) # any other error is unexpected raise ClientAuthenticationError(message=ex.message, response=ex.response) from ex - except Exception as ex: # pylint:disable=broad-except + except Exception as ex: # if anything else was raised, assume the endpoint is unavailable error_message = "ManagedIdentityCredential authentication unavailable, no response from the IMDS endpoint." raise CredentialUnavailableError(error_message) from ex diff --git a/sdk/identity/azure-identity/azure/identity/aio/_internal/decorators.py b/sdk/identity/azure-identity/azure/identity/aio/_internal/decorators.py index 3e8f04be1bb5..8d92881b36cb 100644 --- a/sdk/identity/azure-identity/azure/identity/aio/_internal/decorators.py +++ b/sdk/identity/azure-identity/azure/identity/aio/_internal/decorators.py @@ -41,7 +41,7 @@ async def wrapper(*args, **kwargs): except Exception as ex: # pylint: disable=broad-except _LOGGER.debug("Failed to log the account information: %s", ex, exc_info=True) return token - except Exception as ex: # pylint: disable=broad-except + except Exception as ex: _LOGGER.log( logging.DEBUG if within_credential_chain.get() else logging.WARNING, "%s failed: %s", @@ -70,7 +70,7 @@ async def wrapper(*args, **kwargs): return result except ClientAuthenticationError: raise - except Exception as ex: # pylint:disable=broad-except + except Exception as ex: auth_error = ClientAuthenticationError(message="Authentication failed: {}".format(ex)) raise auth_error from ex diff --git a/sdk/identity/azure-identity/azure/identity/aio/_internal/managed_identity_client.py b/sdk/identity/azure-identity/azure/identity/aio/_internal/managed_identity_client.py index 340bb5a11fa2..89f1b70ff30f 100644 --- a/sdk/identity/azure-identity/azure/identity/aio/_internal/managed_identity_client.py +++ b/sdk/identity/azure-identity/azure/identity/aio/_internal/managed_identity_client.py @@ -15,7 +15,7 @@ T = TypeVar("T", bound="AsyncManagedIdentityClient") -# pylint:disable=async-client-bad-name,missing-client-constructor-parameter-credential +# pylint:disable=async-client-bad-name class AsyncManagedIdentityClient(AsyncContextManager, ManagedIdentityClientBase): async def __aenter__(self: T) -> T: await self._pipeline.__aenter__()