RED-7175: changed TenantContext.getTenantId() to tenantRequest.getTenantId() to fix wrong index prefix when creating a new tenant with empty index prefix

This commit is contained in:
Ali Oezyetimoglu 2023-09-12 13:30:21 +02:00
parent 02f8689769
commit acd8f4369b

View File

@ -120,7 +120,7 @@ public class TenantManagementService implements TenantProvider {
.password(encryptionService.encrypt(tenantRequest.getSearchConnection().getPassword()))
.numberOfShards(tenantRequest.getSearchConnection().getNumberOfShards())
.numberOfReplicas(tenantRequest.getSearchConnection().getNumberOfReplicas())
.indexPrefix(indexPrefix != null ? indexPrefix : TenantContext.getTenantId())
.indexPrefix(indexPrefix != null ? indexPrefix : tenantRequest.getTenantId())
.build())
.build();
@ -416,7 +416,7 @@ public class TenantManagementService implements TenantProvider {
.password(encryptionService.encrypt(searchConnection.getPassword()))
.numberOfShards(searchConnection.getNumberOfShards())
.numberOfReplicas(searchConnection.getNumberOfReplicas())
.indexPrefix(indexPrefix != null ? indexPrefix : TenantContext.getTenantId())
.indexPrefix(indexPrefix != null ? indexPrefix : tenantRequest.getTenantId())
.build());
}