Improve logging and fix unit test (BL-12568))

Author: andrew-polk

bookCleanup/bookCleanup.test.ts

@@ -110,8 +110,10 @@ describe("bookCleanup", () => {
       Environment.UNITTEST
     );
 
-    await bookCleanupInternal(Environment.UNITTEST);
+    // eslint-disable-next-line @typescript-eslint/no-empty-function
+    await bookCleanupInternal(Environment.UNITTEST, () => {});
   });
+  // eslint-disable-next-line @typescript-eslint/no-empty-function
   beforeEach(async function () {});
   afterAll(async () => {
     await cleanupParse();

bookCleanup/bookCleanup.ts

@@ -1,9 +1,8 @@
-import { Context } from "@azure/functions";
 import BloomParseServer from "../common/BloomParseServer";
 import { deleteFilesByPrefix } from "../common/s3";
 import { Environment } from "../common/utils";
 
-export async function bookCleanupInternal(env: Environment, context: Context) {
+export async function bookCleanupInternal(env: Environment, log: Function) {
   const parseServer = new BloomParseServer(env);
 
   const runInSafeMode = env === Environment.PRODUCTION;
@@ -19,7 +18,7 @@ export async function bookCleanupInternal(env: Environment, context: Context) {
       // Delete files from S3 for partial upload.
       await deleteFilesByPrefix(bookPrefixToDelete, env);
     }
-    context.log(
+    log(
       `${
         runInSafeMode ? "Safe Mode. Would have deleted" : "Deleted"
       } files with prefix ${bookPrefixToDelete} from S3.`
@@ -30,7 +29,7 @@ export async function bookCleanupInternal(env: Environment, context: Context) {
         // Delete new book record which was never fully created.
         await parseServer.deleteBookRecord(book.objectId, sessionToken);
       }
-      context.log(
+      log(
         `${
           runInSafeMode ? "Safe Mode. Would have deleted" : "Deleted"
         } book record with ID ${book.objectId}.`
@@ -46,7 +45,7 @@ export async function bookCleanupInternal(env: Environment, context: Context) {
           sessionToken
         );
       }
-      context.log(
+      log(
         `${
           runInSafeMode ? "Safe Mode. Would have updated" : "Updated"
         } book record with ID ${

bookCleanup/index.ts

@@ -7,20 +7,23 @@ const runEvenIfLocal: boolean = false;
 // See README for schedule of time triggered tasks
 const timerTrigger: AzureFunction = async function (
   context: Context,
-  dailyTimer: any
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  timer: any
 ): Promise<void> {
   // By default, we don't want to run this if we are running the functions locally.
   if (!runEvenIfLocal && isLocalEnvironment()) return;
 
   context.log("bookCleanup trigger function started", new Date().toISOString());
 
-  if (dailyTimer.isPastDue) {
+  if (timer.isPastDue) {
     context.log("bookCleanup trigger function is running late");
   }
 
   try {
-    await bookCleanupInternal(Environment.DEVELOPMENT, context);
-    await bookCleanupInternal(Environment.PRODUCTION, context);
+    context.log("running book cleanup for development");
+    await bookCleanupInternal(Environment.DEVELOPMENT, context.log);
+    context.log("running book cleanup for production");
+    await bookCleanupInternal(Environment.PRODUCTION, context.log);
     context.log("book cleanup succeeded");
   } catch (e) {
     context.log("book cleanup failed", e);