Skip to content

concord-server: simplify code #1238

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

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

concord-server: simplify code #1238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a9147e0
concord-server: simplify code
ibodrov Oct 29, 2025
ef3698b
concord-server: use validated name when updating secrets, fix formatting
ibodrov Oct 29, 2025
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
20 changes: 11 additions & 9 deletions ...src/main/java/com/walmartlabs/concord/server/boot/resteasy/ResteasyBootstrapListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,15 +82,17 @@ private static void processInjector(ResteasyDeployment deployment, Injector inje

var providerFactory = deployment.getProviderFactory();
for (var binding : injector.getBindings().values()) {
var type = (Object) binding.getKey().getTypeLiteral().getRawType();
if (type instanceof Class<?> beanClass) {
if (GetRestful.isRootResource(beanClass)) {
rootResourceBindings.add(binding);
}
if (beanClass.isAnnotationPresent(Provider.class)) {
log.info("registering provider instance for {}", beanClass.getName());
providerFactory.registerProviderInstance(binding.getProvider().get());
}
var type = binding.getKey().getTypeLiteral().getRawType();
if (type == null) {
continue;
}

if (GetRestful.isRootResource(type)) {
rootResourceBindings.add(binding);
}
if (type.isAnnotationPresent(Provider.class)) {
log.info("registering provider instance for {}", type.getName());
providerFactory.registerProviderInstance(binding.getProvider().get());
}
}

Expand Down
12 changes: 5 additions & 7 deletions server/impl/src/main/java/com/walmartlabs/concord/server/org/secret/SecretManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,26 +368,24 @@ public void update(UUID orgId, String secretName, SecretUpdateParams params) {
newEncryptedData = null;
hashAlgorithm = null;
}
if(newProjectIds == null || newProjectIds.isEmpty()){
if (newProjectIds == null || newProjectIds.isEmpty()) {
policyManager.checkEntity(e.getOrgId(), null, EntityType.SECRET, EntityAction.UPDATE, newOwner,
PolicyUtils.secretToMap(e.getOrgId(), e.getName(), e.getType(), e.getVisibility(), e.getStoreType()));
} else {
newProjectIds.stream().forEach(newProjectId -> {
policyManager.checkEntity(e.getOrgId(), newProjectId, EntityType.SECRET, EntityAction.UPDATE, newOwner,
PolicyUtils.secretToMap(e.getOrgId(), e.getName(), e.getType(), e.getVisibility(), e.getStoreType()));
});
newProjectIds.forEach(newProjectId ->
policyManager.checkEntity(e.getOrgId(), newProjectId, EntityType.SECRET, EntityAction.UPDATE, newOwner,
PolicyUtils.secretToMap(e.getOrgId(), e.getName(), e.getType(), e.getVisibility(), e.getStoreType())));
}

String newName = validateName(params.newName(), newOrgId, e);

SecretType finalNewType = newType;
secretDao.tx(tx -> {
if (newOrgId != null) {
// update repository mapping to null when org is changing
repositoryDao.clearSecretMappingBySecretId(tx, e.getId());
}

secretDao.update(tx, e.getId(), params.newName(), newOwner != null ? newOwner.getId() : null,
secretDao.update(tx, e.getId(), newName, newOwner != null ? newOwner.getId() : null,
finalNewType, newEncryptedData, params.newVisibility(), newOrgId, hashAlgorithm);
secretDao.updateSecretProjects(tx, e.getId(), params.removeProjectLink() ? Collections.emptySet() : newProjectIds);
});
Expand Down