cleanup

provider/indexer-aws/pom.xml

@@ -24,12 +24,12 @@
 
   <modelVersion>4.0.0</modelVersion>
   <artifactId>indexer-aws</artifactId>
-  <description>Storage service on AWS</description>
+  <description>Indexer service on AWS</description>
   <packaging>jar</packaging>
     <version>0.11.0-SNAPSHOT</version>
 
   <properties>
-      <aws.version>1.11.637</aws.version>
+      <aws.version>1.11.1018</aws.version>
       <deployment.environment>dev</deployment.environment>
   </properties>
 
@@ -47,19 +47,19 @@
     <dependency>
         <groupId>org.opengroup.osdu.core.aws</groupId>
         <artifactId>os-core-lib-aws</artifactId>
-        <version>0.3.16</version>
+        <version>0.11.0-SNAPSHOT</version>
     </dependency>
 
     <!-- AWS managed packages -->
     <dependency>
       <groupId>com.amazonaws</groupId>
       <artifactId>aws-java-sdk-core</artifactId>
-      <version>1.11.651</version>
+      <version>${aws.version}</version>
     </dependency>
     <dependency>
       <groupId>com.amazonaws</groupId>
       <artifactId>aws-java-sdk</artifactId>
-      <version>1.11.327</version>
+      <version>${aws.version}</version>
     </dependency>
 
     <!-- Third party Apache 2.0 license packages -->

provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/persistence/ElasticRepositoryImpl.java

@@ -14,16 +14,16 @@
 
 package org.opengroup.osdu.indexer.aws.persistence;
 
-import org.opengroup.osdu.core.aws.secrets.SecretsManager;
-import org.opengroup.osdu.core.aws.ssm.ParameterStorePropertySource;
-import org.opengroup.osdu.core.aws.ssm.SSMConfig;
+
 import org.opengroup.osdu.core.common.model.search.ClusterSettings;
 import org.opengroup.osdu.core.common.model.tenant.TenantInfo;
 import org.opengroup.osdu.core.common.provider.interfaces.IElasticRepository;
+import org.opengroup.osdu.core.aws.ssm.K8sLocalParameterProvider;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
+import java.util.Map;
 
 @Component
 public class ElasticRepositoryImpl implements IElasticRepository {
@@ -45,36 +45,20 @@ public class ElasticRepositoryImpl implements IElasticRepository {
 
     String usernameAndPassword;
 
-
-    @Value("${aws.elasticsearch.port}")
-    String portParameter;
-
-    @Value("${aws.elasticsearch.host}")
-    String hostParameter;
-
-    @Value("${aws.elasticsearch.credentials.secret}")
-    String elasticCredentialsSecret;
-
     @Value("${aws.region}")
     private String amazonRegion;
 
-    @Value("${aws.ssm}")
-    String ssmEnabledString;
-
-    private ParameterStorePropertySource ssm;
-
     @PostConstruct
     private void postConstruct() {
-        if( Boolean.parseBoolean(ssmEnabledString)) {
-            SSMConfig ssmConfig = new SSMConfig();
-            ssm = ssmConfig.amazonSSM();
-            host = ssm.getProperty(hostParameter).toString();
-            port = Integer.parseInt(ssm.getProperty(portParameter).toString());            
-
+        K8sLocalParameterProvider provider = new K8sLocalParameterProvider();
+        host = provider.getParameterAsStringOrDefault("elasticsearch_host", host);
+        port = Integer.parseInt(provider.getParameterAsStringOrDefault("elasticsearch_port", port));
+        Map<String, String> val = provider.getCredentialsAsMap("elasticsearch_credentials");
+        if (val != null){
+            username = val.get("username");
+            password = val.get("password");
         }
-        SecretsManager sm = new SecretsManager();
-        username = sm.getSecret(elasticCredentialsSecret,amazonRegion,"username");
-        password = sm.getSecret(elasticCredentialsSecret,amazonRegion,"password");
+
         //elastic expects username:password format
         usernameAndPassword = String.format("%s:%s", username, password);
     }

provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/publish/PublisherImpl.java

@@ -17,8 +17,7 @@ package org.opengroup.osdu.indexer.aws.publish;
 import com.amazonaws.services.sns.model.MessageAttributeValue;
 import com.amazonaws.services.sns.model.PublishRequest;
 import com.amazonaws.services.sns.AmazonSNS;
-import org.opengroup.osdu.core.aws.ssm.ParameterStorePropertySource;
-import org.opengroup.osdu.core.aws.ssm.SSMConfig;
+
 import org.opengroup.osdu.core.common.model.http.DpsHeaders;
 import org.opengroup.osdu.core.aws.sns.AmazonSNSConfig;
 import org.opengroup.osdu.core.aws.sns.PublishRequestBuilder;
@@ -26,7 +25,7 @@ import org.opengroup.osdu.indexer.provider.interfaces.IPublisher;
 import org.opengroup.osdu.core.common.model.indexer.JobStatus;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
-
+import org.opengroup.osdu.core.aws.ssm.K8sLocalParameterProvider;
 import javax.inject.Inject;
 import java.util.HashMap;
 import java.util.Map;
@@ -35,25 +34,17 @@ import java.util.Map;
 public class PublisherImpl implements IPublisher {
 
     AmazonSNS snsClient;
-
-    private ParameterStorePropertySource ssm;
-
     private String amazonSNSTopic;
 
     @Value("${aws.region}")
     private String amazonSNSRegion;
 
-    @Value("${aws.indexer.sns.topic.arn}")
-    private String parameter;
-
-
     @Inject
     public void init(){
         AmazonSNSConfig snsConfig = new AmazonSNSConfig(amazonSNSRegion);
         snsClient = snsConfig.AmazonSNS();
-        SSMConfig ssmConfig = new SSMConfig();
-        ssm = ssmConfig.amazonSSM();
-        amazonSNSTopic = ssm.getProperty(parameter).toString();
+        K8sLocalParameterProvider provider = new K8sLocalParameterProvider();
+        amazonSNSTopic = provider.getPropertyAsString("indexer-sns-topic-arn");
     }
 
     public void publishStatusChangedTagsToTopic(DpsHeaders headers, JobStatus indexerBatchStatus) throws Exception

provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/util/IndexerQueueTaskBuilderAws.java

@@ -19,8 +19,7 @@ import org.opengroup.osdu.core.aws.sqs.AmazonSQSConfig;
 import com.amazonaws.services.sqs.model.MessageAttributeValue;
 import com.amazonaws.services.sqs.model.SendMessageRequest;
 import com.google.gson.Gson;
-import org.opengroup.osdu.core.aws.ssm.ParameterStorePropertySource;
-import org.opengroup.osdu.core.aws.ssm.SSMConfig;
+import org.opengroup.osdu.core.aws.ssm.K8sLocalParameterProvider;
 import org.opengroup.osdu.core.common.model.http.DpsHeaders;
 import org.opengroup.osdu.core.common.model.search.RecordChangedMessages;
 import org.opengroup.osdu.indexer.util.IndexerQueueTaskBuilder;
@@ -41,8 +40,6 @@ public class IndexerQueueTaskBuilderAws extends IndexerQueueTaskBuilder {
 
     private AmazonSQS sqsClient;
 
-    private ParameterStorePropertySource ssm;
-
     private String storageQueue;
     private String dlq;
     private final String retryString = "retry";
@@ -52,20 +49,14 @@ public class IndexerQueueTaskBuilderAws extends IndexerQueueTaskBuilder {
     @Value("${aws.region}")
     private String region;
 
-    @Value("${aws.storage.sqs.queue.url}")
-    String sqsStorageQueueParameter;
-    @Value("${aws.indexer.sqs.dlq.url}")
-    String deadLetterQueueParameter;
-
     @Inject
     public void init() {
         AmazonSQSConfig config = new AmazonSQSConfig(region);
         sqsClient = config.AmazonSQS();
         gson =new Gson();
-        SSMConfig ssmConfig = new SSMConfig();
-        ssm = ssmConfig.amazonSSM();
-        storageQueue = ssm.getProperty(sqsStorageQueueParameter).toString();
-        dlq = ssm.getProperty(deadLetterQueueParameter).toString();
+        K8sLocalParameterProvider provider = new K8sLocalParameterProvider();
+        storageQueue = provider.getParameterAsString("storage-sqs-url");
+        dlq =  provider.getParameterAsString("indexer-deadletter-queue-sqs-url");
     }
 
     @Override

provider/indexer-aws/src/main/resources/application.properties

@@ -54,15 +54,6 @@ aws.dynamodb.endpoint=dynamodb.${AWS_REGION}.amazonaws.com
 aws.ssm=${SSM_ENABLED}
 aws.ssm.prefix=/osdu/${ENVIRONMENT}
 
-aws.elasticsearch.host=${aws.ssm.prefix}/elasticsearch/end-point
-aws.elasticsearch.port=${aws.ssm.prefix}/elasticsearch/end-point-port
-aws.elasticsearch.credentials.secret=${aws.ssm.prefix}/elasticsearch/credentials
-aws.indexer.sns.topic.arn=${aws.ssm.prefix}/indexer/indexer-sns-topic-arn
-aws.storage.sns.topic.arn=${aws.ssm.prefix}/storage/storage-sns-topic-arn
-
-aws.storage.sqs.queue.url=${aws.ssm.prefix}/storage/storage-sqs-url
-aws.indexer.sqs.dlq.url=${aws.ssm.prefix}/indexer-queue/indexer-deadletter-queue-sqs-url
-
 server.ssl.enabled=${SSL_ENABLED:true}
 server.ssl.key-store-type=PKCS12
 server.ssl.key-store=${SSL_KEY_STORE_PATH:/certs/osduonaws.p12}