Update more samples.

Author: jmdobry

functions/background/index.js

@@ -20,16 +20,16 @@
  * Background Cloud Function.
  *
  * @param {object} event The Cloud Functions event.
- * @param {object} event.payload The event payload.
+ * @param {object} event.data The event data.
  * @param {function} The callback function.
  */
 exports.helloWorld = function helloWorld (event, callback) {
-  if (!event.payload.myMessage) {
+  if (!event.data.myMessage) {
     // This is an error case, "myMessage" is required
     callback(new Error('No message defined!'));
   } else {
     // Everything is ok
-    console.log(event.payload.myMessage);
+    console.log(event.data.myMessage);
     callback();
   }
 };
@@ -41,14 +41,14 @@ exports.helloWorld = function helloWorld (event, callback) {
  * a "context" argument to the function.
  *
  * @param {object} event The Cloud Functions event.
- * @param {object} event.payload The event payload.
+ * @param {object} event.data The event data.
  * @returns {Promise}
  */
 exports.helloPromise = function helloPromise (event) {
   const request = require('request-promise');
 
   return request({
-    uri: event.payload.endpoint
+    uri: event.data.endpoint
   });
 };
 // [END helloPromise]
@@ -59,11 +59,11 @@ exports.helloPromise = function helloPromise (event) {
  * a "context" argument to the function.
  *
  * @param {object} event The Cloud Functions event.
- * @param {object} event.payload The event payload.
+ * @param {object} event.data The event data.
  */
 exports.helloSynchronous = function helloSynchronous (event) {
   // This function returns synchronously
-  if (event.payload.something === true) {
+  if (event.data.something === true) {
     return 'Something is true!';
   } else {
     throw new Error('Something was not true!');

functions/background/test/index.test.js

@@ -33,7 +33,7 @@ function getSample () {
 describe(`functions:background`, () => {
   it(`should echo message`, () => {
     const event = {
-      payload: {
+      data: {
         myMessage: `hi`
       }
     };
@@ -43,7 +43,7 @@ describe(`functions:background`, () => {
     sample.program.helloWorld(event, callback);
 
     assert.equal(console.log.callCount, 1);
-    assert.deepEqual(console.log.firstCall.args, [event.payload.myMessage]);
+    assert.deepEqual(console.log.firstCall.args, [event.data.myMessage]);
     assert.equal(callback.callCount, 1);
     assert.deepEqual(callback.firstCall.args, []);
   });
@@ -52,7 +52,7 @@ describe(`functions:background`, () => {
     const error = new Error(`No message defined!`);
     const callback = sinon.stub();
     const sample = getSample();
-    sample.program.helloWorld({ payload: {} }, callback);
+    sample.program.helloWorld({ data: {} }, callback);
 
     assert.equal(callback.callCount, 1);
     assert.deepEqual(callback.firstCall.args, [error]);
@@ -61,7 +61,7 @@ describe(`functions:background`, () => {
   it(`should make a promise request`, () => {
     const sample = getSample();
     const event = {
-      payload: {
+      data: {
         endpoint: `foo.com`
       }
     };
@@ -75,7 +75,7 @@ describe(`functions:background`, () => {
 
   it(`should return synchronously`, () => {
     assert.equal(getSample().program.helloSynchronous({
-      payload: {
+      data: {
         something: true
       }
     }), `Something is true!`);
@@ -84,7 +84,7 @@ describe(`functions:background`, () => {
   it(`should throw an error`, () => {
     assert.throws(() => {
       getSample().program.helloSynchronous({
-        payload: {
+        data: {
           something: false
         }
       });

functions/datastore/README.md

@@ -21,31 +21,31 @@ Functions for your project.
 
 1. Create a Cloud Storage Bucket to stage our deployment:
 
-        gsutil mb gs://[YOUR_BUCKET_NAME]
+        gsutil mb gs://YOUR_BUCKET_NAME
 
-    * Replace `[YOUR_BUCKET_NAME]` with the name of your Cloud Storage Bucket.
+    * Replace `YOUR_BUCKET_NAME` with the name of your Cloud Storage Bucket.
 
 1. Ensure the Cloud Datastore API is enabled:
 
   [Click here to enable the Cloud Datastore API](https://console.cloud.google.com/flows/enableapi?apiid=datastore.googleapis.com&redirect=https://github.com/GoogleCloudPlatform/nodejs-docs-samples/tree/master/functions/datastore)
 
 1. Deploy the "get" function with an HTTP trigger:
 
-        gcloud alpha functions deploy get --stage-bucket [YOUR_BUCKET_NAME] --trigger-http
+        gcloud alpha functions deploy get --stage-bucket YOUR_BUCKET_NAME --trigger-http
 
-    * Replace `[YOUR_BUCKET_NAME]` with the name of your Cloud Storage Bucket.
+    * Replace `YOUR_BUCKET_NAME` with the name of your Cloud Storage Bucket.
 
 1. Deploy the "set" function with an HTTP trigger:
 
-        gcloud alpha functions deploy set --stage-bucket [YOUR_BUCKET_NAME] --trigger-http
+        gcloud alpha functions deploy set --stage-bucket YOUR_BUCKET_NAME --trigger-http
 
-    * Replace `[YOUR_BUCKET_NAME]` with the name of your Cloud Storage Bucket.
+    * Replace `YOUR_BUCKET_NAME` with the name of your Cloud Storage Bucket.
 
 1. Deploy the "del" function with an HTTP trigger:
 
-        gcloud alpha functions deploy del --stage-bucket [YOUR_BUCKET_NAME] --trigger-http
+        gcloud alpha functions deploy del --stage-bucket YOUR_BUCKET_NAME --trigger-http
 
-    * Replace `[YOUR_BUCKET_NAME]` with the name of your Cloud Storage Bucket.
+    * Replace `YOUR_BUCKET_NAME` with the name of your Cloud Storage Bucket.
 
 1. Call the "set" function to create a new entity:
 

functions/errorreporting/index.js

@@ -1,27 +1,29 @@
-// Copyright 2016, Google, Inc.
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+/**
+ * Copyright 2016, Google, Inc.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
 'use strict';
 
 // [START setup]
-var Logging = require('@google-cloud/logging');
+const Logging = require('@google-cloud/logging');
 
-// Instantiate a logging client
-var logging = Logging();
+// Instantiates a client
+const logging = Logging();
 // [END setup]
 
 // [START reportDetailedError]
-var reportDetailedError = require('./report');
+const reportDetailedError = require('./report');
 // [END reportDetailedError]
 
 // [START helloSimpleErrorReport]
@@ -36,22 +38,22 @@ function reportError (err, callback) {
   // This is the name of the StackDriver log stream that will receive the log
   // entry. This name can be any valid log stream name, but must contain "err"
   // in order for the error to be picked up by StackDriver Error Reporting.
-  var logName = 'errors';
-  var log = logging.log(logName);
+  const logName = 'errors';
+  const log = logging.log(logName);
 
   // https://cloud.google.com/logging/docs/api/ref_v2beta1/rest/v2beta1/MonitoredResource
-  var monitoredResource = {
+  const monitoredResource = {
     type: 'cloud_function',
     labels: {
       function_name: process.env.FUNCTION_NAME
     }
   };
 
   // https://cloud.google.com/error-reporting/reference/rest/v1beta1/ErrorEvent
-  var errorEvent = {
+  const errorEvent = {
     message: err.stack,
     serviceContext: {
-      service: 'cloud_function:' + process.env.FUNCTION_NAME,
+      service: `cloud_function:${process.env.FUNCTION_NAME}`,
       version: require('./package.json').version || 'unknown'
     }
   };
@@ -65,23 +67,23 @@ function reportError (err, callback) {
 /**
  * HTTP Cloud Function.
  *
- * @param {Object} req Cloud Function request object.
- * @param {Object} res Cloud Function response object.
+ * @param {object} req Cloud Function request context.
+ * @param {object} res Cloud Function response context.
  */
 exports.helloSimpleError = function helloSimpleError (req, res) {
   try {
     if (req.method !== 'GET') {
-      var error = new Error('Only GET requests are accepted!');
+      const error = new Error('Only GET requests are accepted!');
       error.code = 405;
       throw error;
     }
     // All is good, respond to the HTTP request
-    return res.send('Hello World!');
+    res.send('Hello World!');
   } catch (err) {
     // Report the error
-    return reportError(err, function () {
+    reportError(err, () => {
       // Now respond to the HTTP request
-      return res.status(error.code || 500).send(err.message);
+      res.status(err.code || 500).send(err.message);
     });
   }
 };
@@ -91,25 +93,27 @@ exports.helloSimpleError = function helloSimpleError (req, res) {
 /**
  * HTTP Cloud Function.
  *
- * @param {Object} req Cloud Function request object.
- * @param {Object} res Cloud Function response object.
+ * @param {object} req Cloud Function request context.
+ * @param {object} req.body The request body.
+ * @param {string} req.body.message Message provided in the request.
+ * @param {object} res Cloud Function response context.
  */
 exports.helloHttpError = function helloHttpError (req, res) {
   try {
     if (req.method !== 'POST' && req.method !== 'GET') {
-      var error = new Error('Only POST and GET requests are accepted!');
+      const error = new Error('Only POST and GET requests are accepted!');
       error.code = 405;
       throw error;
     }
     // All is good, respond to the HTTP request
-    return res.send('Hello ' + (req.body.message || 'World') + '!');
+    res.send(`Hello ${req.body.message || 'World'}!`);
   } catch (err) {
     // Set the response status code before reporting the error
     res.status(err.code || 500);
     // Report the error
-    return reportDetailedError(err, req, res, function () {
+    reportDetailedError(err, req, res, () => {
       // Now respond to the HTTP request
-      return res.send(err.message);
+      res.send(err);
     });
   }
 };
@@ -119,22 +123,23 @@ exports.helloHttpError = function helloHttpError (req, res) {
 /**
  * Background Cloud Function.
  *
- * @param {Object} context Cloud Function context object.
- * @param {Object} data Request data, provided by a trigger.
- * @param {string} data.message Message, provided by the trigger.
+ * @param {object} event The Cloud Functions event.
+ * @param {object} event.data The event data.
+ * @param {string} event.data.message Message, provided by the trigger.
+ * @param {function} The callback function.
  */
-exports.helloBackgroundError = function helloBackgroundError (context, data) {
+exports.helloBackgroundError = function helloBackgroundError (event, callback) {
   try {
-    if (!data.message) {
+    if (!event.data.message) {
       throw new Error('"message" is required!');
     }
     // All is good, respond with a message
-    return context.success('Hello World!');
+    callback(null, 'Hello World!');
   } catch (err) {
     // Report the error
-    return reportDetailedError(err, function () {
-      // Now finish mark the execution failure
-      return context.failure(err.message);
+    reportDetailedError(err, () => {
+      // Now finish and mark the execution as a failure
+      callback(err);
     });
   }
 };

functions/errorreporting/package.json

@@ -9,9 +9,9 @@
     "test": "mocha -R spec -t 120000 --require intelli-espower-loader ../../test/_setup.js test/*.test.js"
   },
   "dependencies": {
-    "@google-cloud/logging": "^0.1.1"
+    "@google-cloud/logging": "^0.5.0"
   },
   "devDependencies": {
-    "mocha": "^3.0.2"
+    "mocha": "^3.1.2"
   }
 }