Skip to content
Snippets Groups Projects
Commit 9b866459 authored by Alan Braz's avatar Alan Braz
Browse files

update configs

parent e55f3c34
No related branches found
No related tags found
1 merge request!6Trusted ibm
......@@ -3,28 +3,28 @@ package org.opengroup.osdu.util;
public class Config {
//FIXME: remove credentials from here
private static final String DEFAULT_ELASTIC_HOST = "elasticsearch-instance-osdu-es6.osdu-dev-7b9b848225bcb25e9d50d2c703a0ef7e-0002.us-south.containers.appdomain.cloud";
private static final String DEFAULT_ELASTIC_HOST = "elasticsearch-instance-osdu-es.osduadev-a1c3eaf78a86806e299f5f3f207556f0-0000.us-south.containers.appdomain.cloud";
//private static final String DEFAULT_ELASTIC_HOST = "localhost";
private static final String DEFAULT_ELASTIC_USER_NAME = "elastic";
private static final String DEFAULT_ELASTIC_PASSWORD = "d7l9hhlqsdhd64dgz9jslvtn";
private static final String DEFAULT_ELASTIC_PASSWORD = "f5bljztd8jtpv76cxqqhvf46";
//static final int PORT = 8080;
static final int PORT = 443;
private static final String DEFAULT_INDEXER_HOST = "localhost";
private static final String DEFAULT_SEARCH_HOST = "localhost";
private static final String DEFAULT_STORAGE_HOST = "http://os-storage-brl-osdu.apps.ris.ocp.cloud9.ibm.com/api/storage/v2/";
private static final String DEFAULT_STORAGE_AUTH_TOKEN = "dGVzdEBpYm0uY29tOjEyMw==";
private static final String DEFAULT_STORAGE_HOST = "https://os-storage-ibm-osdu-r2.osduadev-a1c3eaf78a86806e299f5f3f207556f0-0000.us-south.containers.appdomain.cloud/api/storage/v2/";
private static final String DEFAULT_STORAGE_AUTH_TOKEN = "FIX ME";
private static final String DEFAULT_DATA_PARTITION_ID_TENANT1 = "opendes";
private static final String DEFAULT_DATA_PARTITION_ID_TENANT2 = "common";
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_LEGAL_TAG = "common-public-usa-dataset-us";
private static final String DEFAULT_OTHER_RELEVANT_DATA_COUNTRIES = "US";
private static final String DEFAULT_ENTITLEMENTS_DOMAIN = "";
private static final String DEFAULT_ENTITLEMENTS_DOMAIN = "ibm.com";
public static String getOtherRelevantDataCountries() {
......@@ -74,7 +74,7 @@ public class Config {
public static String getStorageBaseURL() {
return getEnvironmentVariableOrDefaultValue("STORAGE_HOST", DEFAULT_STORAGE_HOST);
}
public static String getStorageBasicAuthToken() {
return getEnvironmentVariableOrDefaultValue("STORAGE_AUTH_TOKEN", DEFAULT_STORAGE_AUTH_TOKEN);
}
......
......@@ -32,7 +32,7 @@
<dependency>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-test-core</artifactId>
<version>0.0.1</version>
<version>0.0.2-SNAPSHOT</version>
</dependency>
<!-- Cucumber -->
......
......@@ -15,7 +15,7 @@ public class IBMHTTPClient extends HTTPClient {
public synchronized String getAccessToken() {
if(token == null) {
//FIXME need to get this from somewhere
token = "Basic " + Config.getStorageBasicAuthToken();
token = "Bearer " + Config.getStorageBasicAuthToken();
return token;
}
return token;
......
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