fix samples so CI passes

Author: jhuleatt

2nd-gen/alerts-to-discord/functions/index.js

@@ -78,7 +78,7 @@ id: \`${id}\`
     if (response.ok) {
       logger.info(
           `Posted fatal Crashlytics alert ${id} to Discord`,
-          event.payload,
+          event.data.payload,
       );
     } else {
       throw new Error(response.error);

2nd-gen/callable-functions/functions/index.js

@@ -22,12 +22,12 @@ const sanitizer = require("./sanitizer");
 // [START v2allAdd]
 // [START v2addFunctionTrigger]
 // Adds two numbers to each other.
-exports.addnumbers = onCall((data) => {
+exports.addnumbers = onCall((request) => {
   // [END v2addFunctionTrigger]
   // [START v2readAddData]
   // Numbers passed from the client.
-  const firstNumber = data.firstNumber;
-  const secondNumber = data.secondNumber;
+  const firstNumber = request.data.firstNumber;
+  const secondNumber = request.data.secondNumber;
   // [END v2readAddData]
 
 
@@ -89,7 +89,7 @@ exports.addmessage = onCall((data, context) => {
   // Saving the new message to the Realtime Database.
   const sanitizedMessage = sanitizer.sanitizeText(text); // Sanitize message.
 
-  return getDatabase.ref("/messages").push({
+  return getDatabase().ref("/messages").push({
     text: sanitizedMessage,
     author: {uid, name, picture, email},
   }).then(() => {

2nd-gen/callable-functions/functions/sanitizer.js

@@ -39,7 +39,7 @@ exports.sanitizeText = (text) => {
 /**
  * Returns true if the string contains swearwords.
  * @param {string} message
- * @return {string}
+ * @return {boolean}
  */
 function containsSwearwords(message) {
   return message !== badWordsFilter.clean(message);
@@ -58,7 +58,7 @@ function replaceSwearwords(message) {
  * Detect if the current message is shouting. i.e. there are too many Uppercase
  * characters or exclamation points.
  * @param {string} message message to be analyzed
- * @return {string}
+ * @return {boolean}
  */
 function isShouting(message) {
   return message.replace(/[^A-Z]/g, "").length > message.length / 2 ||

2nd-gen/custom-events/functions/index.js

@@ -17,8 +17,8 @@
 // [START import]
 const {onCustomEventPublished} = require("firebase-functions/v2/eventarc");
 const logger = require("firebase-functions/logger");
-const { initializeApp } = require('firebase-admin/app');
-const { getStorage } = require('firebase-admin/storage');
+const {initializeApp} = require("firebase-admin/app");
+const {getStorage} = require("firebase-admin/storage");
 // [END import]
 
 initializeApp();
@@ -33,5 +33,6 @@ exports.onimageresized = onCustomEventPublished(
           .bucket("my-project.appspot.com")
           .file(event.subject)
           .delete();
-    });
+    }
+);
 // [END imageresizedEvent]

2nd-gen/taskqueues-backup-images/functions/index.js

@@ -28,8 +28,8 @@ const HttpsError = functions.https.HttpsError;
 initializeApp();
 
 const BACKUP_START_DATE = new Date("1995-06-17");
-const BACKUP_COUNT = process.env.BACKUP_COUNT || 100;
-const HOURLY_BATCH_SIZE = process.env.HOURLY_BATCH_SIZE || 500;
+const BACKUP_COUNT = parseInt(process.env.BACKUP_COUNT) || 100;
+const HOURLY_BATCH_SIZE = parseInt(process.env.HOURLY_BATCH_SIZE) || 500;
 const BACKUP_BUCKET = process.env.BACKUP_BUCKET;
 
 /**
@@ -47,7 +47,7 @@ exports.backupapod = onTaskDispatched(
         maxConcurrentDispatches: 6,
       },
     }, async (req) => {
-// [END v2TaskFunctionSetup]
+      // [END v2TaskFunctionSetup]
       const date = req.data.date;
       if (!date) {
         logger.warn("Invalid payload. Must include date.");
@@ -100,10 +100,15 @@ exports.backupapod = onTaskDispatched(
 
 
 let auth;
+
+// [START v2GetFunctionUri]
 /**
- * Returns URL of the given v2 google cloud function.
+ * Get the URL of a given v2 cloud function.
+ *
+ * @param {string} name the function's name
+ * @param {string} location the function's location
+ * @return {Promise<string>} The URL of the function
  */
-// [START v2GetFunctionUri]
 async function getFunctionUrl(name, location="us-central1") {
   if (!auth) {
     auth = new GoogleAuth({
@@ -133,7 +138,8 @@ exports.enqueuebackuptasks = onRequest(
       const enqueues = [];
       for (let i = 0; i <= BACKUP_COUNT; i += 1) {
         const iteration = Math.floor(i / HOURLY_BATCH_SIZE);
-        const scheduleDelaySeconds = iteration * (60 * 60); // Delay each batch by N * hour
+        // Delay each batch by N * hour
+        const scheduleDelaySeconds = iteration * (60 * 60);
 
         const backupDate = new Date(BACKUP_START_DATE);
         backupDate.setDate(BACKUP_START_DATE.getDate() + i);

2nd-gen/time-server/functions/index.js

@@ -13,21 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-'use strict';
+"use strict";
 
 // [START v2httpImport]
-const { onRequest } = require('firebase-functions/v2/https');
+const {onRequest} = require("firebase-functions/v2/https");
 // [END v2httpImport]
 
 // [START v2httpAdditionalImports]
-const logger = require('firebase-functions/logger');
+const logger = require("firebase-functions/logger");
 // Moments library to format dates.
-const moment = require('moment');
+const moment = require("moment");
 // [END v2httpAdditionalImports]
 
 // [START v2httpAll]
 /**
- * Returns the server's date. Options `timeoutSeconds` and `region` are optional.
+ * Returns the server's date.
+ * Options `timeoutSeconds` and `region` are optional.
  *
  * You must provide a `format` URL query parameter or `format` value in
  * the request body with which we'll try to format the date.
@@ -43,33 +44,36 @@ const moment = require('moment');
  *        https://us-central1-<project-id>.cloudfunctions.net/date
  */
 // [START v2httpTrigger]
-exports.date = onRequest({ timeoutSeconds: 1200, region: ["us-west1", "us-east1"] }, (req, res) => {
-  // [END v2httpTrigger]
+exports.date = onRequest(
+    {timeoutSeconds: 1200, region: ["us-west1", "us-east1"]},
+    (req, res) => {
+    // [END v2httpTrigger]
 
-  // [START v2httpSendError]
-  // Forbidding PUT requests.
-  if (req.method === 'PUT') {
-    res.status(403).send('Forbidden!');
-    return;
-  }
-  // [END v2httpSendError]
- 
-  // Reading date format from URL query parameter.
-  // [START v2httpReadQueryParam]
-  let format = req.query.format;
-  // [END v2httpReadQueryParam]
+      // [START v2httpSendError]
+      // Forbidding PUT requests.
+      if (req.method === "PUT") {
+        res.status(403).send("Forbidden!");
+        return;
+      }
+      // [END v2httpSendError]
 
-  // Reading date format from request body query parameter
-  if (!format) {
-    // [START v2httpReadBodyParam]
-    format = req.body.format;
-    // [END v2httpReadBodyParam]
-  }
+      // Reading date format from URL query parameter.
+      // [START v2httpReadQueryParam]
+      let format = req.query.format;
+      // [END v2httpReadQueryParam]
 
-  // [START v2httpSendResponse]
-  const formattedDate = moment().format(`${format}`);
-  logger.log('Sending formatted date:', formattedDate);
-  res.status(200).send(formattedDate);
-  // [END v2httpSendResponse]
-});
+      // Reading date format from request body query parameter
+      if (!format) {
+      // [START v2httpReadBodyParam]
+        format = req.body.format;
+      // [END v2httpReadBodyParam]
+      }
+
+      // [START v2httpSendResponse]
+      const formattedDate = moment().format(`${format}`);
+      logger.log("Sending formatted date:", formattedDate);
+      res.status(200).send(formattedDate);
+    // [END v2httpSendResponse]
+    }
+);
 // [END v2httpAll]

authenticated-json-api/functions/index.js

@@ -80,6 +80,7 @@ app.post('/api/messages', async (req, res) => {
   } catch(error) {
     functions.logger.log(
       'Error detecting sentiment or saving message',
+      // @ts-ignore
       error.message
     );
     res.sendStatus(500);
@@ -112,6 +113,7 @@ app.get('/api/messages', async (req, res) => {
 
     res.status(200).json(messages);
   } catch(error) {
+    // @ts-ignore
     functions.logger.log('Error getting messages', error.message);
     res.sendStatus(500);
   }
@@ -138,6 +140,7 @@ app.get('/api/message/:messageId', async (req, res) => {
     functions.logger.log(
       'Error getting message details',
       messageId,
+      // @ts-ignore
       error.message
     );
     return res.sendStatus(500);

image-sharp/functions/package.json

@@ -3,7 +3,7 @@
   "description": "Generate Thumbnail with Sharp Firebase Functions sample",
   "dependencies": {
     "@google-cloud/storage": "^4.3.1",
-    "sharp": "0.23.4",
+    "sharp": "0.30.4",
     "firebase-admin": "^10.0.0",
     "firebase-functions": "^3.16.0"
   },