Skip to content

GH-920 Handle duplicate database roles #954

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
goutamadwant wants to merge 1 commit into
base: main
Choose a base branch
from
Open

GH-920 Handle duplicate database roles #954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...ringframework/cloud/vault/config/databases/VaultConfigDatabaseBootstrapConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,8 @@ static SecretBackendMetadata forDatabase(final DatabaseSecretProperties properti

@Override
public String getName() {
return String.format("%s with Role %s", properties.getBackend(), properties.getRole());
return String.format("%s with Role %s using %s/%s", properties.getBackend(), properties.getRole(),
properties.getUsernameProperty(), properties.getPasswordProperty());
}

@Override
Expand Down
41 changes: 41 additions & 0 deletions ...work/cloud/vault/config/databases/VaultConfigDatabaseBootstrapConfigurationUnitTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,13 @@

package org.springframework.cloud.vault.config.databases;

import java.util.Map;

import org.junit.jupiter.api.Test;

import org.springframework.cloud.vault.config.SecretBackendMetadata;
import org.springframework.core.env.CompositePropertySource;
import org.springframework.core.env.MapPropertySource;

import static org.assertj.core.api.Assertions.assertThat;

Expand All @@ -44,4 +48,41 @@ public void shouldConsiderCredentialPath() {
assertThat(metadata.getPath()).isEqualTo("database/static-creds/my-role");
}

@Test
public void shouldContributePropertiesForSameRoleWithDifferentTargetProperties() {

VaultConfigDatabaseBootstrapConfiguration.DatabaseSecretBackendMetadataFactory factory = new VaultConfigDatabaseBootstrapConfiguration()
.databaseSecretBackendMetadataFactory();

VaultDatabaseProperties primary = databaseProperties("db1-dbuser", "spring.datasource.username",
"spring.datasource.password");
VaultDatabaseProperties secondary = databaseProperties("db1-dbuser", "spring.secondary-datasource.username",
"spring.secondary-datasource.password");

SecretBackendMetadata primaryMetadata = factory.createMetadata(primary);
SecretBackendMetadata secondaryMetadata = factory.createMetadata(secondary);
Map<String, Object> secret = Map.of("username", "vault-user", "password", "vault-password");

CompositePropertySource propertySource = new CompositePropertySource("vault");
propertySource.addPropertySource(new MapPropertySource(primaryMetadata.getName(),
primaryMetadata.getPropertyTransformer().transformProperties(secret)));
propertySource.addPropertySource(new MapPropertySource(secondaryMetadata.getName(),
secondaryMetadata.getPropertyTransformer().transformProperties(secret)));

assertThat(propertySource.getProperty("spring.datasource.username")).isEqualTo("vault-user");
assertThat(propertySource.getProperty("spring.datasource.password")).isEqualTo("vault-password");
assertThat(propertySource.getProperty("spring.secondary-datasource.username")).isEqualTo("vault-user");
assertThat(propertySource.getProperty("spring.secondary-datasource.password")).isEqualTo("vault-password");
}

private static VaultDatabaseProperties databaseProperties(String role, String usernameProperty,
String passwordProperty) {

VaultDatabaseProperties properties = new VaultDatabaseProperties();
properties.setRole(role);
properties.setUsernameProperty(usernameProperty);
properties.setPasswordProperty(passwordProperty);
return properties;
}

}