diff --git a/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/persistence/ElasticSettingSchemaRepositoryImpl.java b/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/persistence/ElasticSettingSchemaRepositoryImpl.java
index 82abc04f912ba1a46e2b237811035b0e0a460132..5fc0e51672e1f32ef5daeab9e194a213ade5ff6e 100644
--- a/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/persistence/ElasticSettingSchemaRepositoryImpl.java
+++ b/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/persistence/ElasticSettingSchemaRepositoryImpl.java
@@ -15,29 +15,30 @@
package org.opengroup.osdu.indexer.ibm.persistence;
import javax.annotation.PostConstruct;
+import javax.inject.Inject;
+import org.opengroup.osdu.core.common.logging.JaxRsDpsLog;
import org.opengroup.osdu.core.ibm.auth.ServiceCredentials;
import org.opengroup.osdu.core.ibm.cloudant.IBMCloudantClientFactory;
import org.opengroup.osdu.indexer.ibm.model.ElasticSettingSchema;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Repository;
-
import com.cloudant.client.api.Database;
@Repository
public class ElasticSettingSchemaRepositoryImpl implements ISchemaRepository {
- private static final Logger logger = LoggerFactory.getLogger(ElasticSettingSchemaRepositoryImpl.class);
-
+ //private static final Logger logger = LoggerFactory.getLogger(ElasticSettingSchemaRepositoryImpl.class);
+ @Inject
+ private JaxRsDpsLog log;
@Value("${ibm.cloudant.url}")
private String url;
@Value("${ibm.cloudant.apikey}")
private String apiKey;
@Value("${ibm.cloudant.dbname.prefix:local-dev}")
private String dbNamePrefix;
+
private Database db;
@@ -70,7 +71,7 @@ public class ElasticSettingSchemaRepositoryImpl implements ISchemaRepository {
newSchema.setHttps(sd.getSettingSchema().isHttps());
return newSchema;
} else {
- logger.error(ElasticSettingsDoc.class + " with id " + id + " was not found in the database.");
+ log.error(ElasticSettingsDoc.class + " with id " + id + " was not found in the database.");
return null;
}
}
diff --git a/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/publish/PublisherImpl.java b/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/publish/PublisherImpl.java
index d184fceaf9460ca9a75f1ef889c06dc6e5c0b817..ef3f5a53e70ec0652b174a9a6756ca93141aef0a 100644
--- a/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/publish/PublisherImpl.java
+++ b/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/publish/PublisherImpl.java
@@ -32,7 +32,6 @@ import org.opengroup.osdu.core.ibm.messagebus.IMessageFactory;
import org.opengroup.osdu.indexer.provider.interfaces.IPublisher;
import org.springframework.stereotype.Component;
import org.springframework.web.context.annotation.RequestScope;
-
import com.google.common.reflect.TypeToken;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
diff --git a/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/util/DpsHeadersIBMQueue.java b/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/util/DpsHeadersIBMQueue.java
index 749b3fb8d5f9cb0a374d6682b8dd1e171e760663..b7be24d47a6acbf611054f2d27304d1b2ce9b37b 100644
--- a/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/util/DpsHeadersIBMQueue.java
+++ b/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/util/DpsHeadersIBMQueue.java
@@ -22,12 +22,12 @@ import javax.servlet.http.HttpServletRequest;
import javax.inject.Inject;
import org.opengroup.osdu.core.common.model.http.DpsHeaders;
-
+import org.opengroup.osdu.core.ibm.logging.logger.OSDUSLF4JLogger;
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 org.opengroup.osdu.core.common.model.http.Request;
@Component
@RequestScope
@Primary
@@ -38,7 +38,10 @@ public class DpsHeadersIBMQueue extends DpsHeaders {
//ToDo this should be moved to Azure client-lib
public static final String INDEXER_QUEUE_KEY = "x-functions-key";
-
+ @Inject
+ private OSDUSLF4JLogger logger;
+ @Inject
+ private Request logRequest;
@Inject
public DpsHeadersIBMQueue(HttpServletRequest request) {
@@ -48,10 +51,15 @@ public class DpsHeadersIBMQueue extends DpsHeaders {
.collect(Collectors.toMap(h -> h, request::getHeader));
headers.put(INDEXER_QUEUE_KEY,queueKey);
-
+
this.addFromMap(headers);
// Add Correlation ID if missing
this.addCorrelationIdIfMissing();
+ //logRequest
+ logRequest.setIp(request.getRemoteAddr());
+ logRequest.setRequestMethod(request.getMethod());
+ logRequest.setRequestUrl(request.getRequestURL().toString());
+ logger.writeRequestEntry("DpsHeadersIBMQueue", "DpsHeadersIBMQueue request", logRequest, headers);
}
}
diff --git a/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/util/RequestInfoImpl.java b/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/util/RequestInfoImpl.java
index 0d999868bd7a130074c6ac77fef2f4bd0bf5d600..12fd218f826bc9ea1177e433d305cbc951571605 100644
--- a/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/util/RequestInfoImpl.java
+++ b/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/util/RequestInfoImpl.java
@@ -34,16 +34,19 @@ import org.springframework.stereotype.Component;
import com.google.common.base.Strings;
-import lombok.extern.java.Log;
+import org.opengroup.osdu.core.common.logging.JaxRsDpsLog;
@Primary
-@Log
+
@Component
//@RequestScope
public class RequestInfoImpl implements IRequestInfo {
@Inject
private DpsHeaders headersMap;
+
+ @Inject
+ private JaxRsDpsLog logger;
@Inject
private IServiceAccountJwtClient serviceAccountJwtClient;
@@ -58,7 +61,7 @@ public class RequestInfoImpl implements IRequestInfo {
@Override
public DpsHeaders getHeaders() {
if (headersMap == null) {
- log.warning("Headers Map DpsHeaders is null");
+ logger.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");
}
@@ -103,6 +106,7 @@ public class RequestInfoImpl implements IRequestInfo {
if (DeploymentEnvironment.valueOf(DEPLOYMENT_ENVIRONMENT) == DeploymentEnvironment.LOCAL) {
String authHeader = this.headersMap.getAuthorization();
if (Strings.isNullOrEmpty(authHeader)) {
+ logger.error(HttpStatus.SC_UNAUTHORIZED + " : Invalid authorization header");
throw new AppException(HttpStatus.SC_UNAUTHORIZED, "Invalid authorization header", "Authorization token cannot be empty");
}
return "Bearer " + authHeader;
diff --git a/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/util/ServiceAccountJwtClientImpl.java b/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/util/ServiceAccountJwtClientImpl.java
index 632dbd5c819cc0addb92e575e902a21fe82cfdd4..adb2e3cd2fd6236b1e050c9c21d775045e137ef7 100644
--- a/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/util/ServiceAccountJwtClientImpl.java
+++ b/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/util/ServiceAccountJwtClientImpl.java
@@ -41,7 +41,7 @@ public class ServiceAccountJwtClientImpl implements IServiceAccountJwtClient {
private IJwtCache cacheService;
@Inject
- private JaxRsDpsLog log;
+ private JaxRsDpsLog logger;
@Inject
private KeyCloakProvider keyCloack;
@@ -73,6 +73,7 @@ public class ServiceAccountJwtClientImpl implements IServiceAccountJwtClient {
} catch (AppException e) {
throw e;
} catch (Exception e) {
+ logger.error("Error generating token", e);
throw new AppException(HttpStatus.SC_INTERNAL_SERVER_ERROR, "Persistence error", "Error generating token", e);
}
diff --git a/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/service/ElasticSettingServiceIBMImpl.java b/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/service/ElasticSettingServiceIBMImpl.java
index 4eae00075ec886eac7ff9ea0aca047b40bf0e253..da352d885fa21eae88ce99f1ae83c680c8dd2bdd 100644
--- a/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/service/ElasticSettingServiceIBMImpl.java
+++ b/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/service/ElasticSettingServiceIBMImpl.java
@@ -37,7 +37,7 @@ public class ElasticSettingServiceIBMImpl implements IElasticSettingService {
@Inject
private IElasticCredentialsCache elasticCredentialCache;
@Inject
- private JaxRsDpsLog log;
+ private JaxRsDpsLog logger;
@Override
public ClusterSettings getElasticClusterInformation() {
@@ -48,7 +48,7 @@ public class ElasticSettingServiceIBMImpl implements IElasticSettingService {
return clusterInfo;
}
- log.warning(String.format("elastic-credential cache missed for tenant: %s", tenantInfo.getName()));
+ logger.warning(String.format("elastic-credential cache missed for tenant: %s", tenantInfo.getName()));
clusterInfo = this.elasticRepository.getElasticClusterSettings(tenantInfo);
if (clusterInfo == null) {
diff --git a/testing/indexer-test-ibm/pom.xml b/testing/indexer-test-ibm/pom.xml
index 4ad93cb4413624cd9307f65e860e4fb730f7fdaa..4c7a5184c1b26d355455d8e3a7d8840efb3dbcea 100644
--- a/testing/indexer-test-ibm/pom.xml
+++ b/testing/indexer-test-ibm/pom.xml
@@ -1,201 +1,202 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.opengroup.osdu.indexer</groupId>
- <artifactId>indexer-test-ibm</artifactId>
- <version>0.0.2</version>
- <packaging>jar</packaging>
-
- <properties>
- <maven.compiler.target>1.8</maven.compiler.target>
- <maven.compiler.source>1.8</maven.compiler.source>
- <cucumber.version>1.2.5</cucumber.version>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>com.google.api-client</groupId>
- <artifactId>google-api-client</artifactId>
- <version>1.28.0</version>
- <exclusions>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.opengroup.osdu.indexer</groupId>
- <artifactId>indexer-test-core</artifactId>
- <version>0.0.2-SNAPSHOT</version>
- </dependency>
-
- <!-- Cucumber -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>info.cukes</groupId>
- <artifactId>cucumber-java</artifactId>
- <version>${cucumber.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>info.cukes</groupId>
- <artifactId>cucumber-junit</artifactId>
- <version>${cucumber.version}</version>
- <scope>test</scope>
- </dependency>
-
- <!-- Gson: Java to Json conversion -->
- <dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- <version>2.8.5</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-json-provider</artifactId>
- <version>2.9.9</version>
- </dependency>
-
- <dependency>
- <groupId>org.glassfish</groupId>
- <artifactId>javax.json</artifactId>
- <version>1.1.4</version>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-client</artifactId>
- <version>1.19.4</version>
- </dependency>
-
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <version>1.18.2</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.6</version>
- </dependency>
-
- <!--Elasticsearch-->
- <dependency>
- <groupId>org.elasticsearch</groupId>
- <artifactId>elasticsearch</artifactId>
- <version>6.6.2</version>
- </dependency>
- <dependency>
- <groupId>org.elasticsearch.client</groupId>
- <artifactId>elasticsearch-rest-client</artifactId>
- <version>6.6.2</version>
- </dependency>
- <dependency>
- <groupId>org.elasticsearch.client</groupId>
- <artifactId>elasticsearch-rest-high-level-client</artifactId>
- <version>6.6.2</version>
- </dependency>
-
- <!--Logging-->
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-to-slf4j</artifactId>
- <version>2.11.2</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <version>1.8.0-beta4</version>
- </dependency>
-
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>27.1-jre</version>
- </dependency>
- </dependencies>
-
- <repositories>
- <repository>
- <id>os-core</id>
- <url>https://pkgs.dev.azure.com/slb-des-ext-collaboration/_packaging/os-core/maven/v1</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.22.2</version>
- <executions>
- <execution>
- <phase>integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <excludes>
- <exclude>none</exclude>
- </excludes>
- <includes>
- <include>**/index</include>
- </includes>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <trimStackTrace>false</trimStackTrace>
- <systemPropertyVariables>
-
- <KEYCLOAK_URL>keycloak-osdu-r2.osduadev-a1c3eaf78a86806e299f5f3f207556f0-0000.us-south.containers.appdomain.cloud</KEYCLOAK_URL>
- <KEYCLOAK_REALM>OSDU</KEYCLOAK_REALM>
- <KEYCLOAK_CLIENT_ID>osdu-login</KEYCLOAK_CLIENT_ID>
- <AUTH_USER_ACCESS>osdu-user</AUTH_USER_ACCESS>
- <AUTH_USER_ACCESS_PASSWORD>REPLACE_ME</AUTH_USER_ACCESS_PASSWORD>
-
- <ENTITLEMENTS_DOMAIN>ibm.com</ENTITLEMENTS_DOMAIN>
- <OTHER_RELEVANT_DATA_COUNTRIES>US</OTHER_RELEVANT_DATA_COUNTRIES>
- <!-- must be a valid, existing tag -->
- <LEGAL_TAG>opendes-public-usa-dataset</LEGAL_TAG>
-
- <!-- tenant1 MUSTG be opendes to work -->
- <DEFAULT_DATA_PARTITION_ID_TENANT1>opendes</DEFAULT_DATA_PARTITION_ID_TENANT1>
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.opengroup.osdu.indexer</groupId>
+ <artifactId>indexer-test-ibm</artifactId>
+ <version>0.0.2</version>
+ <packaging>jar</packaging>
+
+ <properties>
+ <maven.compiler.target>1.8</maven.compiler.target>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <cucumber.version>1.2.5</cucumber.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>com.google.api-client</groupId>
+ <artifactId>google-api-client</artifactId>
+ <version>1.28.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.opengroup.osdu.indexer</groupId>
+ <artifactId>indexer-test-core</artifactId>
+ <version>0.0.2-SNAPSHOT</version>
+ </dependency>
+
+ <!-- Cucumber -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>info.cukes</groupId>
+ <artifactId>cucumber-java</artifactId>
+ <version>${cucumber.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>info.cukes</groupId>
+ <artifactId>cucumber-junit</artifactId>
+ <version>${cucumber.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- Gson: Java to Json conversion -->
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>2.8.5</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
+ <version>2.9.9</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.glassfish</groupId>
+ <artifactId>javax.json</artifactId>
+ <version>1.1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-client</artifactId>
+ <version>1.19.4</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>1.18.2</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.6</version>
+ </dependency>
+
+ <!--Elasticsearch -->
+ <dependency>
+ <groupId>org.elasticsearch</groupId>
+ <artifactId>elasticsearch</artifactId>
+ <version>6.6.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.elasticsearch.client</groupId>
+ <artifactId>elasticsearch-rest-client</artifactId>
+ <version>6.6.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.elasticsearch.client</groupId>
+ <artifactId>elasticsearch-rest-high-level-client</artifactId>
+ <version>6.6.2</version>
+ </dependency>
+
+ <!--Logging -->
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-to-slf4j</artifactId>
+ <version>2.11.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <version>1.8.0-beta4</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>27.1-jre</version>
+ </dependency>
+ </dependencies>
+
+ <repositories>
+ <repository>
+ <id>os-core</id>
+ <url>https://pkgs.dev.azure.com/slb-des-ext-collaboration/_packaging/os-core/maven/v1</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.22.2</version>
+ <executions>
+ <execution>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <excludes>
+ <exclude>none</exclude>
+ </excludes>
+ <includes>
+ <include>**/index</include>
+ </includes>
+ </configuration>
+ </execution>
+ </executions>
+ <configuration>
+ <trimStackTrace>false</trimStackTrace>
+ <systemPropertyVariables>
+
+ <KEYCLOAK_URL>keycloak-osdu-r2.osduadev-a1c3eaf78a86806e299f5f3f207556f0-0000.us-south.containers.appdomain.cloud</KEYCLOAK_URL>
+ <KEYCLOAK_REALM>OSDU</KEYCLOAK_REALM>
+ <KEYCLOAK_CLIENT_ID>osdu-login</KEYCLOAK_CLIENT_ID>
+ <AUTH_USER_ACCESS>osdu-user</AUTH_USER_ACCESS>
+ <AUTH_USER_ACCESS_PASSWORD>password1</AUTH_USER_ACCESS_PASSWORD>
+ <ENTITLEMENTS_DOMAIN>ibm.com</ENTITLEMENTS_DOMAIN>
+ <OTHER_RELEVANT_DATA_COUNTRIES>US</OTHER_RELEVANT_DATA_COUNTRIES>
+ <LEGAL_TAG>opendes-public-usa-dataset</LEGAL_TAG>
+ <!-- tenant1 MUSTG be opendes to work -->
+ <DEFAULT_DATA_PARTITION_ID_TENANT1>opendes</DEFAULT_DATA_PARTITION_ID_TENANT1>
<DEFAULT_DATA_PARTITION_ID_TENANT2>tenant2</DEFAULT_DATA_PARTITION_ID_TENANT2>
-
- <STORAGE_HOST>http://localhost:8082/api/storage/v2/</STORAGE_HOST>
- <ELASTIC_HOST>elasticsearch-instance-osdu-es.osduadev-a1c3eaf78a86806e299f5f3f207556f0-0000.us-south.containers.appdomain.cloud</ELASTIC_HOST>
- <ELASTIC_USER_NAME>REPLACE_ME</ELASTIC_USER_NAME>
- <ELASTIC_PASSWORD>REPLACE_ME</ELASTIC_PASSWORD>
- <ELASTIC_PORT>443</ELASTIC_PORT>
-
- <INTEGRATION_TEST_AUDIENCE>not-used-could-be-removed-from-test-core-config-java</INTEGRATION_TEST_AUDIENCE>
- <SEARCH_INTEGRATION_TESTER>not-used-could-be-removed-from-test-core-config-java</SEARCH_INTEGRATION_TESTER>
- <INDEXER_HOST>not-used-could-be-removed-from-test-core-config-java</INDEXER_HOST>
- <SEARCH_HOST>not-used-could-be-removed-from-test-core-config-java</SEARCH_HOST>
-
- </systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <!-- test against OpenShift -->
+ <STORAGE_HOST>https://os-storage-ibm-osdu-r2.osduadev-a1c3eaf78a86806e299f5f3f207556f0-0000.us-south.containers.appdomain.cloud/api/storage/v2/</STORAGE_HOST>
+ <ELASTIC_HOST>85e9c617-e295-460e-a2ff-048b18a76b22.blijs0dd0dcr4f55oehg.databases.appdomain.cloud</ELASTIC_HOST>
+ <ELASTIC_USER_NAME>ibm_cloud_a3207231_f8ea_4ca5_9e7e_b63badc2e544</ELASTIC_USER_NAME>
+ <ELASTIC_PASSWORD>61e86fddfd5b9385510e961bec444d95799258d41b635422e59b073610d7f62d</ELASTIC_PASSWORD>
+ <ELASTIC_PORT>30842</ELASTIC_PORT>
+ <!-- test locally -->
+ <!-- <STORAGE_HOST>http://localhost:8082/api/storage/v2/</STORAGE_HOST>
+ <ELASTIC_HOST>elasticsearch-instance-osdu-es.osduadev-a1c3eaf78a86806e299f5f3f207556f0-0000.us-south.containers.appdomain.cloud</ELASTIC_HOST>
+ <ELASTIC_USER_NAME>elastic-internal</ELASTIC_USER_NAME> <ELASTIC_PASSWORD>mp7m94xrgz4t7rz758p4k79m</ELASTIC_PASSWORD>
+ <ELASTIC_PORT>443</ELASTIC_PORT> -->
+ <INTEGRATION_TEST_AUDIENCE>not-used-could-be-removed-from-test-core-config-java</INTEGRATION_TEST_AUDIENCE>
+ <SEARCH_INTEGRATION_TESTER>not-used-could-be-removed-from-test-core-config-java</SEARCH_INTEGRATION_TESTER>
+ <INDEXER_HOST>not-used-could-be-removed-from-test-core-config-java</INDEXER_HOST>
+ <SEARCH_HOST>not-used-could-be-removed-from-test-core-config-java</SEARCH_HOST>
+ </systemPropertyVariables>
+
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>