getting ES default creds from env

provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/util/RequestInfoImpl.java

@@ -15,7 +15,6 @@
 package org.opengroup.osdu.indexer.ibm.util;
 
 import static org.opengroup.osdu.core.common.model.http.DpsHeaders.AUTHORIZATION;
-import static org.opengroup.osdu.indexer.ibm.util.DpsHeadersIBMQueue.INDEXER_QUEUE_KEY;
 
 import java.util.Map;
 
@@ -27,20 +26,25 @@ import org.opengroup.osdu.core.common.model.http.DpsHeaders;
 import org.opengroup.osdu.core.common.model.search.DeploymentEnvironment;
 import org.opengroup.osdu.core.common.model.tenant.TenantInfo;
 import org.opengroup.osdu.core.common.provider.interfaces.IRequestInfo;
+import org.opengroup.osdu.core.common.search.Preconditions;
 import org.opengroup.osdu.core.common.util.IServiceAccountJwtClient;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Component;
-import org.springframework.web.context.annotation.RequestScope;
 
 import com.google.common.base.Strings;
 
+import lombok.extern.java.Log;
 
+
+@Primary
+@Log
 @Component
-@RequestScope
+//@RequestScope
 public class RequestInfoImpl implements IRequestInfo {
 
     @Inject
-    private DpsHeaders dpsHeaders;
+    private DpsHeaders headersMap;
 
     @Inject
     private IServiceAccountJwtClient serviceAccountJwtClient;
@@ -54,18 +58,23 @@ public class RequestInfoImpl implements IRequestInfo {
 
     @Override
     public DpsHeaders getHeaders() {
-
-        return this.dpsHeaders;
+        if (headersMap == null) {
+            log.warning("Headers Map DpsHeaders is null");
+            // throw to prevent null reference exception below
+            throw new AppException(HttpStatus.SC_INTERNAL_SERVER_ERROR, "Invalid Headers", "Headers Map DpsHeaders is null");
+        }
+        DpsHeaders headers = this.getCoreServiceHeaders(headersMap.getHeaders());
+        return headers;
     }
 
     @Override
     public String getPartitionId() {
-        return this.dpsHeaders.getPartitionId();
+        return getHeaders().getPartitionIdWithFallbackToAccountId();
     }
 
     @Override
     public Map<String, String> getHeadersMap() {
-        return this.dpsHeaders.getHeaders();
+        return getHeaders().getHeaders();
     }
 
     @Override
@@ -75,8 +84,8 @@ public class RequestInfoImpl implements IRequestInfo {
 
     @Override
     public DpsHeaders getHeadersWithDwdAuthZ() {
-        this.dpsHeaders.put(AUTHORIZATION, this.checkOrGetAuthorizationHeader());
-        return this.dpsHeaders;
+        this.headersMap.put(AUTHORIZATION, this.checkOrGetAuthorizationHeader());
+        return getHeaders();
     }
 
     @Override
@@ -84,7 +93,7 @@ public class RequestInfoImpl implements IRequestInfo {
 
     @Override
     public boolean isTaskQueueRequest() {
-        if (!this.dpsHeaders.getHeaders().containsKey(INDEXER_QUEUE_KEY)) return false;
+        //if (!this.dpsHeaders.getHeaders().containsKey(INDEXER_QUEUE_KEY)) return false;
 
 //        String queueId = this.headersInfo.getHeadersMap().get(AppEngineHeaders.TASK_QUEUE_NAME);
 //        return queueId.endsWith(Constants.INDEXER_QUEUE_IDENTIFIER);
@@ -93,13 +102,19 @@ public class RequestInfoImpl implements IRequestInfo {
 
     public String checkOrGetAuthorizationHeader() {
         if (DeploymentEnvironment.valueOf(DEPLOYMENT_ENVIRONMENT) == DeploymentEnvironment.LOCAL) {
-            String authHeader = this.dpsHeaders.getAuthorization();
+            String authHeader = this.headersMap.getAuthorization();
             if (Strings.isNullOrEmpty(authHeader)) {
                 throw new AppException(HttpStatus.SC_UNAUTHORIZED, "Invalid authorization header", "Authorization token cannot be empty");
             }
-            return authHeader;
+            return "Bearer " + authHeader;
         } else {
             return "Bearer " + this.serviceAccountJwtClient.getIdToken(tenantInfo.getName());
         }
     }
+    
+    private DpsHeaders getCoreServiceHeaders(Map<String, String> input) {
+        Preconditions.checkNotNull(input, "input headers cannot be null");
+        DpsHeaders output = DpsHeaders.createFromMap(input);
+        return output;
+    }
 }

provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/util/ServiceAccountJwtClientImpl.java

@@ -44,7 +44,7 @@ public class ServiceAccountJwtClientImpl implements IServiceAccountJwtClient {
 	
     @Override
     public String getIdToken(String tenantName){
-        return "dont-have-one";
+        return tenantName + "-dont-have-one";
     }
     
     /*

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

@@ -12,7 +12,7 @@ AUTHORIZE_API=https://entitlements-osdu-r2.osduadev-a1c3eaf78a86806e299f5f3f2075
 AUTHORIZE_API_KEY=tobeupdated
 LEGALTAG_API=https://os-legal-ibm-osdu-r2.osduadev-a1c3eaf78a86806e299f5f3f207556f0-0000.us-south.containers.appdomain.cloud/api/legal/v1
 
-DEPLOYMENT_ENVIRONMENT=CLOUD
+DEPLOYMENT_ENVIRONMENT=LOCAL
 
 SCHEMA_CACHE_EXPIRATION=60
 INDEX_CACHE_EXPIRATION=60
@@ -25,11 +25,8 @@ KINDS_REDIS_DATABASE=1
 CRON_INDEX_CLEANUP_THRESHOLD_DAYS=3
 CRON_EMPTY_INDEX_CLEANUP_THRESHOLD_DAYS=7
 
-storage_service_url=http://localhost:8080
-
-#STORAGE_SCHEMA_HOST=https://os-storage-ibm-osdu-r2.osduadev-a1c3eaf78a86806e299f5f3f207556f0-0000.us-south.containers.appdomain.cloud/api/storage/v2/schemas
-#STORAGE_QUERY_RECORD_HOST=https://os-storage-ibm-osdu-r2.osduadev-a1c3eaf78a86806e299f5f3f207556f0-0000.us-south.containers.appdomain.cloud/api/storage/v2/query/records
-#STORAGE_QUERY_RECORD_FOR_CONVERSION_HOST=https://os-storage-ibm-osdu-r2.osduadev-a1c3eaf78a86806e299f5f3f207556f0-0000.us-south.containers.appdomain.cloud/api/storage/v2/query/records:batch
+#storage_service_url=http://localhost:8080
+storage_service_url=https://os-storage-ibm-osdu-r2.osduadev-a1c3eaf78a86806e299f5f3f207556f0-0000.us-south.containers.appdomain.cloud
 STORAGE_SCHEMA_HOST=${storage_service_url}/api/storage/v2/schemas
 STORAGE_QUERY_RECORD_HOST=${storage_service_url}/api/storage/v2/query/records
 STORAGE_QUERY_RECORD_FOR_CONVERSION_HOST=${storage_service_url}/api/storage/v2/query/records:batch
@@ -60,5 +57,9 @@ indexer.queue.key=abcd
 ELASTIC_DATASTORE_KIND=SearchSettings
 ELASTIC_DATASTORE_ID=indexer-service
 
+ELASTIC_HOST=elasticsearch-instance-osdu-es.osduadev-a1c3eaf78a86806e299f5f3f207556f0-0000.us-south.containers.appdomain.cloud
+ELASTIC_USER_PASSWORD=elastic:5bljztd8jtpv76cxqqhvf46
+
+
 #GAE_SERVICE=indexer