diff --git a/indexer-core/pom.xml b/indexer-core/pom.xml
index 435ffc8a9084053d0f2800c1a4432110749d96bd..6012b4efe37bada412276e8a2eaa673a57cebb51 100644
--- a/indexer-core/pom.xml
+++ b/indexer-core/pom.xml
@@ -18,7 +18,7 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-common</artifactId>
- <version>0.0.11</version>
+ <version>0.0.12</version>
</dependency>
<!-- spring boot dependencies -->
diff --git a/provider/indexer-aws/pom.xml b/provider/indexer-aws/pom.xml
index 59789e1827766333378e1e865efae5a21be052a8..abac644bc00790c76cdf7de06352d266344b2209 100644
--- a/provider/indexer-aws/pom.xml
+++ b/provider/indexer-aws/pom.xml
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-common</artifactId>
- <version>0.0.11</version>
+ <version>0.0.12</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu.indexer</groupId>
@@ -49,7 +49,7 @@
<dependency>
<groupId>org.opengroup.osdu.core.aws</groupId>
<artifactId>aws-osdu-util</artifactId>
- <version>0.0.7</version>
+ <version>0.0.8</version>
</dependency>
<!-- AWS managed packages -->
diff --git a/provider/indexer-azure/pom.xml b/provider/indexer-azure/pom.xml
index 55730e964fe9998b259b8c30eb34dbdaba47f41f..fc9c57586dabccb8a93b1dc9b1846fa55edf84b7 100644
--- a/provider/indexer-azure/pom.xml
+++ b/provider/indexer-azure/pom.xml
@@ -88,7 +88,7 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-common</artifactId>
- <version>0.0.11</version>
+ <version>0.0.12</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu.indexer</groupId>
@@ -99,7 +99,7 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>core-lib-azure</artifactId>
- <version>0.0.7</version>
+ <version>0.0.8</version>
</dependency>
<dependency>
diff --git a/provider/indexer-gcp/pom.xml b/provider/indexer-gcp/pom.xml
index bcad6880070fbf3babe345db011de4d81c5819e1..e5ad401653ea99e64f8eac189c2d06a73377937c 100644
--- a/provider/indexer-gcp/pom.xml
+++ b/provider/indexer-gcp/pom.xml
@@ -38,13 +38,13 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>core-lib-gcp</artifactId>
- <version>0.1.15</version>
+ <version>0.1.16</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-common</artifactId>
- <version>0.0.11</version>
+ <version>0.0.12</version>
</dependency>
<dependency>
diff --git a/provider/indexer-gcp/scripts/deploy2gcp.sh.tmpl b/provider/indexer-gcp/scripts/deploy2gcp.sh.tmpl
index 269585f74061f31dc85360dfabdbfef2d472495d..b3f5589121c6763544d3a2528b479a157bf5fd94 100644
--- a/provider/indexer-gcp/scripts/deploy2gcp.sh.tmpl
+++ b/provider/indexer-gcp/scripts/deploy2gcp.sh.tmpl
@@ -70,6 +70,7 @@ then
sed -i -e "s|CRON_JOB_IP_VAR|$CRON_JOB_IP|g" app.yaml
sed -i -e "s|LEGAL_HOSTNAME_VAR|$LEGAL_HOSTNAME|g" app.yaml
sed -i -e "s|REGION_VAR|$REGION|g" app.yaml
+ sed -i -e "s|ENVIRONMENT|$ENVIRONMENT|g" app.yaml
echo "Content of app.yaml:"
cat app.yaml
diff --git a/provider/indexer-gcp/src/main/appengine/app.yaml b/provider/indexer-gcp/src/main/appengine/app.yaml
index 905d3b69f69ed2b4d652bf0ce3d54eba101fcd0a..dee4515740c38e195f4afeada8a4b66471a32833 100644
--- a/provider/indexer-gcp/src/main/appengine/app.yaml
+++ b/provider/indexer-gcp/src/main/appengine/app.yaml
@@ -38,3 +38,4 @@ env_variables:
CRON_JOB_IP: "CRON_JOB_IP_VAR"
LEGAL_HOSTNAME: "LEGAL_HOSTNAME_VAR"
REGION: "REGION_VAR"
+ SPRING_PROFILES_ACTIVE: 'ENVIRONMENT'
diff --git a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/di/AppengineLogFactory.java b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/di/AppengineLogFactory.java
new file mode 100644
index 0000000000000000000000000000000000000000..00c9332200ec28900c968436483072d2e1d9725e
--- /dev/null
+++ b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/di/AppengineLogFactory.java
@@ -0,0 +1,27 @@
+package org.opengroup.osdu.indexer.di;
+
+import org.opengroup.osdu.core.common.logging.ILogger;
+import org.opengroup.osdu.core.gcp.logging.logger.AppEngineLoggingProvider;
+
+import org.springframework.beans.factory.FactoryBean;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.context.annotation.Primary;
+import org.springframework.stereotype.Component;
+
+@Component
+@Primary
+@Lazy
+public class AppengineLogFactory implements FactoryBean<ILogger> {
+
+ private AppEngineLoggingProvider appEngineLoggingProvider = new AppEngineLoggingProvider();
+
+ @Override
+ public ILogger getObject() throws Exception {
+ return appEngineLoggingProvider.getLogger();
+ }
+
+ @Override
+ public Class<?> getObjectType() {
+ return ILogger.class;
+ }
+}
\ No newline at end of file
diff --git a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/di/EntitlementsClientFactory.java b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/di/EntitlementsClientFactory.java
index b1b5a6539f6f334a9eb37c9831bd022e319f2d51..6630705facc5810952f23f2e29eca5eb3c6acfb0 100644
--- a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/di/EntitlementsClientFactory.java
+++ b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/di/EntitlementsClientFactory.java
@@ -19,11 +19,13 @@ import org.opengroup.osdu.core.common.entitlements.EntitlementsFactory;
import org.opengroup.osdu.core.common.entitlements.IEntitlementsFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.beans.factory.config.AbstractFactoryBean;
+import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Component;
import org.springframework.web.context.annotation.RequestScope;
@Component
@RequestScope
+@Lazy
public class EntitlementsClientFactory extends AbstractFactoryBean<IEntitlementsFactory> {
@Value("${AUTHORIZE_API}")
diff --git a/provider/indexer-gcp/src/main/resources/application-dev.properties b/provider/indexer-gcp/src/main/resources/application-dev.properties
new file mode 100644
index 0000000000000000000000000000000000000000..61da3c7139e0f8e834b2ec5b90173b2c517d075d
--- /dev/null
+++ b/provider/indexer-gcp/src/main/resources/application-dev.properties
@@ -0,0 +1,21 @@
+GOOGLE_CLOUD_PROJECT=opendes
+
+INDEXER_HOST=os-indexer-dot-opendes.appspot.com
+STORAGE_HOSTNAME=os-storage-dot-opendes.appspot.com
+
+STORAGE_SCHEMA_HOST=https://os-storage-dot-opendes.appspot.com/api/storage/v2/schemas
+STORAGE_QUERY_RECORD_HOST=https://os-storage-dot-opendes.appspot.com/api/storage/v2/query/records
+STORAGE_QUERY_RECORD_FOR_CONVERSION_HOST=https://os-storage-dot-opendes.appspot.com/api/storage/v2/query/records:batch
+STORAGE_RECORDS_BATCH_SIZE=20
+
+INDEXER_QUEUE_HOST=https://os-indexer-queue-dot-opendes.appspot.com/_dps/task-handlers/enqueue
+
+AUTHORIZE_API=https://entitlements-dot-opendes.appspot.com/entitlements/v1
+LEGALTAG_API=https://os-legal-dot-opendes.appspot.com/api/legal/v1
+CRS_API=https://crs-converter-gae-dot-opendes.appspot.com/api/crs/v1
+
+## use below values for gcp: opendes
+REDIS_GROUP_HOST=10.0.16.28
+REDIS_SEARCH_HOST=10.0.16.20
+
+GOOGLE_AUDIENCES=245464679631-ktfdfpl147m1mjpbutl00b3cmffissgq.apps.googleusercontent.com
\ No newline at end of file
diff --git a/provider/indexer-gcp/src/main/resources/application-testing.properties b/provider/indexer-gcp/src/main/resources/application-testing.properties
new file mode 100644
index 0000000000000000000000000000000000000000..5368d291c5653bcf9bd31bfbc9c31af3765e9b1f
--- /dev/null
+++ b/provider/indexer-gcp/src/main/resources/application-testing.properties
@@ -0,0 +1,21 @@
+GOOGLE_CLOUD_PROJECT=opendes-evt
+
+INDEXER_HOST=os-indexer-dot-opendes-evt.appspot.com
+STORAGE_HOSTNAME=os-storage-dot-opendes-evt.appspot.com
+
+STORAGE_SCHEMA_HOST=https://os-storage-dot-opendes-evt.appspot.com/api/storage/v2/schemas
+STORAGE_QUERY_RECORD_HOST=https://os-storage-dot-opendes-evt.appspot.com/api/storage/v2/query/records
+STORAGE_QUERY_RECORD_FOR_CONVERSION_HOST=https://os-storage-dot-opendes-evt.appspot.com/api/storage/v2/query/records:batch
+STORAGE_RECORDS_BATCH_SIZE=20
+
+INDEXER_QUEUE_HOST=https://os-indexer-queue-dot-opendes-evt.appspot.com/_dps/task-handlers/enqueue
+
+AUTHORIZE_API=https://entitlements-dot-opendes-evt.appspot.com/entitlements/v1
+LEGALTAG_API=https://os-legal-dot-opendes-evt.appspot.com/api/legal/v1
+CRS_API=https://crs-converter-gae-dot-opendes-evt.appspot.com/api/crs/v1
+
+## use below values for gcp: opendes
+REDIS_GROUP_HOST=10.253.209.196
+REDIS_SEARCH_HOST=10.118.2.140
+
+GOOGLE_AUDIENCES=833591776864-oobhqvmtdg9rpreubjvn44m5f8revglk.apps.googleusercontent.com
diff --git a/provider/indexer-gcp/src/main/resources/application.properties b/provider/indexer-gcp/src/main/resources/application.properties
index 77b781efa6764367c95127d57940b44ebd56572a..1ccde084878626a19f762e0fd8abb6a650450447 100644
--- a/provider/indexer-gcp/src/main/resources/application.properties
+++ b/provider/indexer-gcp/src/main/resources/application.properties
@@ -3,32 +3,15 @@ LOG_PREFIX=indexer
server.servlet.contextPath=/api/indexer/v2
logging.level.org.springframework.web=DEBUG
server.port=8080
-#spring.cloud.gcp.project-id=opendes
-#spring.security.user.roles=service.search.admin
JAVA_OPTS=-Xms3072m -Xmx3072m
JAVA_GC_OPTS=-XX:+UseG1GC -XX:+UseStringDeduplication -XX:InitiatingHeapOccupancyPercent=45
-GOOGLE_AUDIENCES=245464679631-ktfdfpl147m1mjpbutl00b3cmffissgq.apps.googleusercontent.com
-
-## use below values for gcp: local
-#REDIS_GROUP_HOST=127.0.0.1
-#REDIS_SEARCH_HOST=localhost
-#DEPLOYMENT_ENVIRONMENT=LOCAL
-
-## use below values for gcp: opendes
-REDIS_GROUP_HOST=10.0.16.28
-REDIS_SEARCH_HOST=10.0.16.20
DEPLOYMENT_ENVIRONMENT=CLOUD
REDIS_GROUP_PORT=6379
REDIS_SEARCH_PORT=6379
DEFAULT_DATA_COUNTRY=US
-AUTHORIZE_API=https://entitlements-dot-opendes.appspot.com/entitlements/v1
-LEGALTAG_API=https://os-legal-dot-opendes.appspot.com/api/legal/v1
-CRS_API=https://crs-converter-gae-dot-opendes.appspot.com/api/crs/v1
-
-
#Default Cache Settings
SCHEMA_CACHE_EXPIRATION=60
INDEX_CACHE_EXPIRATION=60
@@ -43,21 +26,9 @@ KINDS_REDIS_DATABASE=1
CRON_INDEX_CLEANUP_THRESHOLD_DAYS=3
CRON_EMPTY_INDEX_CLEANUP_THRESHOLD_DAYS=7
-GOOGLE_CLOUD_PROJECT=opendes
GAE_SERVICE=indexer
-
-INDEXER_HOST=os-indexer-dot-opendes.appspot.com
-STORAGE_HOSTNAME=os-storage-dot-opendes.appspot.com
-
KEY_RING=csqp
KMS_KEY=searchService
ELASTIC_DATASTORE_KIND=SearchSettings
ELASTIC_DATASTORE_ID=indexer-service
-
-STORAGE_SCHEMA_HOST=https://os-storage-dot-opendes.appspot.com/api/storage/v2/schemas
-STORAGE_QUERY_RECORD_HOST=https://os-storage-dot-opendes.appspot.com/api/storage/v2/query/records
-STORAGE_QUERY_RECORD_FOR_CONVERSION_HOST=https://os-storage-dot-opendes.appspot.com/api/storage/v2/query/records:batch
-STORAGE_RECORDS_BATCH_SIZE=20
-
-INDEXER_QUEUE_HOST=https://os-indexer-queue-dot-opendes.appspot.com/_dps/task-handlers/enqueue
diff --git a/testing/indexer-test-aws/pom.xml b/testing/indexer-test-aws/pom.xml
index c2bce80ee604ccec6abd86437a576d4379ef0b38..f0e554ab57e326b001ddc4c3df66df3cec5ad697 100644
--- a/testing/indexer-test-aws/pom.xml
+++ b/testing/indexer-test-aws/pom.xml
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.opengroup.osdu.core.aws</groupId>
<artifactId>aws-osdu-util</artifactId>
- <version>0.0.7</version>
+ <version>0.0.8</version>
</dependency>
<!-- AWS managed packages -->
diff --git a/testing/indexer-test-azure/pom.xml b/testing/indexer-test-azure/pom.xml
index de4544b8b534713aa2b2cda922af5092cc1087ef..41312647e8aec6bf5591ec96d1505cd11575c0cb 100644
--- a/testing/indexer-test-azure/pom.xml
+++ b/testing/indexer-test-azure/pom.xml
@@ -58,7 +58,7 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>core-lib-azure</artifactId>
- <version>0.0.7</version>
+ <version>0.0.8</version>
</dependency>
<dependency>
diff --git a/testing/indexer-test-core/pom.xml b/testing/indexer-test-core/pom.xml
index b1aa24379271729be6a5f8cb0f002feff8fd950e..4a08809967950ef8f180cd9d63b8e88fdcc2a88a 100644
--- a/testing/indexer-test-core/pom.xml
+++ b/testing/indexer-test-core/pom.xml
@@ -31,7 +31,7 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-common</artifactId>
- <version>0.0.11</version>
+ <version>0.0.12</version>
</dependency>
<dependency>