Merge pull request #15 from contentstack/development

DX | 21-08-2024 | Release

Author: cs-raj

Diff for: .github/workflows/jira.yml

@@ -3,7 +3,7 @@ on:
   pull_request:
     types: [opened]
 jobs:
-  security:
+  security-jira:
     if: ${{ github.actor == 'dependabot[bot]' || github.actor == 'snyk-bot' || contains(github.event.pull_request.head.ref, 'snyk-fix-')  || contains(github.event.pull_request.head.ref, 'snyk-upgrade-')}}
     runs-on: ubuntu-latest
     steps:
@@ -26,3 +26,8 @@ jobs:
             PR: ${{ github.event.pull_request.html_url }}
 
           fields: "${{ secrets.JIRA_FIELDS }}"
+      - name: Transition issue
+        uses: atlassian/gajira-transition@v3
+        with:
+          issue: ${{ steps.create.outputs.issue }}
+          transition: ${{ secrets.JIRA_TRANSITION }}

Diff for: .github/workflows/sast-scan.yml

@@ -0,0 +1,11 @@
+name: SAST Scan
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+jobs:
+  security-sast:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Semgrep Scan
+        run: docker run -v /var/run/docker.sock:/var/run/docker.sock -v "${PWD}:/src" returntocorp/semgrep semgrep scan --config auto

Diff for: .github/workflows/sca-scan.yml

@@ -3,7 +3,7 @@ on:
   pull_request:
     types: [opened, synchronize, reopened]
 jobs:
-  security:
+  security-sca:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@master

Diff for: package-lock.json

@@ -1,7 +1,7 @@
 {
   "author": "Contentstack Ecosystem <[email protected]>",
   "name": "datasync-mongodb-sdk",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "Mongodb query wrapper around contents synced via @contentstack/content-store-mongodb",
   "main": "dist/index.js",
   "scripts": {
@@ -29,6 +29,7 @@
     "debug": "^4.3.4",
     "jest": "^29.0.3",
     "jsdoc": "^4.0.0",
+    "node-notifier": "^10.0.1",
     "rimraf": "^2.6.3",
     "ts-jest": "^29.0.2",
     "tslint": "^5.18.0",

Diff for: package.json

@@ -6,6 +6,7 @@
 
 import {
   merge,
+  mergeWith,
   remove,
 } from 'lodash'
 import {
@@ -2125,7 +2126,7 @@ export class Stack {
 
     schemas.forEach((schema) => {
       // Entry references
-      entryReferences = merge(entryReferences, schema[this.types.references])
+      entryReferences = mergeWith(entryReferences, schema[this.types.references])
       // tslint:disable-next-line: forin
       for (const path in schema[this.types.assets]) {
         paths.push(path)

Diff for: src/stack.ts

@@ -8,7 +8,7 @@ export const assets = [
     title: 'A 1',
     uid: 'a1',
     url:
-    'https://images.contentstack.io/v3/assets/***REMOVED***/blt6788d40f2aaaab9a/5c5aae49005d89b20bb85c21/cnn.png',
+    'https://images.contentstack.io/v3/assets/blt44d99c34b040fa61/blt6788d40f2aaaab9a/5c5aae49005d89b20bb85c21/cnn.png',
   },
   {
     _version: 1,
@@ -19,7 +19,7 @@ export const assets = [
     title: 'A 2',
     uid: 'a2',
     url:
-    'https://images.contentstack.io/v3/assets/***REMOVED***/blt6788d40f2aaaab9a/5c5aae49005d89b20bb85c21/cnn.png',
+    'https://images.contentstack.io/v3/assets/blt44d99c34b040fa61/blt6788d40f2aaaab9a/5c5aae49005d89b20bb85c21/cnn.png',
   },
   {
     _version: 2,
@@ -30,6 +30,6 @@ export const assets = [
     title: 'A 3',
     uid: 'a3',
     url:
-    'https://images.contentstack.io/v3/assets/***REMOVED***/blt6788d40f2aaaab9a/5c5aae49005d89b20bb85c21/cnn.png',
+    'https://images.contentstack.io/v3/assets/blt44d99c34b040fa61/blt6788d40f2aaaab9a/5c5aae49005d89b20bb85c21/cnn.png',
   },
 ]