diff --git a/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/ElasticsearchReconciler.java b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/ElasticsearchReconciler.java
index d9d42a1268a60a7e2008ba8c28f92ef75a42d6d1..80d6f4ee4ad709698af67a072fb839751d64dada 100644
--- a/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/ElasticsearchReconciler.java
+++ b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/ElasticsearchReconciler.java
@@ -27,14 +27,14 @@ public class ElasticsearchReconciler implements Reconciler<OzgCloudElasticsearch
public UpdateControl<OzgCloudElasticsearchCustomResource> reconcile(OzgCloudElasticsearchCustomResource resource,
Context<OzgCloudElasticsearchCustomResource> context) {
try {
- LOG.info("{0}: Reconcile user", resource.getCRDName());
+ LOG.info("{}: Reconcile user", resource.getCRDName());
var namespace = resource.getMetadata().getNamespace();
var secret = service.getOrCreateCredentialSecret(resource, context);
service.createIndexIfMissing(namespace);
service.createSecurityRoleIfMissing(namespace);
service.createSecurityUserIfMissing(namespace, getPassword(secret));
service.createCertificateIfMissing(namespace);
- LOG.info("{0}: Reconcile user successful.", resource.getCRDName());
+ LOG.info("{}: Reconcile user successful.", resource.getCRDName());
return OzgCloudElasticsearchUpdateControlBuilder.fromResource(resource).withStatus(CustomResourceStatus.OK).build();
} catch (Exception exception) {
LOG.warn(resource.getCRDName() + ": Reconcile user failed.", exception);
diff --git a/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/OzgCloudElasticsearchService.java b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/OzgCloudElasticsearchService.java
index cc0a532ada6ad93ce775049769deb823715071ce..d5ce0f979511c5c1ea61b1d295370c7e53809660 100644
--- a/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/OzgCloudElasticsearchService.java
+++ b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/OzgCloudElasticsearchService.java
@@ -29,14 +29,14 @@ public class OzgCloudElasticsearchService {
public Secret getOrCreateCredentialSecret(OzgCloudElasticsearchCustomResource resource, Context<OzgCloudElasticsearchCustomResource> context) {
try {
- LOG.debug("{0}: Get or create secret.", resource.getCRDName());
+ LOG.debug("{}: Get or create secret.", resource.getCRDName());
var namespace = resource.getMetadata().getNamespace();
var secretResource = getCredentialsSecretResource(namespace);
if (Objects.isNull(secretResource.get())) {
- LOG.info("{0}: Secret not exists, create one ...", resource.getCRDName());
+ LOG.info("{}: Secret not exists, create one ...", resource.getCRDName());
createCredentialSecret(secretResource, namespace);
- LOG.info("{0}: Secret creation successful.", resource.getCRDName());
+ LOG.info("{}: Secret creation successful.", resource.getCRDName());
}
return secretResource.get();
} catch (Exception e) {
@@ -54,14 +54,14 @@ public class OzgCloudElasticsearchService {
}
public void createIndexIfMissing(String name) throws Exception {
- LOG.debug("{0}: Check elasticsearch index...", name);
+ LOG.debug("{}: Check elasticsearch index...", name);
if (!remoteService.existsIndex(name)) {
remoteService.createIndex(name);
}
}
public void createSecurityRoleIfMissing(String roleName) throws Exception {
- LOG.debug("{0}: Check elasticsearch role...", roleName);
+ LOG.debug("{}: Check elasticsearch role...", roleName);
if (!remoteService.existsSecurityRole(roleName)) {
remoteService.createSecurityRole(buildPutRoleRequestData(roleName));
}
@@ -76,7 +76,7 @@ public class OzgCloudElasticsearchService {
}
public void createSecurityUserIfMissing(String namespace, String password) throws Exception {
- LOG.debug("{0}: Check elasticsearch user...", namespace);
+ LOG.debug("{}: Check elasticsearch user...", namespace);
if (!remoteService.existsSecurityUser(namespace)) {
remoteService.createSecurityUser(buildPutUserRequestData(namespace, password));
}
@@ -87,21 +87,21 @@ public class OzgCloudElasticsearchService {
}
public void deleteSecurityUserIfExists(String userName) throws Exception {
- LOG.debug("{0}: Check delete elasticsearch user...", userName);
+ LOG.debug("{}: Check delete elasticsearch user...", userName);
if (remoteService.existsSecurityUser(userName)) {
remoteService.deleteSecurityUser(userName);
}
}
public void deleteSecurityRoleIfExists(String roleName) throws Exception {
- LOG.debug("{0}: Check delete elasticsearch role...", roleName);
+ LOG.debug("{}: Check delete elasticsearch role...", roleName);
if (remoteService.existsSecurityRole(roleName)) {
remoteService.deleteSecurityRole(roleName);
}
}
public void deleteIndexIfExists(String indexName) throws Exception {
- LOG.debug("{0}: Check delete elasticsearch index ...", indexName);
+ LOG.debug("{}: Check delete elasticsearch index ...", indexName);
if (remoteService.existsIndex(indexName)) {
remoteService.deleteIndex(indexName);
}
@@ -109,11 +109,11 @@ public class OzgCloudElasticsearchService {
public void createCertificateIfMissing(String namespace) {
try {
- LOG.debug("{0}: Create certificate secret if missing...", namespace);
+ LOG.debug("{}: Create certificate secret if missing...", namespace);
var secretResource = kubernetesService.getSecretResource(namespace, properties.getCertificateSecretName());
if (Objects.isNull(secretResource.get())) {
- LOG.info("{0}: Create certificate secret", namespace);
+ LOG.info("{}: Create certificate secret", namespace);
createCredentialSecret(namespace, secretResource);
}
} catch (Exception e) {
diff --git a/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/ElasticsearchRemoteService.java b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/ElasticsearchRemoteService.java
index df911818b510fc33765ec243a4d14f2638ce22a8..cb28b3edef67c355f6505099d744c21e8eeb0a03 100644
--- a/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/ElasticsearchRemoteService.java
+++ b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/ElasticsearchRemoteService.java
@@ -23,9 +23,9 @@ public class ElasticsearchRemoteService {
public boolean existsIndex(String index) throws Exception {
try {
- LOG.debug("Test if elasticsearch index {0} exits.", index);
+ LOG.debug("Test if elasticsearch index {} exits.", index);
var exists = client.indices().exists(builder -> builder.index(index)).value();
- LOG.debug("Elasticsearch index exists: {0}", exists);
+ LOG.debug("Elasticsearch index exists: {}", exists);
return exists;
} catch (ElasticsearchException | IOException e) {
throw new RuntimeException("Error checking index '" + index, e);
@@ -34,9 +34,9 @@ public class ElasticsearchRemoteService {
public void createIndex(String indexName) throws Exception {
try {
- LOG.info("Create elasticsearch index {0}", indexName);
+ LOG.info("Create elasticsearch index {}", indexName);
client.indices().create(builder -> builder.index(indexName));
- LOG.info("Create elasticsearch index {0} successful", indexName);
+ LOG.info("Create elasticsearch index {} successful", indexName);
} catch (Exception e) {
throw new RuntimeException("Create elasticsearch index " + indexName + "failed.", e);
}
@@ -48,9 +48,9 @@ public class ElasticsearchRemoteService {
public void createSecurityRole(PutRoleRequestData requestData) throws Exception {
try {
- LOG.info("Create elasticsearch role {0}", requestData.getName());
+ LOG.info("Create elasticsearch role {}", requestData.getName());
client.security().putRole(createPutRoleRequest(requestData));
- LOG.info("Create elasticsearch role {0} successful", requestData.getName());
+ LOG.info("Create elasticsearch role {} successful", requestData.getName());
} catch (Exception e) {
throw new RuntimeException("Create elasticsearch role " + requestData.getName() + "failed.", e);
}
@@ -80,9 +80,9 @@ public class ElasticsearchRemoteService {
public void createSecurityUser(PutUserRequestData requestData) throws Exception {
try {
- LOG.info("Create elasticsearch user {0}", requestData.getUsername());
+ LOG.info("Create elasticsearch user {}", requestData.getUsername());
client.security().putUser(createPutUserRequest(requestData));
- LOG.info("Create elasticsearch user {0} successful", requestData.getUsername());
+ LOG.info("Create elasticsearch user {} successful", requestData.getUsername());
} catch (Exception e) {
throw new RuntimeException("Create elasticsearch user " + requestData.getUsername() + "failed.", e);
}
@@ -102,9 +102,9 @@ public class ElasticsearchRemoteService {
public void deleteIndex(String indexName) throws Exception {
try {
- LOG.info("Delete elasticsearch index {0}", indexName);
+ LOG.info("Delete elasticsearch index {}", indexName);
client.indices().delete(builder -> builder.index(indexName));
- LOG.info("Delete elasticsearch index {0} successful", indexName);
+ LOG.info("Delete elasticsearch index {} successful", indexName);
} catch (Exception e) {
throw new RuntimeException("Delete elasticsearch index " + indexName + "failed.", e);
}
@@ -112,9 +112,9 @@ public class ElasticsearchRemoteService {
public void deleteSecurityRole(String roleName) throws Exception {
try {
- LOG.info("Delete elasticsearch role {0}", roleName);
+ LOG.info("Delete elasticsearch role {}", roleName);
client.security().deleteRole(builder -> builder.name(roleName));
- LOG.info("Delete elasticsearch role {0} successful", roleName);
+ LOG.info("Delete elasticsearch role {} successful", roleName);
} catch (Exception e) {
throw new RuntimeException("Delete elasticsearch role " + roleName + "failed.", e);
}
@@ -122,9 +122,9 @@ public class ElasticsearchRemoteService {
public void deleteSecurityUser(String userName) throws Exception {
try {
- LOG.info("Delete elasticsearch user {0}", userName);
+ LOG.info("Delete elasticsearch user {}", userName);
client.security().deleteUser(builder -> builder.username(userName));
- LOG.info("Delete elasticsearch user {0} successful", userName);
+ LOG.info("Delete elasticsearch user {} successful", userName);
} catch (Exception e) {
throw new RuntimeException("Delete elasticsearch user " + userName + "failed.", e);
}