Remove emulator + shims from testing samples

functions/helloworld/index.js

@@ -59,8 +59,8 @@ exports.helloHttp = (req, res) => {
  * @param {object} event The Cloud Functions event.
  * @param {function} callback The callback function.
  */
-exports.helloBackground = (event, callback) => {
-  callback(null, `Hello ${event.data.name || 'World'}!`);
+exports.helloBackground = (data, context, callback) => {
+  callback(null, `Hello ${data.name || 'World'}!`);
 };
 // [END functions_helloworld_background]
 
@@ -70,42 +70,37 @@ exports.helloBackground = (event, callback) => {
  * This function is exported by index.js, and executed when
  * the trigger topic receives a message.
  *
- * @param {object} event The Cloud Functions event.
- * @param {function} callback The callback function.
+ * @param {object} data The event payload.
+ * @param {object} context The event metadata.
  */
-exports.helloPubSub = (event, callback) => {
-  const pubsubMessage = event.data;
-  const name = pubsubMessage.data
-    ? Buffer.from(pubsubMessage.data, 'base64').toString()
+exports.helloPubSub = (data, context) => {
+  const pubSubMessage = data;
+  const name = pubSubMessage.data
+    ? Buffer.from(pubSubMessage.data, 'base64').toString()
     : 'World';
 
   console.log(`Hello, ${name}!`);
-
-  callback();
 };
 // [END functions_helloworld_pubsub]
 
 // [START functions_helloworld_storage]
 /**
  * Background Cloud Function to be triggered by Cloud Storage.
  *
- * @param {object} event The Cloud Functions event.
- * @param {function} callback The callback function.
+ * @param {object} data The event payload.
+ * @param {object} context The event metadata.
  */
-exports.helloGCS = (event, callback) => {
-  const file = event.data;
-
+exports.helloGCS = (data, context) => {
+  const file = data;
   if (file.resourceState === 'not_exists') {
     console.log(`File ${file.name} deleted.`);
   } else if (file.metageneration === '1') {
     // metageneration attribute is updated on metadata changes.
-    // value is 1 if file was newly created or overwritten
+    // on create value is 1
     console.log(`File ${file.name} uploaded.`);
   } else {
     console.log(`File ${file.name} metadata updated.`);
   }
-
-  callback();
 };
 // [END functions_helloworld_storage]
 
@@ -116,11 +111,11 @@ exports.helloGCS = (event, callback) => {
  * @param {object} event The Cloud Functions event.
  * @param {function} callback The callback function.
  */
-exports.helloGCSGeneric = (event, callback) => {
-  const file = event.data;
+exports.helloGCSGeneric = (data, context, callback) => {
+  const file = data;
 
-  console.log(`  Event: ${event.eventId}`);
-  console.log(`  Event Type: ${event.eventType}`);
+  console.log(`  Event: ${context.eventId}`);
+  console.log(`  Event Type: ${context.eventType}`);
   console.log(`  Bucket: ${file.bucket}`);
   console.log(`  File: ${file.name}`);
   console.log(`  Metageneration: ${file.metageneration}`);
@@ -138,7 +133,7 @@ exports.helloGCSGeneric = (event, callback) => {
  * @param {function} callback The callback function.
  */
 
-exports.helloError = (event, callback) => {
+exports.helloError = (data, context, callback) => {
   // [START functions_helloworld_error]
   // These WILL be reported to Stackdriver Error Reporting
   console.error(new Error('I failed you'));
@@ -156,7 +151,7 @@ exports.helloError = (event, callback) => {
  */
 /* eslint-disable no-throw-literal */
 
-exports.helloError2 = (event, callback) => {
+exports.helloError2 = (data, context, callback) => {
   // [START functions_helloworld_error]
   // These will NOT be reported to Stackdriver Error Reporting
   console.info(new Error('I failed you')); // Logging an Error object at the info level
@@ -173,7 +168,7 @@ exports.helloError2 = (event, callback) => {
  * @param {function} callback The callback function.
  */
 /* eslint-disable */
-exports.helloError3 = (event, callback) => {
+exports.helloError3 = (data, context, callback) => {
   // This will NOT be reported to Stackdriver Error Reporting
   // [START functions_helloworld_error]
   callback('I failed you');

functions/helloworld/package.json

@@ -12,25 +12,27 @@
     "node": ">=8.0.0"
   },
   "scripts": {
-    "e2e-test": "export FUNCTIONS_CMD='gcloud functions' && sh test/updateFunctions.sh && BASE_URL=\"https://$GCP_REGION-$GCLOUD_PROJECT.cloudfunctions.net/\" mocha test/*.test.js --timeout=60000 --exit",
-    "test": "export FUNCTIONS_CMD='functions-emulator' && sh test/updateFunctions.sh && export BASE_URL=\"http://localhost:8010/$GCLOUD_PROJECT/$GCF_REGION\" && mocha test/*.test.js --timeout=60000 --exit",
-    "system-test": "export FUNCTIONS_CMD='functions-emulator' && sh test/updateFunctions.sh && export BASE_URL=\"http://localhost:8010/$GCLOUD_PROJECT/$GCF_REGION\" && mocha test/*.test.js --timeout=60000 --exit"
+    "test": "mocha test/*.test.js --timeout=5000 --exit"
   },
   "dependencies": {
     "@google-cloud/debug-agent": "^4.0.0",
     "escape-html": "^1.0.3",
     "pug": "^2.0.3",
-    "safe-buffer": "^5.1.2"
+    "safe-buffer": "^5.1.2",
+    "supertest": "^4.0.2"
   },
   "devDependencies": {
     "@google-cloud/nodejs-repo-tools": "^3.3.0",
     "@google-cloud/pubsub": "^0.28.0",
     "@google-cloud/storage": "^2.0.0",
-    "mocha": "^6.0.0",
+    "child-process-promise": "^2.2.1",
+    "delay": "^4.3.0",
     "express": "^4.16.3",
+    "mocha": "^6.1.4",
     "proxyquire": "^2.1.0",
+    "request": "^2.88.0",
+    "requestretry": "^4.0.0",
     "sinon": "^7.0.0",
-    "supertest": "^4.0.0",
     "uuid": "^3.1.0",
     "yargs": "^13.0.0"
   },