@squiz/job-runner-lib 2.4.0 → 2.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. package/CHANGELOG.md +6 -0
  2. package/lib/domains/job/services/JobExecutionTaskService/JobExecutionTaskService.defs.d.ts +0 -1
  3. package/lib/index.js +6 -6
  4. package/lib/index.js.map +2 -2
  5. package/package.json +1 -1
  6. package/src/domains/job/services/JobExecutionTaskService/JobExecutionTaskService.defs.ts +0 -1
  7. package/src/domains/job/services/JobExecutionTaskService/JobExecutionTaskService.spec.ts +10 -13
  8. package/src/domains/job/services/JobExecutionTaskService/JobExecutionTaskService.ts +1 -7
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@squiz/job-runner-lib",
3
- "version": "2.4.0",
3
+ "version": "2.5.0",
4
4
  "description": "",
5
5
  "main": "lib/index.js",
6
6
  "private": false,
package/src/domains/job/services/JobExecutionTaskService/JobExecutionTaskService.defs.ts CHANGED
@@ -16,7 +16,6 @@ export interface RunJobTaskParams {
16
16
  shortRegion: string;
17
17
  shortEnvironment: string;
18
18
  clusterArn: string;
19
- subnets: Array<string>;
20
19
  taskDefinitionArn: string;
21
20
  tenantId: string;
22
21
  }
package/src/domains/job/services/JobExecutionTaskService/JobExecutionTaskService.spec.ts CHANGED
@@ -1,17 +1,17 @@
1
- import 'aws-sdk-client-mock-jest';
2
- import { AwsClientStub, mockClient } from 'aws-sdk-client-mock';
3
- import { ConflictException, ResourceNotFoundException, ECSClient, RunTaskCommand } from '@aws-sdk/client-ecs';
1
+ import { ConflictException, ECSClient, ResourceNotFoundException, RunTaskCommand } from '@aws-sdk/client-ecs';
4
2
  import { faker } from '@faker-js/faker';
5
- import { JobExecutionTaskService } from './JobExecutionTaskService';
6
- import { JobManifestService } from '../JobManifestService/JobManifestService';
7
- import { JobContextService } from '../JobContextService/JobContextService';
3
+ import { AwsClientStub, mockClient } from 'aws-sdk-client-mock';
4
+ import 'aws-sdk-client-mock-jest';
8
5
  import { JobDetailsRepository, JobUploadsRepository } from '../../S3Repository';
9
- import { createMockJobExecution } from '../../model/JobExecution';
10
- import { createMockJobContext } from '../../model/JobContext';
6
+ import { JOB_EXECUTION_STATUS } from '../../constants/JobExecutionStatus.constants';
11
7
  import { createMockJobManifest } from '../../manifest';
12
- import { RunJobTaskParams } from './JobExecutionTaskService.defs';
8
+ import { createMockJobContext } from '../../model/JobContext';
9
+ import { createMockJobExecution } from '../../model/JobExecution';
13
10
  import { JobExecutionRepository } from '../../repository';
14
- import { JOB_EXECUTION_STATUS } from '../../constants/JobExecutionStatus.constants';
11
+ import { JobContextService } from '../JobContextService/JobContextService';
12
+ import { JobManifestService } from '../JobManifestService/JobManifestService';
13
+ import { JobExecutionTaskService } from './JobExecutionTaskService';
14
+ import { RunJobTaskParams } from './JobExecutionTaskService.defs';
15
15
 
16
16
  describe('JobExecutionTaskService', () => {
17
17
  let mockEcsClient: AwsClientStub<ECSClient>;
@@ -30,7 +30,6 @@ describe('JobExecutionTaskService', () => {
30
30
  shortRegion: 'au',
31
31
  shortEnvironment: 'dev',
32
32
  clusterArn: `clusterArn`,
33
- subnets: ['subnet1'],
34
33
  taskDefinitionArn: `taskDefinitionArn`,
35
34
  tenantId: 'some_tenant',
36
35
  };
@@ -124,8 +123,6 @@ describe('JobExecutionTaskService', () => {
124
123
  expect(response).toBe(mockArn);
125
124
  expect(mockEcsClient).toHaveReceivedCommandWith(RunTaskCommand, {
126
125
  cluster: 'clusterArn',
127
- launchType: 'FARGATE',
128
- networkConfiguration: { awsvpcConfiguration: { subnets: ['subnet1'] } },
129
126
  overrides: {
130
127
  containerOverrides: [
131
128
  {
package/src/domains/job/services/JobExecutionTaskService/JobExecutionTaskService.ts CHANGED
@@ -3,7 +3,7 @@
3
3
  * Copyright Squiz Australia Pty Ltd. All Rights Reserved.
4
4
  */
5
5
 
6
- import { ConflictException, ECSClient, LaunchType, RunTaskCommand } from '@aws-sdk/client-ecs';
6
+ import { ConflictException, ECSClient, RunTaskCommand } from '@aws-sdk/client-ecs';
7
7
  import { createHash } from 'node:crypto';
8
8
  import { JobDetailsRepository, JobUploadsRepository } from '../../S3Repository';
9
9
  import { JOB_EXECUTION_STATUS } from '../../constants/JobExecutionStatus.constants';
@@ -104,12 +104,6 @@ export class JobExecutionTaskService {
104
104
  const result = await this.ecsClient.send(
105
105
  new RunTaskCommand({
106
106
  cluster: params.clusterArn,
107
- networkConfiguration: {
108
- awsvpcConfiguration: {
109
- subnets: params.subnets,
110
- },
111
- },
112
- launchType: LaunchType.FARGATE,
113
107
  taskDefinition: params.taskDefinitionArn,
114
108
  overrides: {
115
109
  containerOverrides: [