Skip to content

Commit 4d0b686

Browse files
barnabycollinsbarnabycollins
authored
Merge pull request #770 from govuk-one-login/OJ-3693
OJ-3693: Remove OTel & fix dependencies
2 parents bf23a4e + 525adbc commit 4d0b686

9 files changed

Lines changed: 4888 additions & 5839 deletions

File tree

‎lambdas/abandon/src/abandon-handler.ts‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { LambdaInterface } from "@aws-lambda-powertools/commons/types";
22
import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from "aws-lambda";
3-
import { initOpenTelemetry } from "../../open-telemetry/src/otel-setup";
43
import { AbandonHandlerConfig } from "./config/abandon-handler-config";
54
import { removeAuthCodeFromSessionRecord } from "./services/abandon-dynamo-service";
65
import { buildAndSendAuditEvent } from "@govuk-one-login/cri-audit";
@@ -9,8 +8,6 @@ import { getSessionBySessionId } from "../../common/src/database/get-record-by-s
98
import { AUDIT_EVENT_TYPE } from "../../common/src/types/audit";
109
import { CriError, formatErrorResponse } from "@govuk-one-login/cri-error-response";
1110

12-
initOpenTelemetry();
13-
1411
export class AbandonHandler implements LambdaInterface {
1512
readonly config: AbandonHandlerConfig;
1613

@@ -43,7 +40,13 @@ export class AbandonHandler implements LambdaInterface {
4340
restricted: { device_information: { encoded: txmaAuditHeader } },
4441
}
4542
: undefined;
46-
await buildAndSendAuditEvent(this.config.audit.queueUrl, AUDIT_EVENT_TYPE.ABANDONED, this.config.audit.componentId, sessionItem, txmaAuditValue);
43+
await buildAndSendAuditEvent(
44+
this.config.audit.queueUrl,
45+
AUDIT_EVENT_TYPE.ABANDONED,
46+
this.config.audit.componentId,
47+
sessionItem,
48+
txmaAuditValue
49+
);
4750

4851
return {
4952
statusCode: 200,

‎lambdas/issue-credential/src/handler.ts‎

Lines changed: 26 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from "aws-lambda";
2-
import { initOpenTelemetry } from "../../open-telemetry/src/otel-setup";
32
import { CriError, formatErrorResponse } from "@govuk-one-login/cri-error-response";
43
import { logger } from "@govuk-one-login/cri-logger";
54
import { retrieveSessionIdByAccessToken } from "./helpers/retrieve-session-by-access-token";
@@ -24,8 +23,6 @@ import { IssueCredFunctionConfig } from "./config/function-config";
2423
import { VcCheckConfig, getVcConfig } from "./config/vc-config";
2524
import { jwtSigner } from "./kms-signer/kms-signer";
2625

27-
initOpenTelemetry();
28-
2926
const functionConfig = new IssueCredFunctionConfig();
3027
let vcConfig: VcCheckConfig;
3128

@@ -64,23 +61,34 @@ class IssueCredentialHandler implements LambdaInterface {
6461
});
6562

6663
const [vcEvidence] = vcClaimSet.vc.evidence || [];
67-
await buildAndSendAuditEvent(functionConfig.audit.queueUrl, AUDIT_EVENT_TYPE.VC_ISSUED, functionConfig.audit.componentId, session, {
68-
restricted: {
69-
birthDate: personIdentity.birthDates,
70-
name: personIdentity.names,
71-
socialSecurityRecord: [
72-
{
73-
personalNumber: ninoUser.nino,
74-
},
75-
],
76-
},
77-
extensions: {
78-
evidence: [getAuditEvidence(attempts, contraIndicators, vcEvidence)],
79-
},
80-
});
64+
await buildAndSendAuditEvent(
65+
functionConfig.audit.queueUrl,
66+
AUDIT_EVENT_TYPE.VC_ISSUED,
67+
functionConfig.audit.componentId,
68+
session,
69+
{
70+
restricted: {
71+
birthDate: personIdentity.birthDates,
72+
name: personIdentity.names,
73+
socialSecurityRecord: [
74+
{
75+
personalNumber: ninoUser.nino,
76+
},
77+
],
78+
},
79+
extensions: {
80+
evidence: [getAuditEvidence(attempts, contraIndicators, vcEvidence)],
81+
},
82+
}
83+
);
8184

8285
captureMetric("VCIssuedMetric");
83-
await buildAndSendAuditEvent(functionConfig.audit.queueUrl, AUDIT_EVENT_TYPE.END, functionConfig.audit.componentId, session);
86+
await buildAndSendAuditEvent(
87+
functionConfig.audit.queueUrl,
88+
AUDIT_EVENT_TYPE.END,
89+
functionConfig.audit.componentId,
90+
session
91+
);
8492

8593
return {
8694
statusCode: 200,

‎lambdas/nino-check/src/handler.ts‎

Lines changed: 28 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from "aws-lambda";
2-
import { initOpenTelemetry } from "../../open-telemetry/src/otel-setup";
32
import { writeCompletedCheck } from "./helpers/write-completed-check";
43
import { NinoCheckFunctionConfig } from "./helpers/function-config";
54
import { saveTxn, handleResponseAndSaveAttempt } from "./helpers/nino";
@@ -20,8 +19,6 @@ import { getAttempts } from "../../common/src/database/get-attempts";
2019
import { buildAndSendAuditEvent } from "@govuk-one-login/cri-audit";
2120
import { AUDIT_EVENT_TYPE } from "../../common/src/types/audit";
2221

23-
initOpenTelemetry();
24-
2522
const MAX_PAST_ATTEMPTS = 1;
2623

2724
type InputBody = {
@@ -92,18 +89,24 @@ class NinoCheckHandler implements LambdaInterface {
9289
}
9390
: undefined;
9491

95-
await buildAndSendAuditEvent(functionConfig.audit.queueUrl, AUDIT_EVENT_TYPE.REQUEST_SENT, functionConfig.audit.componentId, session, {
96-
restricted: {
97-
birthDate: personIdentity.birthDates,
98-
name: personIdentity.names,
99-
socialSecurityRecord: [
100-
{
101-
personalNumber: nino,
102-
},
103-
],
104-
...auditDeviceInformation,
105-
},
106-
});
92+
await buildAndSendAuditEvent(
93+
functionConfig.audit.queueUrl,
94+
AUDIT_EVENT_TYPE.REQUEST_SENT,
95+
functionConfig.audit.componentId,
96+
session,
97+
{
98+
restricted: {
99+
birthDate: personIdentity.birthDates,
100+
name: personIdentity.names,
101+
socialSecurityRecord: [
102+
{
103+
personalNumber: nino,
104+
},
105+
],
106+
...auditDeviceInformation,
107+
},
108+
}
109+
);
107110

108111
logger.info(`REQUEST_SENT event fired.`);
109112

@@ -126,10 +129,16 @@ class NinoCheckHandler implements LambdaInterface {
126129

127130
logger.info(`Saved txn.`);
128131

129-
await buildAndSendAuditEvent(functionConfig.audit.queueUrl, AUDIT_EVENT_TYPE.RESPONSE_RECEIVED, functionConfig.audit.componentId, session, {
130-
restricted: auditDeviceInformation,
131-
extensions: { evidence: { txn: parsedPdvMatchResponse.txn } },
132-
});
132+
await buildAndSendAuditEvent(
133+
functionConfig.audit.queueUrl,
134+
AUDIT_EVENT_TYPE.RESPONSE_RECEIVED,
135+
functionConfig.audit.componentId,
136+
session,
137+
{
138+
restricted: auditDeviceInformation,
139+
extensions: { evidence: { txn: parsedPdvMatchResponse.txn } },
140+
}
141+
);
133142

134143
logger.info(`RESPONSE_RECEIVED event fired.`);
135144

‎lambdas/open-telemetry/package.json‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎lambdas/open-telemetry/src/otel-setup.ts‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎lambdas/open-telemetry/tsconfig.json‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎lambdas/open-telemetry/vitest.config.ts‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)