@squiz/job-runner-lib 2.3.0 → 2.5.0

package/lib/jest-global-setup.d.ts

@@ -1 +1,6 @@
-export declare const testLogger: import("winston").Logger;
+/*!
+ * @license
+ * Copyright Squiz Australia Pty Ltd. All Rights Reserved.
+ */
+import { Logger } from '@squiz/optimization-logger';
+export declare const testLogger: Logger;

package/lib/mocks/mockIoc.d.ts

@@ -1,5 +1,5 @@
+import { Logger } from '@squiz/optimization-logger';
 import { Container } from 'inversify';
-import { Logger } from '@squiz/dx-logger-lib';
 declare let iocContainer: Container;
-declare function initIocContainer(log: Logger): void;
-export { iocContainer, initIocContainer };
+declare function initIocContainer(logger?: Logger): void;
+export { initIocContainer, iocContainer };

package/lib/utils/buildJobRunnerModule/buildJobRunnerModule.d.ts

@@ -0,0 +1,2 @@
+import { CreateJobRunnerModuleProps, CreateJobRunnerModuleResult } from './buildJobRunnerModule.types';
+export declare const buildJobRunnerModule: (props: CreateJobRunnerModuleProps) => CreateJobRunnerModuleResult;

package/lib/utils/buildJobRunnerModule/buildJobRunnerModule.types.d.ts

@@ -0,0 +1,14 @@
+import { Logger } from '@squiz/optimization-logger';
+import { ContainerModule } from 'inversify';
+export type CreateJobRunnerModuleProps = {
+    dynamoTableName: string;
+    jobUploadsBucket: string;
+    jobDetailsBucket: string;
+    awsRegion: string;
+    local: boolean;
+    jobStartQueueUrl?: string;
+};
+export type CreateJobRunnerModuleResult = (props: {
+    tenant?: string;
+    logger: Logger;
+}) => ContainerModule;

package/lib/utils/index.d.ts

@@ -0,0 +1,2 @@
+export * from './buildJobRunnerModule/buildJobRunnerModule';
+export * from './buildJobRunnerModule/buildJobRunnerModule.types';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@squiz/job-runner-lib",
-  "version": "2.3.0",
+  "version": "2.5.0",
   "description": "",
   "main": "lib/index.js",
   "private": false,
@@ -18,32 +18,33 @@
   "license": "ISC",
   "devDependencies": {
     "@faker-js/faker": "8.0.2",
-    "@squiz/virus-scanner-lib": "^1.67.0",
+    "@smithy/util-stream": "^4.2.3",
+    "@squiz/virus-scanner-lib": "^1.68.0",
     "@types/cli-color": "2.0.6",
     "@types/fs-extra": "11.0.1",
     "@types/jest": "28.1.8",
     "@types/node": "22.9.0",
     "aws-sdk-client-mock": "^2.2.0",
     "aws-sdk-client-mock-jest": "^2.2.0",
-    "dotenv": "16.0.3",
     "esbuild": "^0.25.8"
   },
   "dependencies": {
-    "@aws-sdk/client-dynamodb": "3.848.0",
-    "@aws-sdk/client-ecs": "3.848.0",
-    "@aws-sdk/client-s3": "3.850.0",
-    "@aws-sdk/s3-request-presigner": "3.850.0",
+    "@aws-sdk/client-dynamodb": "3.1003.0",
+    "@aws-sdk/client-ecs": "3.1003.0",
+    "@aws-sdk/client-s3": "3.1003.0",
+    "@aws-sdk/client-sqs": "3.1003.0",
+    "@aws-sdk/s3-request-presigner": "3.1003.0",
     "@squiz/dx-common-lib": "^1.66.1",
     "@squiz/dx-json-schema-lib": "1.78.1",
     "@squiz/dx-logger-lib": "^1.64.0",
-    "axios": "1.11.0",
+    "@squiz/optimization-logger": "^1.9.0",
+    "axios": "^1.13.6",
     "cli-color": "^2.0.4",
-    "dotenv": "16.0.3",
     "fs-extra": "11.1.0",
+    "immer": "^10.1.3",
     "inversify": "6.0.1",
     "inversify-binding-decorators": "4.0.0",
     "reflect-metadata": "^0.1.13",
-    "tsoa": "5.1.1",
-    "winston": "3.8.2"
+    "zod": "^4.0.17"
   }
 }

package/src/domains/component/errors/JobError.spec.ts

@@ -0,0 +1,30 @@
+import { faker } from '@faker-js/faker';
+import { JobError } from './JobError';
+
+describe('JobError', () => {
+  const requestId = faker.string.uuid();
+  const functionName = faker.lorem.word();
+  const jobName = faker.lorem.words();
+  const jobVersion = faker.system.semver();
+
+  it('Inherits the message and stack of the provided Error instance', () => {
+    const error = new Error('Job code failed');
+    const jobError = new JobError(requestId, error, functionName, jobName, jobVersion);
+
+    expect(jobError.message).toBe(error.message);
+    expect(jobError.stack).toBe(error.stack);
+  });
+
+  it('Inherits the message of the provided string', () => {
+    const error = 'Job code failed';
+    const jobError = new JobError(requestId, error, functionName, jobName, jobVersion);
+
+    expect(jobError.message).toBe(error);
+  });
+
+  it.each([undefined, null, '', false, true])('Uses a generic message when the error is %s', (error: unknown) => {
+    const jobError = new JobError(requestId, error, functionName, jobName, jobVersion);
+
+    expect(jobError.message).toBe('An error occurred with no additional information available');
+  });
+});

package/src/domains/component/errors/JobError.ts

@@ -13,8 +13,15 @@ export class JobError extends ErrorWithHttpStatusCode {
 
     statusCode: number = 500,
   ) {
-    super(statusCode, error?.message || 'An error occurred with no additional information available');
+    let message = 'An error occurred with no additional information available';
 
+    if (typeof error === 'string' && error) {
+      message = error;
+    } else if (error?.message) {
+      message = error.message;
+    }
+
+    super(statusCode, message);
     this.stack = error?.stack;
   }
 }

package/src/domains/job/ParsePartitionKey/ParsePartitionKey.spec.ts

@@ -3,25 +3,34 @@
  * Copyright Squiz Australia Pty Ltd. All Rights Reserved.
  */
 
+import { faker } from '@faker-js/faker';
 import { parsePartitionKey } from './ParsePartitionKey';
 import { InternalServerError } from '../errors';
+import { ENTITY_TYPES } from '../constants/Repository.constants';
 
 describe('parsePartitionKey', () => {
-  it('should parse "job"', () => {
-    expect(parsePartitionKey('job')).toBe('job');
-  });
+  const tenant = faker.string.uuid();
 
-  it('should parse "manifest"', () => {
-    expect(parsePartitionKey('manifest')).toBe('manifest');
+  it.each([
+    [ENTITY_TYPES.context, `${ENTITY_TYPES.context}~${tenant}`],
+    [ENTITY_TYPES.job, `${ENTITY_TYPES.job}~${tenant}`],
+    [ENTITY_TYPES.jobExecution, `${ENTITY_TYPES.jobExecution}~${tenant}`],
+    [ENTITY_TYPES.manifest, `${ENTITY_TYPES.manifest}~${tenant}`],
+  ])('should parse %s partition key', (entityType: string, pk: string) => {
+    expect(parsePartitionKey(pk)).toEqual({ entityType, tenant });
   });
 
-  it('should parse "context"', () => {
-    expect(parsePartitionKey('context')).toBe('context');
-  });
   it('should throw an error for an invalid status', () => {
     const invalidType = 'invalid';
     expect(() => parsePartitionKey(invalidType)).toThrow(
       new InternalServerError(`'${invalidType}' is an invalid type`),
     );
   });
+
+  it('should throw if an invalid multi-tenant partition key is provided', () => {
+    const invalidType = `invalid~${tenant}`;
+    expect(() => parsePartitionKey(invalidType)).toThrow(
+      new InternalServerError(`'${invalidType}' is an invalid type`),
+    );
+  });
 });

package/src/domains/job/ParsePartitionKey/ParsePartitionKey.ts

@@ -1,19 +1,16 @@
-import { JobExecutionPk, PARTITION_KEYS, PartitionKey } from '../constants/Repository.constants';
-import { InternalServerError } from '../errors/InternalServerError';
+import { ENTITY_TYPES, EntityType } from '../constants/Repository.constants';
+import { ParsePartitionKeyResult } from './ParsePartitionKey.types';
+import { InternalServerError } from '../errors';
 
-export function parsePartitionKey(type: string): PartitionKey | JobExecutionPk {
-  if (type.startsWith('jobExecution')) {
-    return type;
-  } else {
-    switch (type) {
-      case 'job':
-        return PARTITION_KEYS.job;
-      case 'manifest':
-        return PARTITION_KEYS.manifest;
-      case 'context':
-        return PARTITION_KEYS.context;
-      default:
-        throw new InternalServerError(`'${type}' is an invalid type`);
-    }
+export function parsePartitionKey(type: string): ParsePartitionKeyResult {
+  const entityTypes = Object.values(ENTITY_TYPES).join('|');
+  const matches = type.match(new RegExp(`^(?<entityType>${entityTypes})~(?<tenant>.+)$`));
+  if (matches?.groups) {
+    return {
+      entityType: matches.groups.entityType as EntityType,
+      tenant: matches.groups.tenant,
+    };
   }
+
+  throw new InternalServerError(`'${type}' is an invalid type`);
 }

package/src/domains/job/ParsePartitionKey/ParsePartitionKey.types.ts

@@ -0,0 +1,6 @@
+import { EntityType } from '../constants/Repository.constants';
+
+export type ParsePartitionKeyResult = {
+  entityType: EntityType;
+  tenant: string;
+};

package/src/domains/job/S3Repository/JobDetailsRepository.spec.ts

@@ -3,50 +3,66 @@
  * Copyright Squiz Australia Pty Ltd. All Rights Reserved.
  */
 
-import { S3Client, S3ClientConfig } from '@aws-sdk/client-s3';
+import 'aws-sdk-client-mock-jest';
+import { AwsClientStub, mockClient } from 'aws-sdk-client-mock';
+import { GetObjectCommand, PutObjectCommand, S3Client } from '@aws-sdk/client-s3';
+import { sdkStreamMixin } from '@smithy/util-stream';
+import { Readable } from 'node:stream';
 import { JobDetailsRepository } from './JobDetailsRepository';
 import { initIocContainer, iocContainer } from '../../../mocks/mockIoc';
-import { testLogger } from '../../../jest-global-setup';
+import { InjectTokens } from '../constants/InjectTokens';
+import { createMockJobContext } from '../model/JobContext';
+import { createMockJobManifest } from '../manifest';
+import { createMockJobExecution } from '../model/JobExecution';
 
-// Create a new container tsoa can use
-initIocContainer(testLogger);
+initIocContainer();
 
-// Mock S3 Client
-const mockOptions = {} as S3ClientConfig;
-const mockClient = new S3Client(mockOptions);
+describe('JobDetailsRepositoryV2', (): void => {
+  let s3Client: AwsClientStub<S3Client>;
+  let jobDetailsRepository: JobDetailsRepository;
+  let bucketName: string;
+  let tenant: string;
 
-const mockSend = jest.fn().mockResolvedValue({
-  Body: { transformToString: jest.fn().mockResolvedValue('file') },
-  $metadata: {},
-});
-mockClient.send = mockSend;
-
-// Inject the S3Repository with a mocked client
-iocContainer.rebind<S3Client>(S3Client).toConstantValue(mockClient);
-
-let jobDetailsRepository: JobDetailsRepository;
-
-describe('JobDetailsRepository', (): void => {
-  beforeAll((): void => {
+  beforeEach(() => {
+    s3Client = mockClient(iocContainer.get(S3Client));
     jobDetailsRepository = iocContainer.get(JobDetailsRepository);
+    bucketName = iocContainer.get(InjectTokens.JobDetailsBucket);
+    tenant = iocContainer.get(InjectTokens.Tenant);
   });
 
   describe(`get`, (): void => {
-    beforeEach(() => {
-      jest.resetAllMocks();
-    });
-
     it(`should return a response for get`, async (): Promise<void> => {
       const mockKey = `mock`;
-      mockSend.mockImplementationOnce(() =>
-        Promise.resolve({
-          Body: { transformToString: jest.fn().mockResolvedValue('file') },
-        }),
-      );
+
+      s3Client.on(GetObjectCommand).resolves({
+        Body: sdkStreamMixin(Readable.from(['file'])),
+      });
 
       const response = await jobDetailsRepository.get(mockKey);
-      expect(mockSend).toBeCalledTimes(1);
-      expect(response).toStrictEqual('file');
+      expect(response).toBe('file');
+      expect(s3Client).toHaveReceivedCommandWith(GetObjectCommand, {
+        Bucket: bucketName,
+        Key: mockKey,
+      });
+    });
+  });
+
+  describe('createJobDetailsFile', (): void => {
+    it('should create the job details file', async () => {
+      s3Client.on(PutObjectCommand).resolves({});
+
+      const jobContext = createMockJobContext();
+      const jobManifest = createMockJobManifest();
+      const jobExecution = createMockJobExecution();
+      const expectedKey = `${tenant}/${jobExecution.id}`;
+      const response = await jobDetailsRepository.createJobDetailsFile(tenant, jobContext, jobManifest, jobExecution);
+
+      expect(response).toBe(expectedKey);
+      expect(s3Client).toHaveReceivedCommandWith(PutObjectCommand, {
+        Bucket: bucketName,
+        Key: expectedKey,
+        Body: JSON.stringify({ jobContext, jobManifest, jobExecution }),
+      });
     });
   });
 });

package/src/domains/job/S3Repository/JobDetailsRepository.ts

@@ -5,12 +5,13 @@ import { provideTransient } from '../transientProvider';
 import { JobContext } from '../model/JobContext';
 import { JobManifest } from '../manifest';
 import { JobExecution } from '../model/JobExecution';
+import { InjectTokens } from '../constants/InjectTokens';
 
 @provideTransient(JobDetailsRepository)
 export class JobDetailsRepository extends S3RepositoryBase {
   constructor(
     @inject(S3Client) protected s3Client: S3Client,
-    @inject('JobDetailsBucketName') bucketName: string,
+    @inject(InjectTokens.JobDetailsBucket) bucketName: string,
   ) {
     super(s3Client, bucketName);
   }
@@ -22,15 +23,13 @@ export class JobDetailsRepository extends S3RepositoryBase {
    * an error.
    */
   public async createJobDetailsFile(
-    jobDetailsFileName: string,
+    tenant: string,
     jobContext: JobContext | null,
     jobManifest: JobManifest | null,
     jobExecution: JobExecution,
-  ) {
-    await this.put(jobDetailsFileName, JSON.stringify({ jobContext, jobManifest, jobExecution }));
-  }
-
-  public static createJobDetailsFileName(tenantId: string, jobExecutionId: string): string {
-    return `${tenantId}/${jobExecutionId}`;
+  ): Promise<string> {
+    const key = `${tenant}/${jobExecution.id}`;
+    await this.put(key, JSON.stringify({ jobContext, jobManifest, jobExecution }));
+    return key;
   }
 }

package/src/domains/job/S3Repository/JobUploadsRepository.spec.ts

@@ -0,0 +1,66 @@
+/*!
+ * @license
+ * Copyright Squiz Australia Pty Ltd. All Rights Reserved.
+ */
+
+import 'aws-sdk-client-mock-jest';
+import { faker } from '@faker-js/faker';
+import { GetObjectCommand, ListObjectsV2Command, ListObjectsV2CommandOutput, S3Client } from '@aws-sdk/client-s3';
+import { initIocContainer, iocContainer } from '../../../mocks/mockIoc';
+import { AwsClientStub, mockClient } from 'aws-sdk-client-mock';
+import { InjectTokens } from '../constants/InjectTokens';
+import { JobUploadsRepository } from './JobUploadsRepository';
+import { sdkStreamMixin } from '@smithy/util-stream';
+import { Readable } from 'node:stream';
+
+initIocContainer();
+
+describe('JobUploadsRepositoryV2', (): void => {
+  let s3Client: AwsClientStub<S3Client>;
+  let jobUploadsRepository: JobUploadsRepository;
+  let bucketName: string;
+
+  beforeEach(() => {
+    s3Client = mockClient(iocContainer.get(S3Client));
+    jobUploadsRepository = iocContainer.get(JobUploadsRepository);
+    bucketName = iocContainer.get(InjectTokens.JobUploadsBucket);
+  });
+
+  describe(`get`, (): void => {
+    it(`should return a response for get`, async (): Promise<void> => {
+      const mockKey = `mock`;
+
+      s3Client.on(GetObjectCommand).resolves({
+        Body: sdkStreamMixin(Readable.from(['file'])),
+      });
+
+      const response = await jobUploadsRepository.get(mockKey);
+      expect(response).toBe('file');
+      expect(s3Client).toHaveReceivedCommandWith(GetObjectCommand, {
+        Bucket: bucketName,
+        Key: mockKey,
+      });
+    });
+  });
+
+  describe('listByTenant', (): void => {
+    it('should list objects by prefix with the provided continuation token', async (): Promise<void> => {
+      const tenant = faker.string.uuid();
+      const continuationToken = faker.string.uuid();
+      const expectedResult: ListObjectsV2CommandOutput = {
+        Contents: [{ Key: faker.string.uuid() }, { Key: faker.string.uuid() }],
+        $metadata: {},
+      };
+
+      s3Client.on(ListObjectsV2Command).resolves(expectedResult);
+
+      const response = await jobUploadsRepository.listByTenant(tenant, continuationToken);
+      expect(response).toBe(expectedResult);
+      expect(s3Client).toHaveReceivedCommandWith(ListObjectsV2Command, {
+        Bucket: bucketName,
+        Prefix: `${tenant}/`,
+        ContinuationToken: continuationToken,
+      });
+    });
+  });
+});

package/src/domains/job/S3Repository/JobUploadsRepository.ts

@@ -0,0 +1,35 @@
+/*!
+ * @license
+ * Copyright Squiz Australia Pty Ltd. All Rights Reserved.
+ */
+
+import { ListObjectsV2Command, ListObjectsV2CommandOutput, S3Client } from '@aws-sdk/client-s3';
+import { inject } from 'inversify';
+import { S3RepositoryBase } from './S3RepositoryBase';
+import { provideTransient } from '../transientProvider';
+import { InjectTokens } from '../constants/InjectTokens';
+
+/**
+ * Repository class for interacting with the job uploads S3 bucket.
+ * @export
+ * @class JobUploadsRepository
+ */
+@provideTransient(JobUploadsRepository)
+export class JobUploadsRepository extends S3RepositoryBase {
+  public constructor(
+    @inject(S3Client) protected s3Client: S3Client,
+    @inject(InjectTokens.JobUploadsBucket) bucketName: string,
+  ) {
+    super(s3Client, bucketName);
+  }
+
+  public async listByTenant(tenant: string, continuationToken?: string): Promise<ListObjectsV2CommandOutput> {
+    return await this.s3Client.send(
+      new ListObjectsV2Command({
+        Bucket: this.bucketName,
+        Prefix: `${tenant}/`,
+        ContinuationToken: continuationToken,
+      }),
+    );
+  }
+}

package/src/domains/job/S3Repository/S3RepositoryBase.spec.ts

@@ -4,12 +4,10 @@
  */
 
 import { S3Client, S3ClientConfig } from '@aws-sdk/client-s3';
-import { S3Repository } from './S3Repository';
 import { initIocContainer, iocContainer } from '../../../mocks/mockIoc';
-import { testLogger } from '../../../jest-global-setup';
+import { S3RepositoryBase } from './S3RepositoryBase';
 
-// Create a new container tsoa can use
-initIocContainer(testLogger);
+initIocContainer();
 
 // Mock S3 Client
 const mockOptions = {} as S3ClientConfig;
@@ -21,21 +19,16 @@ const mockSend = jest.fn().mockResolvedValue({
 });
 mockClient.send = mockSend;
 
-// Inject the S3Repository with a mocked client
 iocContainer.rebind<S3Client>(S3Client).toConstantValue(mockClient);
 
-let s3Repository: S3Repository;
+let s3Repository: S3RepositoryBase;
 
 describe('S3RepositoryBase', (): void => {
   beforeAll((): void => {
-    s3Repository = new S3Repository(mockClient, 'mock-bucket');
+    s3Repository = new S3RepositoryBase(mockClient, 'mock-bucket');
   });
 
   describe(`get`, (): void => {
-    beforeEach(() => {
-      jest.resetAllMocks();
-    });
-
     it(`should return a response for get`, async (): Promise<void> => {
       const mockKey = `mock`;
       mockSend.mockResolvedValueOnce({
@@ -61,10 +54,6 @@ describe('S3RepositoryBase', (): void => {
   });
 
   describe(`put`, (): void => {
-    beforeEach(() => {
-      jest.resetAllMocks();
-    });
-
     it(`should return a response for get`, async (): Promise<void> => {
       const mockKey = `mock`;
       const mockObject = ``;
@@ -79,10 +68,6 @@ describe('S3RepositoryBase', (): void => {
   });
 
   describe(`check`, (): void => {
-    beforeEach(() => {
-      jest.resetAllMocks();
-    });
-
     it(`should return a response if S3 object key exists`, async (): Promise<void> => {
       const mockKey = `mock`;
       mockSend.mockResolvedValueOnce({
@@ -94,4 +79,13 @@ describe('S3RepositoryBase', (): void => {
       expect(response).toBeTruthy();
     });
   });
+
+  describe(`delete`, (): void => {
+    it(`should delete the requested object`, async (): Promise<void> => {
+      const mockKey = `mock`;
+      const response = await s3Repository.delete(mockKey);
+      expect(mockSend).toBeCalledTimes(1);
+      expect(response).toBeFalsy();
+    });
+  });
 });

package/src/domains/job/S3Repository/S3RepositoryBase.ts

@@ -3,10 +3,8 @@
  * Copyright Squiz Australia Pty Ltd. All Rights Reserved.
  */
 
-import * as dotenv from 'dotenv';
-dotenv.config();
-
 import {
+  DeleteObjectCommand,
   GetObjectCommand,
   HeadObjectCommand,
   HeadObjectCommandOutput,
@@ -21,10 +19,10 @@ import 'reflect-metadata';
 /**
  * Repository class for interacting with S3.
  * @export
- * @class S3Repository
+ * @class S3RepositoryBase
  */
 @injectable()
-export abstract class S3RepositoryBase {
+export class S3RepositoryBase {
   protected bucketName: string;
   public constructor(
     @inject(S3Client) protected s3Client: S3Client,
@@ -38,7 +36,7 @@ export abstract class S3RepositoryBase {
    * @param {string} key The S3 object key.
    * @param {PutObjectCommandInputType['Body']} body The body of the S3 object.
    * @return {Promise<void>}
-   * @memberof S3Repository
+   * @memberof S3RepositoryBase
    */
   async put(key: string, body: PutObjectCommandInput['Body']): Promise<void> {
     await this.s3Client.send(
@@ -50,11 +48,26 @@ export abstract class S3RepositoryBase {
     );
   }
 
+  /**
+   * Delete object from S3.
+   *
+   * @param {string} key The S3 object key.
+   * @memberof S3RepositoryBase
+   */
+  public async delete(key: string): Promise<void> {
+    await this.s3Client.send(
+      new DeleteObjectCommand({
+        Bucket: this.bucketName,
+        Key: key,
+      }),
+    );
+  }
+
   /**
    * Retrieve object from S3.
    * @param {string} key The S3 object key.
    * @return {Promise<string | null>} The S3 object.
-   * @memberof S3Repository
+   * @memberof S3RepositoryBase
    */
   async get(key: string): Promise<string | null> {
     const s3Object = await this.s3Client.send(
@@ -71,7 +84,7 @@ export abstract class S3RepositoryBase {
    * Check if the S3 object key exists.
    * @param {string} key The S3 object key.
    * @return {Promise<HeadObjectCommandOutput>}
-   * @memberof S3Repository
+   * @memberof S3RepositoryBase
    */
   async check(key: string): Promise<HeadObjectCommandOutput> {
     return this.s3Client.send(
@@ -89,7 +102,9 @@ export abstract class S3RepositoryBase {
     });
 
     const res = await getSignedUrl(this.s3Client, command, {
-      expiresIn: 600, // 10 minutes
+      // In some instances ECS tasks can take 30 minutes from PROVISIONING -> RUNNING.
+      // https://squizgroup.atlassian.net/browse/PLATFORM-2402
+      expiresIn: 3600, // 1 hour
     });
     return res;
   }

package/src/domains/job/S3Repository/index.ts

@@ -1,2 +1,3 @@
 export * from './JobDetailsRepository';
-export * from './S3Repository';
+export * from './JobUploadsRepository';
+export * from './JobUploadsRepository';

package/src/domains/job/constants/InjectTokens.ts

@@ -0,0 +1,8 @@
+export const InjectTokens = {
+  Tenant: Symbol('tenant'),
+  DynamoTableName: Symbol('dynamoTableName'),
+  JobUploadsBucket: Symbol('jobUploadsBucket'),
+  JobDetailsBucket: Symbol('jobDetailsBucket'),
+  JobStartQueueUrl: Symbol('jobStartQueueUrl'),
+  Logger: Symbol('logger'),
+};

package/src/domains/job/constants/JobExecutionStatus.constants.ts

@@ -6,4 +6,5 @@ export enum JOB_EXECUTION_STATUS {
   successfullyCompleted = 'successfully-completed',
   running = 'running',
   errored = 'errored',
+  taskFailedToStart = 'task-failed-to-start',
 }

package/src/domains/job/constants/Repository.constants.ts

@@ -3,14 +3,14 @@
  * Copyright Squiz Australia Pty Ltd. All Rights Reserved.
  */
 
-export type PartitionKey = PARTITION_KEYS | JobExecutionPk;
+export type EntityType = ENTITY_TYPES | EntityTypeRaw;
 
 // this needs to be dynamic as it changes based on the jobName,
 // and tsoa can't parse a template literal type
 // so we need to use a string type here
-export type JobExecutionPk = string;
+export type EntityTypeRaw = string;
 
-export enum PARTITION_KEYS {
+export enum ENTITY_TYPES {
   job = 'job',
   manifest = 'manifest',
   jobExecution = 'jobExecution',