Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 0 additions & 20 deletions src/helpers/logging/__mocks__/logger.js

This file was deleted.

6 changes: 5 additions & 1 deletion src/helpers/logging/logger.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ import { loggerOptions } from '~/src/helpers/logging/logger-options.js'
/**
* Create a logger instance.
*/
export function createLogger() {
function createPinoLogger() {
return pino(loggerOptions)
}

// Singleton logger instance - pino adds 'exit' listeners to process,
// so we reuse a single instance to avoid MaxListenersExceededWarning
export const logger = createPinoLogger()
4 changes: 1 addition & 3 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@ import { chdir } from 'node:process'

import { getErrorMessage } from '@defra/forms-model'

import { createLogger } from '~/src/helpers/logging/logger.js'

const logger = createLogger()
import { logger } from '~/src/helpers/logging/logger.js'

// Move working directory to build output
chdir(import.meta.dirname)
Expand Down
4 changes: 1 addition & 3 deletions src/messaging/event.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
} from '@aws-sdk/client-sqs'

import { config } from '~/src/config/index.js'
import { createLogger } from '~/src/helpers/logging/logger.js'
import { logger } from '~/src/helpers/logging/logger.js'
import { sqsClient } from '~/src/messaging/sqs.js'

export const receiveMessageTimeout = config.get('receiveMessageTimeout')
Expand All @@ -16,8 +16,6 @@ const deadLetterQueueArn = config.get('sqsEventsDlqArn')
const maxNumberOfMessages = config.get('maxNumberOfMessages')
const visibilityTimeout = config.get('visibilityTimeout')

const logger = createLogger()

/**
* @type {ReceiveMessageCommandInput}
*/
Expand Down
8 changes: 7 additions & 1 deletion src/messaging/event.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,13 @@ import {
resubmitDlqMessage
} from '~/src/messaging/event.js'

jest.mock('~/src/helpers/logging/logger.js')
jest.mock('~/src/helpers/logging/logger.js', () => ({
logger: {
error: jest.fn(),
warn: jest.fn(),
info: jest.fn()
}
}))

describe('event', () => {
const snsMock = mockClient(SQSClient)
Expand Down
4 changes: 2 additions & 2 deletions src/plugins/auth/auth.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ const mockActualTestWarnFn = jest.fn()
const mockActualTestInfoFn = jest.fn()

jest.mock('~/src/helpers/logging/logger.js', () => ({
createLogger: jest.fn().mockReturnValue({
logger: {
error: mockActualTestErrorFn,
warn: mockActualTestWarnFn,
info: mockActualTestInfoFn
})
}
}))

jest.mock('~/src/config/index.js', () => ({
Expand Down
4 changes: 1 addition & 3 deletions src/plugins/auth/index.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
import Jwt from '@hapi/jwt'

import { config } from '~/src/config/index.js'
import { createLogger } from '~/src/helpers/logging/logger.js'
import { logger } from '~/src/helpers/logging/logger.js'
import { getUserScopes } from '~/src/service/entitlements/service.js'

const oidcJwksUri = config.get('oidcJwksUri')
const oidcVerifyAud = config.get('oidcVerifyAud')
const oidcVerifyIss = config.get('oidcVerifyIss')

const logger = createLogger()

/**
* Validates user credentials from JWT token
* @param {Artifacts<UserCredentials>} artifacts - JWT artifacts
Expand Down
4 changes: 1 addition & 3 deletions src/routes/admin.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
import { Scopes } from '@defra/forms-model'
import Joi from 'joi'

import { createLogger } from '~/src/helpers/logging/logger.js'
import { logger } from '~/src/helpers/logging/logger.js'
import {
deleteDlqMessage,
receiveDlqMessages,
redriveDlqMessages,
resubmitDlqMessage
} from '~/src/messaging/event.js'

const logger = createLogger()

const OK_RESPONSE = 200

const messageIdSchema = Joi.object({
Expand Down
4 changes: 1 addition & 3 deletions src/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@ import { getErrorMessage } from '@defra/forms-model'

import { createServer } from '~/src/api/server.js'
import { config } from '~/src/config/index.js'
import { createLogger } from '~/src/helpers/logging/logger.js'

const logger = createLogger()
import { logger } from '~/src/helpers/logging/logger.js'

process.on('unhandledRejection', (err) => {
logger.error(
Expand Down
3 changes: 1 addition & 2 deletions src/service/entitlements/service.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import Boom from '@hapi/boom'

import { config } from '~/src/config/index.js'
import { createLogger } from '~/src/helpers/logging/logger.js'
import { logger } from '~/src/helpers/logging/logger.js'
import { getJson } from '~/src/lib/fetch.js'

const entitlementUrl = config.get('entitlementUrl')
const entitlementsEndpoint = new URL('/', entitlementUrl)
const logger = createLogger()

/**
* Fetches user scopes from the entitlements API
Expand Down
2 changes: 1 addition & 1 deletion src/service/entitlements/service.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ describe('entitlements service', () => {
}
}))
jest.doMock('~/src/helpers/logging/logger.js', () => ({
createLogger: jest.fn().mockReturnValue(mockLogger)
logger: mockLogger
}))

const fetchModule = await import('~/src/lib/fetch.js')
Expand Down
4 changes: 1 addition & 3 deletions src/service/events.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,9 @@ import { formAdapterSubmissionMessagePayloadSchema } from '@defra/forms-engine-p
import { getErrorMessage } from '@defra/forms-model'
import Joi from 'joi'

import { createLogger } from '~/src/helpers/logging/logger.js'
import { logger } from '~/src/helpers/logging/logger.js'
import { deleteEventMessage } from '~/src/messaging/event.js'

const logger = createLogger()

/**
* @param {Message} message
* @returns {FormAdapterSubmissionMessage}
Expand Down
8 changes: 7 additions & 1 deletion src/service/events.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,13 @@ import {
} from '~/src/service/events.js'

jest.mock('~/src/messaging/event.js')
jest.mock('~/src/helpers/logging/logger.js')
jest.mock('~/src/helpers/logging/logger.js', () => ({
logger: {
error: jest.fn(),
warn: jest.fn(),
info: jest.fn()
}
}))
jest.mock('~/src/config/index.js', () => ({
config: {
get: jest.fn(() => {
Expand Down
3 changes: 1 addition & 2 deletions src/service/notify.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,14 @@ import { isFeedbackForm, replaceCustomControllers } from '@defra/forms-model'

import { config } from '~/src/config/index.js'
import { getBoomErrorMessage } from '~/src/helpers/logging/error-helper.js'
import { createLogger } from '~/src/helpers/logging/logger.js'
import { logger } from '~/src/helpers/logging/logger.js'
import { getFormDefinition, getFormMetadata } from '~/src/lib/manager.js'
import { sendNotification } from '~/src/lib/notify.js'
import { getFormatter } from '~/src/service/mappers/formatters/index.js'
import { getUserConfirmationEmailBody } from '~/src/service/mappers/user-confirmation.js'

const templateId = config.get('notifyTemplateId')
const notifyReplyToId = config.get('notifyReplyToId')
const logger = createLogger()

/**
* Sends one or more mails to GovNotify
Expand Down
4 changes: 2 additions & 2 deletions src/service/notify.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ import {
} from '~/src/service/notify.js'

jest.mock('~/src/helpers/logging/logger.js', () => ({
createLogger: () => ({
logger: {
info: jest.fn(),
error: jest.fn(),
debug: jest.fn()
})
}
}))
jest.mock('nunjucks', () => {
const environment = {
Expand Down
4 changes: 1 addition & 3 deletions src/tasks/receive-messages.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
import { getErrorMessage } from '@defra/forms-model'

import { createLogger } from '~/src/helpers/logging/logger.js'
import { logger } from '~/src/helpers/logging/logger.js'
import {
receiveEventMessages,
receiveMessageTimeout
} from '~/src/messaging/event.js'
import { handleEvent } from '~/src/service/index.js'

const logger = createLogger()

/**
* @returns {Promise<void>}
*/
Expand Down
8 changes: 7 additions & 1 deletion src/tasks/receive-messages.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,13 @@ import { handleEvent } from '~/src/service/index.js'
import { runTask, runTaskOnce } from '~/src/tasks/receive-messages.js'
jest.mock('~/src/messaging/event.js')
jest.mock('~/src/service/index.js')
jest.mock('~/src/helpers/logging/logger.js')
jest.mock('~/src/helpers/logging/logger.js', () => ({
logger: {
error: jest.fn(),
warn: jest.fn(),
info: jest.fn()
}
}))

describe('receive-messages', () => {
const message = /** @type {Message} */ ({
Expand Down
Loading