Merge branch 'master' into numbers-be-big

googleapis · Sep 14, 2018 · ae83f19 · ae83f19
2 parents 8005dcc + dfdaab1
commit ae83f19
Show file tree

Hide file tree

Showing 16 changed files with 33 additions and 14 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -149,21 +149,24 @@ jobs:
           name: Decrypt credentials.
           command: |
             if ! [[ -z "${SYSTEM_TESTS_ENCRYPTION_KEY}" ]]; then
-              openssl aes-256-cbc -d -in .circleci/key.json.enc \
-                -out .circleci/key.json \
-                -k "${SYSTEM_TESTS_ENCRYPTION_KEY}"
+              for encrypted_key in .circleci/*.json.enc; do
+                openssl aes-256-cbc -d -in $encrypted_key \
+                  -out $(echo $encrypted_key | sed 's/\.enc//') \
+                  -k "${SYSTEM_TESTS_ENCRYPTION_KEY}"
+              done
             fi
       - run: *npm_install_and_link
       - run:
           name: Run system tests.
           command: npm run system-test
           environment:
+            GCLOUD_PROJECT: long-door-651
             GOOGLE_APPLICATION_CREDENTIALS: .circleci/key.json
       - run:
           name: Remove unencrypted key.
           command: |
             if ! [[ -z "${SYSTEM_TESTS_ENCRYPTION_KEY}" ]]; then
-              rm .circleci/key.json
+              rm .circleci/*.json
             fi
           when: always
   publish_npm:

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -3,7 +3,7 @@ Thanks for stopping by to let us know something could be better!
 Please run down the following list and make sure you've tried the usual "quick
 fixes":
 
-  - Search the issues already opened: https://github.com/GoogleCloudPlatform/gcp-metadata/issues
+  - Search the issues already opened: https://github.com/googleapis/gcp-metadata/issues
   - Search the issues on our "catch-all" repository: https://github.com/GoogleCloudPlatform/google-cloud-node
   - Search StackOverflow: http://stackoverflow.com/questions/tagged/google-cloud-platform+node.js
 

diff --git a/.kokoro/common.cfg b/.kokoro/common.cfg
@@ -16,7 +16,7 @@ build_file: "gcp-metadata/.kokoro/trampoline.sh"
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
     key: "TRAMPOLINE_IMAGE"
-    value: "gcr.io/cloud-devrel-kokoro-resources/node:10"
+    value: "gcr.io/cloud-devrel-kokoro-resources/node:10-user"
 }
 env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"

diff --git a/.kokoro/continuous/node10/common.cfg b/.kokoro/continuous/node10/common.cfg
@@ -16,7 +16,7 @@ build_file: "gcp-metadata/.kokoro/trampoline.sh"
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
     key: "TRAMPOLINE_IMAGE"
-    value: "gcr.io/cloud-devrel-kokoro-resources/node:10"
+    value: "gcr.io/cloud-devrel-kokoro-resources/node:10-user"
 }
 env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"

diff --git a/.kokoro/continuous/node6/common.cfg b/.kokoro/continuous/node6/common.cfg
@@ -16,7 +16,7 @@ build_file: "gcp-metadata/.kokoro/trampoline.sh"
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
     key: "TRAMPOLINE_IMAGE"
-    value: "gcr.io/cloud-devrel-kokoro-resources/node:6"
+    value: "gcr.io/cloud-devrel-kokoro-resources/node:6-user"
 }
 env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"

diff --git a/.kokoro/continuous/node8/common.cfg b/.kokoro/continuous/node8/common.cfg
@@ -16,7 +16,7 @@ build_file: "gcp-metadata/.kokoro/trampoline.sh"
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
     key: "TRAMPOLINE_IMAGE"
-    value: "gcr.io/cloud-devrel-kokoro-resources/node:8"
+    value: "gcr.io/cloud-devrel-kokoro-resources/node:8-user"
 }
 env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"

diff --git a/.kokoro/docs.sh b/.kokoro/docs.sh
@@ -16,6 +16,8 @@
 
 set -xeo pipefail
 
+export NPM_CONFIG_PREFIX=/home/node/.npm-global
+
 cd $(dirname $0)/..
 
 npm install

diff --git a/.kokoro/lint.sh b/.kokoro/lint.sh
@@ -16,6 +16,8 @@
 
 set -xeo pipefail
 
+export NPM_CONFIG_PREFIX=/home/node/.npm-global
+
 cd $(dirname $0)/..
 
 npm install

diff --git a/.kokoro/presubmit/node10/common.cfg b/.kokoro/presubmit/node10/common.cfg
@@ -16,7 +16,7 @@ build_file: "gcp-metadata/.kokoro/trampoline.sh"
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
     key: "TRAMPOLINE_IMAGE"
-    value: "gcr.io/cloud-devrel-kokoro-resources/node:10"
+    value: "gcr.io/cloud-devrel-kokoro-resources/node:10-user"
 }
 env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"

diff --git a/.kokoro/presubmit/node6/common.cfg b/.kokoro/presubmit/node6/common.cfg
@@ -16,7 +16,7 @@ build_file: "gcp-metadata/.kokoro/trampoline.sh"
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
     key: "TRAMPOLINE_IMAGE"
-    value: "gcr.io/cloud-devrel-kokoro-resources/node:6"
+    value: "gcr.io/cloud-devrel-kokoro-resources/node:6-user"
 }
 env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"

diff --git a/.kokoro/presubmit/node8/common.cfg b/.kokoro/presubmit/node8/common.cfg
@@ -16,7 +16,7 @@ build_file: "gcp-metadata/.kokoro/trampoline.sh"
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
     key: "TRAMPOLINE_IMAGE"
-    value: "gcr.io/cloud-devrel-kokoro-resources/node:8"
+    value: "gcr.io/cloud-devrel-kokoro-resources/node:8-user"
 }
 env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"

diff --git a/.kokoro/samples-test.sh b/.kokoro/samples-test.sh
@@ -16,6 +16,8 @@
 
 set -xeo pipefail
 
+export NPM_CONFIG_PREFIX=/home/node/.npm-global
+
 # Setup service account credentials.
 export GOOGLE_APPLICATION_CREDENTIALS=${KOKORO_GFILE_DIR}/service-account.json
 export GCLOUD_PROJECT=long-door-651

diff --git a/.kokoro/system-test.sh b/.kokoro/system-test.sh
@@ -16,11 +16,19 @@
 
 set -xeo pipefail
 
+export NPM_CONFIG_PREFIX=/home/node/.npm-global
+
 # Setup service account credentials.
 export GOOGLE_APPLICATION_CREDENTIALS=${KOKORO_GFILE_DIR}/service-account.json
+export GCLOUD_PROJECT=long-door-651
 
 cd $(dirname $0)/..
 
+# Run a pre-test hook, if a pre-system-test.sh is in the project
+if [ -f .kokoro/pre-system-test.sh ]; then
+    . .kokoro/pre-system-test.sh
+fi
+
 npm install
 
 npm run system-test
diff --git a/.kokoro/test.sh b/.kokoro/test.sh
@@ -16,6 +16,8 @@
 
 set -xeo pipefail
 
+export NPM_CONFIG_PREFIX=/home/node/.npm-global
+
 cd $(dirname $0)/..
 
 npm install

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "gcp-metadata",
   "version": "0.7.0",
   "description": "Get the metadata from a Google Cloud Platform environment",
-  "repository": "GoogleCloudPlatform/gcp-metadata",
+  "repository": "googleapis/gcp-metadata",
   "main": "./build/src/index.js",
   "types": "./build/src/index.d.ts",
   "files": [

diff --git a/samples/package.json b/samples/package.json
@@ -5,7 +5,7 @@
   "engines": {
     "node": ">=8"
   },
-  "repository": "GoogleCloudPlatform/gcp-metadata",
+  "repository": "googleapis/gcp-metadata",
   "private": true,
   "scripts": {
     "test": "mocha system-test"