update dependencies and remove package-lock (#8)

* update dependencies and remove package-lock * eslint fixes
adobe · Sep 26, 2019 · d64c7f3 · shazron · Oct 14, 2019 · d64c7f3
1 parent d63b735
commit d64c7f3
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 7,109 deletions.
diff --git a/.gitignore b/.gitignore
@@ -27,4 +27,5 @@ coverage
 #custom
 playground
 
-.tvmCache
+.tvmCache
+package-lock.json
diff --git a/.npmrc b/.npmrc
@@ -0,0 +1 @@
+package-lock=false
diff --git a/.travis.yml b/.travis.yml
@@ -10,7 +10,7 @@ env:
     - CXX=g++-4.8
 install:
   - npm version
-  - npm ci
+  - npm install
 script:
   - npm test
 after_success:

diff --git a/lib/StateStore.js b/lib/StateStore.js
@@ -21,8 +21,8 @@ function throwNotImplemented (methodName) {
 }
 
 // eslint-disable-next-line jsdoc/require-jsdoc
-function validateInput (input, joiObject, details) {
-  const validation = joi.validate(input, joiObject)
+function validateInput (input, schema, details) {
+  const validation = schema.validate(input)
   if (validation.error) {
     logAndThrow(new codes.ERROR_BAD_ARGUMENT({
       messageValues: [validation.error.message],

diff --git a/lib/impl/CosmosStateStore.js b/lib/impl/CosmosStateStore.js
@@ -68,7 +68,7 @@ class CosmosStateStore extends StateStore {
    * @private
    */
   static async init (credentials) {
-    const validation = joi.validate(credentials, joi.object().label('cosmos').keys({
+    const validation = joi.object().label('cosmos').keys({
       // either
       resourceToken: joi.string(),
       // or
@@ -80,7 +80,8 @@ class CosmosStateStore extends StateStore {
       partitionKey: joi.string().required(),
 
       expiration: joi.string() // allowed for tvm response
-    }).xor('masterKey', 'resourceToken').required())
+    }).xor('masterKey', 'resourceToken').required()
+      .validate(credentials)
     if (validation.error) {
       if (typeof credentials === 'object') {
         if (credentials.masterKey) credentials.masterKey = '<hidden>'
@@ -92,7 +93,7 @@ class CosmosStateStore extends StateStore {
       }))
     }
 
-    let cosmosClient, container
+    let cosmosClient
     if (credentials.resourceToken) {
       cosmosClient = new cosmos.CosmosClient({ endpoint: credentials.endpoint, consistencyLevel: 'Session', tokenProvider: /* istanbul ignore next */ async () => credentials.resourceToken })
     } else {
@@ -101,7 +102,7 @@ class CosmosStateStore extends StateStore {
       // const { database } = await cosmosClient.databases.createIfNotExists({ id: credentials.databaseId })
       // container = (await database.containers.createIfNotExists({ id: credentials.containerId })).container
     }
-    container = cosmosClient.database(credentials.databaseId).container(credentials.containerId)
+    const container = cosmosClient.database(credentials.databaseId).container(credentials.containerId)
     return new CosmosStateStore(container, credentials.partitionKey)
   }
 

diff --git a/lib/init.js b/lib/init.js
@@ -92,7 +92,7 @@ async function init (config = {}) {
   switch (provider) {
     case 'cosmos':
       if (config.cosmos) {
-        logger.debug(`init with user provided cosmosDB credentials`)
+        logger.debug('init with user provided cosmosDB credentials')
         return CosmosStateStore.init(config.cosmos)
       }
       logger.debug('init with openwhisk credentials')
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		package-lock=false
This comment has been minimized. Sign in to view Copy link shazron Oct 14, 2019 Member Can we remove this file or this line? TESSA needs a package-lock.json to work and with automation, the TESSA reporting will fail. You still have the .gitignore line so you won't see it in your git modified files