Merge pull request #6228 from mozilla/mntor-5024-2

feat(fx breaches): fix breach alerts cron job in fx settings

Author: kschelonka

eslint.config.js

@@ -41,6 +41,7 @@ const config = [
       "dist",
       "coverage",
       "!.storybook",
+      "playwright-report/**",
     ],
   },
   ...compat.config({

jest.config.cjs

@@ -44,6 +44,7 @@ const customJestConfig = {
     "<rootDir>/src/apiMocks/mockData.ts",
     "<rootDir>/src/(.+).stories.(ts|tsx)",
     "<rootDir>/.storybook/",
+    "<rootDir>/src/test/",
   ],
 
   // Indicates which provider should be used to instrument code for coverage

package-lock.json

@@ -16,7 +16,7 @@
     "dev:cron:db-delete-unverified-subscribers": "tsx --tsconfig tsconfig.cronjobs.json src/scripts/cronjobs/deleteUnverifiedSubscribers.ts",
     "dev:cron:db-pull-breaches": "tsx --tsconfig tsconfig.cronjobs.json src/scripts/cronjobs/syncBreaches.ts",
     "dev:cron:db-pull-data-brokers": "tsx --tsconfig tsconfig.cronjobs.json src/scripts/cronjobs/syncOnerepDataBrokers.ts",
-    "dev:cron:remote-settings-pull-breaches": "tsx --tsconfig tsconfig.cronjobs.json src/scripts/cronjobs/updateBreachesInRemoteSettings.ts",
+    "dev:cron:remote-settings-pull-breaches": "tsx --tsconfig tsconfig.cronjobs.json src/scripts/cronjobs/updateBreachesInRemoteSettings/index.ts",
     "dev:cron:onerep-limits-alert": "tsx --tsconfig tsconfig.cronjobs.json src/scripts/cronjobs/onerepStatsAlert.ts",
     "dev:cron:report-lighthouse-results": "tsx --tsconfig tsconfig.cronjobs.json src/scripts/cronjobs/reportLighthouseResults.ts",
     "dev:nimbus": "node --watch-path config/nimbus.yaml src/scripts/build/nimbusTypes.js",
@@ -36,7 +36,7 @@
     "cron:db-delete-unverified-subscribers": "node dist/scripts/cronjobs/deleteUnverifiedSubscribers.js",
     "cron:db-pull-breaches": "node dist/scripts/cronjobs/syncBreaches.js",
     "cron:db-pull-data-brokers": "node dist/scripts/cronjobs/syncOnerepDataBrokers.js",
-    "cron:remote-settings-pull-breaches": "node dist/scripts/cronjobs/updateBreachesInRemoteSettings.js",
+    "cron:remote-settings-pull-breaches": "node dist/scripts/cronjobs/updateBreachesInRemoteSettings/index.js",
     "cron:onerep-limits-alert": "node dist/scripts/cronjobs/onerepStatsAlert.js",
     "cron:report-lighthouse-results": "node dist/scripts/cronjobs/reportLighthouseResults.js",
     "db:migrate": "node -r dotenv-flow/config node_modules/knex/bin/cli.js migrate:latest --knexfile src/db/knexfile.js",
@@ -116,7 +116,8 @@
     "server-only": "^0.0.1",
     "sharp": "^0.34.2",
     "uuid": "^11.1.0",
-    "winston": "^3.17.0"
+    "winston": "^3.17.0",
+    "winston-transport": "^4.9.0"
   },
   "devDependencies": {
     "@eslint/eslintrc": "^3.3.1",

package.json

@@ -2,8 +2,10 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-import { createLogger, transports } from "winston";
+import { createLogger, transports, LoggerOptions } from "winston";
+import Transport from "winston-transport";
 import { LoggingWinston } from "@google-cloud/logging-winston";
+import * as Sentry from "@sentry/node";
 
 // Explicitly not run in tests (and other non-gcpdev environments)
 /* c8 ignore next 7 */
@@ -24,3 +26,26 @@ export const logger = createLogger({
     ? [getLoggingWinston()]
     : [new transports.Console()],
 });
+
+// Automatically capture logger error, warn and forward to Sentry
+// Avoids double-logging
+/* c8 ignore start  */
+// can't be used in tests due to jsdom environment
+// [MNTOR-1880]
+const SentryWinstonTransport = Sentry.createSentryWinstonTransport(Transport, {
+  levels: ["error", "warn"],
+});
+const sentryTransports: LoggerOptions["transports"] = [
+  ["gcpdev"].includes(process.env.APP_ENV ?? "local")
+    ? getLoggingWinston()
+    : new transports.Console(),
+];
+if (Sentry.isInitialized()) {
+  sentryTransports.push(new SentryWinstonTransport());
+}
+
+export const sentryLogger = createLogger({
+  level: "info",
+  transports: sentryTransports,
+});
+/* c8 ignore stop */

src/app/functions/server/logging.ts

@@ -0,0 +1,27 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+/**
+ * Cron: Daily
+ * From all the HIBP breaches, we parse out the new breaches that are not already present
+ * in firefox remote settings, and update the data source accordingly
+ */
+
+import * as Sentry from "@sentry/node";
+
+Sentry.init({
+  environment: process.env.APP_ENV,
+  dsn: process.env.SENTRY_DSN,
+  tracesSampleRate: 1.0,
+});
+
+Sentry.setTag("job", "updateBreachesInRemoteSettings");
+
+import "dotenv-flow/config";
+import { sentryLogger } from "../../../app/functions/server/logging";
+import { main } from "./updateBreachesInRemoteSettings";
+
+await main(sentryLogger);