From 46a783a1a7f485a1cf58b7a55fc0ff78c42be06d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hl=C3=B6=C3=B0ver=20Sigur=C3=B0sson?= Date: Tue, 10 Dec 2024 11:57:53 +0200 Subject: [PATCH] feat(functions): explicit appName in app initialiser --- functions/src/add_project_file_on_storage_upload.ts | 5 +++-- functions/src/delete_user.ts | 6 +++--- functions/src/followers_counter.ts | 3 ++- functions/src/following_counter.ts | 5 +++-- functions/src/host.ts | 3 ++- functions/src/new_user.ts | 5 +++-- functions/src/project_file_storage_delete.ts | 5 +++-- functions/src/projects_counter.ts | 5 +++-- 8 files changed, 22 insertions(+), 15 deletions(-) diff --git a/functions/src/add_project_file_on_storage_upload.ts b/functions/src/add_project_file_on_storage_upload.ts index 5188680a..a549c546 100644 --- a/functions/src/add_project_file_on_storage_upload.ts +++ b/functions/src/add_project_file_on_storage_upload.ts @@ -3,8 +3,9 @@ import { initializeApp } from "firebase-admin/app"; import { onObjectFinalized } from "firebase-functions/v2/storage"; import { makeLogger } from "./logger.js"; -initializeApp(); // ensure this is done somewhere in your setup -const log = makeLogger("addProjectFileOnStorageUpload"); +const functionName = "addProjectFileOnStorageUpload"; +initializeApp(undefined, functionName); +const log = makeLogger(functionName); const newTimestamp = admin.firestore.FieldValue.serverTimestamp(); export const addProjectFileOnStorageUploadCallback = onObjectFinalized( diff --git a/functions/src/delete_user.ts b/functions/src/delete_user.ts index 61a509de..4884a021 100644 --- a/functions/src/delete_user.ts +++ b/functions/src/delete_user.ts @@ -3,9 +3,9 @@ import { initializeApp } from "firebase-admin/app"; import functions from "firebase-functions/v1"; import { makeLogger } from "./logger.js"; -const log = makeLogger("deleteUser"); - -initializeApp(); +const functionName = "deleteUser"; +initializeApp(undefined, functionName); +const log = makeLogger(functionName); const deleteUserDocument = async ( user: admin.auth.UserRecord diff --git a/functions/src/followers_counter.ts b/functions/src/followers_counter.ts index 0fcfcc98..6eeb7c24 100644 --- a/functions/src/followers_counter.ts +++ b/functions/src/followers_counter.ts @@ -3,7 +3,8 @@ import { initializeApp } from "firebase-admin/app"; import { onDocumentWritten } from "firebase-functions/v2/firestore"; import { makeLogger } from "./logger.js"; -initializeApp(); +const functionName = "followersCounter"; +initializeApp(undefined, functionName); const log = makeLogger("followersCounter"); export const followersCounter = onDocumentWritten( diff --git a/functions/src/following_counter.ts b/functions/src/following_counter.ts index 2757200c..d3499b88 100644 --- a/functions/src/following_counter.ts +++ b/functions/src/following_counter.ts @@ -3,8 +3,9 @@ import { initializeApp } from "firebase-admin/app"; import { onDocumentWritten } from "firebase-functions/v2/firestore"; import { makeLogger } from "./logger.js"; -initializeApp(); -const log = makeLogger("followersCounter"); +const functionName = "followersCounter"; +initializeApp(undefined, functionName); +const log = makeLogger(functionName); export const followingCounter = onDocumentWritten( "following/{userUid}", diff --git a/functions/src/host.ts b/functions/src/host.ts index 98ede3bc..4e141f3a 100644 --- a/functions/src/host.ts +++ b/functions/src/host.ts @@ -6,7 +6,8 @@ import fs from "node:fs"; import path from "node:path"; import * as R from "ramda"; -initializeApp(); +const functionName = "host"; +initializeApp(undefined, functionName); function printTree(dirPath: string, indent = "") { const files = fs.readdirSync(dirPath); diff --git a/functions/src/new_user.ts b/functions/src/new_user.ts index 9bd4859a..c0368303 100644 --- a/functions/src/new_user.ts +++ b/functions/src/new_user.ts @@ -5,8 +5,9 @@ import { initializeApp } from "firebase-admin/app"; import functions from "firebase-functions/v1"; import { makeLogger } from "./logger.js"; -initializeApp(); -const log = makeLogger("newUser"); +const functionName = "newUser"; +initializeApp(undefined, functionName); +const log = makeLogger(functionName); async function createProfileDocument( user: admin.auth.UserRecord diff --git a/functions/src/project_file_storage_delete.ts b/functions/src/project_file_storage_delete.ts index 2e1738fb..9713cc15 100644 --- a/functions/src/project_file_storage_delete.ts +++ b/functions/src/project_file_storage_delete.ts @@ -4,8 +4,9 @@ import { onDocumentDeleted } from "firebase-functions/v2/firestore"; import { config } from "firebase-functions/v1"; import { makeLogger } from "./logger.js"; -initializeApp(); -const log = makeLogger("projectFileStorageDelete"); +const functionName = "projectFileStorageDelete"; +initializeApp(undefined, functionName); +const log = makeLogger(functionName); async function projectFileStorageDelete(binaryUrl: string): Promise { log( diff --git a/functions/src/projects_counter.ts b/functions/src/projects_counter.ts index aeefabb0..9fd9b0f2 100644 --- a/functions/src/projects_counter.ts +++ b/functions/src/projects_counter.ts @@ -4,8 +4,9 @@ import { FieldValue } from "firebase-admin/firestore"; import { onDocumentWritten } from "firebase-functions/v2/firestore"; import { makeLogger } from "./logger.js"; -initializeApp(); -const log = makeLogger("projectsCounter"); +const functionName = "projectsCounter"; +initializeApp(undefined, functionName); +const log = makeLogger(functionName); export const projectsCounter = onDocumentWritten( "projects/{projectUid}",