@punks/backend-entity-manager 0.0.472 → 0.0.474

package/dist/cjs/types/platforms/nest/extensions/jobs/abstractions/runner.d.ts

@@ -1,3 +1,4 @@
+import { BatchJobVariables } from "../../../plugins/jobs/aws-batch/manager/types";
 import { JobDefinition, JobSchedule } from "./definition";
 export interface JobDispatchInput {
     definition: JobDefinition<unknown, unknown>;
@@ -5,6 +6,7 @@ export interface JobDispatchInput {
     instanceId: string;
     payload?: unknown;
     commandPlaceholders?: Record<string, string>;
+    variables?: BatchJobVariables;
 }
 export declare enum JobProviderState {
     Initializing = "initializing",

package/dist/cjs/types/platforms/nest/extensions/jobs/commands/job-dispatch/command.d.ts

@@ -1,3 +1,4 @@
+import { BatchJobVariables } from "../../../../plugins/jobs/aws-batch/manager/types";
 import { JobDefinition, JobRunType, JobSchedule } from "../../abstractions";
 export interface JobDispatchCommandInput {
     job: JobDefinition<unknown, unknown>;
@@ -5,6 +6,7 @@ export interface JobDispatchCommandInput {
     runType: JobRunType;
     payload?: unknown;
     commandPlaceholders?: Record<string, string>;
+    variables?: BatchJobVariables;
 }
 export declare class JobDispatchCommand {
     readonly input: JobDispatchCommandInput;

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

@@ -0,0 +1,4 @@
+import { KeyValuePair } from "@aws-sdk/client-batch";
+import { BatchJobVariables } from "./types";
+export declare const replaceVariable: (environmentValue: KeyValuePair, variables: BatchJobVariables) => KeyValuePair;
+export declare const replaceVariables: (environment: KeyValuePair[], variables: BatchJobVariables) => KeyValuePair[];

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

@@ -11,10 +11,12 @@ export type BatchJobOverrides = {
     command?: string[];
     batchComputeEnvironment?: string;
 };
+export type BatchJobVariables = Record<string, string>;
 export type SubmitBatchJobInput = {
     overrides?: BatchJobOverrides;
     jobUid: string;
     instanceId: string;
+    variables?: BatchJobVariables;
 };
 export type GetBatchJobStatusInput = {
     jobUid: string;

package/dist/esm/index.js

@@ -34912,7 +34912,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 = newUuid$1();
         try {
             this.logger.info(`JOB DISPATCH -> dispatching started job ${job.uid} -> ${instanceId}`);
@@ -34928,6 +34928,7 @@ let JobDispatchHandler = JobDispatchHandler_1 = class JobDispatchHandler {
                 instanceId,
                 payload,
                 commandPlaceholders,
+                variables,
             });
             await this.instances.updateInstance(instanceId, {
                 status: JobStatus.Ready,
@@ -41506,6 +41507,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}`;
@@ -41572,14 +41594,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,
@@ -41711,6 +41737,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 sleep(10000);
             const updatedQueue = await this.getQueue(queueName);
             if (!updatedQueue) {
                 throw new Error(`Queue not updated -> ${queueName}`);
@@ -41809,6 +41837,7 @@ let AwsJobsProvider = class AwsJobsProvider {
                 command: awsInvocationParams.startCommand?.map((x) => replacePlaceholders(replacePayload(x, payload), commandPlaceholders)),
                 batchComputeEnvironment: awsInfrastructureParams.batchComputeEnvironment,
             },
+            variables: input.variables,
         });
     }
     async upsertJobDefinition(input) {