mongodb
diff --git a/‎Dockerfile.enhanced‎
Lines changed: 5 additions & 5 deletions b/‎Dockerfile.enhanced‎
Lines changed: 5 additions & 5 deletions
diff --git a/‎api/controllers/v2/github.ts‎
Lines changed: 4 additions & 3 deletions b/‎api/controllers/v2/github.ts‎
Lines changed: 4 additions & 3 deletions
diff --git a/‎api/controllers/v2/jobs.ts‎
Lines changed: 2 additions & 7 deletions b/‎api/controllers/v2/jobs.ts‎
Lines changed: 2 additions & 7 deletions
diff --git a/‎api/controllers/v2/slack.ts‎
Lines changed: 8 additions & 0 deletions b/‎api/controllers/v2/slack.ts‎
Lines changed: 8 additions & 0 deletions
diff --git a/‎cdk-infra/lib/constructs/api/webhook-api-construct.ts‎
Lines changed: 13 additions & 1 deletion b/‎cdk-infra/lib/constructs/api/webhook-api-construct.ts‎
Lines changed: 13 additions & 1 deletion
diff --git a/‎cdk-infra/lib/constructs/api/webhook-env-construct.ts‎
Lines changed: 3 additions & 2 deletions b/‎cdk-infra/lib/constructs/api/webhook-env-construct.ts‎
Lines changed: 3 additions & 2 deletions
diff --git a/‎cdk-infra/lib/constructs/worker/worker-construct.ts‎
Lines changed: 1 addition & 1 deletion b/‎cdk-infra/lib/constructs/worker/worker-construct.ts‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎cdk-infra/lib/constructs/worker/worker-env-construct.ts‎
Lines changed: 5 additions & 4 deletions b/‎cdk-infra/lib/constructs/worker/worker-env-construct.ts‎
Lines changed: 5 additions & 4 deletions
@@ -4,19 +4,19 @@ WORKDIR /home/docsworker-xlarge
 COPY  config config/
 COPY package*.json ./
 COPY tsconfig*.json ./
-RUN npm install
+RUN npm ci
 COPY . ./
 RUN npm run build
 
 # install persistence module
 RUN cd ./modules/persistence \
-    && npm install \
+    && npm ci --legacy-peer-deps \
     && npm run build
 
 # Build modules
 # OAS Page Builder
 RUN cd ./modules/oas-page-builder \
-    && npm install \
+    && npm ci --legacy-peer-deps \
     && npm run build
 
 # where repo work will happen
@@ -102,14 +102,14 @@ RUN mkdir -p modules/persistence && chmod 755 modules/persistence
 COPY --from=ts-compiler --chown=docsworker-xlarge /home/docsworker-xlarge/modules/persistence/package*.json ./modules/persistence/
 COPY --from=ts-compiler --chown=docsworker-xlarge /home/docsworker-xlarge/modules/persistence/dist ./modules/persistence/
 ENV PERSISTENCE_MODULE_PATH=${WORK_DIRECTORY}/modules/persistence/index.js
-RUN cd ./modules/persistence/ && ls && npm install
+RUN cd ./modules/persistence/ && ls && npm ci --legacy-peer-deps
 
 # OAS Page Builder module copy
 # Create directory and add permissions to allow node module installation
 RUN mkdir -p modules/oas-page-builder && chmod 755 modules/oas-page-builder
 COPY --from=ts-compiler --chown=docsworker-xlarge /home/docsworker-xlarge/modules/oas-page-builder/package*.json ./modules/oas-page-builder/
 COPY --from=ts-compiler --chown=docsworker-xlarge /home/docsworker-xlarge/modules/oas-page-builder/dist ./modules/oas-page-builder/
-RUN cd ./modules/oas-page-builder/ && npm install
+RUN cd ./modules/oas-page-builder/ && npm ci --legacy-peer-deps
 
 # Needed for OAS Page Builder module in shared.mk
 ENV REDOC_PATH=${WORK_DIRECTORY}/redoc/cli/index.js
 
@@ -6,7 +6,7 @@ import { APIGatewayEvent, APIGatewayProxyResult } from 'aws-lambda';
 import { JobRepository } from '../../../src/repositories/jobRepository';
 import { ConsoleLogger } from '../../../src/services/logger';
 import { BranchRepository } from '../../../src/repositories/branchRepository';
-import { Job, JobStatus } from '../../../src/entities/job';
+import { EnhancedJob, JobStatus } from '../../../src/entities/job';
 import { PushEvent } from '@octokit/webhooks-types';
 
 // This function will validate your payload from GitHub
@@ -29,7 +29,7 @@ async function prepGithubPushPayload(
   githubEvent: PushEvent,
   branchRepository: BranchRepository,
   prefix: string
-): Promise<Omit<Job, '_id'>> {
+): Promise<Omit<EnhancedJob, '_id'>> {
   const branch_name = githubEvent.ref.split('/')[2];
   const branch_info = await branchRepository.getRepoBranchAliases(githubEvent.repository.name, branch_name);
   const urlSlug = branch_info.aliasObject?.urlSlug ?? branch_name;
@@ -39,7 +39,7 @@ async function prepGithubPushPayload(
   return {
     title: githubEvent.repository.full_name,
     user: githubEvent.pusher.name,
-    email: githubEvent.pusher.email,
+    email: githubEvent.pusher.email ?? '',
     status: JobStatus.inQueue,
     createdTime: new Date(),
     startTime: null,
@@ -111,6 +111,7 @@ export const TriggerBuild = async (event: APIGatewayEvent): Promise<APIGatewayPr
   try {
     consoleLogger.info(job.title, 'Creating Job');
     const jobId = await jobRepository.insertJob(job, c.get('jobsQueueUrl'));
+    jobRepository.notify(jobId, c.get('jobUpdatesQueueUrl'), JobStatus.inQueue, 0);
     consoleLogger.info(job.title, `Created Job ${jobId}`);
   } catch (err) {
     return {
 
@@ -65,20 +65,15 @@ export const HandleJobs = async (event: SQSEvent): Promise<void> => {
         switch (jobStatus) {
           case JobStatus[JobStatus.inQueue]:
             await NotifyBuildProgress(jobId);
-            // start the task , don't start the process before processing the notification
-            const ecsServices = new ECSContainer(c, consoleLogger);
-            const res = await ecsServices.execute(jobId);
-            if (res) {
-              await saveTaskId(jobId, res, consoleLogger);
-            }
-            consoleLogger.info(jobId, JSON.stringify(res));
             break;
           case JobStatus[JobStatus.inProgress]:
             await NotifyBuildProgress(jobId);
             break;
           case JobStatus[JobStatus.timedOut]:
             await NotifyBuildSummary(jobId);
             const taskId = body['taskId'];
+            // for the enhanced application, the taskId will never be defined
+            // as we are not saving it at this time
             if (taskId) {
               await stopECSTask(taskId, consoleLogger);
             }
 
@@ -6,6 +6,7 @@ import { ConsoleLogger, ILogger } from '../../../src/services/logger';
 import { SlackConnector } from '../../../src/services/slack';
 import { JobRepository } from '../../../src/repositories/jobRepository';
 import { APIGatewayEvent, APIGatewayProxyResult } from 'aws-lambda';
+import { JobStatus } from '../../../src/entities/job';
 
 function isUserEntitled(entitlementsObject: any): boolean {
   return (entitlementsObject?.repos?.length ?? 0) > 0;
@@ -99,6 +100,13 @@ export const DisplayRepoOptions = async (event: APIGatewayEvent): Promise<APIGat
 async function deployRepo(deployable: Array<any>, logger: ILogger, jobRepository: JobRepository, jobQueueUrl) {
   try {
     await jobRepository.insertBulkJobs(deployable, jobQueueUrl);
+
+    // we need to also notify the jobUpdatesQueue as well so that slack users get notified
+    await Promise.all(
+      deployable.map(async ({ jobId }) => {
+        await jobRepository.notify(jobId, c.get('jobUpdatesQueueUrl'), JobStatus.inQueue, 0);
+      })
+    );
   } catch (err) {
     logger.error('deployRepo', err);
   }
 
@@ -1,10 +1,12 @@
+import { Duration } from 'aws-cdk-lib';
 import { Cors, CorsOptions, LambdaIntegration, LambdaRestApi } from 'aws-cdk-lib/aws-apigateway';
 import { Code, Function, Runtime } from 'aws-cdk-lib/aws-lambda';
 import { SqsEventSource } from 'aws-cdk-lib/aws-lambda-event-sources';
 import { BundlingOptions, NodejsFunction } from 'aws-cdk-lib/aws-lambda-nodejs';
 import { IQueue } from 'aws-cdk-lib/aws-sqs';
 import { Construct } from 'constructs';
 import path from 'path';
+import { getFeatureName } from '../../../utils/env';
 
 const HANDLERS_PATH = path.join(__dirname, '/../../../../api/controllers/v2');
 
@@ -35,12 +37,15 @@ export class WebhookApiConstruct extends Construct {
   constructor(scope: Construct, id: string, { jobsQueue, jobUpdatesQueue, environment }: WebhookApiConstructProps) {
     super(scope, id);
 
+    const timeout = Duration.minutes(2);
+
     const slackTriggerLambda = new NodejsFunction(this, 'slackTriggerLambda', {
       entry: `${HANDLERS_PATH}/slack.ts`,
       runtime,
       handler: 'DeployRepo',
       environment,
       bundling,
+      timeout,
     });
 
     const slackDisplayRepoLambda = new NodejsFunction(this, 'slackDisplayRepoLambda', {
@@ -49,13 +54,15 @@ export class WebhookApiConstruct extends Construct {
       handler: 'DeployRepoDisplayRepoOptions',
       environment,
       bundling,
+      timeout,
     });
 
     const dochubTriggerUpsertLambda = new NodejsFunction(this, 'dochubTriggerUpsertLambda', {
       entry: `${HANDLERS_PATH}/dochub.ts`,
       runtime,
       handler: 'UpsertEdgeDictionaryItem',
       environment,
+      timeout,
     });
 
     const githubTriggerLambda = new NodejsFunction(this, 'githubTriggerLambda', {
@@ -64,6 +71,7 @@ export class WebhookApiConstruct extends Construct {
       handler: 'TriggerBuild',
       bundling,
       environment,
+      timeout,
     });
 
     const triggerLocalBuildLambda = new NodejsFunction(this, 'triggerLocalBuildLambda', {
@@ -72,6 +80,7 @@ export class WebhookApiConstruct extends Construct {
       handler: 'TriggerLocalBuild',
       environment,
       bundling,
+      timeout,
     });
 
     const handleJobsLambda = new NodejsFunction(this, 'handleJobsLambda', {
@@ -87,9 +96,12 @@ export class WebhookApiConstruct extends Construct {
       code: Code.fromInline('exports.default = (event) => { console.log("hello, world!!"); }'),
       runtime,
       handler: 'RootEndpointLambda',
+      timeout,
     });
 
-    const restApi = new LambdaRestApi(this, 'webhookHandlers', {
+    const apiName = `webhookHandlers-${getFeatureName()}`;
+
+    const restApi = new LambdaRestApi(this, apiName, {
       handler: rootEndpointLambda,
       proxy: false,
     });
 
@@ -19,15 +19,16 @@ export class WebhookEnvConstruct extends Construct {
     const dbName = StringParameter.valueFromLookup(this, `${ssmPrefix}/atlas/dbname`);
     const dbUsername = StringParameter.valueFromLookup(this, `${ssmPrefix}/atlas/username`);
     const dbHost = StringParameter.valueFromLookup(this, `${ssmPrefix}/atlas/host`);
+    const jobCollection = StringParameter.valueFromLookup(this, `${ssmPrefix}/atlas/collections/job/queue`);
 
-    const dbPassword = secureStrings[`${ssmPrefix}/atlas/password`];
+    const dbPassword = secureStrings['MONGO_ATLAS_PASSWORD'];
     this.environment = {
       ...secureStrings,
       MONGO_ATLAS_USERNAME: dbUsername,
       MONGO_ATLAS_PASSWORD: dbPassword,
       MONGO_ATLAS_URL: `mongodb+srv://${dbUsername}:${dbPassword}@${dbHost}/admin?retryWrites=true`,
       DB_NAME: dbName,
-
+      JOB_QUEUE_COL_NAME: jobCollection,
       NODE_CONFIG_DIR: './config',
       JOBS_QUEUE_URL: jobsQueue.queueUrl,
       JOB_UPDATES_QUEUE_URL: jobUpdatesQueue.queueUrl,
 
@@ -83,7 +83,7 @@ export class WorkerConstruct extends Construct {
 
     const taskDefLogGroup = new LogGroup(this, 'workerLogGroup');
     const taskDefinition = new FargateTaskDefinition(this, 'workerTaskDefinition', {
-      cpu: 2048,
+      cpu: 4096,
       memoryLimitMiB: 8192,
       taskRole,
       executionRole,
 
@@ -2,7 +2,7 @@ import { IQueue } from 'aws-cdk-lib/aws-sqs';
 import { StringParameter } from 'aws-cdk-lib/aws-ssm';
 import { Construct } from 'constructs';
 import { getCdnInvalidatorUrl } from '../../../utils/cdn';
-import { getEnv, envShortToFullName } from '../../../utils/env';
+import { getEnv, envShortToFullName, getIsEnhanced } from '../../../utils/env';
 import { getSearchIndexFolder } from '../../../utils/search-index';
 import { getSsmPathPrefix } from '../../../utils/ssm';
 
@@ -39,13 +39,13 @@ export class WorkerEnvConstruct extends Construct {
     const repoBranchesCollection = StringParameter.valueFromLookup(this, `${ssmPrefix}/atlas/collections/repo`);
     const jobCollection = StringParameter.valueFromLookup(this, `${ssmPrefix}/atlas/collections/job/queue`);
 
-    const dbPassword = secureStrings[`${ssmPrefix}/atlas/password`];
-
+    const dbPassword = secureStrings['MONGO_ATLAS_PASSWORD'];
     this.environment = {
       ...secureStrings,
       STAGE: env,
       SNOOTY_ENV: envShortToFullName(env),
       MONGO_ATLAS_USERNAME: dbUsername,
+      MONGO_ATLAS_HOST: dbHost,
       MONGO_ATLAS_URL: `mongodb+srv://${dbUsername}:${dbPassword}@${dbHost}/admin?retryWrites=true`,
       DB_NAME: dbName,
       JOBS_QUEUE_URL: jobsQueue.queueUrl,
@@ -55,11 +55,12 @@ export class WorkerEnvConstruct extends Construct {
       PREVIEW_BUILD_ENABLED: previewBuildEnabled,
       USER_ENTITLEMENT_COL_NAME: entitlementCollection,
       NPM_EMAIL: npmEmail,
-      REPO_BRANCHES_COLLECTION: repoBranchesCollection,
+      REPO_BRANCHES_COL_NAME: repoBranchesCollection,
       JOB_QUEUE_COL_NAME: jobCollection,
       CDN_INVALIDATOR_SERVICE_URL: getCdnInvalidatorUrl(env),
       SEARCH_INDEX_BUCKET: 'docs-search-indexes-test',
       SEARCH_INDEX_FOLDER: getSearchIndexFolder(env),
+      ENHANCED: `${getIsEnhanced()}`,
     };
   }
 }