VIA-537 SB & AS No need to qualify with "lazy" now it's the only game in town.

Author: acerathereinspirative-nhs-nvir

auth.ts

@@ -5,7 +5,7 @@ import { getToken } from "@src/utils/auth/callbacks/get-token";
 import { getUpdatedSession } from "@src/utils/auth/callbacks/get-updated-session";
 import { isValidSignIn } from "@src/utils/auth/callbacks/is-valid-signin";
 import { MaxAgeInSeconds } from "@src/utils/auth/types";
-import lazyConfig from "@src/utils/lazy-config";
+import config from "@src/utils/config";
 import { logger } from "@src/utils/logger";
 import { profilePerformanceEnd, profilePerformanceStart } from "@src/utils/performance";
 import { RequestContext, asyncLocalStorage } from "@src/utils/requestContext";
@@ -21,15 +21,15 @@ const AuthJWTPerformanceMarker = "auth-jwt-callback";
 const AuthSessionPerformanceMarker = "auth-session-callback";
 
 export const { handlers, signIn, signOut, auth } = NextAuth(async () => {
-  const MAX_SESSION_AGE_SECONDS: number = ((await lazyConfig.MAX_SESSION_AGE_MINUTES) as number) * 60;
+  const MAX_SESSION_AGE_SECONDS: number = ((await config.MAX_SESSION_AGE_MINUTES) as number) * 60;
   const headerValues = await headers();
 
   const requestContext: RequestContext = extractRequestContextFromHeaders(headerValues);
 
   return await asyncLocalStorage.run(requestContext, async () => {
     return {
       providers: [await NHSLoginAuthProvider()],
-      secret: (await lazyConfig.AUTH_SECRET) as string,
+      secret: (await config.AUTH_SECRET) as string,
       pages: {
         signIn: SSO_FAILURE_ROUTE,
         signOut: SESSION_LOGOUT_ROUTE,

contract/fetch-eligibility-content.contract.ts

@@ -1,13 +1,13 @@
 import { NhsNumber } from "@src/models/vaccine";
 import { EligibilityApiResponse } from "@src/services/eligibility-api/api-types";
 import { fetchEligibilityContent } from "@src/services/eligibility-api/gateway/fetch-eligibility-content";
-import lazyConfig from "@src/utils/lazy-config";
+import config from "@src/utils/config";
 import { asyncLocalStorage } from "@src/utils/requestContext";
-import { AsyncConfigMock, lazyConfigBuilder } from "@test-data/config/builders";
+import { AsyncConfigMock, configBuilder } from "@test-data/config/builders";
 import { readFileSync } from "fs";
 import { pactWith } from "jest-pact";
 
-jest.mock("@src/utils/lazy-config");
+jest.mock("@src/utils/config");
 jest.mock("next-auth/jwt", () => ({
   getToken: jest.fn(),
 }));
@@ -40,10 +40,10 @@ const successfulResponse: EligibilityApiResponse = {
 };
 
 pactWith({ consumer: "VitA", provider: "EliD", port: 1234, logLevel: "warn" }, (provider) => {
-  const mockedConfig = lazyConfig as AsyncConfigMock;
+  const mockedConfig = config as AsyncConfigMock;
 
   beforeEach(() => {
-    const defaultConfig = lazyConfigBuilder()
+    const defaultConfig = configBuilder()
       .withEligibilityApiEndpoint(new URL("http://localhost:1234/"))
       .andEligibilityApiKey("test-api-key")
       .andIsApimAuthEnabled(false)

src/_lambda/content-cache-hydrator/content-cache-reader.test.ts

@@ -5,8 +5,8 @@ import {
 import { VaccineInfo, VaccineType } from "@src/models/vaccine";
 import { readContentFromCache } from "@src/services/content-api/gateway/content-reader-service";
 import { InvalidatedCacheError, S3NoSuchKeyError } from "@src/services/content-api/gateway/exceptions";
-import lazyConfig from "@src/utils/lazy-config";
-import { AsyncConfigMock, lazyConfigBuilder } from "@test-data/config/builders";
+import config from "@src/utils/config";
+import { AsyncConfigMock, configBuilder } from "@test-data/config/builders";
 
 jest.mock("@src/services/content-api/gateway/content-reader-service");
 jest.mock("sanitize-data", () => ({ sanitize: jest.fn() }));
@@ -16,10 +16,10 @@ const mockContentCachePath = "wiremock/__files/";
 describe("readCachedContentForVaccine", () => {
   const mockCacheFileContents = "mock-cache-file-contents";
   const vaccineType = VaccineType.RSV;
-  const mockedConfig = lazyConfig as AsyncConfigMock;
+  const mockedConfig = config as AsyncConfigMock;
 
   beforeEach(() => {
-    const defaultConfig = lazyConfigBuilder().withContentCachePath(mockContentCachePath).build();
+    const defaultConfig = configBuilder().withContentCachePath(mockContentCachePath).build();
     Object.assign(mockedConfig, defaultConfig);
     (readContentFromCache as jest.Mock).mockImplementation((): string => mockCacheFileContents);
   });

src/_lambda/content-cache-hydrator/content-cache-reader.ts

@@ -1,7 +1,7 @@
 import { Filename, VaccineInfo, VaccineType } from "@src/models/vaccine";
 import { readContentFromCache } from "@src/services/content-api/gateway/content-reader-service";
 import { InvalidatedCacheError, S3NoSuchKeyError } from "@src/services/content-api/gateway/exceptions";
-import lazyConfig from "@src/utils/lazy-config";
+import config from "@src/utils/config";
 import { logger } from "@src/utils/logger";
 
 const log = logger.child({ module: "content-cache-reader" });
@@ -16,11 +16,7 @@ const readCachedContentForVaccine = async (vaccineType: VaccineType): Promise<Re
   let cachedContent: string;
 
   try {
-    cachedContent = await readContentFromCache(
-      (await lazyConfig.CONTENT_CACHE_PATH) as string,
-      cacheFilename,
-      vaccineType,
-    );
+    cachedContent = await readContentFromCache((await config.CONTENT_CACHE_PATH) as string, cacheFilename, vaccineType);
   } catch (error) {
     if (error instanceof S3NoSuchKeyError) {
       return { cacheStatus: "empty", cacheContent: "" };

src/_lambda/content-cache-hydrator/content-fetcher.test.ts

@@ -1,7 +1,7 @@
 import { CONTENT_API_PATH_PREFIX, fetchContentForVaccine } from "@src/_lambda/content-cache-hydrator/content-fetcher";
 import { VaccineInfo, VaccineType } from "@src/models/vaccine";
-import lazyConfig from "@src/utils/lazy-config";
-import { AsyncConfigMock, lazyConfigBuilder } from "@test-data/config/builders";
+import config from "@src/utils/config";
+import { AsyncConfigMock, configBuilder } from "@test-data/config/builders";
 import axios from "axios";
 
 jest.mock("axios");
@@ -11,13 +11,10 @@ describe("fetchContentForVaccine", () => {
   const testApiKey: string = "test-key";
   const testApiEndpoint: URL = new URL("https://test-endpoint/");
   const testApiContent = { test: "content" };
-  const mockedConfig = lazyConfig as AsyncConfigMock;
+  const mockedConfig = config as AsyncConfigMock;
 
   beforeEach(() => {
-    const defaultConfig = lazyConfigBuilder()
-      .withContentApiKey(testApiKey)
-      .andContentApiEndpoint(testApiEndpoint)
-      .build();
+    const defaultConfig = configBuilder().withContentApiKey(testApiKey).andContentApiEndpoint(testApiEndpoint).build();
     Object.assign(mockedConfig, defaultConfig);
   });
 

src/_lambda/content-cache-hydrator/content-fetcher.ts

@@ -1,15 +1,15 @@
 import { VaccineInfo, VaccineType } from "@src/models/vaccine";
-import lazyConfig from "@src/utils/lazy-config";
+import config from "@src/utils/config";
 import { logger } from "@src/utils/logger";
 import axios, { AxiosError, AxiosResponse } from "axios";
 
 const log = logger.child({ module: "content-fetcher" });
 const CONTENT_API_PATH_PREFIX = "nhs-website-content/";
 
 const fetchContentForVaccine = async (vaccineType: VaccineType): Promise<string> => {
-  const apiEndpoint: URL = (await lazyConfig.CONTENT_API_ENDPOINT) as URL;
+  const apiEndpoint: URL = (await config.CONTENT_API_ENDPOINT) as URL;
   const vaccinePath = VaccineInfo[vaccineType].contentPath;
-  const apiKey: string = (await lazyConfig.CONTENT_API_KEY) as string;
+  const apiKey: string = (await config.CONTENT_API_KEY) as string;
 
   const uri: string = `${apiEndpoint}${CONTENT_API_PATH_PREFIX}${vaccinePath}`;
   let response: AxiosResponse;

src/_lambda/content-cache-hydrator/content-writer-service.test.ts

@@ -8,8 +8,8 @@ import {
   writeContentForVaccine,
 } from "@src/_lambda/content-cache-hydrator/content-writer-service";
 import { Filename, VaccineInfo, VaccineType } from "@src/models/vaccine";
-import lazyConfig from "@src/utils/lazy-config";
-import { AsyncConfigMock, lazyConfigBuilder } from "@test-data/config/builders";
+import config from "@src/utils/config";
+import { AsyncConfigMock, configBuilder } from "@test-data/config/builders";
 import { writeFile } from "node:fs/promises";
 
 jest.mock("node:fs/promises");
@@ -29,11 +29,11 @@ describe("Content Writer Service", () => {
   const location: string = "test-location/";
   const path: Filename = "test-filename.json" as Filename;
   const content: string = "test-data";
-  const mockedConfig = lazyConfig as AsyncConfigMock;
+  const mockedConfig = config as AsyncConfigMock;
 
   beforeEach(() => {
     mockSend = jest.fn();
-    const defaultConfig = lazyConfigBuilder().withContentCachePath(location).build();
+    const defaultConfig = configBuilder().withContentCachePath(location).build();
     Object.assign(mockedConfig, defaultConfig);
   });
 

src/_lambda/content-cache-hydrator/content-writer-service.ts

@@ -1,7 +1,7 @@
 import { PutObjectCommand, S3Client } from "@aws-sdk/client-s3";
 import { Filename, VaccineInfo, VaccineType } from "@src/models/vaccine";
+import config from "@src/utils/config";
 import { AWS_PRIMARY_REGION } from "@src/utils/constants";
-import lazyConfig from "@src/utils/lazy-config";
 import { logger } from "@src/utils/logger";
 import { S3_PREFIX, isS3Path } from "@src/utils/path";
 import { writeFile } from "node:fs/promises";
@@ -39,7 +39,7 @@ const _writeContentToCache = async (
 
 const writeContentForVaccine = async (vaccineType: VaccineType, vaccineContent: string) => {
   const cacheFilename = VaccineInfo[vaccineType].cacheFilename;
-  await _writeContentToCache((await lazyConfig.CONTENT_CACHE_PATH) as string, cacheFilename, vaccineContent);
+  await _writeContentToCache((await config.CONTENT_CACHE_PATH) as string, cacheFilename, vaccineContent);
 };
 
 export { _writeFileS3, _writeContentToCache, writeContentForVaccine };

src/_lambda/content-cache-hydrator/handler.test.ts

@@ -10,9 +10,9 @@ import { invalidateCacheForVaccine } from "@src/_lambda/content-cache-hydrator/i
 import { VaccineType } from "@src/models/vaccine";
 import { getFilteredContentForVaccine } from "@src/services/content-api/parsers/content-filter-service";
 import { getStyledContentForVaccine } from "@src/services/content-api/parsers/content-styling-service";
-import lazyConfig from "@src/utils/lazy-config";
+import config from "@src/utils/config";
 import { RequestContext, asyncLocalStorage } from "@src/utils/requestContext";
-import { AsyncConfigMock, lazyConfigBuilder } from "@test-data/config/builders";
+import { AsyncConfigMock, configBuilder } from "@test-data/config/builders";
 import { Context } from "aws-lambda";
 
 jest.mock("@src/_lambda/content-cache-hydrator/content-writer-service");
@@ -53,10 +53,10 @@ describe("Lambda Handler", () => {
   });
 
   describe("when content-change-approval-needed feature disabled", () => {
-    const mockedConfig = lazyConfig as AsyncConfigMock;
+    const mockedConfig = config as AsyncConfigMock;
 
     beforeEach(() => {
-      const defaultConfig = lazyConfigBuilder().withContentCacheIsChangeApprovalEnabled(false).build();
+      const defaultConfig = configBuilder().withContentCacheIsChangeApprovalEnabled(false).build();
       Object.assign(mockedConfig, defaultConfig);
     });
 
@@ -100,10 +100,10 @@ describe("Lambda Handler", () => {
   });
 
   describe("when content-change-approval-needed feature enabled", () => {
-    const mockedConfig = lazyConfig as AsyncConfigMock;
+    const mockedConfig = config as AsyncConfigMock;
 
     beforeEach(() => {
-      const defaultConfig = lazyConfigBuilder().withContentCacheIsChangeApprovalEnabled(true).build();
+      const defaultConfig = configBuilder().withContentCacheIsChangeApprovalEnabled(true).build();
       Object.assign(mockedConfig, defaultConfig);
     });
 

src/_lambda/content-cache-hydrator/handler.ts

@@ -7,7 +7,7 @@ import { VaccineType } from "@src/models/vaccine";
 import { getFilteredContentForVaccine } from "@src/services/content-api/parsers/content-filter-service";
 import { getStyledContentForVaccine } from "@src/services/content-api/parsers/content-styling-service";
 import { VaccinePageContent } from "@src/services/content-api/types";
-import lazyConfig from "@src/utils/lazy-config";
+import config from "@src/utils/config";
 import { logger } from "@src/utils/logger";
 import { getVaccineTypeFromLowercaseString } from "@src/utils/path";
 import { RequestContext, asyncLocalStorage } from "@src/utils/requestContext";
@@ -150,7 +150,7 @@ const runContentCacheHydrator = async (event: ContentCacheHydratorEvent) => {
   for (const vaccine of vaccinesToRunOn) {
     const status = await hydrateCacheForVaccine(
       vaccine,
-      (await lazyConfig.CONTENT_CACHE_IS_CHANGE_APPROVAL_ENABLED) as boolean,
+      (await config.CONTENT_CACHE_IS_CHANGE_APPROVAL_ENABLED) as boolean,
       forceUpdate,
     );
     invalidatedCount += status.invalidatedCount;