Simplified constructors and xray configuration

dvsa · Sep 12, 2024 · a4fed20 · a4fed20
1 parent 0a04749
commit a4fed20
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 47 deletions.
diff --git a/src/config/DependencyInjection.ts b/src/config/DependencyInjection.ts
@@ -0,0 +1,21 @@
+import { Container, Service } from 'typedi';
+import { LambdaClient } from '@aws-sdk/client-lambda';
+import * as AWSXRay from 'aws-xray-sdk';
+import { S3Client } from '@aws-sdk/client-s3';
+import { IInvokeConfig } from '../models';
+import { Configuration } from '../utils/Configuration';
+
+@Service()
+export class DependencyInjection {
+  public static register() {
+    const config: IInvokeConfig = Configuration.getInstance().getInvokeConfig();
+
+    Container.set(LambdaClient, AWSXRay.captureAWSv3Client(new LambdaClient(config.params)));
+    Container.set(S3Client, AWSXRay.captureAWSv3Client(new S3Client(config)));
+
+    const isOffline = (process.env.IS_OFFLINE ?? false) as boolean;
+    if (isOffline) {
+      // Needed for later.
+    }
+  }
+}
diff --git a/src/handler.ts b/src/handler.ts
@@ -1,16 +1,6 @@
 import { certGen } from "./functions/certGen";
+import { DependencyInjection } from "./config/DependencyInjection";
 
-const isOffline: boolean =
-  !process.env.BRANCH || process.env.BRANCH === "local";
+DependencyInjection.register();
 
-let credentials = {};
-
-if (isOffline) {
-  credentials = {
-    accessKeyId: "accessKey1",
-    secretAccessKey: "verySecretKey1",
-  };
-}
-
-export { credentials };
 export { certGen as handler };
diff --git a/src/services/CertificateGenerationService.ts b/src/services/CertificateGenerationService.ts
@@ -1,4 +1,4 @@
-import { Inject, Service } from 'typedi';
+import { Service } from "typedi";
 import { InvocationRequest, InvocationResponse, ServiceException } from "@aws-sdk/client-lambda";
 import { GetObjectOutput } from "@aws-sdk/client-s3";
 import { getProfile } from "@dvsa/cvs-feature-flags/profiles/vtx";
@@ -51,14 +51,9 @@ import { S3BucketService } from "./S3BucketService";
  */
 @Service()
 class CertificateGenerationService {
-  private readonly s3Client: S3BucketService;
-  private readonly config: Configuration;
-  private readonly lambdaClient: LambdaService;
-
-  constructor(@Inject() s3Client: S3BucketService, @Inject() lambdaClient: LambdaService) {
-    this.s3Client = s3Client;
-    this.config = Configuration.getInstance();
-    this.lambdaClient = lambdaClient;
+  private readonly config: Configuration = Configuration.getInstance();
+
+  constructor(private s3Client: S3BucketService, private lambdaClient: LambdaService) {
   }
 
   /**

diff --git a/src/services/CertificateUploadService.ts b/src/services/CertificateUploadService.ts
@@ -1,4 +1,4 @@
-import { Inject, Service } from 'typedi';
+import { Service } from "typedi";
 import { PutObjectCommandOutput } from "@aws-sdk/client-s3";
 import { IGeneratedCertificateResponse } from "../models";
 import { S3BucketService } from "./S3BucketService";
@@ -8,10 +8,7 @@ import { S3BucketService } from "./S3BucketService";
  */
 @Service()
 class CertificateUploadService {
-  private readonly s3BucketService: S3BucketService;
-
-  constructor(@Inject() s3BucketService: S3BucketService) {
-    this.s3BucketService = s3BucketService;
+  constructor(private s3BucketService: S3BucketService) {
   }
 
   /**

diff --git a/src/services/LambdaService.ts b/src/services/LambdaService.ts
@@ -1,22 +1,14 @@
-import { Inject, Service } from 'typedi';
-import { IInvokeConfig } from "../models";
-import { Configuration } from "../utils/Configuration";
+import { Service } from "typedi";
 import { InvocationRequest, InvocationResponse, LambdaClient, InvokeCommand } from "@aws-sdk/client-lambda";
 import { HTTPError } from "../models/HTTPError";
 import { ERRORS } from "../models/Enums";
 
-import AWSXRay from "aws-xray-sdk";
-
 /**
  * Service class for invoking external lambda functions
  */
 @Service()
 class LambdaService {
-  public readonly lambdaClient: LambdaClient;
-
-  constructor(@Inject() lambdaClient: LambdaClient) {
-    const config: IInvokeConfig = Configuration.getInstance().getInvokeConfig();
-    this.lambdaClient = AWSXRay.captureAWSv3Client(new LambdaClient({ ...lambdaClient, ...config.params }));
+  constructor(private lambdaClient: LambdaClient) {
   }
 
   /**

diff --git a/src/services/S3BucketService.ts b/src/services/S3BucketService.ts
@@ -1,20 +1,13 @@
-import { Inject, Service } from 'typedi';
-import {Readable} from "stream";
-import {Configuration} from "../utils/Configuration";
-import {IS3Config} from "../models";
-import AWSXRay from "aws-xray-sdk";
-import {DeleteObjectCommand, DeleteObjectCommandOutput, GetObjectCommand, GetObjectCommandOutput, PutObjectCommand, PutObjectCommandOutput, S3Client} from "@aws-sdk/client-s3";
+import { Service } from "typedi";
+import { Readable } from "stream";
+import { DeleteObjectCommand, DeleteObjectCommandOutput, GetObjectCommand, GetObjectCommandOutput, PutObjectCommand, PutObjectCommandOutput, S3Client } from "@aws-sdk/client-s3";
 
 /**
  * Service class for communicating with Simple Storage Service
  */
 @Service()
 class S3BucketService {
-  public readonly s3Client: S3Client;
-
-  constructor(@Inject() s3Client: S3Client) {
-    const config: IS3Config = Configuration.getInstance().getS3Config();
-    this.s3Client = AWSXRay.captureAWSv3Client(new S3Client({ ...s3Client, ...config }));
+  constructor(private s3Client: S3Client) {
   }
 
   /**