diff --git a/stubs/hvac/hvac/api/auth_methods/__init__.pyi b/stubs/hvac/hvac/api/auth_methods/__init__.pyi index 90323a99fb53..7d3e80ff560b 100644 --- a/stubs/hvac/hvac/api/auth_methods/__init__.pyi +++ b/stubs/hvac/hvac/api/auth_methods/__init__.pyi @@ -1,5 +1,3 @@ -from _typeshed import Incomplete - from hvac.api.auth_methods.approle import AppRole as AppRole from hvac.api.auth_methods.aws import Aws as Aws from hvac.api.auth_methods.azure import Azure as Azure @@ -15,6 +13,7 @@ from hvac.api.auth_methods.okta import Okta as Okta from hvac.api.auth_methods.radius import Radius as Radius from hvac.api.auth_methods.token import Token as Token from hvac.api.auth_methods.userpass import Userpass as Userpass +from hvac.api.vault_api_base import VaultApiBase from hvac.api.vault_api_category import VaultApiCategory __all__ = ( @@ -37,5 +36,5 @@ __all__ = ( ) class AuthMethods(VaultApiCategory): - implemented_classes: Incomplete - unimplemented_classes: Incomplete + implemented_classes: list[type[VaultApiBase]] + unimplemented_classes: list[str] diff --git a/stubs/hvac/hvac/api/auth_methods/aws.pyi b/stubs/hvac/hvac/api/auth_methods/aws.pyi index 79dba1a592d6..7298a79a1cc9 100644 --- a/stubs/hvac/hvac/api/auth_methods/aws.pyi +++ b/stubs/hvac/hvac/api/auth_methods/aws.pyi @@ -1,8 +1,8 @@ -from _typeshed import Incomplete +import logging from hvac.api.vault_api_base import VaultApiBase -logger: Incomplete +logger: logging.Logger class Aws(VaultApiBase): def configure( diff --git a/stubs/hvac/hvac/api/auth_methods/azure.pyi b/stubs/hvac/hvac/api/auth_methods/azure.pyi index 5198b3c2e7a1..ffa918c02e17 100644 --- a/stubs/hvac/hvac/api/auth_methods/azure.pyi +++ b/stubs/hvac/hvac/api/auth_methods/azure.pyi @@ -1,9 +1,10 @@ -from _typeshed import Incomplete +import logging from hvac.api.vault_api_base import VaultApiBase DEFAULT_MOUNT_POINT: str -logger: Incomplete + +logger: logging.Logger class Azure(VaultApiBase): def configure(self, tenant_id, resource, environment=None, client_id=None, client_secret=None, mount_point="azure"): ... diff --git a/stubs/hvac/hvac/api/auth_methods/gcp.pyi b/stubs/hvac/hvac/api/auth_methods/gcp.pyi index 8a38915c3637..8ebb0e03faf4 100644 --- a/stubs/hvac/hvac/api/auth_methods/gcp.pyi +++ b/stubs/hvac/hvac/api/auth_methods/gcp.pyi @@ -1,9 +1,10 @@ -from _typeshed import Incomplete +import logging from hvac.api.vault_api_base import VaultApiBase DEFAULT_MOUNT_POINT: str -logger: Incomplete + +logger: logging.Logger class Gcp(VaultApiBase): def configure( diff --git a/stubs/hvac/hvac/api/auth_methods/legacy_mfa.pyi b/stubs/hvac/hvac/api/auth_methods/legacy_mfa.pyi index 42598cb7fd93..68f56a952845 100644 --- a/stubs/hvac/hvac/api/auth_methods/legacy_mfa.pyi +++ b/stubs/hvac/hvac/api/auth_methods/legacy_mfa.pyi @@ -1,9 +1,7 @@ -from _typeshed import Incomplete - from hvac.api.vault_api_base import VaultApiBase -SUPPORTED_MFA_TYPES: Incomplete -SUPPORTED_AUTH_METHODS: Incomplete +SUPPORTED_MFA_TYPES: list[str] +SUPPORTED_AUTH_METHODS: list[str] class LegacyMfa(VaultApiBase): def configure(self, mount_point, mfa_type: str = "duo", force: bool = False): ... diff --git a/stubs/hvac/hvac/api/secrets_engines/__init__.pyi b/stubs/hvac/hvac/api/secrets_engines/__init__.pyi index 3831a24d9e5a..b74e0da3363b 100644 --- a/stubs/hvac/hvac/api/secrets_engines/__init__.pyi +++ b/stubs/hvac/hvac/api/secrets_engines/__init__.pyi @@ -1,5 +1,3 @@ -from _typeshed import Incomplete - from hvac.api.secrets_engines.active_directory import ActiveDirectory as ActiveDirectory from hvac.api.secrets_engines.aws import Aws as Aws from hvac.api.secrets_engines.azure import Azure as Azure @@ -15,6 +13,7 @@ from hvac.api.secrets_engines.rabbitmq import RabbitMQ as RabbitMQ from hvac.api.secrets_engines.ssh import Ssh as Ssh from hvac.api.secrets_engines.transform import Transform as Transform from hvac.api.secrets_engines.transit import Transit as Transit +from hvac.api.vault_api_base import VaultApiBase from hvac.api.vault_api_category import VaultApiCategory __all__ = ( @@ -37,5 +36,5 @@ __all__ = ( ) class SecretsEngines(VaultApiCategory): - implemented_classes: Incomplete - unimplemented_classes: Incomplete + implemented_classes: list[type[VaultApiBase]] + unimplemented_classes: list[str] diff --git a/stubs/hvac/hvac/api/secrets_engines/identity.pyi b/stubs/hvac/hvac/api/secrets_engines/identity.pyi index acafad3d33c9..7adc58901956 100644 --- a/stubs/hvac/hvac/api/secrets_engines/identity.pyi +++ b/stubs/hvac/hvac/api/secrets_engines/identity.pyi @@ -1,8 +1,8 @@ -from _typeshed import Incomplete +import logging from hvac.api.vault_api_base import VaultApiBase -logger: Incomplete +logger: logging.Logger class Identity(VaultApiBase): def create_or_update_entity( diff --git a/stubs/hvac/hvac/api/secrets_engines/kv.pyi b/stubs/hvac/hvac/api/secrets_engines/kv.pyi index 1f4a3de383d0..00b60c9c3437 100644 --- a/stubs/hvac/hvac/api/secrets_engines/kv.pyi +++ b/stubs/hvac/hvac/api/secrets_engines/kv.pyi @@ -1,11 +1,11 @@ -from _typeshed import Incomplete +import logging from hvac.api.vault_api_base import VaultApiBase -logger: Incomplete +logger: logging.Logger class Kv(VaultApiBase): - allowed_kv_versions: Incomplete + allowed_kv_versions: list[str] def __init__(self, adapter, default_kv_version: str = "2") -> None: ... @property def v1(self): ... diff --git a/stubs/hvac/hvac/api/system_backend/__init__.pyi b/stubs/hvac/hvac/api/system_backend/__init__.pyi index 23533ef38942..c4066c28c71b 100644 --- a/stubs/hvac/hvac/api/system_backend/__init__.pyi +++ b/stubs/hvac/hvac/api/system_backend/__init__.pyi @@ -1,5 +1,3 @@ -from _typeshed import Incomplete - from hvac.api.system_backend.audit import Audit as Audit from hvac.api.system_backend.auth import Auth as Auth from hvac.api.system_backend.capabilities import Capabilities as Capabilities @@ -17,6 +15,7 @@ from hvac.api.system_backend.raft import Raft as Raft from hvac.api.system_backend.seal import Seal as Seal from hvac.api.system_backend.system_backend_mixin import SystemBackendMixin as SystemBackendMixin from hvac.api.system_backend.wrapping import Wrapping as Wrapping +from hvac.api.vault_api_base import VaultApiBase from hvac.api.vault_api_category import VaultApiCategory __all__ = ( @@ -59,5 +58,5 @@ class SystemBackend( Seal, Wrapping, ): - implemented_classes: Incomplete - unimplemented_classes: Incomplete + implemented_classes: list[type[VaultApiBase]] + unimplemented_classes: list[str] diff --git a/stubs/hvac/hvac/api/system_backend/system_backend_mixin.pyi b/stubs/hvac/hvac/api/system_backend/system_backend_mixin.pyi index 44090cd45ac8..5aab4a8129e5 100644 --- a/stubs/hvac/hvac/api/system_backend/system_backend_mixin.pyi +++ b/stubs/hvac/hvac/api/system_backend/system_backend_mixin.pyi @@ -1,8 +1,8 @@ -from _typeshed import Incomplete +import logging from abc import ABCMeta from hvac.api.vault_api_base import VaultApiBase -logger: Incomplete +logger: logging.Logger class SystemBackendMixin(VaultApiBase, metaclass=ABCMeta): ... diff --git a/stubs/hvac/hvac/api/system_backend/wrapping.pyi b/stubs/hvac/hvac/api/system_backend/wrapping.pyi index 37a386f4250f..090f79e47a26 100644 --- a/stubs/hvac/hvac/api/system_backend/wrapping.pyi +++ b/stubs/hvac/hvac/api/system_backend/wrapping.pyi @@ -1,7 +1,6 @@ -from _typeshed import Incomplete - from hvac.api.system_backend.system_backend_mixin import SystemBackendMixin +from requests.models import _JSON class Wrapping(SystemBackendMixin): def unwrap(self, token=None): ... - def wrap(self, payload: dict[Incomplete, Incomplete] | None = None, ttl: int = 60): ... + def wrap(self, payload: _JSON | None = None, ttl: int = 60): ... diff --git a/stubs/hvac/hvac/api/vault_api_category.pyi b/stubs/hvac/hvac/api/vault_api_category.pyi index 2162d9bb5f52..2807505a3a92 100644 --- a/stubs/hvac/hvac/api/vault_api_category.pyi +++ b/stubs/hvac/hvac/api/vault_api_category.pyi @@ -1,5 +1,4 @@ from abc import ABCMeta, abstractmethod -from collections.abc import Sequence from logging import Logger from typing import Any @@ -9,7 +8,7 @@ from hvac.api.vault_api_base import VaultApiBase logger: Logger class VaultApiCategory(VaultApiBase, metaclass=ABCMeta): - implemented_class_names: Sequence[str] + implemented_class_names: list[str] def __init__(self, adapter: Adapter[Any]) -> None: ... def __getattr__(self, item): ... @property @@ -20,6 +19,6 @@ class VaultApiCategory(VaultApiBase, metaclass=ABCMeta): @abstractmethod def implemented_classes(self): ... @property - def unimplemented_classes(self) -> None: ... + def unimplemented_classes(self) -> list[str]: ... @staticmethod def get_private_attr_name(class_name): ...