Merge branch 'next' of github.com:novuhq/novu into ci/actions-internal-auth

Author: merrcury

.github/workflows/deploy.yml

@@ -8,7 +8,9 @@ run-name: >
   }}${{
     github.event.inputs.deploy_ws == 'true' && 'ws, ' || ''
   }}${{
-    github.event.inputs.deploy_webhook == 'true' && 'webhook ' || ''
+    github.event.inputs.deploy_webhook == 'true' && 'webhook, ' || ''
+  }}${{
+    github.event.inputs.deploy_inbound_mail == 'true' && 'inbound-mail ' || ''
   }}on ${{ github.event.inputs.environment }}
 description: |
   This workflow deploys the Novu Cloud application to different environments and services based on the selected options.
@@ -55,7 +57,12 @@ on:
         type: boolean
         default: false
       deploy_webhook:
-        description: "Deploy Webhook"
+        description: "Deploy Webhook (staging / production-us / production-eu only)"
+        required: true
+        type: boolean
+        default: false
+      deploy_inbound_mail:
+        description: "Deploy Inbound Mail (staging / production-us / production-eu only)"
         required: true
         type: boolean
         default: false
@@ -75,15 +82,31 @@ jobs:
           INPUT_DEPLOY_WORKER: ${{ github.event.inputs.deploy_worker }}
           INPUT_DEPLOY_WS: ${{ github.event.inputs.deploy_ws }}
           INPUT_DEPLOY_WEBHOOK: ${{ github.event.inputs.deploy_webhook }}
+          INPUT_DEPLOY_INBOUND_MAIL: ${{ github.event.inputs.deploy_inbound_mail }}
         run: |
           if [ "$INPUT_DEPLOY_API" != "true" ] && \
              [ "$INPUT_DEPLOY_WORKER" != "true" ] && \
              [ "$INPUT_DEPLOY_WS" != "true" ] && \
-             [ "$INPUT_DEPLOY_WEBHOOK" != "true" ]; then
+             [ "$INPUT_DEPLOY_WEBHOOK" != "true" ] && \
+             [ "$INPUT_DEPLOY_INBOUND_MAIL" != "true" ]; then
             echo "Error: At least one service must be selected for deployment."
             exit 1
           fi
 
+          # webhook and inbound-mail only have infra in staging-eu, prod-us, prod-eu.
+          # Fail fast if someone selects them with an unsupported environment.
+          if [ "${{ github.event.inputs.deploy_webhook }}" = "true" ] || \
+             [ "${{ github.event.inputs.deploy_inbound_mail }}" = "true" ]; then
+            case "${{ github.event.inputs.environment }}" in
+              staging|production-us|production-eu|production-us-and-eu) ;;
+              *)
+                echo "Error: webhook and inbound-mail can only deploy to staging, production-us, production-eu, or production-us-and-eu."
+                echo "Selected environment: ${{ github.event.inputs.environment }}"
+                exit 1
+                ;;
+            esac
+          fi
+
       - name: Generate Environment, Service, and Deploy Matrices
         id: set-matrix
         env:
@@ -155,6 +178,9 @@ jobs:
           if [ "$INPUT_DEPLOY_WEBHOOK" == "true" ]; then
             services+=("\"webhook\"")
           fi
+          if [ "${{ github.event.inputs.deploy_inbound_mail }}" == "true" ]; then
+            services+=("\"inbound-mail\"")
+          fi
 
           # Parse service secrets and generate deploy_matrix
           for service in "${services[@]}"; do
@@ -233,6 +259,13 @@ jobs:
               task_name=webhook-task
               image=webhook
               deploy_matrix+=("{\"cluster_name\": \"$cluster_name\", \"container_name\": \"$container_name\", \"service_name\": \"$service_name\", \"task_name\": \"$task_name\", \"image\": \"$image\"}")
+            elif [ "$service" == "\"inbound-mail\"" ]; then
+              cluster_name=inbound-mail-cluster
+              container_name=inbound-mail-container
+              service_name=inbound-mail-service
+              task_name=inbound-mail-task
+              image=inbound-mail
+              deploy_matrix+=("{\"cluster_name\": \"$cluster_name\", \"container_name\": \"$container_name\", \"service_name\": \"$service_name\", \"task_name\": \"$task_name\", \"image\": \"$image\"}")
             fi
           done
 

.github/workflows/dev-deploy-inbound-mail.yml

@@ -56,6 +56,7 @@ jobs:
           DEPLOY_WORKER=false
           DEPLOY_WS=false
           DEPLOY_WEBHOOK=false
+          DEPLOY_INBOUND_MAIL=false
           SKIP_DEPLOYMENT=false
 
           # Check if only CI/CD label exists (standalone)
@@ -88,30 +89,44 @@ jobs:
               DEPLOY_WEBHOOK=true
               echo "Found @novu/webhook label"
             fi
+
+            if echo "$LABELS" | grep -q "@novu/inbound-mail"; then
+              DEPLOY_INBOUND_MAIL=true
+              echo "Found @novu/inbound-mail label"
+            fi
             
             # If no service labels found, deploy api and worker by default
-            if [ "$DEPLOY_API" = "false" ] && [ "$DEPLOY_WORKER" = "false" ] && [ "$DEPLOY_WS" = "false" ] && [ "$DEPLOY_WEBHOOK" = "false" ]; then
+            if [ "$DEPLOY_API" = "false" ] && [ "$DEPLOY_WORKER" = "false" ] && [ "$DEPLOY_WS" = "false" ] && [ "$DEPLOY_WEBHOOK" = "false" ] && [ "$DEPLOY_INBOUND_MAIL" = "false" ]; then
               echo "No service labels found, deploying api and worker by default"
               DEPLOY_API=true
               DEPLOY_WORKER=true
             fi
           fi
 
+          TRIGGER_DEPLOY=false
+          if [ "$DEPLOY_API" = "true" ] || [ "$DEPLOY_WORKER" = "true" ] || [ "$DEPLOY_WS" = "true" ] || \
+             [ "$DEPLOY_WEBHOOK" = "true" ] || [ "$DEPLOY_INBOUND_MAIL" = "true" ]; then
+            TRIGGER_DEPLOY=true
+          fi
+
           echo "skip_deployment=$SKIP_DEPLOYMENT" >> $GITHUB_OUTPUT
+          echo "trigger_deploy=$TRIGGER_DEPLOY" >> $GITHUB_OUTPUT
           echo "deploy_api=$DEPLOY_API" >> $GITHUB_OUTPUT
           echo "deploy_worker=$DEPLOY_WORKER" >> $GITHUB_OUTPUT
           echo "deploy_ws=$DEPLOY_WS" >> $GITHUB_OUTPUT
           echo "deploy_webhook=$DEPLOY_WEBHOOK" >> $GITHUB_OUTPUT
+          echo "deploy_inbound_mail=$DEPLOY_INBOUND_MAIL" >> $GITHUB_OUTPUT
 
           echo "Final deployment configuration:"
           echo "  Skip: $SKIP_DEPLOYMENT"
           echo "  API: $DEPLOY_API"
           echo "  Worker: $DEPLOY_WORKER"
           echo "  WS: $DEPLOY_WS"
           echo "  Webhook: $DEPLOY_WEBHOOK"
+          echo "  Inbound Mail: $DEPLOY_INBOUND_MAIL"
 
       - name: Trigger Deploy Workflow via GitHub CLI
-        if: steps.determine-services.outputs.skip_deployment == 'false'
+        if: steps.determine-services.outputs.skip_deployment == 'false' && steps.determine-services.outputs.trigger_deploy == 'true'
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
@@ -121,4 +136,5 @@ jobs:
             -f deploy_api=${{ steps.determine-services.outputs.deploy_api }} \
             -f deploy_worker=${{ steps.determine-services.outputs.deploy_worker }} \
             -f deploy_ws=${{ steps.determine-services.outputs.deploy_ws }} \
-            -f deploy_webhook=${{ steps.determine-services.outputs.deploy_webhook }}
+            -f deploy_webhook=${{ steps.determine-services.outputs.deploy_webhook }} \
+            -f deploy_inbound_mail=${{ steps.determine-services.outputs.deploy_inbound_mail }}