Merge pull request #12 from topcoder-platform/develop

[v6 PROD RELEASE] - dev -> master

Author: jmgasper

.circleci/config.yml

@@ -67,6 +67,7 @@ workflows:
           branches:
             only:
             - develop
+            - pm-2539
 
     # Production builds are exectuted only on tagged commits to the
     # master branch.

.github/workflows/trivy.yaml

@@ -0,0 +1,34 @@
+name: Trivy Scanner
+
+permissions:
+  contents: read
+  security-events: write
+on:
+  push:
+    branches:
+      - main
+      - dev
+  pull_request:
+jobs:
+  trivy-scan:
+    name: Use Trivy
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Run Trivy scanner in repo mode
+        uses: aquasecurity/trivy-action@0.33.1
+        with:
+          scan-type: "fs"
+          ignore-unfixed: true
+          format: "sarif"
+          output: "trivy-results.sarif"
+          severity: "CRITICAL,HIGH,UNKNOWN"
+          scanners: vuln,secret,misconfig,license
+          github-pat: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Upload Trivy scan results to GitHub Security tab
+        uses: github/codeql-action/upload-sarif@v3
+        with:
+          sarif_file: "trivy-results.sarif"

config/default.js

@@ -121,5 +121,6 @@ module.exports = {
 
   HASHING_KEYS: {
     USERFLOW: process.env.USERFLOW_PRIVATE_KEY
-  }
+  },
+  MEMBER_SERVICE_PRISMA_TIMEOUT: process.env.MEMBER_SERVICE_PRISMA_TIMEOUT ? parseInt(process.env.MEMBER_SERVICE_PRISMA_TIMEOUT, 10) : 10000,
 }

src/common/prisma.js

@@ -4,8 +4,12 @@ const {
   Prisma
 } = require('../../prisma/generated/client')
 const { PrismaClient: SkillsPrismaClient } = require('../../prisma/generated/skills-client')
+const config = require('config')
 
 const clientOptions = {
+  transactionOptions: {
+    timeout: config.MEMBER_SERVICE_PRISMA_TIMEOUT,
+  },
   log: [
     { level: 'query', emit: 'event' },
     { level: 'info', emit: 'event' },