@punks/backend-entity-manager 0.0.472 → 0.0.474

package/dist/cjs/index.js

@@ -34927,7 +34927,7 @@ let JobDispatchHandler = JobDispatchHandler_1 = class JobDispatchHandler {
         return result.result;
     }
     async dispatchJob(command) {
-        const { input: { job, schedule, runType, payload, commandPlaceholders }, } = command;
+        const { input: { job, schedule, runType, payload, commandPlaceholders, variables, }, } = command;
         const instanceId = backendCore.newUuid();
         try {
             this.logger.info(`JOB DISPATCH -> dispatching started job ${job.uid} -> ${instanceId}`);
@@ -34943,6 +34943,7 @@ let JobDispatchHandler = JobDispatchHandler_1 = class JobDispatchHandler {
                 instanceId,
                 payload,
                 commandPlaceholders,
+                variables,
             });
             await this.instances.updateInstance(instanceId, {
                 status: exports.JobStatus.Ready,
@@ -41521,6 +41522,27 @@ const ensureJobLogGroup = async (logGroupName, awsSettings) => {
     }
 };
 
+const replaceVariablesInValue = (value, variables) => {
+    // Example matches:
+    // Input: "Hello ${name} and $(user)!" with variables {name: "World", user: "John"}
+    // Output: "Hello World and John!"
+    //
+    // Input: "The ${animal} jumps over $(object)" with variables {animal: "fox", object: "fence"}
+    // Output: "The fox jumps over fence"
+    return value.replace(/[\$][\{\(]([^\}\)]+)[\}\)]/g, (match, p1) => variables[p1]);
+};
+const replaceVariable = (environmentValue, variables) => {
+    return {
+        name: environmentValue.name,
+        value: environmentValue.value
+            ? replaceVariablesInValue(environmentValue.value, variables)
+            : environmentValue.value,
+    };
+};
+const replaceVariables = (environment, variables) => {
+    return environment.map((e) => replaceVariable(e, variables));
+};
+
 var AwsBatchService_1;
 const jobDefinitionName = (jobUid) => `${awsBatchSettings.value.batchResourcesPrefix}-job-${jobUid}`;
 const jobInstanceName = (jobUid, instanceId) => `${awsBatchSettings.value.batchResourcesPrefix}-job-${jobUid}-${instanceId}`;
@@ -41587,14 +41609,18 @@ let AwsBatchService = AwsBatchService_1 = class AwsBatchService {
             jobQueue: queue.jobQueueArn,
             jobDefinition: jobDefinition.jobDefinitionArn,
             jobName,
-            ...(input.overrides?.command || jobDefinition.containerProperties?.command
-                ? {
-                    containerOverrides: {
+            containerOverrides: {
+                ...(input.overrides?.command ||
+                    jobDefinition.containerProperties?.command
+                    ? {
                         command: input.overrides?.command ??
                             jobDefinition.containerProperties.command,
-                    },
-                }
-                : {}),
+                    }
+                    : {}),
+                environment: jobDefinition.containerProperties?.environment && input.variables
+                    ? replaceVariables(jobDefinition.containerProperties.environment, input.variables)
+                    : jobDefinition.containerProperties?.environment ?? [],
+            },
         };
         this.logger.info(`AWS JOB -> invoking job ${jobName} ${queue.jobQueueArn}`, {
             request: submitJobRequest,
@@ -41726,6 +41752,8 @@ let AwsBatchService = AwsBatchService_1 = class AwsBatchService {
             });
             await this.updateQueue(queueName, options);
             this.logger.debug(`AWS JOB -> queue updated ${queueName}`);
+            // Wait for the queue to be active
+            await backendCore.sleep(10000);
             const updatedQueue = await this.getQueue(queueName);
             if (!updatedQueue) {
                 throw new Error(`Queue not updated -> ${queueName}`);
@@ -41824,6 +41852,7 @@ let AwsJobsProvider = class AwsJobsProvider {
                 command: awsInvocationParams.startCommand?.map((x) => replacePlaceholders(replacePayload(x, payload), commandPlaceholders)),
                 batchComputeEnvironment: awsInfrastructureParams.batchComputeEnvironment,
             },
+            variables: input.variables,
         });
     }
     async upsertJobDefinition(input) {