Skip to content
Snippets Groups Projects
Commit 858133c9 authored by Bill Wang's avatar Bill Wang
Browse files

clean up

parent 047f4d80
No related branches found
No related tags found
1 merge request!191EKS Deploy
...@@ -15,6 +15,8 @@ ...@@ -15,6 +15,8 @@
package org.opengroup.osdu.indexer.aws.persistence; package org.opengroup.osdu.indexer.aws.persistence;
import com.fasterxml.jackson.core.JsonProcessingException;
import org.opengroup.osdu.core.aws.ssm.K8sParameterNotFoundException;
import org.opengroup.osdu.core.common.model.search.ClusterSettings; import org.opengroup.osdu.core.common.model.search.ClusterSettings;
import org.opengroup.osdu.core.common.model.tenant.TenantInfo; import org.opengroup.osdu.core.common.model.tenant.TenantInfo;
import org.opengroup.osdu.core.common.provider.interfaces.IElasticRepository; import org.opengroup.osdu.core.common.provider.interfaces.IElasticRepository;
...@@ -49,10 +51,10 @@ public class ElasticRepositoryImpl implements IElasticRepository { ...@@ -49,10 +51,10 @@ public class ElasticRepositoryImpl implements IElasticRepository {
private String amazonRegion; private String amazonRegion;
@PostConstruct @PostConstruct
private void postConstruct() { private void postConstruct() throws K8sParameterNotFoundException, JsonProcessingException {
K8sLocalParameterProvider provider = new K8sLocalParameterProvider(); K8sLocalParameterProvider provider = new K8sLocalParameterProvider();
host = provider.getParameterAsStringOrDefault("elasticsearch_host", host); host = provider.getParameterAsStringOrDefault("elasticsearch_host", host);
port = Integer.parseInt(provider.getParameterAsStringOrDefault("elasticsearch_port", port)); port = Integer.parseInt(provider.getParameterAsStringOrDefault("elasticsearch_port", String.valueOf(port)));
Map<String, String> val = provider.getCredentialsAsMap("elasticsearch_credentials"); Map<String, String> val = provider.getCredentialsAsMap("elasticsearch_credentials");
if (val != null){ if (val != null){
username = val.get("username"); username = val.get("username");
......
...@@ -18,6 +18,7 @@ import com.amazonaws.services.sns.model.MessageAttributeValue; ...@@ -18,6 +18,7 @@ import com.amazonaws.services.sns.model.MessageAttributeValue;
import com.amazonaws.services.sns.model.PublishRequest; import com.amazonaws.services.sns.model.PublishRequest;
import com.amazonaws.services.sns.AmazonSNS; import com.amazonaws.services.sns.AmazonSNS;
import org.opengroup.osdu.core.aws.ssm.K8sParameterNotFoundException;
import org.opengroup.osdu.core.common.model.http.DpsHeaders; import org.opengroup.osdu.core.common.model.http.DpsHeaders;
import org.opengroup.osdu.core.aws.sns.AmazonSNSConfig; import org.opengroup.osdu.core.aws.sns.AmazonSNSConfig;
import org.opengroup.osdu.core.aws.sns.PublishRequestBuilder; import org.opengroup.osdu.core.aws.sns.PublishRequestBuilder;
...@@ -40,11 +41,11 @@ public class PublisherImpl implements IPublisher { ...@@ -40,11 +41,11 @@ public class PublisherImpl implements IPublisher {
private String amazonSNSRegion; private String amazonSNSRegion;
@Inject @Inject
public void init(){ public void init() throws K8sParameterNotFoundException {
AmazonSNSConfig snsConfig = new AmazonSNSConfig(amazonSNSRegion); AmazonSNSConfig snsConfig = new AmazonSNSConfig(amazonSNSRegion);
snsClient = snsConfig.AmazonSNS(); snsClient = snsConfig.AmazonSNS();
K8sLocalParameterProvider provider = new K8sLocalParameterProvider(); K8sLocalParameterProvider provider = new K8sLocalParameterProvider();
amazonSNSTopic = provider.getPropertyAsString("indexer-sns-topic-arn"); amazonSNSTopic = provider.getParameterAsString("indexer-sns-topic-arn");
} }
public void publishStatusChangedTagsToTopic(DpsHeaders headers, JobStatus indexerBatchStatus) throws Exception public void publishStatusChangedTagsToTopic(DpsHeaders headers, JobStatus indexerBatchStatus) throws Exception
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment