From 0d4fb33a951edb458b502dae86b038c5f2019167 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Mon, 18 Dec 2023 12:16:50 +0100
Subject: [PATCH] OZG-4453 adjust naming
---
ozgcloud-elastic-operator/pom.xml | 4 +++
.../src/main/helm/Chart.yaml | 4 +--
...or.ozgcloud.de_OzgCloudElasticsearch.yaml} | 20 +++++++-------
...role.yaml => elasticsearch_edit_role.yaml} | 4 +--
...role.yaml => elasticsearch_view_role.yaml} | 4 +--
...=> ElasticsearchCustomResourceStatus.java} | 2 +-
... => ElasticsearchOperatorApplication.java} | 4 +--
...ties.java => ElasticsearchProperties.java} | 2 +-
...e.java => ElasticsearchRemoteService.java} | 6 +++--
...e.java => ElasticsearchServerService.java} | 4 +--
....java => ElasticsearchCustomResource.java} | 10 +++----
...iler.java => ElasticsearchReconciler.java} | 18 ++++++-------
...er.java => ElasticsearchSecretHelper.java} | 6 ++---
...Service.java => ElasticsearchService.java} | 6 ++---
...icUserSpec.java => ElasticsearchSpec.java} | 2 +-
...=> ElasticsearchUpdateControlBuilder.java} | 26 +++++++++----------
...gcloud.de_OzgCloudElasticsearch_test.yaml} | 14 +++++-----
...gCloudElasticsearch_versions_v1_test.yaml} | 10 +++----
...yaml => elasticsearch_edit_role_test.yaml} | 8 +++---
...yaml => elasticsearch_view_role_test.yaml} | 8 +++---
.../ElasticSearchRemoteServiceTest.java | 4 +--
.../ElasticSearchServiceTest.java | 6 ++---
...lasticCustomResourceStatusTestFactory.java | 18 -------------
.../ElasticUserCustomResourceTestFactory.java | 11 --------
...searchCustomResourceStatusTestFactory.java | 18 +++++++++++++
...lasticsearchCustomResourceTestFactory.java | 11 ++++++++
...ava => ElasticsearchReconcilerITCase.java} | 2 +-
....java => ElasticsearchReconcilerTest.java} | 22 ++++++++--------
...va => ElasticsearchSecretBuilderTest.java} | 20 +++++++-------
...est.java => ElasticsearchServiceTest.java} | 14 +++++-----
30 files changed, 146 insertions(+), 142 deletions(-)
rename ozgcloud-elastic-operator/src/main/helm/templates/crd/{operator.ozgcloud.de_OzgCloudElasticUser.yaml => operator.ozgcloud.de_OzgCloudElasticsearch.yaml} (80%)
rename ozgcloud-elastic-operator/src/main/helm/templates/rbac/{elastic_edit_role.yaml => elasticsearch_edit_role.yaml} (86%)
rename ozgcloud-elastic-operator/src/main/helm/templates/rbac/{elastic_view_role.yaml => elasticsearch_view_role.yaml} (85%)
rename ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/{ElasticCustomResourceStatus.java => ElasticsearchCustomResourceStatus.java} (94%)
rename ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/{ElasticOperatorApplication.java => ElasticsearchOperatorApplication.java} (90%)
rename ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/{ElasticSearchProperties.java => ElasticsearchProperties.java} (92%)
rename ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/{ElasticSearchRemoteService.java => ElasticsearchRemoteService.java} (94%)
rename ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/{ElasticSearchService.java => ElasticsearchServerService.java} (96%)
rename ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/user/{ElasticUserCustomResource.java => ElasticsearchCustomResource.java} (82%)
rename ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/user/{ElasticUserReconciler.java => ElasticsearchReconciler.java} (64%)
rename ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/user/{ElasticSecretHelper.java => ElasticsearchSecretHelper.java} (90%)
rename ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/user/{ElasticUserService.java => ElasticsearchService.java} (88%)
rename ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/user/{ElasticUserSpec.java => ElasticsearchSpec.java} (97%)
rename ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/user/{ElasticUserUpdateControlBuilder.java => ElasticsearchUpdateControlBuilder.java} (50%)
rename ozgcloud-elastic-operator/src/test/helm/crd/{operator.ozgcloud.de_OzgCloudElasticUser_test.yaml => operator.ozgcloud.de_OzgCloudElasticsearch_test.yaml} (74%)
rename ozgcloud-elastic-operator/src/test/helm/crd/{operator.ozgcloud.de_OzgCloudElasticUser_versions_v1_test.yaml => operator.ozgcloud.de_OzgCloudElasticsearch_versions_v1_test.yaml} (91%)
rename ozgcloud-elastic-operator/src/test/helm/rbac/{elastic_edit_role_test.yaml => elasticsearch_edit_role_test.yaml} (92%)
rename ozgcloud-elastic-operator/src/test/helm/rbac/{elastic_view_role_test.yaml => elasticsearch_view_role_test.yaml} (92%)
delete mode 100644 ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/ElasticCustomResourceStatusTestFactory.java
delete mode 100644 ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/ElasticUserCustomResourceTestFactory.java
create mode 100644 ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/ElasticsearchCustomResourceStatusTestFactory.java
create mode 100644 ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/ElasticsearchCustomResourceTestFactory.java
rename ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/{ElasticUserReconcilerITCase.java => ElasticsearchReconcilerITCase.java} (97%)
rename ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/{ElasticUserReconcilerTest.java => ElasticsearchReconcilerTest.java} (82%)
rename ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/{ElasticUserSecretBuilderTest.java => ElasticsearchSecretBuilderTest.java} (72%)
rename ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/{ElasticUserServiceTest.java => ElasticsearchServiceTest.java} (85%)
diff --git a/ozgcloud-elastic-operator/pom.xml b/ozgcloud-elastic-operator/pom.xml
index 966dd73..6868aff 100644
--- a/ozgcloud-elastic-operator/pom.xml
+++ b/ozgcloud-elastic-operator/pom.xml
@@ -29,6 +29,10 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ </dependency>
<!-- test -->
<dependency>
diff --git a/ozgcloud-elastic-operator/src/main/helm/Chart.yaml b/ozgcloud-elastic-operator/src/main/helm/Chart.yaml
index fed209d..ae8cad7 100644
--- a/ozgcloud-elastic-operator/src/main/helm/Chart.yaml
+++ b/ozgcloud-elastic-operator/src/main/helm/Chart.yaml
@@ -1,6 +1,6 @@
apiVersion: v2
-name: ozgcloud-elastic-operator
-description: OZG Cloud Elastic Operator
+name: ozgcloud-elasticsearch-operator
+description: OZG-Cloud Elasticsearch Operator
type: application
version: 0.0.0-MANAGED-BY-JENKINS
appVersion: "0.0.0-MANAGED-BY-JENKINS"
diff --git a/ozgcloud-elastic-operator/src/main/helm/templates/crd/operator.ozgcloud.de_OzgCloudElasticUser.yaml b/ozgcloud-elastic-operator/src/main/helm/templates/crd/operator.ozgcloud.de_OzgCloudElasticsearch.yaml
similarity index 80%
rename from ozgcloud-elastic-operator/src/main/helm/templates/crd/operator.ozgcloud.de_OzgCloudElasticUser.yaml
rename to ozgcloud-elastic-operator/src/main/helm/templates/crd/operator.ozgcloud.de_OzgCloudElasticsearch.yaml
index 530a95b..b805b0d 100644
--- a/ozgcloud-elastic-operator/src/main/helm/templates/crd/operator.ozgcloud.de_OzgCloudElasticUser.yaml
+++ b/ozgcloud-elastic-operator/src/main/helm/templates/crd/operator.ozgcloud.de_OzgCloudElasticsearch.yaml
@@ -1,23 +1,21 @@
-# Muss die Datei so benannt werden?
---- #TOASK Werden die gebraucht?!
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
- name: ozgcloudelasticuser.operator.ozgcloud.de
+ name: ozgcloudelasticsearch.operator.ozgcloud.de
spec:
group: operator.ozgcloud.de
names:
- kind: OzgCloudElasticUser
- listKind: OzgCloudElasticUserList
- plural: ozgelasticusers
- singular: ozgelasticuser
+ kind: OzgCloudElasticsearch
+ listKind: OzgCloudElasticsearchList
+ plural: ozgcloudelasticsearchs
+ singular: ozgcloudelasticsearch
scope: Namespaced
versions:
- name: v1
schema:
openAPIV3Schema:
type: object
- description: OzgCloudElasticUser is the Schema for the keycloaks API
+ description: OzgCloudElasticsearch is the Schema for the keycloaks API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
@@ -32,14 +30,14 @@ spec:
metadata:
type: object
spec:
- description: Spec defines the desired state of Elastic
+ description: Spec defines the desired state of Elasticsearch
type: object
x-kubernetes-preserve-unknown-fields: true
status:
- description: Status defines the observed state of Elastic
+ description: Status defines the observed state of Elasticsearch
type: object
x-kubernetes-preserve-unknown-fields: true
served: true
storage: true
subresources:
- status: {}
+ status: {}
\ No newline at end of file
diff --git a/ozgcloud-elastic-operator/src/main/helm/templates/rbac/elastic_edit_role.yaml b/ozgcloud-elastic-operator/src/main/helm/templates/rbac/elasticsearch_edit_role.yaml
similarity index 86%
rename from ozgcloud-elastic-operator/src/main/helm/templates/rbac/elastic_edit_role.yaml
rename to ozgcloud-elastic-operator/src/main/helm/templates/rbac/elasticsearch_edit_role.yaml
index fe5364c..8c47d52 100644
--- a/ozgcloud-elastic-operator/src/main/helm/templates/rbac/elastic_edit_role.yaml
+++ b/ozgcloud-elastic-operator/src/main/helm/templates/rbac/elasticsearch_edit_role.yaml
@@ -1,10 +1,10 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
- name: elastic-edit-role
+ name: elasticsearch-edit-role
labels:
app.kubernetes.io/name: clusterrole
- app.kubernetes.io/instance: elastic-edit-role
+ app.kubernetes.io/instance: elasticsearch-edit-role
app.kubernetes.io/component: rbac
app.kubernetes.io/created-by: ozgcloud-operator
app.kubernetes.io/part-of: ozgcloud-operator
diff --git a/ozgcloud-elastic-operator/src/main/helm/templates/rbac/elastic_view_role.yaml b/ozgcloud-elastic-operator/src/main/helm/templates/rbac/elasticsearch_view_role.yaml
similarity index 85%
rename from ozgcloud-elastic-operator/src/main/helm/templates/rbac/elastic_view_role.yaml
rename to ozgcloud-elastic-operator/src/main/helm/templates/rbac/elasticsearch_view_role.yaml
index f84a78a..04d9878 100644
--- a/ozgcloud-elastic-operator/src/main/helm/templates/rbac/elastic_view_role.yaml
+++ b/ozgcloud-elastic-operator/src/main/helm/templates/rbac/elasticsearch_view_role.yaml
@@ -1,10 +1,10 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
- name: elastic-view-role
+ name: elasticsearch-view-role
labels:
app.kubernetes.io/name: clusterrole
- app.kubernetes.io/instance: elastic-view-role
+ app.kubernetes.io/instance: elasticsearch-view-role
app.kubernetes.io/component: rbac
app.kubernetes.io/created-by: ozgcloud-operator
app.kubernetes.io/part-of: ozgcloud-operator
diff --git a/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/ElasticCustomResourceStatus.java b/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/ElasticsearchCustomResourceStatus.java
similarity index 94%
rename from ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/ElasticCustomResourceStatus.java
rename to ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/ElasticsearchCustomResourceStatus.java
index 6cf85a9..ba83ac4 100644
--- a/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/ElasticCustomResourceStatus.java
+++ b/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/ElasticsearchCustomResourceStatus.java
@@ -38,7 +38,7 @@ import lombok.Setter;
@NoArgsConstructor
@AllArgsConstructor
@JsonIgnoreProperties(ignoreUnknown = true)
-public class ElasticCustomResourceStatus extends ObservedGenerationAwareStatus {
+public class ElasticsearchCustomResourceStatus extends ObservedGenerationAwareStatus {
private CustomResourceStatus status;
diff --git a/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/ElasticOperatorApplication.java b/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/ElasticsearchOperatorApplication.java
similarity index 90%
rename from ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/ElasticOperatorApplication.java
rename to ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/ElasticsearchOperatorApplication.java
index cad0e94..5a4aa26 100644
--- a/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/ElasticOperatorApplication.java
+++ b/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/ElasticsearchOperatorApplication.java
@@ -27,9 +27,9 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication
-public class ElasticOperatorApplication {
+public class ElasticsearchOperatorApplication {
public static void main(String[] args) {
- SpringApplication.run(ElasticOperatorApplication.class, args);
+ SpringApplication.run(ElasticsearchOperatorApplication.class, args);
}
}
\ No newline at end of file
diff --git a/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/ElasticSearchProperties.java b/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/ElasticsearchProperties.java
similarity index 92%
rename from ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/ElasticSearchProperties.java
rename to ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/ElasticsearchProperties.java
index 78d2c7a..f3cdb0f 100644
--- a/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/ElasticSearchProperties.java
+++ b/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/ElasticsearchProperties.java
@@ -10,7 +10,7 @@ import lombok.Setter;
@Setter
@ConfigurationProperties("ozgcloud.elastic")
@Configuration
-public class ElasticSearchProperties {
+public class ElasticsearchProperties {
private String namespace;
private String secretName;
diff --git a/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/ElasticSearchRemoteService.java b/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/ElasticsearchRemoteService.java
similarity index 94%
rename from ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/ElasticSearchRemoteService.java
rename to ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/ElasticsearchRemoteService.java
index af52fe8..af263ca 100644
--- a/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/ElasticSearchRemoteService.java
+++ b/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/ElasticsearchRemoteService.java
@@ -30,9 +30,9 @@ import lombok.extern.java.Log;
@Log
@RequiredArgsConstructor
@Component
-class ElasticSearchRemoteService {
+class ElasticsearchRemoteService {
- private final ElasticSearchProperties elasticSearchProperties;
+ private final ElasticsearchProperties elasticSearchProperties;
private final KubernetesService kubernetesService;
@@ -83,6 +83,7 @@ class ElasticSearchRemoteService {
public boolean existsIndex(String index) throws Exception {
try {
log.info("Exists index " + index + "...");
+ client = createClient(elasticSearchProperties.getSecretData(), getPassword());
var exists = client.indices().exists(ExistsRequest.of(builder -> builder.index(index))).value();
log.info("Exists index: " + exists);
return exists;
@@ -95,6 +96,7 @@ class ElasticSearchRemoteService {
public void createIndex(String indexName) throws Exception {
try {
log.info("Create index " + indexName + "...");
+ client = createClient(elasticSearchProperties.getSecretData(), getPassword());
client.indices().create(builder -> builder.index(indexName));
log.info("Create index successful.");
} catch(Exception e) {
diff --git a/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/ElasticSearchService.java b/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/ElasticsearchServerService.java
similarity index 96%
rename from ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/ElasticSearchService.java
rename to ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/ElasticsearchServerService.java
index a5bc270..2c12679 100644
--- a/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/ElasticSearchService.java
+++ b/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/ElasticsearchServerService.java
@@ -11,11 +11,11 @@ import lombok.extern.java.Log;
@Log
@RequiredArgsConstructor
@Component
-public class ElasticSearchService {
+public class ElasticsearchServerService {
static final String PRIVILEGES_ALL = "all";
- private final ElasticSearchRemoteService remoteService;
+ private final ElasticsearchRemoteService remoteService;
// curl -k -X PUT -u elastic:$ELASTICSEARCH_PASSWORD -H 'Content-Type: application/json' 'https://ozg-search-cluster-es-http:9200/'$ES_NS_USER
public void checkIndex(String namespace) throws Exception {
diff --git a/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/user/ElasticUserCustomResource.java b/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/user/ElasticsearchCustomResource.java
similarity index 82%
rename from ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/user/ElasticUserCustomResource.java
rename to ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/user/ElasticsearchCustomResource.java
index e0f02a3..bbc1a13 100644
--- a/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/user/ElasticUserCustomResource.java
+++ b/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/user/ElasticsearchCustomResource.java
@@ -23,7 +23,7 @@
*/
package de.ozgcloud.operator.user;
-import de.ozgcloud.operator.ElasticCustomResourceStatus;
+import de.ozgcloud.operator.ElasticsearchCustomResourceStatus;
import io.fabric8.kubernetes.api.model.Namespaced;
import io.fabric8.kubernetes.client.CustomResource;
import io.fabric8.kubernetes.model.annotation.Group;
@@ -32,11 +32,11 @@ import io.fabric8.kubernetes.model.annotation.Plural;
import io.fabric8.kubernetes.model.annotation.Singular;
import io.fabric8.kubernetes.model.annotation.Version;
-@Kind("OzgCloudElasticUser")
+@Kind("OzgCloudElasticsearch")
@Group("operator.ozgcloud.de")
@Version("v1")
-@Singular("ozgcloudelasticuser")
-@Plural("ozgcloudelasticusers")
+@Singular("ozgcloudelasticsearch")
+@Plural("ozgcloudelasticsearchs")
@SuppressWarnings("serial")
-class ElasticUserCustomResource extends CustomResource<ElasticUserSpec, ElasticCustomResourceStatus> implements Namespaced {
+class ElasticsearchCustomResource extends CustomResource<ElasticsearchSpec, ElasticsearchCustomResourceStatus> implements Namespaced {
}
diff --git a/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/user/ElasticUserReconciler.java b/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/user/ElasticsearchReconciler.java
similarity index 64%
rename from ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/user/ElasticUserReconciler.java
rename to ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/user/ElasticsearchReconciler.java
index 43f3ff4..c269a38 100644
--- a/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/user/ElasticUserReconciler.java
+++ b/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/user/ElasticsearchReconciler.java
@@ -5,7 +5,7 @@ import org.springframework.stereotype.Component;
import de.ozgcloud.operator.CustomResourceStatus;
import de.ozgcloud.operator.OperatorConfig;
-import de.ozgcloud.operator.common.elasticsearch.ElasticSearchService;
+import de.ozgcloud.operator.common.elasticsearch.ElasticsearchServerService;
import io.fabric8.kubernetes.api.model.Secret;
import io.javaoperatorsdk.operator.api.reconciler.Context;
import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
@@ -18,13 +18,13 @@ import lombok.extern.java.Log;
@RequiredArgsConstructor
@ControllerConfiguration
@Component
-public class ElasticUserReconciler implements Reconciler<ElasticUserCustomResource> {
+public class ElasticsearchReconciler implements Reconciler<ElasticsearchCustomResource> {
- private final ElasticUserService service;
- private final ElasticSearchService searchService;
+ private final ElasticsearchService service;
+ private final ElasticsearchServerService searchService;
@Override
- public UpdateControl<ElasticUserCustomResource> reconcile(ElasticUserCustomResource resource, Context<ElasticUserCustomResource> context) {
+ public UpdateControl<ElasticsearchCustomResource> reconcile(ElasticsearchCustomResource resource, Context<ElasticsearchCustomResource> context) {
try {
log.info("Reconcile user " + resource.getCRDName() + "...");
var namespace = resource.getMetadata().getNamespace();
@@ -33,7 +33,7 @@ public class ElasticUserReconciler implements Reconciler<ElasticUserCustomResour
searchService.checkSecurityRole(namespace);
searchService.checkSecurityUser(namespace, getPassword(secret));
log.info("Reconcile user successful.");
- return ElasticUserUpdateControlBuilder.fromResource(resource).withStatus(CustomResourceStatus.OK).build();
+ return ElasticsearchUpdateControlBuilder.fromResource(resource).withStatus(CustomResourceStatus.OK).build();
} catch (Exception e) {
log.info("Reconcile user failed: " + e);
return buildExceptionUpdateControl(resource, e);
@@ -41,11 +41,11 @@ public class ElasticUserReconciler implements Reconciler<ElasticUserCustomResour
}
private String getPassword(Secret secret) {
- return MapUtils.getString(secret.getStringData(), ElasticSecretHelper.SECRET_PASSWORD_FIELD);
+ return MapUtils.getString(secret.getStringData(), ElasticsearchSecretHelper.SECRET_PASSWORD_FIELD);
}
- UpdateControl<ElasticUserCustomResource> buildExceptionUpdateControl(ElasticUserCustomResource resource, Exception e) {
- return ElasticUserUpdateControlBuilder
+ UpdateControl<ElasticsearchCustomResource> buildExceptionUpdateControl(ElasticsearchCustomResource resource, Exception e) {
+ return ElasticsearchUpdateControlBuilder
.fromResource(resource)
.withStatus(CustomResourceStatus.ERROR)
.withReschedule(OperatorConfig.RECONCILER_RETRY_SECONDS_ON_ERROR)
diff --git a/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/user/ElasticSecretHelper.java b/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/user/ElasticsearchSecretHelper.java
similarity index 90%
rename from ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/user/ElasticSecretHelper.java
rename to ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/user/ElasticsearchSecretHelper.java
index 54272d5..3457807 100644
--- a/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/user/ElasticSecretHelper.java
+++ b/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/user/ElasticsearchSecretHelper.java
@@ -3,7 +3,7 @@ package de.ozgcloud.operator.user;
import org.apache.commons.lang3.RandomStringUtils;
import org.springframework.stereotype.Component;
-import de.ozgcloud.operator.common.elasticsearch.ElasticSearchProperties;
+import de.ozgcloud.operator.common.elasticsearch.ElasticsearchProperties;
import io.fabric8.kubernetes.api.model.ObjectMeta;
import io.fabric8.kubernetes.api.model.Secret;
import io.fabric8.kubernetes.api.model.SecretBuilder;
@@ -11,7 +11,7 @@ import lombok.RequiredArgsConstructor;
@RequiredArgsConstructor
@Component
-public class ElasticSecretHelper {
+public class ElasticsearchSecretHelper {
static final String SECRET_TYPE = "Opaque";
static final String SECRET_ADDRESS_FIELD = "address";
@@ -21,7 +21,7 @@ public class ElasticSecretHelper {
static final int PASSWORD_LENGTH = 15;
- private final ElasticSearchProperties properties;
+ private final ElasticsearchProperties properties;
public Secret buildCredentialSecret(String namespace, String name) {
return new SecretBuilder()
diff --git a/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/user/ElasticUserService.java b/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/user/ElasticsearchService.java
similarity index 88%
rename from ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/user/ElasticUserService.java
rename to ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/user/ElasticsearchService.java
index 7c7174d..edf9c5d 100644
--- a/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/user/ElasticUserService.java
+++ b/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/user/ElasticsearchService.java
@@ -15,15 +15,15 @@ import lombok.extern.java.Log;
@Log
@RequiredArgsConstructor
@Component
-class ElasticUserService {
+class ElasticsearchService {
static final String ELASTIC_USER_SECRET_NAME = "elasticsearch-credentials";
- private final ElasticSecretHelper secretHelper;
+ private final ElasticsearchSecretHelper secretHelper;
private final KubernetesService kubernetesService;
- public Secret getOrCreateCredentialSecret(ElasticUserCustomResource resource, Context<ElasticUserCustomResource> context) {
+ public Secret getOrCreateCredentialSecret(ElasticsearchCustomResource resource, Context<ElasticsearchCustomResource> context) {
try {
log.info("Get or create secret...");
var namespace = resource.getMetadata().getNamespace();
diff --git a/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/user/ElasticUserSpec.java b/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/user/ElasticsearchSpec.java
similarity index 97%
rename from ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/user/ElasticUserSpec.java
rename to ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/user/ElasticsearchSpec.java
index 47b1ba6..fb7fb3a 100644
--- a/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/user/ElasticUserSpec.java
+++ b/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/user/ElasticsearchSpec.java
@@ -33,6 +33,6 @@ import lombok.Setter;
@Setter
@Builder
@JsonIgnoreProperties(ignoreUnknown = true)
-class ElasticUserSpec {
+class ElasticsearchSpec {
}
diff --git a/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/user/ElasticUserUpdateControlBuilder.java b/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/user/ElasticsearchUpdateControlBuilder.java
similarity index 50%
rename from ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/user/ElasticUserUpdateControlBuilder.java
rename to ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/user/ElasticsearchUpdateControlBuilder.java
index 88fa010..0c5e2c4 100644
--- a/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/user/ElasticUserUpdateControlBuilder.java
+++ b/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/user/ElasticsearchUpdateControlBuilder.java
@@ -4,12 +4,12 @@ import java.time.Duration;
import java.util.Optional;
import de.ozgcloud.operator.CustomResourceStatus;
-import de.ozgcloud.operator.ElasticCustomResourceStatus;
+import de.ozgcloud.operator.ElasticsearchCustomResourceStatus;
import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
-class ElasticUserUpdateControlBuilder {
+class ElasticsearchUpdateControlBuilder {
- private ElasticUserCustomResource resource;
+ private ElasticsearchCustomResource resource;
private CustomResourceStatus status;
private Optional<String> message = Optional.empty();
@@ -17,44 +17,44 @@ class ElasticUserUpdateControlBuilder {
private boolean reschedule = false;
private Duration scheduleDuration;
- public ElasticUserUpdateControlBuilder(ElasticUserCustomResource resource) {
+ public ElasticsearchUpdateControlBuilder(ElasticsearchCustomResource resource) {
this.resource = resource;
}
- public static ElasticUserUpdateControlBuilder fromResource(ElasticUserCustomResource resource) {
- return new ElasticUserUpdateControlBuilder(resource);
+ public static ElasticsearchUpdateControlBuilder fromResource(ElasticsearchCustomResource resource) {
+ return new ElasticsearchUpdateControlBuilder(resource);
}
- public ElasticUserUpdateControlBuilder withStatus(CustomResourceStatus status) {
+ public ElasticsearchUpdateControlBuilder withStatus(CustomResourceStatus status) {
this.status = status;
return this;
}
- public ElasticUserUpdateControlBuilder withMessage(String message) {
+ public ElasticsearchUpdateControlBuilder withMessage(String message) {
this.message = Optional.ofNullable(message);
return this;
}
- public ElasticUserUpdateControlBuilder withReschedule(Duration duration) {
+ public ElasticsearchUpdateControlBuilder withReschedule(Duration duration) {
this.reschedule = true;
this.scheduleDuration = duration;
return this;
}
- public UpdateControl<ElasticUserCustomResource> build() {
+ public UpdateControl<ElasticsearchCustomResource> build() {
resource.setStatus(buildElasticCustomResourceStatus());
return buildUpdateControl();
}
- private ElasticCustomResourceStatus buildElasticCustomResourceStatus() {
- var userStatus = ElasticCustomResourceStatus.builder().status(status);
+ private ElasticsearchCustomResourceStatus buildElasticCustomResourceStatus() {
+ var userStatus = ElasticsearchCustomResourceStatus.builder().status(status);
message.ifPresent(userStatus::message);
return userStatus.build();
}
- private UpdateControl<ElasticUserCustomResource> buildUpdateControl() {
+ private UpdateControl<ElasticsearchCustomResource> buildUpdateControl() {
if (reschedule) {
return UpdateControl.updateStatus(resource).rescheduleAfter(scheduleDuration);
}
diff --git a/ozgcloud-elastic-operator/src/test/helm/crd/operator.ozgcloud.de_OzgCloudElasticUser_test.yaml b/ozgcloud-elastic-operator/src/test/helm/crd/operator.ozgcloud.de_OzgCloudElasticsearch_test.yaml
similarity index 74%
rename from ozgcloud-elastic-operator/src/test/helm/crd/operator.ozgcloud.de_OzgCloudElasticUser_test.yaml
rename to ozgcloud-elastic-operator/src/test/helm/crd/operator.ozgcloud.de_OzgCloudElasticsearch_test.yaml
index ecef608..8129c02 100644
--- a/ozgcloud-elastic-operator/src/test/helm/crd/operator.ozgcloud.de_OzgCloudElasticUser_test.yaml
+++ b/ozgcloud-elastic-operator/src/test/helm/crd/operator.ozgcloud.de_OzgCloudElasticsearch_test.yaml
@@ -1,6 +1,6 @@
-suite: operator.ozgcloud.de_OzgCloudElasticUser test
+suite: operator.ozgcloud.de_OzgCloudElasticsearch test
templates:
- - templates/crd/operator.ozgcloud.de_OzgCloudElasticUser.yaml
+ - templates/crd/operator.ozgcloud.de_OzgCloudElasticsearch.yaml
tests:
- it: should have apiVersion
asserts:
@@ -16,7 +16,7 @@ tests:
asserts:
- equal:
path: metadata.name
- value: ozgcloudelasticuser.operator.ozgcloud.de
+ value: ozgcloudelasticsearch.operator.ozgcloud.de
- it: should have spec group
asserts:
@@ -27,22 +27,22 @@ tests:
asserts:
- equal:
path: spec.names.kind
- value: OzgCloudElasticUser
+ value: OzgCloudElasticsearch
- it: should have spec names listKind
asserts:
- equal:
path: spec.names.listKind
- value: OzgCloudElasticUserList
+ value: OzgCloudElasticsearchList
- it: should have spec names plural
asserts:
- equal:
path: spec.names.plural
- value: ozgelasticusers
+ value: ozgcloudelasticsearchs
- it: should have spec names singular
asserts:
- equal:
path: spec.names.singular
- value: ozgelasticuser
+ value: ozgcloudelasticsearch
- it: should have spec scope
asserts:
diff --git a/ozgcloud-elastic-operator/src/test/helm/crd/operator.ozgcloud.de_OzgCloudElasticUser_versions_v1_test.yaml b/ozgcloud-elastic-operator/src/test/helm/crd/operator.ozgcloud.de_OzgCloudElasticsearch_versions_v1_test.yaml
similarity index 91%
rename from ozgcloud-elastic-operator/src/test/helm/crd/operator.ozgcloud.de_OzgCloudElasticUser_versions_v1_test.yaml
rename to ozgcloud-elastic-operator/src/test/helm/crd/operator.ozgcloud.de_OzgCloudElasticsearch_versions_v1_test.yaml
index d52d460..076fa2a 100644
--- a/ozgcloud-elastic-operator/src/test/helm/crd/operator.ozgcloud.de_OzgCloudElasticUser_versions_v1_test.yaml
+++ b/ozgcloud-elastic-operator/src/test/helm/crd/operator.ozgcloud.de_OzgCloudElasticsearch_versions_v1_test.yaml
@@ -1,6 +1,6 @@
-suite: operator.ozgcloud.de_OzgCloudElasticUser versions v1 test
+suite: operator.ozgcloud.de_OzgCloudElasticsearch versions v1 test
templates:
- - templates/crd/operator.ozgcloud.de_OzgCloudElasticUser.yaml
+ - templates/crd/operator.ozgcloud.de_OzgCloudElasticsearch.yaml
tests:
- it: should have versions name
asserts:
@@ -11,7 +11,7 @@ tests:
asserts:
- equal:
path: spec.versions[0].schema.openAPIV3Schema.description
- value: OzgCloudElasticUser is the Schema for the keycloaks API
+ value: OzgCloudElasticsearch is the Schema for the keycloaks API
- it: should have versions schema type
asserts:
- equal:
@@ -54,7 +54,7 @@ tests:
asserts:
- equal:
path: spec.versions[0].schema.openAPIV3Schema.properties.spec.description
- value: Spec defines the desired state of Elastic
+ value: Spec defines the desired state of Elasticsearch
- it: should have versions schema spec type
asserts:
- equal:
@@ -70,7 +70,7 @@ tests:
asserts:
- equal:
path: spec.versions[0].schema.openAPIV3Schema.properties.status.description
- value: Status defines the observed state of Elastic
+ value: Status defines the observed state of Elasticsearch
- it: should have versions schema status type
asserts:
- equal:
diff --git a/ozgcloud-elastic-operator/src/test/helm/rbac/elastic_edit_role_test.yaml b/ozgcloud-elastic-operator/src/test/helm/rbac/elasticsearch_edit_role_test.yaml
similarity index 92%
rename from ozgcloud-elastic-operator/src/test/helm/rbac/elastic_edit_role_test.yaml
rename to ozgcloud-elastic-operator/src/test/helm/rbac/elasticsearch_edit_role_test.yaml
index d4c28e5..6b3bcc3 100644
--- a/ozgcloud-elastic-operator/src/test/helm/rbac/elastic_edit_role_test.yaml
+++ b/ozgcloud-elastic-operator/src/test/helm/rbac/elasticsearch_edit_role_test.yaml
@@ -1,6 +1,6 @@
-suite: elastic_edit_role test
+suite: elasticsearch_edit_role test
templates:
- - templates/rbac/elastic_edit_role.yaml
+ - templates/rbac/elasticsearch_edit_role.yaml
tests:
- it: should have apiVersion
asserts:
@@ -16,7 +16,7 @@ tests:
asserts:
- equal:
path: metadata.name
- value: elastic-edit-role
+ value: elasticsearch-edit-role
- it: should have metadata labels name
asserts:
- equal:
@@ -26,7 +26,7 @@ tests:
asserts:
- equal:
path: metadata.labels.[app.kubernetes.io/instance]
- value: elastic-edit-role
+ value: elasticsearch-edit-role
- it: should have metadata labels component
asserts:
- equal:
diff --git a/ozgcloud-elastic-operator/src/test/helm/rbac/elastic_view_role_test.yaml b/ozgcloud-elastic-operator/src/test/helm/rbac/elasticsearch_view_role_test.yaml
similarity index 92%
rename from ozgcloud-elastic-operator/src/test/helm/rbac/elastic_view_role_test.yaml
rename to ozgcloud-elastic-operator/src/test/helm/rbac/elasticsearch_view_role_test.yaml
index 3be96c4..d584880 100644
--- a/ozgcloud-elastic-operator/src/test/helm/rbac/elastic_view_role_test.yaml
+++ b/ozgcloud-elastic-operator/src/test/helm/rbac/elasticsearch_view_role_test.yaml
@@ -1,6 +1,6 @@
-suite: elastic_view_role test
+suite: elasticsearch_view_role test
templates:
- - templates/rbac/elastic_view_role.yaml
+ - templates/rbac/elasticsearch_view_role.yaml
tests:
- it: should have apiVersion
asserts:
@@ -16,7 +16,7 @@ tests:
asserts:
- equal:
path: metadata.name
- value: elastic-view-role
+ value: elasticsearch-view-role
- it: should have metadata labels name
asserts:
- equal:
@@ -26,7 +26,7 @@ tests:
asserts:
- equal:
path: metadata.labels.[app.kubernetes.io/instance]
- value: elastic-view-role
+ value: elasticsearch-view-role
- it: should have metadata labels component
asserts:
- equal:
diff --git a/ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/common/elasticsearch/ElasticSearchRemoteServiceTest.java b/ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/common/elasticsearch/ElasticSearchRemoteServiceTest.java
index be55962..258b2c4 100644
--- a/ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/common/elasticsearch/ElasticSearchRemoteServiceTest.java
+++ b/ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/common/elasticsearch/ElasticSearchRemoteServiceTest.java
@@ -21,9 +21,9 @@ class ElasticSearchRemoteServiceTest {
@Spy
@InjectMocks
- private ElasticSearchRemoteService service;
+ private ElasticsearchRemoteService service;
@Mock
- private ElasticSearchProperties elasticSearchProperties;
+ private ElasticsearchProperties elasticSearchProperties;
@Mock
private KubernetesService kubernetesService;
diff --git a/ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/common/elasticsearch/ElasticSearchServiceTest.java b/ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/common/elasticsearch/ElasticSearchServiceTest.java
index c3efd54..8cc4f7f 100644
--- a/ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/common/elasticsearch/ElasticSearchServiceTest.java
+++ b/ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/common/elasticsearch/ElasticSearchServiceTest.java
@@ -20,9 +20,9 @@ class ElasticSearchServiceTest {
@Spy
@InjectMocks
- private ElasticSearchService service;
+ private ElasticsearchServerService service;
@Mock
- private ElasticSearchRemoteService remoteService;
+ private ElasticsearchRemoteService remoteService;
@DisplayName("Check index")
@Nested
@@ -105,7 +105,7 @@ class ElasticSearchServiceTest {
void shouldContainPrivileges() {
var request = service.createPutRoleRequest(NAMESPACE);
- assertThat(request.indices().get(0).privileges()).containsExactly(ElasticSearchService.PRIVILEGES_ALL);
+ assertThat(request.indices().get(0).privileges()).containsExactly(ElasticsearchServerService.PRIVILEGES_ALL);
}
}
}
diff --git a/ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/ElasticCustomResourceStatusTestFactory.java b/ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/ElasticCustomResourceStatusTestFactory.java
deleted file mode 100644
index 36fd6fd..0000000
--- a/ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/ElasticCustomResourceStatusTestFactory.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package de.ozgcloud.operator.user;
-
-import de.ozgcloud.operator.CustomResourceStatus;
-import de.ozgcloud.operator.ElasticCustomResourceStatus;
-
-public class ElasticCustomResourceStatusTestFactory {
-
- public final static CustomResourceStatus STATUS = CustomResourceStatus.OK;
-
- public static ElasticCustomResourceStatus create() {
- return createBuilder().build();
- }
-
- public static ElasticCustomResourceStatus.ElasticCustomResourceStatusBuilder createBuilder() {
- return ElasticCustomResourceStatus.builder()
- .status(STATUS);
- }
-}
\ No newline at end of file
diff --git a/ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/ElasticUserCustomResourceTestFactory.java b/ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/ElasticUserCustomResourceTestFactory.java
deleted file mode 100644
index 47599fb..0000000
--- a/ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/ElasticUserCustomResourceTestFactory.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package de.ozgcloud.operator.user;
-
-public class ElasticUserCustomResourceTestFactory {
-
- public static ElasticUserCustomResource create() {
- var resource = new ElasticUserCustomResource();
- resource.setStatus(ElasticCustomResourceStatusTestFactory.create());
- resource.setMetadata(ObjectMetaTestFactory.create());
- return resource;
- }
-}
\ No newline at end of file
diff --git a/ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/ElasticsearchCustomResourceStatusTestFactory.java b/ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/ElasticsearchCustomResourceStatusTestFactory.java
new file mode 100644
index 0000000..8f22514
--- /dev/null
+++ b/ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/ElasticsearchCustomResourceStatusTestFactory.java
@@ -0,0 +1,18 @@
+package de.ozgcloud.operator.user;
+
+import de.ozgcloud.operator.CustomResourceStatus;
+import de.ozgcloud.operator.ElasticsearchCustomResourceStatus;
+
+public class ElasticsearchCustomResourceStatusTestFactory {
+
+ public final static CustomResourceStatus STATUS = CustomResourceStatus.OK;
+
+ public static ElasticsearchCustomResourceStatus create() {
+ return createBuilder().build();
+ }
+
+ public static ElasticsearchCustomResourceStatus.ElasticsearchCustomResourceStatusBuilder createBuilder() {
+ return ElasticsearchCustomResourceStatus.builder()
+ .status(STATUS);
+ }
+}
\ No newline at end of file
diff --git a/ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/ElasticsearchCustomResourceTestFactory.java b/ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/ElasticsearchCustomResourceTestFactory.java
new file mode 100644
index 0000000..544b2d9
--- /dev/null
+++ b/ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/ElasticsearchCustomResourceTestFactory.java
@@ -0,0 +1,11 @@
+package de.ozgcloud.operator.user;
+
+public class ElasticsearchCustomResourceTestFactory {
+
+ public static ElasticsearchCustomResource create() {
+ var resource = new ElasticsearchCustomResource();
+ resource.setStatus(ElasticsearchCustomResourceStatusTestFactory.create());
+ resource.setMetadata(ObjectMetaTestFactory.create());
+ return resource;
+ }
+}
\ No newline at end of file
diff --git a/ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/ElasticUserReconcilerITCase.java b/ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/ElasticsearchReconcilerITCase.java
similarity index 97%
rename from ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/ElasticUserReconcilerITCase.java
rename to ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/ElasticsearchReconcilerITCase.java
index f9d9fb0..890f2c3 100644
--- a/ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/ElasticUserReconcilerITCase.java
+++ b/ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/ElasticsearchReconcilerITCase.java
@@ -16,7 +16,7 @@ import io.fabric8.kubernetes.api.model.PodListBuilder;
import io.fabric8.kubernetes.client.NamespacedKubernetesClient;
import io.fabric8.kubernetes.client.server.mock.KubernetesServer;
-class ElasticUserReconcilerITCase {
+class ElasticsearchReconcilerITCase {
@Rule
private final KubernetesServer server = new KubernetesServer();
diff --git a/ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/ElasticUserReconcilerTest.java b/ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/ElasticsearchReconcilerTest.java
similarity index 82%
rename from ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/ElasticUserReconcilerTest.java
rename to ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/ElasticsearchReconcilerTest.java
index f89dc36..97cf7a1 100644
--- a/ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/ElasticUserReconcilerTest.java
+++ b/ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/ElasticsearchReconcilerTest.java
@@ -13,7 +13,7 @@ import org.mockito.Mock;
import org.mockito.Spy;
import de.ozgcloud.operator.CustomResourceStatus;
-import de.ozgcloud.operator.common.elasticsearch.ElasticSearchService;
+import de.ozgcloud.operator.common.elasticsearch.ElasticsearchServerService;
import de.ozgcloud.operator.common.kubernetes.NamespaceTestFactory;
import de.ozgcloud.operator.common.kubernetes.SecretTestFactory;
import io.fabric8.kubernetes.api.model.Secret;
@@ -21,27 +21,27 @@ import io.javaoperatorsdk.operator.api.reconciler.Context;
import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
import lombok.SneakyThrows;
-class ElasticUserReconcilerTest {
+class ElasticsearchReconcilerTest {
@Spy
@InjectMocks
- private ElasticUserReconciler reconciler;
+ private ElasticsearchReconciler reconciler;
@Mock
- private ElasticUserService service;
+ private ElasticsearchService service;
@Mock
- private ElasticSearchService searchService;
+ private ElasticsearchServerService searchService;
@DisplayName("Reconcile")
@Nested
class TestReconcile {
@Mock
- private Context<ElasticUserCustomResource> context;
+ private Context<ElasticsearchCustomResource> context;
- private final ElasticUserCustomResource resource = ElasticUserCustomResourceTestFactory.create();
+ private final ElasticsearchCustomResource resource = ElasticsearchCustomResourceTestFactory.create();
private final static String PASSWORD = "dummyPassword";
- private final Secret secret = SecretTestFactory.createBuilder().addToStringData(ElasticSecretHelper.SECRET_PASSWORD_FIELD, PASSWORD).build();
+ private final Secret secret = SecretTestFactory.createBuilder().addToStringData(ElasticsearchSecretHelper.SECRET_PASSWORD_FIELD, PASSWORD).build();
@DisplayName("process flow")
@Nested
@@ -104,7 +104,7 @@ class ElasticUserReconcilerTest {
}
@SneakyThrows
- private UpdateControl<ElasticUserCustomResource> reconcile() {
+ private UpdateControl<ElasticsearchCustomResource> reconcile() {
return reconciler.reconcile(resource, context);
}
@@ -112,7 +112,7 @@ class ElasticUserReconcilerTest {
@Nested
class TestBuildExceptionUpdateControl {
- private final ElasticUserCustomResource resource = ElasticUserCustomResourceTestFactory.create();
+ private final ElasticsearchCustomResource resource = ElasticsearchCustomResourceTestFactory.create();
private final static String EXCEPTION_MESSAGE = "ExeptionMessage";
private final Exception exception = new RuntimeException(EXCEPTION_MESSAGE);
@@ -144,7 +144,7 @@ class ElasticUserReconcilerTest {
assertThat(updateControl.getResource().getStatus().getMessage()).isEqualTo(EXCEPTION_MESSAGE);
}
- private UpdateControl<ElasticUserCustomResource> buildExceptionUpdateControl() {
+ private UpdateControl<ElasticsearchCustomResource> buildExceptionUpdateControl() {
return reconciler.buildExceptionUpdateControl(resource, exception);
}
}
diff --git a/ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/ElasticUserSecretBuilderTest.java b/ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/ElasticsearchSecretBuilderTest.java
similarity index 72%
rename from ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/ElasticUserSecretBuilderTest.java
rename to ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/ElasticsearchSecretBuilderTest.java
index 5851373..aa9e2d4 100644
--- a/ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/ElasticUserSecretBuilderTest.java
+++ b/ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/ElasticsearchSecretBuilderTest.java
@@ -11,18 +11,18 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Spy;
-import de.ozgcloud.operator.common.elasticsearch.ElasticSearchProperties;
+import de.ozgcloud.operator.common.elasticsearch.ElasticsearchProperties;
import de.ozgcloud.operator.common.kubernetes.NamespaceTestFactory;
import de.ozgcloud.operator.common.kubernetes.SecretTestFactory;
import io.fabric8.kubernetes.api.model.Secret;
-class ElasticUserSecretBuilderTest {
+class ElasticsearchSecretBuilderTest {
@Spy
@InjectMocks
- private ElasticSecretHelper builder;
+ private ElasticsearchSecretHelper builder;
@Mock
- private ElasticSearchProperties properties;
+ private ElasticsearchProperties properties;
@DisplayName("Build credential secret")
@Nested
@@ -41,7 +41,7 @@ class ElasticUserSecretBuilderTest {
void shouldContainType() {
var secret = buildCredentialSecret();
- assertThat(secret.getType()).isEqualTo(ElasticSecretHelper.SECRET_TYPE);
+ assertThat(secret.getType()).isEqualTo(ElasticsearchSecretHelper.SECRET_TYPE);
}
@DisplayName("metadata")
@@ -71,7 +71,7 @@ class ElasticUserSecretBuilderTest {
void shouldBeSet() {
var secret = buildCredentialSecret();
- assertThat(secret.getStringData()).containsEntry(ElasticSecretHelper.SECRET_ADDRESS_FIELD, String.format("%s:%s", ADDRESS, PORT));
+ assertThat(secret.getStringData()).containsEntry(ElasticsearchSecretHelper.SECRET_ADDRESS_FIELD, String.format("%s:%s", ADDRESS, PORT));
}
@Test
@@ -93,22 +93,22 @@ class ElasticUserSecretBuilderTest {
void shouldContainIndex() {
var secret = buildCredentialSecret();
- assertThat(secret.getStringData()).containsEntry(ElasticSecretHelper.SECRET_INDEX_FIELD, NamespaceTestFactory.NAMESPACE);
+ assertThat(secret.getStringData()).containsEntry(ElasticsearchSecretHelper.SECRET_INDEX_FIELD, NamespaceTestFactory.NAMESPACE);
}
@Test
void shouldContainPassword() {
var secret = buildCredentialSecret();
- assertThat(secret.getStringData()).containsKey(ElasticSecretHelper.SECRET_PASSWORD_FIELD);
- assertThat(secret.getStringData().get(ElasticSecretHelper.SECRET_PASSWORD_FIELD)).isNotNull();
+ assertThat(secret.getStringData()).containsKey(ElasticsearchSecretHelper.SECRET_PASSWORD_FIELD);
+ assertThat(secret.getStringData().get(ElasticsearchSecretHelper.SECRET_PASSWORD_FIELD)).isNotNull();
}
@Test
void shouldContainUsername() {
var secret = buildCredentialSecret();
- assertThat(secret.getStringData()).containsEntry(ElasticSecretHelper.SECRET_USERNAME_FIELD, NamespaceTestFactory.NAMESPACE);
+ assertThat(secret.getStringData()).containsEntry(ElasticsearchSecretHelper.SECRET_USERNAME_FIELD, NamespaceTestFactory.NAMESPACE);
}
private Secret buildCredentialSecret() {
diff --git a/ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/ElasticUserServiceTest.java b/ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/ElasticsearchServiceTest.java
similarity index 85%
rename from ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/ElasticUserServiceTest.java
rename to ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/ElasticsearchServiceTest.java
index 6fa99ce..6118286 100644
--- a/ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/ElasticUserServiceTest.java
+++ b/ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/ElasticsearchServiceTest.java
@@ -20,13 +20,13 @@ import io.fabric8.kubernetes.client.dsl.Resource;
import io.fabric8.kubernetes.client.extension.ResourceAdapter;
import io.javaoperatorsdk.operator.api.reconciler.Context;
-class ElasticUserServiceTest {
+class ElasticsearchServiceTest {
@Spy
@InjectMocks
- private ElasticUserService service;
+ private ElasticsearchService service;
@Mock
- private ElasticSecretHelper secretHelper;
+ private ElasticsearchSecretHelper secretHelper;
@Mock
private KubernetesService kubernetesService;
@@ -35,7 +35,7 @@ class ElasticUserServiceTest {
class TestCheckSecret {
@Mock
- private Context<ElasticUserCustomResource> context;
+ private Context<ElasticsearchCustomResource> context;
@Mock
private ResourceAdapter<Secret> resourceAdapter;
@Mock
@@ -43,7 +43,7 @@ class ElasticUserServiceTest {
private final Secret secret = SecretTestFactory.create();
- private final ElasticUserCustomResource resource = ElasticUserCustomResourceTestFactory.create();
+ private final ElasticsearchCustomResource resource = ElasticsearchCustomResourceTestFactory.create();
@BeforeEach
void mock() {
@@ -55,7 +55,7 @@ class ElasticUserServiceTest {
void shouldGetSecret() {
service.getOrCreateCredentialSecret(resource, context);
- verify(kubernetesService).getSecretResource(NamespaceTestFactory.NAMESPACE, ElasticUserService.ELASTIC_USER_SECRET_NAME);
+ verify(kubernetesService).getSecretResource(NamespaceTestFactory.NAMESPACE, ElasticsearchService.ELASTIC_USER_SECRET_NAME);
}
@DisplayName("on existing")
@@ -85,7 +85,7 @@ class ElasticUserServiceTest {
void shouldBuildSecret() {
service.getOrCreateCredentialSecret(resource, context);
- verify(secretHelper).buildCredentialSecret(NamespaceTestFactory.NAMESPACE, ElasticUserService.ELASTIC_USER_SECRET_NAME);
+ verify(secretHelper).buildCredentialSecret(NamespaceTestFactory.NAMESPACE, ElasticsearchService.ELASTIC_USER_SECRET_NAME);
}
@Test
--
GitLab