Skip to content
Snippets Groups Projects
Commit 3d269293 authored by OZGCloud's avatar OZGCloud
Browse files

OZG-4906 add unittest to es operator copy crt

parent 21afe27f
No related branches found
No related tags found
No related merge requests found
......@@ -48,7 +48,7 @@ pipeline {
}
configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
sh 'mvn --version'
sh 'mvn -s $MAVEN_SETTINGS clean install -DskipTests -Dmaven.wagon.http.retryHandler.count=3'
sh 'mvn -s $MAVEN_SETTINGS clean install -Dmaven.wagon.http.retryHandler.count=3'
script {
try {
......
......@@ -25,6 +25,7 @@ public class OzgCloudElasticsearchService {
private final OzgCloudElasticsearchSecretHelper secretHelper;
private final OzgCloudElasticsearchProperties properties;
private final OzgCloudElasticsearchServerProperties serverProperties;
private final ElasticsearchRemoteService remoteService;
......@@ -36,7 +37,7 @@ public class OzgCloudElasticsearchService {
LOG.debug("Copy elasticseaerch ssl certificate from namespace: {}" , serverProperties.getCertificateNamespace());
LOG.debug("Copy elasticseaerch ssl certificate secret: {}" , serverProperties.getCertificateSecretName());
var secretResource = kubernetesService.getSecretResource(serverProperties.getCertificateNamespace(), "ozg-search-cluster-es-http-ca-internal");
var secretResource = kubernetesService.getSecretResource(serverProperties.getCertificateNamespace(), serverProperties.getCertificateSecretName());
LOG.info("{}: Create certificate secret", namespace);
createCredentialSecret(secretResource,namespace);
} catch (ElasticsearchException e) {
......
......@@ -31,6 +31,12 @@ class OzgCloudElasticsearchServiceTest {
@Spy
@InjectMocks
private OzgCloudElasticsearchService service;
@Mock
private OzgCloudElasticsearchServerProperties serverProperties;
@Mock
private Resource<Secret> secretResource;
private final Secret secret = SecretTestFactory.create();
@Mock
private ElasticsearchRemoteService remoteService;
@Mock
......@@ -40,6 +46,8 @@ class OzgCloudElasticsearchServiceTest {
@Mock
private KubernetesRemoteService kubernetesService;
@DisplayName("Get or create secret")
@Nested
class TestGetOrCreateSecret {
......@@ -48,10 +56,10 @@ class OzgCloudElasticsearchServiceTest {
private Context<OzgCloudElasticsearchCustomResource> context;
@Mock
private ResourceAdapter<Secret> resourceAdapter;
@Mock
private Resource<Secret> secretResource;
//@Mock
//private Resource<Secret> secretResource;
private final Secret secret = SecretTestFactory.create();
private final OzgCloudElasticsearchCustomResource resource = ElasticsearchCustomResourceTestFactory.create();
......@@ -117,6 +125,9 @@ class OzgCloudElasticsearchServiceTest {
@SneakyThrows
@Test
void shouldCheckIfIndexExists() {
when(kubernetesService.getSecretResource(any(), any())).thenReturn(secretResource);
when(serverProperties.getCertificateNamespace()).thenReturn(NAMESPACE);
service.createIndexIfMissing(NAMESPACE);
verify(remoteService).existsIndex(NAMESPACE);
......@@ -125,12 +136,24 @@ class OzgCloudElasticsearchServiceTest {
@SneakyThrows
@Test
void shouldCreateIndexIfMissing() {
when(kubernetesService.getSecretResource(any(), any())).thenReturn(secretResource);
when(serverProperties.getCertificateNamespace()).thenReturn(NAMESPACE);
when(remoteService.existsIndex(any())).thenReturn(false);
service.createIndexIfMissing(NAMESPACE);
verify(remoteService).createIndex(NAMESPACE);
}
@SneakyThrows
@Test
void shouldCallCopyElasticCertificate() {
when(kubernetesService.getSecretResource(any(), any())).thenReturn(secretResource);
service.createIndexIfMissing(NAMESPACE);
verify(service).copyElasticCertificate(NAMESPACE);
}
}
@DisplayName("Check security role if missing")
......@@ -144,12 +167,24 @@ class OzgCloudElasticsearchServiceTest {
void shouldCreateSecurityRoleIfMissing() {
doReturn(putRoleRequest).when(service).buildPutRoleRequestData(any());
when(kubernetesService.getSecretResource(any(), any())).thenReturn(secretResource);
service.createSecurityRoleIfMissing(NAMESPACE);
verify(remoteService).createOrUpdateSecurityRole(putRoleRequest);
}
@SneakyThrows
@Test
void shouldCallCopyElasticCertificate() {
when(kubernetesService.getSecretResource(any(), any())).thenReturn(secretResource);
service.createSecurityRoleIfMissing(NAMESPACE);
verify(service).copyElasticCertificate(NAMESPACE);
}
@DisplayName("create put role request data")
@Nested
class TestCreatePutRoleRequestData {
......@@ -196,12 +231,23 @@ class OzgCloudElasticsearchServiceTest {
@Test
void shouldCreateSecurityUserIfMissing() {
doReturn(putUserRequestData).when(service).buildPutUserRequestData(any(), any());
when(kubernetesService.getSecretResource(any(), any())).thenReturn(secretResource);
service.createSecurityUserIfMissing(NAMESPACE, PutUserRequestDataTestFactory.PASSWORD);
verify(remoteService).createOrUpdateSecurityUser(putUserRequestData);
}
@SneakyThrows
@Test
void shouldCallCopyElasticCertificate() {
when(kubernetesService.getSecretResource(any(), any())).thenReturn(secretResource);
service.createSecurityUserIfMissing(NAMESPACE, PutUserRequestDataTestFactory.PASSWORD);
verify(service).copyElasticCertificate(NAMESPACE);
}
@DisplayName("create put user request data")
@Nested
class TestCreatePutUserRequestData {
......@@ -240,10 +286,22 @@ class OzgCloudElasticsearchServiceTest {
@SneakyThrows
@Test
void shouldDeleteSecurityUserIfExists() {
when(kubernetesService.getSecretResource(any(), any())).thenReturn(secretResource);
service.deleteSecurityUserIfExists(PutUserRequestDataTestFactory.USERNAME);
verify(remoteService).deleteSecurityUser(PutUserRequestDataTestFactory.USERNAME);
}
@SneakyThrows
@Test
void shouldCallCopyElasticCertificate() {
when(kubernetesService.getSecretResource(any(), any())).thenReturn(secretResource);
service.deleteSecurityUserIfExists(PutUserRequestDataTestFactory.USERNAME);
verify(service).copyElasticCertificate(PutUserRequestDataTestFactory.USERNAME);
}
}
@DisplayName("Delete security role if exists")
......@@ -253,10 +311,21 @@ class OzgCloudElasticsearchServiceTest {
@SneakyThrows
@Test
void shouldDeleteSecurityRoleIfExists() {
when(kubernetesService.getSecretResource(any(), any())).thenReturn(secretResource);
service.deleteSecurityRoleIfExists(PutRoleRequestDataTestFactory.NAME);
verify(remoteService).deleteSecurityRole(PutRoleRequestDataTestFactory.NAME);
}
@SneakyThrows
@Test
void shouldCallCopyElasticCertificate() {
when(kubernetesService.getSecretResource(any(), any())).thenReturn(secretResource);
service.deleteSecurityRoleIfExists(PutRoleRequestDataTestFactory.NAME);
verify(service).copyElasticCertificate(PutRoleRequestDataTestFactory.NAME);
}
}
@DisplayName("Delete index if exists")
......@@ -268,6 +337,8 @@ class OzgCloudElasticsearchServiceTest {
@SneakyThrows
@Test
void shouldCheckIfIndexExists() {
when(kubernetesService.getSecretResource(any(), any())).thenReturn(secretResource);
service.deleteIndexIfExists(INDEX_NAME);
verify(remoteService).existsIndex(INDEX_NAME);
......@@ -276,6 +347,7 @@ class OzgCloudElasticsearchServiceTest {
@SneakyThrows
@Test
void shouldDeleteIndexIfExists() {
when(kubernetesService.getSecretResource(any(), any())).thenReturn(secretResource);
when(remoteService.existsIndex(any())).thenReturn(true);
service.deleteIndexIfExists(INDEX_NAME);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment