You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by ma...@apache.org on 2018/09/07 11:35:08 UTC
[incubator-openwhisk] branch master updated: Update CosmosDB SDK to
v2.1.0 (#4008)
This is an automated email from the ASF dual-hosted git repository.
markusthoemmes pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git
The following commit(s) were added to refs/heads/master by this push:
new 05f916c Update CosmosDB SDK to v2.1.0 (#4008)
05f916c is described below
commit 05f916c746e6ca2860d50952086a37b6bdab239c
Author: Chetan Mehrotra <ch...@apache.org>
AuthorDate: Fri Sep 7 17:05:02 2018 +0530
Update CosmosDB SDK to v2.1.0 (#4008)
---
common/scala/build.gradle | 2 +-
.../src/main/scala/whisk/core/database/cosmosdb/CosmosDBUtil.scala | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/common/scala/build.gradle b/common/scala/build.gradle
index 4871eb8..cbeed11 100644
--- a/common/scala/build.gradle
+++ b/common/scala/build.gradle
@@ -75,7 +75,7 @@ dependencies {
compile 'io.reactivex:rxscala_2.11:0.26.5'
compile 'io.reactivex:rxjava-reactive-streams:1.2.1'
- compile 'com.microsoft.azure:azure-cosmosdb:2.0.0'
+ compile 'com.microsoft.azure:azure-cosmosdb:2.1.0'
compile ('com.lightbend.akka:akka-stream-alpakka-s3_2.11:0.19') {
exclude group: 'commons-logging'
diff --git a/common/scala/src/main/scala/whisk/core/database/cosmosdb/CosmosDBUtil.scala b/common/scala/src/main/scala/whisk/core/database/cosmosdb/CosmosDBUtil.scala
index 26fc967..4fd01c5 100644
--- a/common/scala/src/main/scala/whisk/core/database/cosmosdb/CosmosDBUtil.scala
+++ b/common/scala/src/main/scala/whisk/core/database/cosmosdb/CosmosDBUtil.scala
@@ -84,7 +84,7 @@ private[cosmosdb] trait CosmosDBUtil {
def createClient(config: CosmosDBConfig): AsyncDocumentClient =
new AsyncDocumentClient.Builder()
.withServiceEndpoint(config.endpoint)
- .withMasterKey(config.key)
+ .withMasterKeyOrResourceToken(config.key)
.withConnectionPolicy(ConnectionPolicy.GetDefault)
.withConsistencyLevel(ConsistencyLevel.Session)
.build