@punks/backend-entity-manager 0.0.285 → 0.0.287

package/dist/cjs/index.js

@@ -39970,14 +39970,15 @@ exports.InMemoryEmailProvider = __decorate([
     WpEmailProvider("in-memory")
 ], exports.InMemoryEmailProvider);
 
+const awsBatchSettings = new AppInMemorySettings();
+
 const JobProvider = (provider) => common.SetMetadata(JOB_PROVIDER, provider);
 
 var AwsBatchService_1;
 const jobDefinitionName = (jobUid) => `job-${jobUid}`;
 const jobInstanceName = (jobUid, instanceId) => `job-${jobUid}-${instanceId}`;
 let AwsBatchService = AwsBatchService_1 = class AwsBatchService {
-    constructor(awsSettings) {
-        this.awsSettings = awsSettings;
+    constructor() {
         this.logger = backendCore.Log.getLogger(AwsBatchService_1.name);
         this.client = () => new clientBatch.BatchClient({
             ...(this.awsSettings.awsSecretAccessKey &&
@@ -40018,7 +40019,7 @@ let AwsBatchService = AwsBatchService_1 = class AwsBatchService {
         const jobDefName = jobDefinitionName(input.jobUid);
         const jobDefinition = await this.getLatestJobDefinition(jobDefName);
         const jobName = jobInstanceName(input.jobUid, input.instanceId);
-        await this.client().send(new clientBatch.SubmitJobCommand({
+        const submitJobRequest = {
             jobQueue: queue.jobQueueArn,
             jobDefinition: jobDefinition.jobDefinitionArn,
             jobName,
@@ -40026,8 +40027,14 @@ let AwsBatchService = AwsBatchService_1 = class AwsBatchService {
                 command: input.overrides?.command ??
                     jobDefinition.containerProperties.command,
             },
-        }));
-        this.logger.info(`AWS JOB -> job submitted ${jobName} ${queue.jobQueueArn}`);
+        };
+        this.logger.info(`AWS JOB -> submitting job ${jobName} ${queue.jobQueueArn}`, {
+            request: submitJobRequest,
+        });
+        const result = await this.client().send(new clientBatch.SubmitJobCommand(submitJobRequest));
+        this.logger.info(`AWS JOB -> job submitted ${jobName} ${queue.jobQueueArn}`, {
+            result,
+        });
     }
     async ensureJobDefinition(definition) {
         const jobName = jobDefinitionName(definition.jobUid);
@@ -40070,6 +40077,10 @@ let AwsBatchService = AwsBatchService_1 = class AwsBatchService {
     }
     async getLatestJobDefinition(jobName) {
         const jobs = await this.getActiveJobDefinitions(jobName);
+        this.logger.debug(`AWS JOB -> latest job definition`, {
+            jobName,
+            jobs,
+        });
         return lodash.exports.orderBy(jobs, (x) => x.revision, "desc")[0];
     }
     async getActiveJobDefinitions(jobName) {
@@ -40080,11 +40091,18 @@ let AwsBatchService = AwsBatchService_1 = class AwsBatchService {
         return result.jobDefinitions ?? [];
     }
     async ensureQueue(queueName) {
+        if (!queueName) {
+            throw new Error(`Queue name not provided`);
+        }
+        this.logger.debug(`AWS JOB -> ensuring queue ${queueName}`);
         const queue = await this.getQueue(queueName);
         if (queue) {
+            this.logger.debug(`AWS JOB -> queue exists ${queueName}`);
             return queue;
         }
+        this.logger.debug(`AWS JOB -> creating queue ${queueName}`);
         await this.createQueue(queueName);
+        this.logger.debug(`AWS JOB -> queue created ${queueName}`);
         const currentQueue = await this.getQueue(queueName);
         if (!currentQueue) {
             throw new Error(`Queue not created -> ${queueName}`);
@@ -40092,6 +40110,9 @@ let AwsBatchService = AwsBatchService_1 = class AwsBatchService {
         return currentQueue;
     }
     async createQueue(queueName) {
+        if (!this.awsSettings.batchComputeEnvironment) {
+            throw new Error(`No compute environment defined`);
+        }
         await this.client().send(new clientBatch.CreateJobQueueCommand({
             jobQueueName: queueName,
             priority: 0,
@@ -40109,11 +40130,12 @@ let AwsBatchService = AwsBatchService_1 = class AwsBatchService {
         }));
         return result.jobQueues?.[0];
     }
+    get awsSettings() {
+        return awsBatchSettings.value;
+    }
 };
 AwsBatchService = AwsBatchService_1 = __decorate([
-    common.Injectable(),
-    __param(0, common.Inject("WP.AWS_BATCH_SETTINGS")),
-    __metadata("design:paramtypes", [Object])
+    common.Injectable()
 ], AwsBatchService);
 
 const mapJobStatus = (awsJobStatus) => {
@@ -40188,17 +40210,10 @@ const ModuleData$3 = {
 };
 exports.AwsJobsModule = AwsJobsModule_1 = class AwsJobsModule {
     static forRoot(input) {
+        awsBatchSettings.initialize(input);
         return {
             module: AwsJobsModule_1,
             ...ModuleData$3,
-            providers: [
-                ...ModuleData$3.providers,
-                {
-                    provide: "WP.AWS_BATCH_SETTINGS",
-                    useValue: input,
-                },
-            ],
-            exports: [...ModuleData$3.exports],
         };
     }
 };
@@ -43617,6 +43632,7 @@ exports.WpRolesService = WpRolesService;
 exports.WpSendgridEmailTemplate = WpSendgridEmailTemplate;
 exports.WpUserRolesService = WpUserRolesService;
 exports.WpUserService = WpUserService;
+exports.awsBatchSettings = awsBatchSettings;
 exports.buildPermissionsGuard = buildPermissionsGuard;
 exports.buildProviderToken = buildProviderToken;
 exports.buildRolesGuard = buildRolesGuard;