@punks/backend-entity-manager 0.0.312 → 0.0.314

package/dist/cjs/index.js

@@ -40016,6 +40016,7 @@ const ensureJobLogGroup = async (logGroupName, awsSettings) => {
 var AwsBatchService_1;
 const jobDefinitionName = (jobUid) => `${awsBatchSettings.value.batchResourcesPrefix}-job-${jobUid}`;
 const jobInstanceName = (jobUid, instanceId) => `${awsBatchSettings.value.batchResourcesPrefix}-job-${jobUid}-${instanceId}`;
+const defaultJobQueueName = () => `${awsBatchSettings.value.batchResourcesPrefix}-${awsBatchSettings.value.defaultQueueName}`;
 let AwsBatchService = AwsBatchService_1 = class AwsBatchService {
     constructor() {
         this.logger = backendCore.Log.getLogger(AwsBatchService_1.name);
@@ -40039,7 +40040,7 @@ let AwsBatchService = AwsBatchService_1 = class AwsBatchService {
         const jobName = jobInstanceName(input.jobUid, input.instanceId);
         this.logger.info(`AWS JOB -> fetching job ${jobName}`);
         const result = await this.client().send(new clientBatch.ListJobsCommand({
-            jobQueue: this.awsSettings.defaultQueueName,
+            jobQueue: defaultJobQueueName(),
             maxResults: 1,
             filters: [
                 {
@@ -40051,10 +40052,10 @@ let AwsBatchService = AwsBatchService_1 = class AwsBatchService {
         return result.jobSummaryList?.[0];
     }
     async submitJob(input) {
-        this.logger.info(`AWS JOB -> submitting job`, {
+        this.logger.info(`AWS JOB -> submitting job triggered`, {
             input,
         });
-        const queue = await this.ensureQueue(this.awsSettings.defaultQueueName);
+        const queue = await this.ensureQueue(defaultJobQueueName());
         const jobDefName = jobDefinitionName(input.jobUid);
         const jobDefinition = await this.getLatestJobDefinition(jobDefName);
         const jobName = jobInstanceName(input.jobUid, input.instanceId);
@@ -40071,7 +40072,7 @@ let AwsBatchService = AwsBatchService_1 = class AwsBatchService {
                 }
                 : {}),
         };
-        this.logger.info(`AWS JOB -> submitting job ${jobName} ${queue.jobQueueArn}`, {
+        this.logger.info(`AWS JOB -> invoking job ${jobName} ${queue.jobQueueArn}`, {
             request: submitJobRequest,
         });
         const result = await this.client().send(new clientBatch.SubmitJobCommand(submitJobRequest));
@@ -40159,7 +40160,7 @@ let AwsBatchService = AwsBatchService_1 = class AwsBatchService {
     async ensureJobLogDriver(jobName, definition) {
         const logGroup = definition.infrastructureParams.logGroupName
             ? {
-                name: `/aws/batch/job-${definition.infrastructureParams.logGroupName}`,
+                name: `/aws/batch/${awsBatchSettings.value.batchResourcesPrefix}-job-${definition.infrastructureParams.logGroupName}`,
             }
             : undefined;
         if (!logGroup) {
@@ -40256,12 +40257,13 @@ let AwsJobsProvider = class AwsJobsProvider {
     }
     async dispatch(input) {
         const { definition, schedule, instanceId, payload, commandPlaceholders } = input;
-        const awsInvocationParams = schedule?.invocationOverrides;
+        const awsInvocationParams = schedule?.invocationOverrides ??
+            definition.invocationParams;
         await this.awsBatchService.submitJob({
             instanceId,
             jobUid: definition.uid,
             overrides: {
-                command: awsInvocationParams?.startCommand?.map((x) => replacePlaceholders(replacePayload(x, payload), commandPlaceholders)),
+                command: awsInvocationParams.startCommand?.map((x) => replacePlaceholders(replacePayload(x, payload), commandPlaceholders)),
             },
         });
     }