DOP-4401-b adding initial changes

mongodb · Mar 26, 2024 · c4f34c1 · c4f34c1
1 parent a164201
commit c4f34c1
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 13 deletions.
diff --git a/.github/workflows/deploy-stg-ecs.yml b/.github/workflows/deploy-stg-ecs.yml
@@ -3,7 +3,6 @@ on:
     branches:
       - "main"
       - "integration"
-      - "DOP-4414"
 concurrency:
   group: environment-stg-${{ github.ref }}
   cancel-in-progress: true

diff --git a/.github/workflows/deploy-stg-enhanced-webhooks.yml b/.github/workflows/deploy-stg-enhanced-webhooks.yml
@@ -1,10 +1,9 @@
 on:
   push:
-    # paths: ["api/v2/**", "cdk-infra/lib/constructs/api/**", "cdk-infra/utils/**"]
+    paths: ["api/v2/**", "cdk-infra/lib/constructs/api/**", "cdk-infra/utils/**"]
     branches:
       - "main"
       - "integration"
-      - "DOP-4414"
 
 concurrency:
   group: environment-stg-enhanced-webhooks-${{ github.ref }}

diff --git a/src/job/productionJobHandler.ts b/src/job/productionJobHandler.ts
@@ -142,21 +142,34 @@ export class ProductionJobHandler extends JobHandler {
 
   getPathPrefix(): string {
     try {
-      if (this.currJob.payload.prefix && this.currJob.payload.prefix === '') {
-        return this.currJob.payload.urlSlug ?? '';
+      const prefix = this.currJob.payload.urlSlug
+        ? `${this.currJob.payload.urlSlug}/${this.currJob.payload.prefix}`
+        : this.currJob.payload.prefix;
+      if (this.currJob.payload.newHead && this.currJob.payload.action == 'automatedTest') {
+        return `${prefix}/${this.currJob.payload.newHead}`;
       }
-      if (this.currJob.payload.urlSlug) {
-        if (this.currJob.payload.urlSlug === '') {
-          return this.currJob.payload.prefix;
-        } else {
-          return `${this.currJob.payload.prefix}/${this.currJob.payload.urlSlug}`;
-        }
-      }
-      return this.currJob.payload.prefix;
+      return prefix;
     } catch (error) {
       this.logger.save(this.currJob._id, error).then();
       throw new InvalidJobError(error.message);
     }
+    // try {
+    //   if (this.currJob.payload.prefix && this.currJob.payload.prefix === '') {
+    //     return this.currJob.payload.urlSlug ?? '';
+    //   }
+    //   if (this.currJob.payload.urlSlug) {
+    //     if (this.currJob.payload.urlSlug === '') {
+    //       return this.currJob.payload.prefix;
+    //     } else {
+    //     return this.currJob.payload.prefix + `/${this.currJob.payload.urlSlug}`;
+    //     }
+    //   }
+
+    //   return prefix;
+    // } catch (error) {
+    //   this.logger.save(this.currJob._id, error).then();
+    //   throw new InvalidJobError(error.message);
+    // }
   }
 
   private async purgePublishedContent(makefileOutput: Array<string>): Promise<void> {