Remove breaking changes

Author: AndreuCodina

tests/test_source_azure_key_vault.py

@@ -81,7 +81,7 @@ def test_do_not_load_disabled_secrets(self, mocker: MockerFixture) -> None:
         class AzureKeyVaultSettings(BaseSettings):
             """AzureKeyVault settings."""
 
-            sql_server_password: str
+            SqlServerPassword: str
             DisabledSqlServerPassword: str
 
         disabled_secret_name = 'SqlServerPassword'
@@ -108,13 +108,14 @@ def test_azure_key_vault_settings_source(self, mocker: MockerFixture) -> None:
         """Test AzureKeyVaultSettingsSource."""
 
         class SqlServer(BaseModel):
-            password: str
+            password: str = Field(..., alias='Password')
 
         class AzureKeyVaultSettings(BaseSettings):
             """AzureKeyVault settings."""
 
-            sql_server_user: str
-            sql_server: SqlServer
+            SqlServerUser: str
+            sql_server_user: str = Field(..., alias='SqlServerUser')
+            sql_server: SqlServer = Field(..., alias='SqlServer')
 
             @classmethod
             def settings_customise_sources(
@@ -147,6 +148,7 @@ def settings_customise_sources(
 
         settings = AzureKeyVaultSettings()  # type: ignore
 
+        assert settings.SqlServerUser == expected_secret_value
         assert settings.sql_server_user == expected_secret_value
         assert settings.sql_server.password == expected_secret_value
 
@@ -159,14 +161,61 @@ def _raise_resource_not_found_when_getting_parent_secret_name(self, secret_name:
 
         return key_vault_secret
 
-    def test_snake_case_translation(self, mocker: MockerFixture) -> None:
+    def test_dash_to_underscore_translation(self, mocker: MockerFixture) -> None:
+        """Test that dashes in secret names are mapped to underscores in field names."""
+
+        class AzureKeyVaultSettings(BaseSettings):
+            my_field: str
+            alias_field: str = Field(..., alias='Secret-Alias')
+
+            @classmethod
+            def settings_customise_sources(
+                cls,
+                settings_cls: type[BaseSettings],
+                init_settings: PydanticBaseSettingsSource,
+                env_settings: PydanticBaseSettingsSource,
+                dotenv_settings: PydanticBaseSettingsSource,
+                file_secret_settings: PydanticBaseSettingsSource,
+            ) -> tuple[PydanticBaseSettingsSource, ...]:
+                return (
+                    AzureKeyVaultSettingsSource(
+                        settings_cls,
+                        'https://my-resource.vault.azure.net/',
+                        DefaultAzureCredential(),
+                        dash_to_underscore=True,
+                    ),
+                )
+
+        expected_secrets = [
+            type('', (), {'name': 'my-field', 'enabled': True}),
+            type('', (), {'name': 'Secret-Alias', 'enabled': True}),
+        ]
+        expected_secret_value = 'SecretValue'
+
+        mocker.patch(
+            f'{AzureKeyVaultSettingsSource.__module__}.{SecretClient.list_properties_of_secrets.__qualname__}',
+            return_value=expected_secrets,
+        )
+        mocker.patch(
+            f'{AzureKeyVaultSettingsSource.__module__}.{SecretClient.get_secret.__qualname__}',
+            return_value=KeyVaultSecret(SecretProperties(), expected_secret_value),
+        )
+
+        settings = AzureKeyVaultSettings()
+
+        assert settings.my_field == expected_secret_value
+        assert settings.alias_field == expected_secret_value
+
+    def test_snake_case_conversion(self, mocker: MockerFixture) -> None:
         """Test that secret names are mapped to snake case in field names."""
 
         class NestedModel(BaseModel):
             nested_field: str
 
         class AzureKeyVaultSettings(BaseSettings):
-            my_field: str
+            my_field_from_kebab_case: str
+            my_field_from_pascal_case: str
+            my_field_from_camel_case: str
             alias_field: str = Field(alias='Secret-Alias')
             alias_field_2: str = Field(alias='another-SECRET-AliaS')
             nested_model: NestedModel
@@ -185,11 +234,14 @@ def settings_customise_sources(
                         settings_cls,
                         'https://my-resource.vault.azure.net/',
                         DefaultAzureCredential(),
+                        snake_case_conversion=True,
                     ),
                 )
 
         expected_secrets = [
-            type('', (), {'name': 'my-field', 'enabled': True}),
+            type('', (), {'name': 'my-field-from-kebab-case', 'enabled': True}),
+            type('', (), {'name': 'MyFieldFromPascalCase', 'enabled': True}),
+            type('', (), {'name': 'myFieldFromCamelCase', 'enabled': True}),
             type('', (), {'name': 'Secret-Alias', 'enabled': True}),
             type('', (), {'name': 'another-SECRET-AliaS', 'enabled': True}),
             type('', (), {'name': 'NestedModel--NestedField', 'enabled': True}),
@@ -207,7 +259,9 @@ def settings_customise_sources(
 
         settings = AzureKeyVaultSettings()
 
-        assert settings.my_field == expected_secret_value
+        assert settings.my_field_from_kebab_case == expected_secret_value
+        assert settings.my_field_from_pascal_case == expected_secret_value
+        assert settings.my_field_from_camel_case == expected_secret_value
         assert settings.alias_field == expected_secret_value
         assert settings.alias_field_2 == expected_secret_value
         assert settings.nested_model.nested_field == expected_secret_value