DOP-4451: Spin up autobuilder workers when sites are deployed for smoke testing

.github/workflows/deploy-stg-ecs.yml

@@ -3,6 +3,7 @@ on:
     branches:
       - "main"
       - "integration"
+      - "DOP-4451"
 concurrency:
   group: environment-stg-${{ github.ref }}
   cancel-in-progress: true

.github/workflows/deploy-stg-enhanced-webhooks.yml

@@ -1,9 +1,10 @@
 on:
   push:
-    paths: ['api/**', 'cdk-infra/lib/constructs/api/**', 'cdk-infra/utils/**']
+    # paths: [api/**', 'cdk-infra/lib/constructs/api/**', 'cdk-infra/utils/**']
     branches:
-      - 'main'
-      - 'integration'
+      - "main"
+      - "integration"
+      - "DOP-4451"
 concurrency:
   group: environment-stg-enhanced-webhooks-${{ github.ref }}
   cancel-in-progress: true

.github/workflows/deploy-stg-enhanced-worker.yml

@@ -1,9 +1,10 @@
 on:
   push:
-    paths: ['src/**', 'cdk-infra/lib/constructs/worker/**', 'Dockerfile', 'modules/**']
+    # paths: ['src/**', 'cdk-infra/lib/constructs/worker/**', 'Dockerfile', 'modules/**']
     branches:
       - 'main'
       - 'integration'
+      - 'DOP-4451'
 concurrency:
   group: environment-stg-enhanced-worker-${{ github.ref }}
   cancel-in-progress: true
@@ -27,5 +28,8 @@ jobs:
           npm ci
           cd cdk-infra/
           npm ci
-          npm run deploy:feature:stack -- -c env=dotcomstg -c customFeatureName=enhancedApp-dotcomstg auto-builder-stack-enhancedApp-dotcomstg-worker
-          npm run deploy:feature:stack -- -c env=stg -c customFeatureName=enhancedApp-stg auto-builder-stack-enhancedApp-stg-worker
+          npm run cdk destroy -- -c customFeatureName=enhancedApp-dotcomstg --force auto-builder-stack-enhancedApp-dotcomstg-webhooks
+          npm run deploy:feature:stack -- -c isFeatureBranch=true -c env=dotcomstg -c customFeatureName=enhancedApp-dotcomstg \
+          auto-builder-stack-enhancedApp-dotcomstg-worker
+          npm run deploy:feature:stack -- -c isFeatureBranch=true -c env=dotcomstg -c customFeatureName=enhancedApp-dotcomstg \
+            auto-builder-stack-enhancedApp-dotcomstg-webhooks

.github/workflows/update-feature-branch.yml

@@ -41,47 +41,6 @@ jobs:
             cdk-infra/node_modules
           key: ${{ github.head_ref }}
   build-webhooks:
-    needs: prep-build
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v1
-        with:
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          aws-region: us-east-2
-      - uses: actions/setup-node@v4
-        with:
-          node-version: '18.x'
-      - uses: actions/cache/restore@v3
-        id: cache-restore
-        with:
-          path: |
-            node_modules
-            cdk-infra/node_modules
-          key: ${{ github.head_ref }}
-      - name: Install Dependencies
-        if: steps.cache-restore.outputs.cache-hit != 'true'
-        run: |
-          npm ci
-          cd cdk-infra/
-          npm ci
-      - uses: dorny/paths-filter@v2
-        id: filter
-        with:
-          filters: |
-            webhooks:
-              - 'api/**'
-              - 'cdk-infra/lib/constructs/api/**'
-              - 'cdk-infra/utils/**'
-      - name: Update Webhook Stack
-        if: steps.filter.outputs.webhooks == 'true'
-        run: |
-          cd cdk-infra/
-          npm run deploy:feature:stack -- -c isFeatureBranch=true -c env=stg -c customFeatureName=enhancedApp-stg-${{github.head_ref}} \
-            auto-builder-stack-enhancedApp-stg-${{github.head_ref}}-webhooks
-  build-worker:
     needs: prep-build
     runs-on: ubuntu-latest
     steps:
@@ -117,9 +76,15 @@ jobs:
               - 'cdk-infra/lib/constructs/worker/**'
               - 'Dockerfile'
               - 'modules/**'
+            webhooks:
+              - 'api/**'
+              - 'cdk-infra/lib/constructs/api/**'
+              - 'cdk-infra/utils/**'
       - name: Update Worker Stack
-        if: steps.filter.outputs.worker == 'true'
         run: |
           cd cdk-infra/
+          npm run cdk destroy -- -c customFeatureName=enhancedApp-stg-${{github.head_ref}} --force auto-builder-stack-enhancedApp-stg-${{github.head_ref}}-webhooks
           npm run deploy:feature:stack -- -c isFeatureBranch=true -c env=stg -c customFeatureName=enhancedApp-stg-${{github.head_ref}} \
-            auto-builder-stack-enhancedApp-stg-${{github.head_ref}}-worker
+          auto-builder-stack-enhancedApp-stg-${{github.head_ref}}-worker
+          npm run deploy:feature:stack -- -c isFeatureBranch=true -c env=stg -c customFeatureName=enhancedApp-stg-${{github.head_ref}} \
+            auto-builder-stack-enhancedApp-stg-${{github.head_ref}}-webhooks

Dockerfile

@@ -75,7 +75,7 @@ ENV PATH="${WORK_DIRECTORY}/.cargo/bin:${PATH}"
 RUN curl https://raw.githubusercontent.com/mongodb/docs-worker-pool/meta/makefiles/shared.mk -o shared.mk
 
 # install snooty frontend and docs-tools
-RUN git clone -b v${SNOOTY_FRONTEND_VERSION} --depth 1 https://github.com/mongodb/snooty.git       \
+RUN git clone -b main --depth 1 https://github.com/mongodb/snooty.git       \
     && cd snooty                                                                                   \
     # Need to remove omit dev as the filter functionality for the frontend depends on a dev dependency.
     && npm ci --legacy-peer-deps                                                       \

api/controllers/v1/slack.ts

@@ -50,7 +50,7 @@ export const DisplayRepoOptions = async (event: APIGatewayEvent): Promise<APIGat
 
   const entitledBranches = await buildEntitledGroupsList(entitlement, repoBranchesRepository);
   const resp = await slackConnector.displayRepoOptions(entitledBranches, key_val['trigger_id'], isAdmin);
-  if (resp?.status == 200 && resp?.data) {
+  if (resp?.status == 200 && resp?.data && resp?.data.ok) {
     return {
       statusCode: 200,
       body: 'Model requested',
@@ -201,6 +201,8 @@ export const DeployRepo = async (event: any = {}): Promise<any> => {
   const decoded = decodeURIComponent(event.body).split('=')[1];
   const parsed = JSON.parse(decoded);
   const stateValues = parsed.view.state.values;
+  console.info('testing', 'logging here');
+  console.log(JSON.stringify(parsed.view));
 
   //TODO: create an interface for slack view_submission payloads
   if (parsed.type !== 'view_submission') {

api/controllers/v2/github.ts

@@ -2,7 +2,7 @@ import * as c from 'config';
 import * as mongodb from 'mongodb';
 import { APIGatewayEvent, APIGatewayProxyResult } from 'aws-lambda';
 import { PushEvent, WorkflowRunCompletedEvent } from '@octokit/webhooks-types';
-
+import { ECSClient, RunTaskCommand } from '@aws-sdk/client-ecs';
 import { JobRepository } from '../../../src/repositories/jobRepository';
 import { ConsoleLogger } from '../../../src/services/logger';
 import { RepoBranchesRepository } from '../../../src/repositories/repoBranchesRepository';
@@ -86,7 +86,7 @@ async function createPayload({
     if (!githubEvent) {
       throw new Error(`Non SmokeTest Deploy jobs must have a github Event`);
     }
-    action = 'push';
+    action = 'automatedTest';
     jobType = 'githubPush';
     branchName = githubEvent.ref.split('/')[2];
     url = githubEvent.repository?.clone_url;
@@ -168,19 +168,51 @@ export const triggerSmokeTestAutomatedBuild = async (event: APIGatewayEvent): Pr
       body: `Workflow ${body.workflow_run.name} completed successfully but only Deploy Staging ECS workflow completion will trigger smoke test site deployments`,
     };
 
-  // if the build was not building main branch, no need for smoke test sites
-  if (body.workflow_run.head_branch != 'main' || body.repository.fork) {
-    console.log('Build was not on master branch in main repo, sites will not deploy as no smoke tests are needed');
-    return {
-      statusCode: 202,
-      headers: { 'Content-Type': 'text/plain' },
-      body: `Build on branch ${body.workflow_run.head_branch} will not trigger site deployments as it was not on main branch in upstream repo`,
-    };
-  }
+  // if the build was not building the main branch, no need for smoke test sites
+
+  // if (body.workflow_run.head_branch != 'main' || body.repository.fork) {
+  //   console.log('Build was not on master branch in main repo, sites will not deploy as no smoke tests are needed');
+  //   return {
+  //     statusCode: 202,
+  //     headers: { 'Content-Type': 'text/plain' },
+  //     body: `Build on branch ${body.workflow_run.head_branch} will not trigger site deployments as it was not on main branch in upstream repo`,
+  //   };
+  // }
 
   //automated test builds will always deploy in dotcomstg
   const env = 'dotcomstg';
 
+  async function runAdditionalECSTasks() {
+    const { TASK_DEFINITION, CLUSTER, SUBNETS } = process.env;
+    console.log('RUN');
+
+    if (!TASK_DEFINITION) throw new Error('ERROR! process.env.TASK_DEFINITION is not defined');
+    if (!CLUSTER) throw new Error('ERROR! process.env.CLUSTER is not defined');
+    if (!SUBNETS) throw new Error('ERROR! process.env.SUBNETS is not defined');
+
+    console.log('Env Vars exist for run');
+
+    const client = new ECSClient({
+      region: 'us-east-2',
+    });
+
+    const command = new RunTaskCommand({
+      taskDefinition: TASK_DEFINITION,
+      cluster: CLUSTER,
+      launchType: 'FARGATE',
+      overrides: {
+        containerOverrides: [{ environment: [{ name: 'INDPENDENT_TASK', value: 'true' }] }],
+      },
+      networkConfiguration: {
+        awsvpcConfiguration: {
+          subnets: JSON.parse(SUBNETS),
+        },
+      },
+    });
+
+    await client.send(command);
+  }
+
   async function createAndInsertJob() {
     return await Promise.all(
       SMOKETEST_SITES.map(async (repoName): Promise<string> => {
@@ -208,10 +240,10 @@ export const triggerSmokeTestAutomatedBuild = async (event: APIGatewayEvent): Pr
           repoOwner,
         });
 
-        //add logic for getting master branch, latest stable branch
         const job = await prepGithubPushPayload(body, payload, jobTitle);
 
         try {
+          // await runAdditionalECSTasks();
           consoleLogger.info(job.title, 'Creating Job');
           const jobId = await jobRepository.insertJob(job, c.get('jobsQueueUrl'));
           jobRepository.notify(jobId, c.get('jobUpdatesQueueUrl'), JobStatus.inQueue, 0);

api/handlers/slack.ts

@@ -23,45 +23,48 @@ export async function buildEntitledGroupsList(entitlement: any, repoBranchesRepo
   const repoOptions: any[] = [];
   for (const repo of entitlement.repos) {
     const [repoOwner, repoName, directoryPath] = repo.split('/');
-
     const branches = await repoBranchesRepository.getRepoBranches(repoName, directoryPath);
-    const options: any[] = [];
-    for (const branch of branches) {
-      const buildWithSnooty = branch['buildsWithSnooty'];
-      if (buildWithSnooty) {
-        const active = branch['active'];
-        const branchName = `${directoryPath ? `${directoryPath}/` : ''}${branch['gitBranchName']}`;
-        const repoPath = `${repoOwner}/${repoName}/${branchName}`;
-        let txt: string;
-        if (!active) {
-          txt = `(!inactive) ${repoPath}`;
-        } else {
-          txt = repoPath;
+    if (branches.length) {
+      const options: any[] = [];
+      for (const branch of branches) {
+        const buildWithSnooty = branch['buildsWithSnooty'];
+        if (buildWithSnooty) {
+          const active = branch['active'];
+          const branchName = `${directoryPath ? `${directoryPath}/` : ''}${branch['gitBranchName']}`;
+          const repoPath = `${repoOwner}/${repoName}/${branchName}`;
+          let txt: string;
+          if (!active) {
+            txt = `(!inactive) ${repoPath}`;
+          } else {
+            txt = repoPath;
+          }
+          options.push({
+            text: {
+              type: 'plain_text',
+              text: txt,
+            },
+            value: repoPath,
+          });
         }
-        options.push({
-          text: {
-            type: 'plain_text',
-            text: txt,
-          },
-          value: repoPath,
-        });
       }
-    }
 
-    const repoOption = {
-      label: {
-        type: 'plain_text',
-        text: repoName,
-      },
-      //sort the options by version number
-      options: options.sort((branchOne, branchTwo) =>
-        branchTwo.text.text
-          .toString()
-          .replace(/\d+/g, (n) => +n + 100000)
-          .localeCompare(branchOne.text.text.toString().replace(/\d+/g, (n) => +n + 100000))
-      ),
-    };
-    repoOptions.push(repoOption);
+      const repoOption = {
+        label: {
+          type: 'plain_text',
+          text: repoName,
+        },
+        //sort the options by version number
+        options: options.sort((branchOne, branchTwo) =>
+          branchTwo.text.text
+            .toString()
+            .replace(/\d+/g, (n) => +n + 100000)
+            .localeCompare(branchOne.text.text.toString().replace(/\d+/g, (n) => +n + 100000))
+        ),
+      };
+      repoOptions.push(repoOption);
+    } else {
+      console.log(repo, branches);
+    }
   }
   return repoOptions.sort((repoOne, repoTwo) => repoOne.label.text.localeCompare(repoTwo.label.text));
 }

cdk-infra/bin/cdk-infra.ts

@@ -38,12 +38,22 @@ async function main() {
   const stackName = `auto-builder-stack-${getFeatureName()}`;
 
   const queues = new AutoBuilderQueueStack(app, `${stackName}-queues`, { env });
-  const { clusterName } = new WorkerStack(app, `${stackName}-worker`, { queues, workerSecureStrings, vpc, env });
+  const { clusterName, taskDefinition } = new WorkerStack(app, `${stackName}-worker`, {
+    queues,
+    workerSecureStrings,
+    vpc,
+    env,
+  });
+
+  // TODO: Pass the VPC as a prop here like the queues or clusterName
+  // TODO: Pass the task definition that will be added from the Worker stack
   new WebhookStack(app, `${stackName}-webhooks`, {
     queues,
     clusterName,
     webhookSecureStrings,
     env,
+    vpc,
+    taskDefinition,
   });
 
   new CacheUpdaterStack(app, `${stackName}-cache`, {

cdk-infra/lib/constructs/api/webhook-api-construct.ts

@@ -7,6 +7,8 @@ import { IQueue } from 'aws-cdk-lib/aws-sqs';
 import { Construct } from 'constructs';
 import path from 'path';
 import { getFeatureName } from '../../../utils/env';
+import { IVpc } from 'aws-cdk-lib/aws-ec2';
+import { TaskDefinition } from 'aws-cdk-lib/aws-ecs';
 
 const HANDLERS_PATH = path.join(__dirname, '/../../../../api/controllers/v2');
 
@@ -31,10 +33,17 @@ interface WebhookApiConstructProps {
   jobsQueue: IQueue;
   jobUpdatesQueue: IQueue;
   environment: Record<string, string>;
+  vpc: IVpc;
+  taskDefinition: TaskDefinition;
+  clusterName: string;
 }
 
 export class WebhookApiConstruct extends Construct {
-  constructor(scope: Construct, id: string, { jobsQueue, jobUpdatesQueue, environment }: WebhookApiConstructProps) {
+  constructor(
+    scope: Construct,
+    id: string,
+    { jobsQueue, jobUpdatesQueue, environment, vpc, taskDefinition, clusterName }: WebhookApiConstructProps
+  ) {
     super(scope, id);
 
     const timeout = Duration.minutes(2);
@@ -79,10 +88,17 @@ export class WebhookApiConstruct extends Construct {
       runtime,
       handler: 'triggerSmokeTestAutomatedBuild',
       bundling,
-      environment,
+      environment: {
+        TASK_DEFINITION: taskDefinition.taskDefinitionArn,
+        SUBNETS: JSON.stringify(vpc.privateSubnets.map((subnet) => subnet.subnetId)),
+        CLUSTER: clusterName,
+        ...environment,
+      },
       timeout,
     });
 
+    taskDefinition.grantRun(githubSmokeTestBuildLambda);
+
     const githubDeleteArtifactsLambda = new NodejsFunction(this, 'githubDeleteArtifactsLambda', {
       entry: `${HANDLERS_PATH}/github.ts`,
       runtime,