Merge branch 'master' into Issue278

googleapis · Oct 2, 2018 · f32062e · f32062e
2 parents 4fe1f2d + d6cbf8f
commit f32062e
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 5 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -68,8 +68,6 @@ jobs:
           environment:
             NPM_CONFIG_PREFIX: /home/node/.npm-global
       - run: npm test
-      - run: node_modules/.bin/codecov
-
   node8:
     docker:
       - image: 'node:8'

diff --git a/.kokoro/common.cfg b/.kokoro/common.cfg
@@ -13,6 +13,17 @@ gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
 # Use the trampoline script to run in docker.
 build_file: "nodejs-bigtable/.kokoro/trampoline.sh"
 
+# Bring in codecov.io master token into the build as $KOKORO_KEYSTORE_DIR/73713_dpebot_codecov_token
+before_action {
+  fetch_keystore {
+    keystore_resource {
+      keystore_config_id: 73713
+      keyname: "dpebot_codecov_token"
+      backend_type: FASTCONFIGPUSH
+    }
+  }
+}
+
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
     key: "TRAMPOLINE_IMAGE"

diff --git a/.kokoro/test.bat b/.kokoro/test.bat
@@ -17,6 +17,8 @@
 cd /d %~dp0
 cd ..
 
+call npm install -g npm@5 || goto :error
+
 call npm install || goto :error
 call npm run test || goto :error
 

diff --git a/.kokoro/test.sh b/.kokoro/test.sh
@@ -22,4 +22,5 @@ cd $(dirname $0)/..
 
 npm install
 npm test
-node_modules/.bin/codecov
+
+bash $KOKORO_GFILE_DIR/codecov.sh
diff --git a/codecov.yaml b/codecov.yaml
@@ -0,0 +1,4 @@
+---
+codecov:
+  ci:
+    - source.cloud.google.com
diff --git a/package.json b/package.json
@@ -91,7 +91,7 @@
     "eslint": "^5.0.0",
     "eslint-config-prettier": "^3.0.0",
     "eslint-plugin-node": "^7.0.0",
-    "eslint-plugin-prettier": "^2.3.1",
+    "eslint-plugin-prettier": "^3.0.0",
     "glob": "^7.1.2",
     "ink-docstrap": "^1.3.0",
     "intelli-espower-loader": "^1.0.1",

diff --git a/src/instance.js b/src/instance.js
@@ -609,7 +609,8 @@ Please use the format 'my-instance' or '${
    *     are 'name', 'schema' or 'full'. Default: 'name'.
    * @param {function} callback The callback function.
    * @param {?error} callback.err An error returned while making this request.
-   * @param {Table[]} callback.tables List of all Tables.
+   * @param {Table[]} callback.tables List of all Table objects.These objects contains
+   *     only table name & id but is not a complete representation of a table.
    * @param {object} callback.apiResponse The full API response.
    *
    * @example <caption>include:samples/document-snippets/instance.js</caption>