Skip to content

Commit 6c0662a

Browse files
committed
fix(sentry): Update stale fxa-shared/sentry imports to @fxa/shared/sentry-*
Because: - Post-rebase CI caught remaining references to fxa-shared/sentry that weren't updated when the sentry code was ported to libs. This commit: - Updates fxa-shared/sentry/node to @fxa/shared/sentry-node in auth-server scripts and admin-server audit-tokens - Updates fxa-shared/sentry/browser to @fxa/shared/sentry-browser in fxa-settings pairing-channel - Updates jest.mock paths for sentry-browser and monitoring
1 parent 17be973 commit 6c0662a

11 files changed

Lines changed: 18 additions & 16 deletions

File tree

.claude/scheduled_tasks.lock

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"sessionId":"78971fe0-51e1-4313-ad81-0fcf4877d1e6","pid":29921,"acquiredAt":1776369341739}

packages/fxa-admin-server/src/scripts/audit-tokens.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import program from 'commander';
66
import { StatsD } from 'hot-shots';
77
import * as Sentry from '@sentry/node';
8-
import { initSentry } from 'fxa-shared/sentry/node';
8+
import { initSentry } from '@fxa/shared/sentry-node';
99
import {
1010
setupAuthDatabase,
1111
setupDatabase,

packages/fxa-auth-server/lib/monitoring.spec.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
* License, v. 2.0. If a copy of the MPL was not distributed with this
33
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
44

5-
65
describe('monitoring', () => {
76
let mockInitMonitoring: jest.Mock;
87
let mockIgnoreErrors: jest.Mock;
@@ -29,7 +28,7 @@ describe('monitoring', () => {
2928
.fn()
3029
.mockReturnValue({ name: 'LinkedErrors' });
3130

32-
jest.doMock('fxa-shared/monitoring', () => ({
31+
jest.doMock('@fxa/shared/monitoring', () => ({
3332
initMonitoring: mockInitMonitoring,
3433
}));
3534
jest.doMock('../config', () => ({

packages/fxa-auth-server/scripts/cleanup-old-carts.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
44
import program from 'commander';
55
import * as Sentry from '@sentry/node';
6-
import { initSentry } from 'fxa-shared/sentry/node';
6+
import { initSentry } from '@fxa/shared/sentry-node';
77

88
import { setupProcessingTaskObjects } from '../lib/payments/processing-tasks-setup';
99
import { CartCleanup } from './cleanup-old-carts/cleanup-old-carts';

packages/fxa-auth-server/scripts/delete-inactive-accounts/enqueue-inactive-account-deletions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import path from 'path';
3333
import { promisify } from 'util';
3434

3535
import * as Sentry from '@sentry/node';
36-
import { initSentry } from 'fxa-shared/sentry/node';
36+
import { initSentry } from '@fxa/shared/sentry-node';
3737
import { Command } from 'commander';
3838
import { StatsD } from 'hot-shots';
3939
import { Container } from 'typedi';

packages/fxa-auth-server/scripts/prune-tokens.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { setupDatabase } from 'fxa-shared/db';
77
import { BaseAuthModel } from 'fxa-shared/db/models/auth';
88
import { StatsD } from 'hot-shots';
99
import * as Sentry from '@sentry/node';
10-
import { initSentry } from 'fxa-shared/sentry/node';
10+
import { initSentry } from '@fxa/shared/sentry-node';
1111
import moment from 'moment';
1212
import { SessionToken } from 'fxa-shared/db/models/auth/session-token';
1313
const { PruneTokens } = require('fxa-shared/db/models/auth');

packages/fxa-auth-server/scripts/recorded-future/check-and-reset.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import crypto from 'crypto';
2525
import { promisify } from 'util';
2626

2727
import * as Sentry from '@sentry/node';
28-
import { initSentry } from 'fxa-shared/sentry/node';
28+
import { initSentry } from '@fxa/shared/sentry-node';
2929
import { Command } from 'commander';
3030
import { Container } from 'typedi';
3131
import { StatsD } from 'hot-shots';

packages/fxa-auth-server/scripts/subscription-reminders.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { StatsD } from 'hot-shots';
66
import Container from 'typedi';
77
import { promisify } from 'util';
88
import * as Sentry from '@sentry/node';
9-
import { initSentry } from 'fxa-shared/sentry/node';
9+
import { initSentry } from '@fxa/shared/sentry-node';
1010

1111
import { setupProcessingTaskObjects } from '../lib/payments/processing-tasks-setup';
1212
import { SubscriptionReminders } from '../lib/payments/subscription-reminders';
@@ -115,7 +115,9 @@ async function init() {
115115
monthlyReminderDays: parseInt(program.endingReminderMonthlyLength),
116116
yearlyReminderDays: parseInt(program.endingReminderYearlyLength),
117117
freeTrialReminderDays: parseInt(program.freeTrialEndingReminderLength),
118-
freeTrialEndRemindersEnabled: parseBooleanArg(program.enableFreeTrialEndingReminders),
118+
freeTrialEndRemindersEnabled: parseBooleanArg(
119+
program.enableFreeTrialEndingReminders
120+
),
119121
},
120122
{
121123
monthlyReminderDays: parseInt(program.monthlyRenewalReminderLength),

packages/fxa-auth-server/scripts/verification-reminders.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ const verificationReminders = require('../lib/verification-reminders')(
2525
config
2626
);
2727
const Sentry = require('@sentry/node');
28-
const { initSentry } = require('fxa-shared/sentry/node');
28+
const { initSentry } = require('@fxa/shared/sentry-node');
2929
const pckg = require('../package.json');
3030
const cadReminders = require('../lib/cad-reminders')(config, log);
3131
const subscriptionAccountReminders =

packages/fxa-settings/src/lib/channels/pairing-channel.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jest.mock(
2626
})
2727
);
2828

29-
jest.mock('fxa-shared/sentry/browser', () => ({
29+
jest.mock('@fxa/shared/sentry-browser', () => ({
3030
captureException: jest.fn(),
3131
}));
3232

0 commit comments

Comments
 (0)