@punks/backend-entity-manager 0.0.285 → 0.0.287

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

@@ -1,9 +1,6 @@
 import { BathJobDefinition, GetBatchJobStatusInput, SubmitBatchJobInput } from "./types";
-import { AwsBatchSettings } from "../settings";
 export declare class AwsBatchService {
-    private readonly awsSettings;
     private readonly logger;
-    constructor(awsSettings: AwsBatchSettings);
     cancelJobInput(): Promise<void>;
     getJobInstance(input: GetBatchJobStatusInput): Promise<import("@aws-sdk/client-batch").JobSummary | undefined>;
     submitJob(input: SubmitBatchJobInput): Promise<void>;
@@ -16,4 +13,5 @@ export declare class AwsBatchService {
     private createQueue;
     private getQueue;
     private client;
+    private get awsSettings();
 }

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

@@ -1,3 +1,4 @@
+import { AppInMemorySettings } from "../../../../../../settings";
 export type AwsBatchSettings = {
     awsAccessKeyId?: string;
     awsSecretAccessKey?: string;
@@ -6,3 +7,4 @@ export type AwsBatchSettings = {
     batchComputeEnvironment: string;
     batchExecutionRole: string;
 };
+export declare const awsBatchSettings: AppInMemorySettings<AwsBatchSettings>;

package/dist/esm/index.js

@@ -39955,14 +39955,15 @@ InMemoryEmailProvider = __decorate([
     WpEmailProvider("in-memory")
 ], InMemoryEmailProvider);
 
+const awsBatchSettings = new AppInMemorySettings();
+
 const JobProvider = (provider) => 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 = Log.getLogger(AwsBatchService_1.name);
         this.client = () => new BatchClient({
             ...(this.awsSettings.awsSecretAccessKey &&
@@ -40003,7 +40004,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 SubmitJobCommand({
+        const submitJobRequest = {
             jobQueue: queue.jobQueueArn,
             jobDefinition: jobDefinition.jobDefinitionArn,
             jobName,
@@ -40011,8 +40012,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 SubmitJobCommand(submitJobRequest));
+        this.logger.info(`AWS JOB -> job submitted ${jobName} ${queue.jobQueueArn}`, {
+            result,
+        });
     }
     async ensureJobDefinition(definition) {
         const jobName = jobDefinitionName(definition.jobUid);
@@ -40055,6 +40062,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) {
@@ -40065,11 +40076,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}`);
@@ -40077,6 +40095,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 CreateJobQueueCommand({
             jobQueueName: queueName,
             priority: 0,
@@ -40094,11 +40115,12 @@ let AwsBatchService = AwsBatchService_1 = class AwsBatchService {
         }));
         return result.jobQueues?.[0];
     }
+    get awsSettings() {
+        return awsBatchSettings.value;
+    }
 };
 AwsBatchService = AwsBatchService_1 = __decorate([
-    Injectable(),
-    __param(0, Inject("WP.AWS_BATCH_SETTINGS")),
-    __metadata("design:paramtypes", [Object])
+    Injectable()
 ], AwsBatchService);
 
 const mapJobStatus = (awsJobStatus) => {
@@ -40173,17 +40195,10 @@ const ModuleData$3 = {
 };
 let 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],
         };
     }
 };
@@ -43514,5 +43529,5 @@ AwsSecretsModule = AwsSecretsModule_1 = __decorate([
     })
 ], AwsSecretsModule);
 
-export { AUTHENTICATION_EVENTS_NAMESPACE, ApiKeyAccess, AppExceptionsFilterBase, AppHashingService, AppInMemorySettings, AppSessionMiddleware, AppSessionService, AuthGuard, Authenticated, AuthenticationEmailTemplates, AuthenticationError, AuthenticationEvents, AuthenticationExtensionSymbols, AuthenticationModule, AuthenticationService, AwsBucketModule, AwsEmailModule, AwsJobsModule, AwsS3BucketError, AwsS3BucketProvider, AwsS3MediaError, AwsS3MediaModule, AwsS3MediaProvider, AwsSecretsModule, AwsSecretsProvider, AwsSesEmailTemplate, BucketItemType, CacheService, ConnectorMode, CurrentUser, CustomDiscoveryModule, CustomDiscoveryService, EmailService, EntityManagerConfigurationError, EntityManagerException, EntityManagerInitializer, EntityManagerModule, EntityManagerRegistry, EntityManagerService, EntityManagerSymbols, EntityManagerUnauthorizedException, EntityNotFoundException, EntityOperationType, EntityOperationUnauthorizedException, EntitySeeder, EntitySerializationFormat, EntitySerializer, EntitySnapshotService, EntityVersionOperation, EventsService, FilesManager, IEntityVersionsCursor, InMemoryBucketProvider, InMemoryEmailProvider, InMemoryMediaProvider, InvalidCredentialsError, JobConcurrency, JobInstance, JobProviderState, JobRunType, JobSchedule, JobStatus, JobsModule, JobsService, LockNotFoundError, MediaLibraryService, MemberOf, MissingEntityIdError, ModulesContainerProvider, MultiTenancyModule, MultipleEntitiesFoundException, NestEntityActions, NestEntityAuthorizationMiddleware, NestEntityManager, NestEntitySerializer, NestEntitySnapshotService, NestPipelineTemplate, NestTypeOrmEntitySeeder, NestTypeOrmQueryBuilder, NestTypeOrmRepository, OperationLockService, OperationTokenMismatchError, PLATFORM_EVENT_NAMESPACE, Permissions, PipelineController, PipelineErrorType, PipelineInvocationError, PipelineStatus, PipelineStepErrorType, PipelinesBuilder, PipelinesRunner, PlatformEvents, Public, QueryBuilderBase, QueryBuilderOperation, ReplicationMode, Roles, SanityMediaError, SanityMediaModule, SanityMediaProvider, SecretsService, SendgridEmailModule, SendgridEmailTemplate, SortDirection, TrackingService, TypeOrmQueryBuilder, TypeOrmRepository, TypeormCacheInstance, TypeormOperationLockRepository, UserCreationError, UserRegistrationError, WpApiKeysService, WpAppInitializer, WpAwsSesEmailTemplate, WpBucketProvider, WpCacheInstance, WpEmailLogger, WpEmailProvider, WpEmailTemplate, WpEntity, WpEntityActions, WpEntityAdapter, WpEntityAuthMiddleware, WpEntityConnector, WpEntityConnectorMapper, WpEntityConverter, WpEntityManager, WpEntityQueryBuilder, WpEntityRepository, WpEntitySeeder, WpEntitySerializer, WpEntitySnapshotService, WpEntityVersioningProvider, WpEventsTracker, WpFileProvider, WpFileReferenceRepository, WpGlobalAuthenticationMiddleware, WpMediaFolderRepository, WpMediaProvider, WpMediaReferenceRepository, WpPermissionsService, WpPipeline, WpRolesService, WpSendgridEmailTemplate, WpUserRolesService, WpUserService, buildPermissionsGuard, buildProviderToken, buildRolesGuard, createContainer, createExpressFileResponse, getEntityManagerProviderToken, getLocalizedText, newUuid, renderHandlebarsTemplate, toEntitiesImportInput };
+export { AUTHENTICATION_EVENTS_NAMESPACE, ApiKeyAccess, AppExceptionsFilterBase, AppHashingService, AppInMemorySettings, AppSessionMiddleware, AppSessionService, AuthGuard, Authenticated, AuthenticationEmailTemplates, AuthenticationError, AuthenticationEvents, AuthenticationExtensionSymbols, AuthenticationModule, AuthenticationService, AwsBucketModule, AwsEmailModule, AwsJobsModule, AwsS3BucketError, AwsS3BucketProvider, AwsS3MediaError, AwsS3MediaModule, AwsS3MediaProvider, AwsSecretsModule, AwsSecretsProvider, AwsSesEmailTemplate, BucketItemType, CacheService, ConnectorMode, CurrentUser, CustomDiscoveryModule, CustomDiscoveryService, EmailService, EntityManagerConfigurationError, EntityManagerException, EntityManagerInitializer, EntityManagerModule, EntityManagerRegistry, EntityManagerService, EntityManagerSymbols, EntityManagerUnauthorizedException, EntityNotFoundException, EntityOperationType, EntityOperationUnauthorizedException, EntitySeeder, EntitySerializationFormat, EntitySerializer, EntitySnapshotService, EntityVersionOperation, EventsService, FilesManager, IEntityVersionsCursor, InMemoryBucketProvider, InMemoryEmailProvider, InMemoryMediaProvider, InvalidCredentialsError, JobConcurrency, JobInstance, JobProviderState, JobRunType, JobSchedule, JobStatus, JobsModule, JobsService, LockNotFoundError, MediaLibraryService, MemberOf, MissingEntityIdError, ModulesContainerProvider, MultiTenancyModule, MultipleEntitiesFoundException, NestEntityActions, NestEntityAuthorizationMiddleware, NestEntityManager, NestEntitySerializer, NestEntitySnapshotService, NestPipelineTemplate, NestTypeOrmEntitySeeder, NestTypeOrmQueryBuilder, NestTypeOrmRepository, OperationLockService, OperationTokenMismatchError, PLATFORM_EVENT_NAMESPACE, Permissions, PipelineController, PipelineErrorType, PipelineInvocationError, PipelineStatus, PipelineStepErrorType, PipelinesBuilder, PipelinesRunner, PlatformEvents, Public, QueryBuilderBase, QueryBuilderOperation, ReplicationMode, Roles, SanityMediaError, SanityMediaModule, SanityMediaProvider, SecretsService, SendgridEmailModule, SendgridEmailTemplate, SortDirection, TrackingService, TypeOrmQueryBuilder, TypeOrmRepository, TypeormCacheInstance, TypeormOperationLockRepository, UserCreationError, UserRegistrationError, WpApiKeysService, WpAppInitializer, WpAwsSesEmailTemplate, WpBucketProvider, WpCacheInstance, WpEmailLogger, WpEmailProvider, WpEmailTemplate, WpEntity, WpEntityActions, WpEntityAdapter, WpEntityAuthMiddleware, WpEntityConnector, WpEntityConnectorMapper, WpEntityConverter, WpEntityManager, WpEntityQueryBuilder, WpEntityRepository, WpEntitySeeder, WpEntitySerializer, WpEntitySnapshotService, WpEntityVersioningProvider, WpEventsTracker, WpFileProvider, WpFileReferenceRepository, WpGlobalAuthenticationMiddleware, WpMediaFolderRepository, WpMediaProvider, WpMediaReferenceRepository, WpPermissionsService, WpPipeline, WpRolesService, WpSendgridEmailTemplate, WpUserRolesService, WpUserService, awsBatchSettings, buildPermissionsGuard, buildProviderToken, buildRolesGuard, createContainer, createExpressFileResponse, getEntityManagerProviderToken, getLocalizedText, newUuid, renderHandlebarsTemplate, toEntitiesImportInput };
 //# sourceMappingURL=index.js.map