Merge branch 'dev' of...

Merge branch 'dev' of https://git-codecommit.us-east-1.amazonaws.com/v1/repos/os-indexer into EntitlementsAdditions

Merge branch 'dev' of...
0750b896 · Spencer Sutton · 5bf9b221 · d65d7e4e · 0750b896 · 0750b896
Commit 0750b896 authored 5 years ago by Spencer Sutton
--- a/provider/indexer-aws/indexer-aws-queue-service/pom.xml
+++ b/provider/indexer-aws/indexer-aws-queue-service/pom.xml
--- a/provider/indexer-aws/indexer-aws-queue-service/src/main/java/org/opengroup/osdu/indexerqueue/aws/api/Arguments.java
+++ b/provider/indexer-aws/indexer-aws-queue-service/src/main/java/org/opengroup/osdu/indexerqueue/aws/api/Arguments.java
--- a/provider/indexer-aws/indexer-aws-queue-service/src/main/java/org/opengroup/osdu/indexerqueue/aws/api/CallableResult.java
+++ b/provider/indexer-aws/indexer-aws-queue-service/src/main/java/org/opengroup/osdu/indexerqueue/aws/api/CallableResult.java
--- a/provider/indexer-aws/indexer-aws-queue-service/src/main/java/org/opengroup/osdu/indexerqueue/aws/api/IndexProcessor.java
+++ b/provider/indexer-aws/indexer-aws-queue-service/src/main/java/org/opengroup/osdu/indexerqueue/aws/api/IndexProcessor.java
--- a/provider/indexer-aws/indexer-aws-queue-service/src/main/java/org/opengroup/osdu/indexerqueue/aws/api/IndexerQueue.java
+++ b/provider/indexer-aws/indexer-aws-queue-service/src/main/java/org/opengroup/osdu/indexerqueue/aws/api/IndexerQueue.java
--- a/provider/indexer-aws/indexer-aws-queue-service/src/main/java/org/opengroup/osdu/indexerqueue/aws/api/IndexerQueueService.java
+++ b/provider/indexer-aws/indexer-aws-queue-service/src/main/java/org/opengroup/osdu/indexerqueue/aws/api/IndexerQueueService.java
--- a/provider/indexer-aws/indexer-aws-queue-service/src/main/java/org/opengroup/osdu/indexerqueue/aws/api/RecordChangedMessages.java
+++ b/provider/indexer-aws/indexer-aws-queue-service/src/main/java/org/opengroup/osdu/indexerqueue/aws/api/RecordChangedMessages.java
--- a/provider/indexer-aws/indexer-aws-queue-service/src/main/java/org/opengroup/osdu/indexerqueue/aws/api/RejectedExecutionHandlerImpl.java
+++ b/provider/indexer-aws/indexer-aws-queue-service/src/main/java/org/opengroup/osdu/indexerqueue/aws/api/RejectedExecutionHandlerImpl.java
--- a/provider/indexer-aws/indexer-aws-queue-service/src/test/java/org/opengroup/osdu/indexerqueue/aws/api/IndexProcessorTest.java
+++ b/provider/indexer-aws/indexer-aws-queue-service/src/test/java/org/opengroup/osdu/indexerqueue/aws/api/IndexProcessorTest.java
--- a/provider/indexer-aws/indexer-aws-queue-service/src/test/java/org/opengroup/osdu/indexerqueue/aws/api/IndexerQueueServiceTest.java
+++ b/provider/indexer-aws/indexer-aws-queue-service/src/test/java/org/opengroup/osdu/indexerqueue/aws/api/IndexerQueueServiceTest.java
--- a/testing/indexer-test-aws/src/test/java/org/opengroup/osdu/util/ElasticUtilsAws.java
+++ b/testing/indexer-test-aws/src/test/java/org/opengroup/osdu/util/ElasticUtilsAws.java
@@ -17,7 +17,6 @@ public class ElasticUtilsAws extends ElasticUtils {
        AWS4Signer signer = new AWS4Signer();
        signer.setServiceName(username);
        signer.setRegionName(password);
-        // TODO: Legal please review the use of this code coming from https://github.com/awslabs/aws-request-signing-apache-interceptor
        HttpRequestInterceptor interceptor = new AWSRequestSigningApacheInterceptor(username, signer, credentials);
        return new RestHighLevelClient(RestClient.builder(HttpHost.create(host)).setHttpClientConfigCallback(configCallBack -> configCallBack.addInterceptorLast(interceptor)));


--- a/testing/indexer-test-core/src/main/java/org/opengroup/osdu/util/Config.java
+++ b/testing/indexer-test-core/src/main/java/org/opengroup/osdu/util/Config.java
@@ -2,24 +2,24 @@ package org.opengroup.osdu.util;

 public class Config {

-    private static final String DEFAULT_ELASTIC_HOST = "https://search-dev-osdu-indexer-i5bpf2gv4iv6ha2xi7rook2rga.us-east-1.es.amazonaws.com";
-    private static final String DEFAULT_ELASTIC_USER_NAME = "es";
-    private static final String DEFAULT_ELASTIC_PASSWORD = "us-east-1";
+    private static final String DEFAULT_ELASTIC_HOST = "";
+    private static final String DEFAULT_ELASTIC_USER_NAME = "";
+    private static final String DEFAULT_ELASTIC_PASSWORD = "";
    static final int PORT = 9243;

-    private static final String DEFAULT_INDEXER_HOST = "http://localhost:8080/api/indexer/v2/";
-    private static final String DEFAULT_SEARCH_HOST = "http://localhost:8082/api/search/v2/";
-    private static final String DEFAULT_STORAGE_HOST = "http://localhost:8081/api/storage/v2/";
-    private static final String DEFAULT_DATA_PARTITION_ID_TENANT1 = "common";
-    private static final String DEFAULT_DATA_PARTITION_ID_TENANT2 = "common";
-    private static final String DEFAULT_SEARCH_INTEGRATION_TESTER = "common";
+    private static final String DEFAULT_INDEXER_HOST = "";
+    private static final String DEFAULT_SEARCH_HOST = "";
+    private static final String DEFAULT_STORAGE_HOST = "";
+    private static final String DEFAULT_DATA_PARTITION_ID_TENANT1 = "";
+    private static final String DEFAULT_DATA_PARTITION_ID_TENANT2 = "";
+    private static final String DEFAULT_SEARCH_INTEGRATION_TESTER = "";

    private static final String DEFAULT_TARGET_AUDIENCE = "";

    private static final String DEFAULT_LEGAL_TAG = "";
    private static final String DEFAULT_OTHER_RELEVANT_DATA_COUNTRIES = "";

-    private static final String DEFAULT_ENTITLEMENTS_DOMAIN = "local";
+    private static final String DEFAULT_ENTITLEMENTS_DOMAIN = "";


    public static String getOtherRelevantDataCountries() {