@punks/backend-entity-manager 0.0.295 → 0.0.297

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

@@ -1,10 +1,10 @@
-import { BathJobDefinition, GetBatchJobStatusInput, SubmitBatchJobInput } from "./types";
+import { AwsJobDefinition, GetBatchJobStatusInput, SubmitBatchJobInput } from "./types";
 export declare class AwsBatchService {
     private readonly logger;
     cancelJobInput(): Promise<void>;
     getJobInstance(input: GetBatchJobStatusInput): Promise<import("@aws-sdk/client-batch").JobSummary | undefined>;
     submitJob(input: SubmitBatchJobInput): Promise<void>;
-    ensureJobDefinition(definition: BathJobDefinition): Promise<import("@aws-sdk/client-batch").JobDefinition>;
+    ensureJobDefinition(definition: AwsJobDefinition): Promise<import("@aws-sdk/client-batch").JobDefinition>;
     private unregisterJobDefinition;
     private registerJobDefinition;
     private getLatestJobDefinition;

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

@@ -1,3 +1,4 @@
+import { AwsBatchInfrastructureParams, AwsBatchInvocationParams } from "../models";
 export type BathJobDefinition = {
     jobUid: string;
     image: string;
@@ -18,3 +19,8 @@ export type GetBatchJobStatusInput = {
     jobUid: string;
     instanceId: string;
 };
+export type AwsJobDefinition = {
+    jobUid: string;
+    infrastructureParams: AwsBatchInfrastructureParams;
+    invocationParams: AwsBatchInvocationParams;
+};

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

@@ -1,9 +1,11 @@
 import { JobDefinition } from "../../../../extensions/jobs/abstractions/definition";
+export type AwsJobComputePlatformType = "ec2" | "fargate";
 export type AwsBatchInfrastructureParams = {
     vcpu: number;
     memory: number;
     gpuMemory?: number;
     dockerImage: string;
+    computePlatformType?: AwsJobComputePlatformType;
 };
 export type AwsBatchInvocationParams = {
     startCommand: string[];

package/dist/esm/index.js

@@ -40070,32 +40070,36 @@ let AwsBatchService = AwsBatchService_1 = class AwsBatchService {
         await this.client().send(new RegisterJobDefinitionCommand({
             jobDefinitionName: jobName,
             type: JobDefinitionType.Container,
-            platformCapabilities: [PlatformCapability.FARGATE],
+            platformCapabilities: definition.infrastructureParams.computePlatformType === "ec2"
+                ? [PlatformCapability.EC2]
+                : [PlatformCapability.FARGATE],
             containerProperties: {
-                command: definition.defaultCommand,
-                image: definition.image,
+                command: definition.invocationParams.startCommand,
+                image: definition.infrastructureParams.dockerImage,
                 executionRoleArn: this.awsSettings.batchExecutionRole,
                 resourceRequirements: [
                     {
                         type: ResourceType.MEMORY,
-                        value: definition.memory.toString(),
+                        value: definition.infrastructureParams.memory.toString(),
                     },
                     {
                         type: ResourceType.VCPU,
-                        value: definition.vcpu.toString(),
+                        value: definition.infrastructureParams.vcpu.toString(),
                     },
-                    ...(definition.gpuMemory
+                    ...(definition.infrastructureParams.gpuMemory
                         ? [
                             {
                                 type: ResourceType.GPU,
-                                value: definition.gpuMemory.toString(),
+                                value: definition.infrastructureParams.gpuMemory.toString(),
                             },
                         ]
                         : []),
                 ],
-                networkConfiguration: {
-                    assignPublicIp: AssignPublicIp.ENABLED,
-                },
+                networkConfiguration: definition.infrastructureParams.computePlatformType !== "ec2"
+                    ? {
+                        assignPublicIp: AssignPublicIp.ENABLED,
+                    }
+                    : undefined,
             },
         }));
     }
@@ -40194,15 +40198,12 @@ let AwsJobsProvider = class AwsJobsProvider {
     }
     async upsertJobDefinition(input) {
         const { definition } = input;
-        const awsInfraParams = definition.infrastructureParams;
-        const awsInvocationParams = definition.invocationParams;
+        const infrastructureParams = definition.infrastructureParams;
+        const invocationParams = definition.invocationParams;
         await this.awsBatchService.ensureJobDefinition({
-            image: awsInfraParams.dockerImage,
             jobUid: definition.uid,
-            memory: awsInfraParams.memory,
-            gpuMemory: awsInfraParams.gpuMemory,
-            vcpu: awsInfraParams.vcpu,
-            defaultCommand: awsInvocationParams.startCommand,
+            infrastructureParams,
+            invocationParams,
         });
     }
     async getJobStatus(input) {