From e76b75876e756036fdd2da38d7c5d00fdf5a78f8 Mon Sep 17 00:00:00 2001
From: Chetan Mehrotra <chetanm@apache.org>
Date: Sun, 22 Apr 2018 11:43:07 +0530
Subject: [PATCH] Change the config name
---
.../database/cosmosdb/CosmosDBArtifactStoreProvider.scala | 4 ++--
tests/src/test/resources/application.conf.j2 | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/scala/src/main/scala/whisk/core/database/cosmosdb/CosmosDBArtifactStoreProvider.scala b/common/scala/src/main/scala/whisk/core/database/cosmosdb/CosmosDBArtifactStoreProvider.scala
index 9780de77318..545b561ea61 100644
--- a/common/scala/src/main/scala/whisk/core/database/cosmosdb/CosmosDBArtifactStoreProvider.scala
+++ b/common/scala/src/main/scala/whisk/core/database/cosmosdb/CosmosDBArtifactStoreProvider.scala
@@ -32,7 +32,7 @@ import whisk.core.entity.{DocumentReader, WhiskActivation, WhiskAuth, WhiskEntit
import scala.reflect.ClassTag
-case class CosmosDBConfig(host: String, key: String, db: String)
+case class CosmosDBConfig(endpoint: String, key: String, db: String)
case class ClientHolder(client: AsyncDocumentClient) extends Closeable {
override def close(): Unit = client.close()
@@ -103,7 +103,7 @@ object CosmosDBArtifactStoreProvider extends ArtifactStoreProvider {
private def createClient(config: CosmosDBConfig): AsyncDocumentClient =
new AsyncDocumentClient.Builder()
- .withServiceEndpoint(config.host)
+ .withServiceEndpoint(config.endpoint)
.withMasterKey(config.key)
.withConnectionPolicy(ConnectionPolicy.GetDefault)
.withConsistencyLevel(ConsistencyLevel.Session)
diff --git a/tests/src/test/resources/application.conf.j2 b/tests/src/test/resources/application.conf.j2
index 3d7f76f35cd..21ea8c2b880 100644
--- a/tests/src/test/resources/application.conf.j2
+++ b/tests/src/test/resources/application.conf.j2
@@ -47,9 +47,9 @@ whisk {
}
cosmosdb {
- host = ${?COSMOSDB_HOST}
- key = ${?COSMOSDB_KEY}
- db = ${?COSMOSDB_NAME}
+ endpoint = ${?COSMOSDB_ENDPOINT}
+ key = ${?COSMOSDB_KEY}
+ db = ${?COSMOSDB_NAME}
}
controller {