@punks/backend-entity-manager 0.0.471 → 0.0.472

package/dist/cjs/types/platforms/nest/plugins/jobs/aws-batch/manager/index.d.ts

@@ -12,6 +12,7 @@ export declare class AwsBatchService {
     private getActiveJobDefinitions;
     private ensureQueue;
     private createQueue;
+    private updateQueue;
     private getQueue;
     private client;
     private get awsSettings();

package/dist/cjs/types/platforms/nest/plugins/jobs/aws-batch/manager/types.d.ts

@@ -9,6 +9,7 @@ export type BathJobDefinition = {
 };
 export type BatchJobOverrides = {
     command?: string[];
+    batchComputeEnvironment?: string;
 };
 export type SubmitBatchJobInput = {
     overrides?: BatchJobOverrides;
@@ -24,3 +25,6 @@ export type AwsJobDefinition = {
     infrastructureParams: AwsBatchInfrastructureParams;
     invocationParams: AwsBatchInvocationParams;
 };
+export type AwsBatchCreateQueueOptions = {
+    batchComputeEnvironment: string;
+};

package/dist/cjs/types/platforms/nest/plugins/jobs/aws-batch/models/index.d.ts

@@ -14,6 +14,7 @@ export type AwsBatchInfrastructureParams = {
     assignPublicIp?: boolean;
     logGroupName?: string;
     privileged?: boolean;
+    batchComputeEnvironment?: string;
 };
 export type AwsBatchInvocationParams = {
     startCommand: string[];

package/dist/cjs/types/platforms/nest/plugins/jobs/aws-batch/settings/index.d.ts

@@ -3,7 +3,8 @@ export type AwsBatchSettings = {
     awsAccessKeyId?: string;
     awsSecretAccessKey?: string;
     region?: string;
-    batchComputeEnvironment: string;
+    defaultFargateBatchComputeEnvironment: string;
+    defaultEc2BatchComputeEnvironment?: string;
     batchExecutionRole: string;
     batchResourcesPrefix: string;
 };

package/dist/esm/index.js

@@ -20,7 +20,7 @@ import { ListObjectsCommand, PutObjectCommand, GetObjectCommand, DeleteObjectCom
 import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
 import { SendEmailCommand, SESClient } from '@aws-sdk/client-ses';
 import { MailService } from '@sendgrid/mail';
-import { BatchClient, CancelJobCommand, ListJobsCommand, SubmitJobCommand, DeregisterJobDefinitionCommand, RegisterJobDefinitionCommand, JobDefinitionType, PlatformCapability, ResourceType, AssignPublicIp, DescribeJobDefinitionsCommand, CreateJobQueueCommand, DescribeJobQueuesCommand, JobStatus as JobStatus$1 } from '@aws-sdk/client-batch';
+import { BatchClient, CancelJobCommand, ListJobsCommand, PlatformCapability, SubmitJobCommand, DeregisterJobDefinitionCommand, RegisterJobDefinitionCommand, JobDefinitionType, ResourceType, AssignPublicIp, DescribeJobDefinitionsCommand, CreateJobQueueCommand, UpdateJobQueueCommand, DescribeJobQueuesCommand, JobStatus as JobStatus$1 } from '@aws-sdk/client-batch';
 import { CloudWatchLogsClient, DescribeLogGroupsCommand, CreateLogGroupCommand } from '@aws-sdk/client-cloudwatch-logs';
 import require$$1$1 from 'http';
 import require$$2 from 'https';
@@ -41548,9 +41548,25 @@ let AwsBatchService = AwsBatchService_1 = class AwsBatchService {
         this.logger.info(`AWS JOB -> submitting job triggered`, {
             input,
         });
-        const queue = await this.ensureQueue(jobQueueName(input.jobUid));
         const jobDefName = jobDefinitionName(input.jobUid);
         const jobDefinition = await this.getLatestJobDefinition(jobDefName);
+        if (!jobDefinition) {
+            throw new Error(`Job definition not found -> ${jobDefName}`);
+        }
+        const platformType = jobDefinition.platformCapabilities?.[0];
+        if (!platformType) {
+            throw new Error(`Platform type not found -> ${jobDefName}`);
+        }
+        const defaultComputeEnvironment = platformType === PlatformCapability.FARGATE
+            ? this.awsSettings.defaultFargateBatchComputeEnvironment
+            : this.awsSettings.defaultEc2BatchComputeEnvironment;
+        const batchComputeEnvironment = input.overrides?.batchComputeEnvironment ?? defaultComputeEnvironment;
+        if (!batchComputeEnvironment) {
+            throw new Error(`Compute environment not found -> ${jobDefName}`);
+        }
+        const queue = await this.ensureQueue(jobQueueName(input.jobUid), {
+            batchComputeEnvironment,
+        });
         const jobName = jobInstanceName(input.jobUid, input.instanceId);
         const submitJobRequest = {
             jobQueue: queue.jobQueueArn,
@@ -41677,18 +41693,32 @@ let AwsBatchService = AwsBatchService_1 = class AwsBatchService {
         }));
         return result.jobDefinitions ?? [];
     }
-    async ensureQueue(queueName) {
+    async ensureQueue(queueName, options) {
         if (!queueName) {
             throw new Error(`Queue name not provided`);
         }
         this.logger.debug(`AWS JOB -> ensuring queue ${queueName}`);
         const queue = await this.getQueue(queueName);
         if (queue) {
-            this.logger.debug(`AWS JOB -> queue exists ${queueName}`);
-            return queue;
+            if (queue.computeEnvironmentOrder?.[0].computeEnvironment ===
+                options.batchComputeEnvironment) {
+                this.logger.debug(`AWS JOB -> queue exists ${queueName}`);
+                return queue;
+            }
+            this.logger.debug(`AWS JOB -> queue exists with different compute environment ${queueName}`, {
+                queue,
+                options,
+            });
+            await this.updateQueue(queueName, options);
+            this.logger.debug(`AWS JOB -> queue updated ${queueName}`);
+            const updatedQueue = await this.getQueue(queueName);
+            if (!updatedQueue) {
+                throw new Error(`Queue not updated -> ${queueName}`);
+            }
+            return updatedQueue;
         }
         this.logger.debug(`AWS JOB -> creating queue ${queueName}`);
-        await this.createQueue(queueName);
+        await this.createQueue(queueName, options);
         this.logger.debug(`AWS JOB -> queue created ${queueName}`);
         // Wait for the queue to be active
         await sleep(10000);
@@ -41698,8 +41728,9 @@ let AwsBatchService = AwsBatchService_1 = class AwsBatchService {
         }
         return currentQueue;
     }
-    async createQueue(queueName) {
-        if (!this.awsSettings.batchComputeEnvironment) {
+    async createQueue(queueName, options) {
+        if (!this.awsSettings.defaultFargateBatchComputeEnvironment &&
+            !options?.batchComputeEnvironment) {
             throw new Error(`No compute environment defined`);
         }
         await this.client().send(new CreateJobQueueCommand({
@@ -41707,7 +41738,25 @@ let AwsBatchService = AwsBatchService_1 = class AwsBatchService {
             priority: 0,
             computeEnvironmentOrder: [
                 {
-                    computeEnvironment: this.awsSettings.batchComputeEnvironment,
+                    computeEnvironment: options?.batchComputeEnvironment ||
+                        this.awsSettings.defaultFargateBatchComputeEnvironment,
+                    order: 0,
+                },
+            ],
+        }));
+    }
+    async updateQueue(queueName, options) {
+        if (!this.awsSettings.defaultFargateBatchComputeEnvironment &&
+            !options?.batchComputeEnvironment) {
+            throw new Error(`No compute environment defined`);
+        }
+        await this.client().send(new UpdateJobQueueCommand({
+            jobQueue: queueName,
+            priority: 0,
+            computeEnvironmentOrder: [
+                {
+                    computeEnvironment: options?.batchComputeEnvironment ||
+                        this.awsSettings.defaultFargateBatchComputeEnvironment,
                     order: 0,
                 },
             ],
@@ -41752,11 +41801,13 @@ let AwsJobsProvider = class AwsJobsProvider {
         const { definition, schedule, instanceId, payload, commandPlaceholders } = input;
         const awsInvocationParams = schedule?.invocationOverrides ??
             definition.invocationParams;
+        const awsInfrastructureParams = definition.infrastructureParams;
         await this.awsBatchService.submitJob({
             instanceId,
             jobUid: definition.uid,
             overrides: {
                 command: awsInvocationParams.startCommand?.map((x) => replacePlaceholders(replacePayload(x, payload), commandPlaceholders)),
+                batchComputeEnvironment: awsInfrastructureParams.batchComputeEnvironment,
             },
         });
     }