@punks/backend-entity-manager 0.0.295 → 0.0.297

package/dist/cjs/index.js

@@ -40085,32 +40085,36 @@ let AwsBatchService = AwsBatchService_1 = class AwsBatchService {
         await this.client().send(new clientBatch.RegisterJobDefinitionCommand({
             jobDefinitionName: jobName,
             type: clientBatch.JobDefinitionType.Container,
-            platformCapabilities: [clientBatch.PlatformCapability.FARGATE],
+            platformCapabilities: definition.infrastructureParams.computePlatformType === "ec2"
+                ? [clientBatch.PlatformCapability.EC2]
+                : [clientBatch.PlatformCapability.FARGATE],
             containerProperties: {
-                command: definition.defaultCommand,
-                image: definition.image,
+                command: definition.invocationParams.startCommand,
+                image: definition.infrastructureParams.dockerImage,
                 executionRoleArn: this.awsSettings.batchExecutionRole,
                 resourceRequirements: [
                     {
                         type: clientBatch.ResourceType.MEMORY,
-                        value: definition.memory.toString(),
+                        value: definition.infrastructureParams.memory.toString(),
                     },
                     {
                         type: clientBatch.ResourceType.VCPU,
-                        value: definition.vcpu.toString(),
+                        value: definition.infrastructureParams.vcpu.toString(),
                     },
-                    ...(definition.gpuMemory
+                    ...(definition.infrastructureParams.gpuMemory
                         ? [
                             {
                                 type: clientBatch.ResourceType.GPU,
-                                value: definition.gpuMemory.toString(),
+                                value: definition.infrastructureParams.gpuMemory.toString(),
                             },
                         ]
                         : []),
                 ],
-                networkConfiguration: {
-                    assignPublicIp: clientBatch.AssignPublicIp.ENABLED,
-                },
+                networkConfiguration: definition.infrastructureParams.computePlatformType !== "ec2"
+                    ? {
+                        assignPublicIp: clientBatch.AssignPublicIp.ENABLED,
+                    }
+                    : undefined,
             },
         }));
     }
@@ -40209,15 +40213,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) {