Skip to content

fix: ensure prefix is present before get #13

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

Merged
estetsenko merged 1 commit into from
Mar 27, 2026
+145 −1
Merged

fix: ensure prefix is present before get #13

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 ...cker/cloud/quarkus/dbaas/opensearch/client/service/impl/OpensearchDbaaSApiClientImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,8 @@ private OpensearchDatabaseSettings updateDatabaseSettings(OpensearchDatabaseSett

private String getDatabasePrefix(DatabaseConfig databaseConfig, Map<String, Object> classifier) {
if (opensearchCreationConfig != null && databaseConfig.getDbNamePrefix() == null) {
if (opensearchCreationConfig.singleTenantPrefixConfig() != null && opensearchCreationConfig.singleTenantPrefixConfig() != null
if (opensearchCreationConfig.singleTenantPrefixConfig() != null
&& opensearchCreationConfig.singleTenantPrefixConfig().prefix().isPresent()
&& classifier.get(SCOPE) == TENANT) {
return opensearchCreationConfig.singleTenantPrefixConfig().prefix().get()
.replace("{tenantId}", (String) classifier.get(TENANT_ID));
Expand Down
143 changes: 143 additions & 0 deletions .../cloud/quarkus/dbaas/opensearch/client/service/impl/OpensearchDbaaSApiClientImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,143 @@
package com.netcracker.cloud.quarkus.dbaas.opensearch.client.service.impl;

import com.netcracker.cloud.dbaas.client.DbaasClient;
import com.netcracker.cloud.dbaas.client.management.DbaasDbClassifier;
import com.netcracker.cloud.dbaas.client.opensearch.entity.OpensearchIndex;
import com.netcracker.cloud.dbaas.client.opensearch.entity.OpensearchIndexConnection;
import com.netcracker.cloud.dbaas.client.opensearch.service.OpensearchLogicalDbProvider;
import com.netcracker.cloud.quarkus.dbaas.opensearch.client.config.DbaaSOpensearchConfigurationProperty;
import com.netcracker.cloud.quarkus.dbaas.opensearch.client.config.DbaaSOpensearchCreationConfig;
import com.netcracker.cloud.quarkus.dbaas.opensearch.client.config.SinglePrefix;
import jakarta.enterprise.inject.Instance;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.opensearch.client.opensearch.OpenSearchClient;

import java.util.Optional;
import java.util.SortedMap;
import java.util.TreeMap;
import java.util.stream.Stream;

import static com.netcracker.cloud.dbaas.client.DbaasConst.*;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;

class OpensearchDbaaSApiClientImplTest {

DbaasDbClassifier mockClassifier;
DbaaSOpensearchCreationConfig creationConfig;
SinglePrefix singleTenantPrefixConfig;
SinglePrefix servicePrefixConfig;
DbaaSOpensearchConfigurationProperty configProp;
OpensearchLogicalDbProvider logicalDbProvider;
Instance<OpensearchLogicalDbProvider> dbProvidersInstance;
DbaasClient dbaasClient;
OpenSearchClient openSearchClient;

private static final String TENANT_ID_VALUE = "tenant-123";
private static final String SERVICE_PREFIX = "service-prefix";
private static final String SINGLE_TENANT_PREFIX_TEMPLATE = "tenant-prefix-{tenantId}";
private static final String SINGLE_TENANT_PREFIX_RESOLVED = "tenant-prefix-tenant-123";
private static final String TEST_USERNAME = "username";
private static final String TEST_NAMESPACE = "test-namespace";

@BeforeEach
void prepareMocks() {
openSearchClient = mock(OpenSearchClient.class);

singleTenantPrefixConfig = mock(SinglePrefix.class);
servicePrefixConfig = mock(SinglePrefix.class);

creationConfig = mock(DbaaSOpensearchCreationConfig.class);
when(creationConfig.getOpensearchConfiguration(any())).thenReturn(null);
when(creationConfig.runtimeUserRole()).thenReturn(Optional.empty());

configProp = mock(DbaaSOpensearchConfigurationProperty.class);
when(configProp.maxConnTotal()).thenReturn(Optional.empty());
when(configProp.maxConnPerRoute()).thenReturn(Optional.empty());

dbaasClient = mock(DbaasClient.class);

logicalDbProvider = mock(OpensearchLogicalDbProvider.class);
when(logicalDbProvider.order()).thenReturn(0);

dbProvidersInstance = mock(Instance.class);
when(dbProvidersInstance.stream()).thenReturn(Stream.of(logicalDbProvider));

mockClassifier = mock(DbaasDbClassifier.class);
}

private OpensearchIndex buildOpensearchIndex(String prefix, SortedMap<String, Object> classifierMap) {
OpensearchIndexConnection connection = new OpensearchIndexConnection();
connection.setResourcePrefix(prefix);
connection.setUsername(TEST_USERNAME);
connection.setPassword("test-password");
connection.setHost("localhost");
connection.setPort(9200);
connection.setUrl("http://localhost:9200");
connection.setTls(false);
connection.setOpenSearchClient(openSearchClient);

OpensearchIndex opensearchIndex = new OpensearchIndex();
opensearchIndex.setConnectionProperties(connection);
opensearchIndex.setClassifier(classifierMap);
return opensearchIndex;
}

private SortedMap<String, Object> buildTenantClassifierMap() {
SortedMap<String, Object> classifierMap = new TreeMap<>();
classifierMap.put(SCOPE, TENANT);
classifierMap.put(TENANT_ID, TENANT_ID_VALUE);
return classifierMap;
}

@Test
void testGetDatabasePrefixUsesSingleTenantPrefixWhenPrefixPresent() {
SortedMap<String, Object> classifierMap = buildTenantClassifierMap();
when(mockClassifier.asMap()).thenReturn(classifierMap);

when(singleTenantPrefixConfig.prefix()).thenReturn(Optional.of(SINGLE_TENANT_PREFIX_TEMPLATE));
when(creationConfig.singleTenantPrefixConfig()).thenReturn(singleTenantPrefixConfig);

when(logicalDbProvider.provide(any(), any(), any()))
.thenReturn(buildOpensearchIndex(SINGLE_TENANT_PREFIX_RESOLVED, classifierMap));

OpensearchDbaaSApiClientImpl apiClient = new OpensearchDbaaSApiClientImpl(
TEST_NAMESPACE, dbProvidersInstance, creationConfig, dbaasClient, configProp);

OpensearchIndexConnection result = apiClient.getOrCreateOpensearchIndex(mockClassifier);

assertEquals(SINGLE_TENANT_PREFIX_RESOLVED, result.getResourcePrefix());
verify(logicalDbProvider).provide(any(),
argThat(config -> SINGLE_TENANT_PREFIX_RESOLVED.equals(config.getDbNamePrefix())),
eq(TEST_NAMESPACE));
}

@Test
void testGetDatabasePrefixFallsBackToServicePrefixWhenSingleTenantPrefixAbsent() {
SortedMap<String, Object> classifierMap = buildTenantClassifierMap();
when(mockClassifier.asMap()).thenReturn(classifierMap);

// singleTenantPrefixConfig is non-null but prefix() is empty —
// the old duplicate != null check would have entered this branch anyway,
// calling .get() on an empty Optional and failing
when(singleTenantPrefixConfig.prefix()).thenReturn(Optional.empty());
when(creationConfig.singleTenantPrefixConfig()).thenReturn(singleTenantPrefixConfig);
when(servicePrefixConfig.prefix()).thenReturn(Optional.of(SERVICE_PREFIX));
when(creationConfig.servicePrefixConfig()).thenReturn(servicePrefixConfig);

when(logicalDbProvider.provide(any(), any(), any()))
.thenReturn(buildOpensearchIndex(SERVICE_PREFIX, classifierMap));

OpensearchDbaaSApiClientImpl apiClient = new OpensearchDbaaSApiClientImpl(
TEST_NAMESPACE, dbProvidersInstance, creationConfig, dbaasClient, configProp);

OpensearchIndexConnection result = apiClient.getOrCreateOpensearchIndex(mockClassifier);

assertEquals(SERVICE_PREFIX, result.getResourcePrefix());
verify(logicalDbProvider).provide(any(),
argThat(config -> SERVICE_PREFIX.equals(config.getDbNamePrefix())),
eq(TEST_NAMESPACE));
}
}
Loading