fix(settings): stop using Config.env_prefix for secrets in BaseSettings

changes/2188-PrettyWood.md

@@ -0,0 +1 @@
+Stop using `Config.env_prefix` for secrets in `BaseSettings`

pydantic/env_settings.py

@@ -66,7 +66,7 @@ def _build_secrets_files(self, _secrets_dir: Union[Path, str, None] = None) -> D
             raise SettingsError(f'secrets_dir must reference a directory, not a {path_type(secrets_path)}')
 
         for field in self.__fields__.values():
-            for env_name in field.field_info.extra['env_names']:
+            for env_name in {field.name}:
                 path = secrets_path / env_name
                 if path.is_file():
                     secrets[field.alias] = path.read_text().strip()

tests/test_settings.py

@@ -852,3 +852,20 @@ class Config:
             secrets_dir = tmp_path
 
     assert Settings(_env_file=e).dict() == {'foo': 'foo_env_value_str'}
+
+
+def test_mix_env_variables_secrets(tmp_path, env):
+    p = tmp_path / 'foo'
+    p.write_text('foo_secret_value_str')
+
+    class Settings(BaseSettings):
+        foo: str  # secret
+        bar: str  # env variable
+
+        class Config:
+            env_prefix = 'PIKA_'
+            secrets_dir = tmp_path
+
+    env.set('PIKA_BAR', 'bar_env_value_str')
+
+    assert Settings().dict() == {'foo': 'foo_secret_value_str', 'bar': 'bar_env_value_str'}