@punks/backend-entity-manager 0.0.311 → 0.0.313

package/dist/cjs/index.js

@@ -33878,6 +33878,7 @@ exports.JobsService = class JobsService {
                 schedule,
                 runType: exports.JobRunType.OnDemand,
                 payload: input.payload,
+                commandPlaceholders: input.commandPlaceholders,
             }));
         };
         this.updateJob = async (input) => {
@@ -33978,7 +33979,7 @@ let JobDispatchHandler = JobDispatchHandler_1 = class JobDispatchHandler {
         return result.result;
     }
     async dispatchJob(command) {
-        const { input: { job, schedule, runType, payload }, } = command;
+        const { input: { job, schedule, runType, payload, commandPlaceholders }, } = command;
         const instanceId = backendCore.newUuid();
         try {
             this.logger.info(`JOB DISPATCH -> dispatching started job ${job.uid} -> ${instanceId}`);
@@ -33993,6 +33994,7 @@ let JobDispatchHandler = JobDispatchHandler_1 = class JobDispatchHandler {
                 schedule,
                 instanceId,
                 payload,
+                commandPlaceholders,
             });
             await this.instances.updateInstance(instanceId, {
                 status: exports.JobStatus.Ready,
@@ -40049,7 +40051,7 @@ 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);
@@ -40069,7 +40071,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));
@@ -40157,7 +40159,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) {
@@ -40254,12 +40256,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)),
             },
         });
     }