tests for AWS Secrets Manager

Author: mavwolverine

Makefile

@@ -13,7 +13,7 @@ refresh-lockfiles:
 	find requirements/ -name '*.txt' ! -name 'all.txt' -type f -delete
 	pip-compile -q --no-emit-index-url --resolver backtracking -o requirements/linting.txt requirements/linting.in
 	pip-compile -q --no-emit-index-url --resolver backtracking -o requirements/testing.txt requirements/testing.in
-	pip-compile -q --no-emit-index-url --resolver backtracking --extra toml --extra yaml --extra azure-key-vault -o requirements/pyproject.txt pyproject.toml
+	pip-compile -q --no-emit-index-url --resolver backtracking --extra toml --extra yaml --extra azure-key-vault --extra aws-secrets-manager -o requirements/pyproject.txt pyproject.toml
 	pip install --dry-run -r requirements/all.txt
 
 .PHONY: format

pydantic_settings/sources.py

@@ -894,7 +894,7 @@ class Cfg(BaseSettings):
                 type_has_key = self.next_field(type_, key, case_sensitive)
                 if type_has_key:
                     return type_has_key
-        elif is_model_class(annotation) or is_pydantic_dataclass(annotation):
+        elif is_model_class(annotation) or is_pydantic_dataclass(annotation):  # type: ignore
             fields = _get_model_fields(annotation)
             # `case_sensitive is None` is here to be compatible with the old behavior.
             # Has to be removed in V3.
@@ -1795,11 +1795,13 @@ def _add_parser_args(
                         if isinstance(group, dict):
                             group = self._add_group(parser, **group)
                         added_args += list(arg_names)
-                        self._add_argument(group, *(f'{flag_prefix[:len(name)]}{name}' for name in arg_names), **kwargs)
+                        self._add_argument(
+                            group, *(f'{flag_prefix[: len(name)]}{name}' for name in arg_names), **kwargs
+                        )
                     else:
                         added_args += list(arg_names)
                         self._add_argument(
-                            parser, *(f'{flag_prefix[:len(name)]}{name}' for name in arg_names), **kwargs
+                            parser, *(f'{flag_prefix[: len(name)]}{name}' for name in arg_names), **kwargs
                         )
 
         self._add_parser_alias_paths(parser, alias_path_args, added_args, arg_prefix, subcommand_prefix, group)
@@ -2256,7 +2258,7 @@ def _load_env_vars(self) -> Mapping[str, Optional[str]]:
         return AzureKeyVaultMapping(secret_client)
 
     def __repr__(self) -> str:
-        return f'{self.__class__.__name__}(url={self._url!r}, ' f'env_nested_delimiter={self.env_nested_delimiter!r})'
+        return f'{self.__class__.__name__}(url={self._url!r}, env_nested_delimiter={self.env_nested_delimiter!r})'
 
 
 class AWSSecretsManagerSettingsSource(EnvSettingsSource):

requirements/linting.txt

@@ -1,14 +1,14 @@
 #
-# This file is autogenerated by pip-compile with Python 3.9
+# This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
 #    pip-compile --no-emit-index-url --output-file=requirements/linting.txt requirements/linting.in
 #
 black==25.1.0
     # via -r requirements/linting.in
-boto3-stubs[secretsmanager]==1.36.15
+boto3-stubs[secretsmanager]==1.36.17
     # via -r requirements/linting.in
-botocore-stubs==1.36.15
+botocore-stubs==1.36.17
     # via boto3-stubs
 cfgv==3.4.0
     # via pre-commit
@@ -18,7 +18,7 @@ distlib==0.3.9
     # via virtualenv
 filelock==3.17.0
     # via virtualenv
-identify==2.6.6
+identify==2.6.7
     # via pre-commit
 mypy==1.15.0
     # via -r requirements/linting.in
@@ -46,15 +46,15 @@ pyyaml==6.0.2
     # via
     #   -r requirements/linting.in
     #   pre-commit
-ruff==0.9.5
+ruff==0.9.6
     # via -r requirements/linting.in
 tokenize-rt==6.1.0
     # via pyupgrade
 tomli==2.2.1
     # via
     #   black
     #   mypy
-types-awscrt==0.23.9
+types-awscrt==0.23.10
     # via botocore-stubs
 types-pyyaml==6.0.12.20241230
     # via -r requirements/linting.in
@@ -66,5 +66,5 @@ typing-extensions==4.12.2
     #   boto3-stubs
     #   mypy
     #   mypy-boto3-secretsmanager
-virtualenv==20.29.1
+virtualenv==20.29.2
     # via pre-commit

requirements/pyproject.txt

@@ -1,8 +1,8 @@
 #
-# This file is autogenerated by pip-compile with Python 3.9
+# This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
-#    pip-compile --extra=azure-key-vault --extra=toml --extra=yaml --no-emit-index-url --output-file=requirements/pyproject.txt pyproject.toml
+#    pip-compile --extra=aws-secrets-manager --extra=azure-key-vault --extra=toml --extra=yaml --no-emit-index-url --output-file=requirements/pyproject.txt pyproject.toml
 #
 annotated-types==0.7.0
     # via pydantic
@@ -14,6 +14,16 @@ azure-identity==1.19.0
     # via pydantic-settings (pyproject.toml)
 azure-keyvault-secrets==4.9.0
     # via pydantic-settings (pyproject.toml)
+boto3==1.36.17
+    # via pydantic-settings (pyproject.toml)
+boto3-stubs[secretsmanager]==1.36.17
+    # via pydantic-settings (pyproject.toml)
+botocore==1.36.17
+    # via
+    #   boto3
+    #   s3transfer
+botocore-stubs==1.36.17
+    # via boto3-stubs
 certifi==2025.1.31
     # via requests
 cffi==1.17.1
@@ -29,12 +39,18 @@ idna==3.10
     # via requests
 isodate==0.7.2
     # via azure-keyvault-secrets
+jmespath==1.0.1
+    # via
+    #   boto3
+    #   botocore
 msal==1.31.1
     # via
     #   azure-identity
     #   msal-extensions
 msal-extensions==1.2.0
     # via azure-identity
+mypy-boto3-secretsmanager==1.36.0
+    # via boto3-stubs
 portalocker==2.10.1
     # via msal-extensions
 pycparser==2.22
@@ -47,6 +63,8 @@ pyjwt[crypto]==2.10.1
     # via
     #   msal
     #   pyjwt
+python-dateutil==2.9.0.post0
+    # via botocore
 python-dotenv==1.0.1
     # via pydantic-settings (pyproject.toml)
 pyyaml==6.0.2
@@ -55,16 +73,28 @@ requests==2.32.3
     # via
     #   azure-core
     #   msal
+s3transfer==0.11.2
+    # via boto3
 six==1.17.0
-    # via azure-core
+    # via
+    #   azure-core
+    #   python-dateutil
 tomli==2.2.1
     # via pydantic-settings (pyproject.toml)
+types-awscrt==0.23.10
+    # via botocore-stubs
+types-s3transfer==0.11.2
+    # via boto3-stubs
 typing-extensions==4.12.2
     # via
     #   azure-core
     #   azure-identity
     #   azure-keyvault-secrets
+    #   boto3-stubs
+    #   mypy-boto3-secretsmanager
     #   pydantic
     #   pydantic-core
 urllib3==2.3.0
-    # via requests
+    # via
+    #   botocore
+    #   requests

requirements/testing.in

@@ -3,3 +3,4 @@ pytest
 pytest-mock
 pytest-examples
 pytest-pretty
+moto[secretsmanager]

requirements/testing.txt

@@ -1,23 +1,52 @@
 #
-# This file is autogenerated by pip-compile with Python 3.9
+# This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
 #    pip-compile --no-emit-index-url --output-file=requirements/testing.txt requirements/testing.in
 #
 black==25.1.0
     # via pytest-examples
+boto3==1.36.17
+    # via moto
+botocore==1.36.17
+    # via
+    #   boto3
+    #   moto
+    #   s3transfer
+certifi==2025.1.31
+    # via requests
+cffi==1.17.1
+    # via cryptography
+charset-normalizer==3.4.1
+    # via requests
 click==8.1.8
     # via black
-coverage[toml]==7.6.10
+coverage[toml]==7.6.11
     # via -r requirements/testing.in
+cryptography==44.0.0
+    # via moto
 exceptiongroup==1.2.2
     # via pytest
+idna==3.10
+    # via requests
 iniconfig==2.0.0
     # via pytest
+jinja2==3.1.5
+    # via moto
+jmespath==1.0.1
+    # via
+    #   boto3
+    #   botocore
 markdown-it-py==3.0.0
     # via rich
+markupsafe==3.0.2
+    # via
+    #   jinja2
+    #   werkzeug
 mdurl==0.1.2
     # via markdown-it-py
+moto[secretsmanager]==5.0.28
+    # via -r requirements/testing.in
 mypy-extensions==1.0.0
     # via black
 packaging==24.2
@@ -30,6 +59,8 @@ platformdirs==4.3.6
     # via black
 pluggy==1.5.0
     # via pytest
+pycparser==2.22
+    # via cffi
 pygments==2.19.1
     # via rich
 pytest==8.3.4
@@ -44,10 +75,26 @@ pytest-mock==3.14.0
     # via -r requirements/testing.in
 pytest-pretty==1.2.0
     # via -r requirements/testing.in
+python-dateutil==2.9.0.post0
+    # via
+    #   botocore
+    #   moto
+pyyaml==6.0.2
+    # via responses
+requests==2.32.3
+    # via
+    #   moto
+    #   responses
+responses==0.25.6
+    # via moto
 rich==13.9.4
     # via pytest-pretty
-ruff==0.9.5
+ruff==0.9.6
     # via pytest-examples
+s3transfer==0.11.2
+    # via boto3
+six==1.17.0
+    # via python-dateutil
 tomli==2.2.1
     # via
     #   black
@@ -57,3 +104,12 @@ typing-extensions==4.12.2
     # via
     #   black
     #   rich
+urllib3==2.3.0
+    # via
+    #   botocore
+    #   requests
+    #   responses
+werkzeug==3.1.3
+    # via moto
+xmltodict==0.14.2
+    # via moto

tests/test_settings.py

@@ -1860,8 +1860,7 @@ def test_builtins_settings_source_repr():
         == "EnvSettingsSource(env_nested_delimiter='__', env_prefix_len=0)"
     )
     assert repr(DotEnvSettingsSource(BaseSettings, env_file='.env', env_file_encoding='utf-8')) == (
-        "DotEnvSettingsSource(env_file='.env', env_file_encoding='utf-8', "
-        'env_nested_delimiter=None, env_prefix_len=0)'
+        "DotEnvSettingsSource(env_file='.env', env_file_encoding='utf-8', env_nested_delimiter=None, env_prefix_len=0)"
     )
     assert (
         repr(SecretsSettingsSource(BaseSettings, secrets_dir='/secrets'))