Add latest changes from gitlab-org/gitlab@16-0-stable-eev16.0.0-rc42

11 files changed, 221 insertions, 29 deletions

diff --git a/spec/fixtures/security_reports/feature-branch/gl-sast-report.json b/spec/fixtures/security_reports/feature-branch/gl-sast-report.json
index 083042e19ff..f153192fed7 100644
--- a/spec/fixtures/security_reports/feature-branch/gl-sast-report.json
+++ b/spec/fixtures/security_reports/feature-branch/gl-sast-report.json
@@ -1,7 +1,8 @@
 {
-  "version": "14.0.0",
+  "version": "15.0.0",
   "vulnerabilities": [
     {
+      "id": "1",
       "category": "sast",
       "name": "Predictable pseudorandom number generator",
       "message": "Predictable pseudorandom number generator",
@@ -29,6 +30,7 @@
       ]
     },
     {
+      "id": "2",
       "category": "sast",
       "name": "Predictable pseudorandom number generator",
       "message": "Predictable pseudorandom number generator",
@@ -56,6 +58,7 @@
       ]
     },
     {
+      "id": "3",
       "category": "sast",
       "name": "ECB mode is insecure",
       "message": "ECB mode is insecure",
@@ -90,6 +93,7 @@
       ]
     },
     {
+      "id": "4",
       "category": "sast",
       "name": "Hard coded key",
       "message": "Hard coded key",
@@ -124,6 +128,7 @@
       ]
     },
     {
+      "id": "5",
       "category": "sast",
       "name": "ECB mode is insecure",
       "message": "ECB mode is insecure",
@@ -158,8 +163,19 @@
       ]
     }
   ],
-  "remediations": [],
+  "remediations": [
+
+  ],
   "scan": {
+    "analyzer": {
+      "id": "find_sec_bugs_analyzer",
+      "name": "Find Security Bugs Analyzer",
+      "url": "https://gitlab.com",
+      "vendor": {
+        "name": "GitLab"
+      },
+      "version": "1.0.0"
+    },
     "scanner": {
       "id": "find_sec_bugs",
       "name": "Find Security Bugs",
@@ -174,4 +190,4 @@
     "start_time": "2022-08-10T22:37:00",
     "end_time": "2022-08-10T22:38:00"
   }
-}
\ No newline at end of file
+}
diff --git a/spec/fixtures/security_reports/feature-branch/gl-secret-detection-report.json b/spec/fixtures/security_reports/feature-branch/gl-secret-detection-report.json
index 4862a504cec..c75b9bfb9de 100644
--- a/spec/fixtures/security_reports/feature-branch/gl-secret-detection-report.json
+++ b/spec/fixtures/security_reports/feature-branch/gl-secret-detection-report.json
@@ -1,5 +1,33 @@
 {
-  "version": "14.1.2",
-  "vulnerabilities": [],
-  "remediations": []
-}
\ No newline at end of file
+  "version": "15.0.0",
+  "vulnerabilities": [
+
+  ],
+  "remediations": [
+
+  ],
+  "scan": {
+    "analyzer": {
+      "id": "secret_detection_analyzer",
+      "name": "Secret Detection Analyzer",
+      "url": "https://gitlab.com",
+      "vendor": {
+        "name": "GitLab"
+      },
+      "version": "1.0.0"
+    },
+    "scanner": {
+      "id": "secret_detection",
+      "name": "Secret Detection",
+      "url": "https://gitlab.com",
+      "vendor": {
+        "name": "GitLab"
+      },
+      "version": "0.1.0"
+    },
+    "type": "sast",
+    "start_time": "2022-03-11T18:48:16",
+    "end_time": "2022-03-11T18:48:22",
+    "status": "success"
+  }
+}
diff --git a/spec/fixtures/security_reports/master/gl-sast-missing-scanner.json b/spec/fixtures/security_reports/master/gl-sast-missing-scanner.json
index fcfd9b831f4..16d02490156 100644
--- a/spec/fixtures/security_reports/master/gl-sast-missing-scanner.json
+++ b/spec/fixtures/security_reports/master/gl-sast-missing-scanner.json
@@ -1,7 +1,23 @@
 {
-  "version": "14.1.2",
+  "version": "15.0.0",
+  "scan": {
+    "analyzer": {
+      "id": "sast_analyzer",
+      "name": "SAST Analyzer",
+      "url": "https://gitlab.com",
+      "vendor": {
+        "name": "GitLab"
+      },
+      "version": "1.0.0"
+    },
+    "type": "sast",
+    "start_time": "2022-03-11T18:48:16",
+    "end_time": "2022-03-11T18:48:22",
+    "status": "success"
+  },
   "vulnerabilities": [
     {
+      "id": "1",
       "category": "sast",
       "message": "Probable insecure usage of temp file/directory.",
       "cve": "python/hardcoded/hardcoded-tmp.py:52865813c884a507be1f152d654245af34aba8a391626d01f1ab6d3f52ec8779:B108",
@@ -26,6 +42,7 @@
       "url": "https://docs.openstack.org/bandit/latest/plugins/b108_hardcoded_tmp_directory.html"
     },
     {
+      "id": "2",
       "category": "sast",
       "name": "Predictable pseudorandom number generator",
       "message": "Predictable pseudorandom number generator",
@@ -53,6 +70,7 @@
       "url": "https://find-sec-bugs.github.io/bugs.htm#PREDICTABLE_RANDOM"
     },
     {
+      "id": "3",
       "category": "sast",
       "name": "Predictable pseudorandom number generator",
       "message": "Predictable pseudorandom number generator",
@@ -80,6 +98,7 @@
       "url": "https://find-sec-bugs.github.io/bugs.htm#PREDICTABLE_RANDOM"
     },
     {
+      "id": "4",
       "category": "sast",
       "message": "Use of insecure MD2, MD4, or MD5 hash function.",
       "cve": "python/imports/imports-aliases.py:cb203b465dffb0cb3a8e8bd8910b84b93b0a5995a938e4b903dbb0cd6ffa1254:B303",
@@ -102,6 +121,7 @@
       "line": 11
     },
     {
+      "id": "5",
       "category": "sast",
       "message": "Use of insecure MD2, MD4, or MD5 hash function.",
       "cve": "python/imports/imports-aliases.py:a7173c43ae66bd07466632d819d450e0071e02dbf782763640d1092981f9631b:B303",
@@ -124,6 +144,7 @@
       "line": 12
     },
     {
+      "id": "6",
       "category": "sast",
       "message": "Use of insecure MD2, MD4, or MD5 hash function.",
       "cve": "python/imports/imports-aliases.py:017017b77deb0b8369b6065947833eeea752a92ec8a700db590fece3e934cf0d:B303",
@@ -146,6 +167,7 @@
       "line": 13
     },
     {
+      "id": "6",
       "category": "sast",
       "message": "Use of insecure MD2, MD4, or MD5 hash function.",
       "cve": "python/imports/imports-aliases.py:45fc8c53aea7b84f06bc4e590cc667678d6073c4c8a1d471177ca2146fb22db2:B303",
@@ -168,6 +190,7 @@
       "line": 14
     },
     {
+      "id": "7",
       "category": "sast",
       "message": "Pickle library appears to be in use, possible security issue.",
       "cve": "python/imports/imports-aliases.py:5f200d47291e7bbd8352db23019b85453ca048dd98ea0c291260fa7d009963a4:B301",
@@ -190,6 +213,7 @@
       "line": 15
     },
     {
+      "id": "8",
       "category": "sast",
       "name": "ECB mode is insecure",
       "message": "ECB mode is insecure",
@@ -217,6 +241,7 @@
       "url": "https://find-sec-bugs.github.io/bugs.htm#ECB_MODE"
     },
     {
+      "id": "9",
       "category": "sast",
       "name": "Cipher with no integrity",
       "message": "Cipher with no integrity",
@@ -244,6 +269,7 @@
       "url": "https://find-sec-bugs.github.io/bugs.htm#CIPHER_INTEGRITY"
     },
     {
+      "id": "10",
       "category": "sast",
       "message": "Probable insecure usage of temp file/directory.",
       "cve": "python/hardcoded/hardcoded-tmp.py:63dd4d626855555b816985d82c4614a790462a0a3ada89dc58eb97f9c50f3077:B108",
@@ -268,6 +294,7 @@
       "url": "https://docs.openstack.org/bandit/latest/plugins/b108_hardcoded_tmp_directory.html"
     },
     {
+      "id": "11",
       "category": "sast",
       "message": "Probable insecure usage of temp file/directory.",
       "cve": "python/hardcoded/hardcoded-tmp.py:4ad6d4c40a8c263fc265f3384724014e0a4f8dd6200af83e51ff120420038031:B108",
@@ -292,6 +319,7 @@
       "url": "https://docs.openstack.org/bandit/latest/plugins/b108_hardcoded_tmp_directory.html"
     },
     {
+      "id": "12",
       "category": "sast",
       "message": "Consider possible security implications associated with Popen module.",
       "cve": "python/imports/imports-aliases.py:2c3e1fa1e54c3c6646e8bcfaee2518153c6799b77587ff8d9a7b0631f6d34785:B404",
@@ -314,6 +342,7 @@
       "line": 1
     },
     {
+      "id": "13",
       "category": "sast",
       "message": "Consider possible security implications associated with pickle module.",
       "cve": "python/imports/imports.py:af58d07f6ad519ef5287fcae65bf1a6999448a1a3a8bc1ac2a11daa80d0b96bf:B403",
@@ -336,6 +365,7 @@
       "line": 2
     },
     {
+      "id": "14",
       "category": "sast",
       "message": "Consider possible security implications associated with subprocess module.",
       "cve": "python/imports/imports.py:8de9bc98029d212db530785a5f6780cfa663548746ff228ab8fa96c5bb82f089:B404",
@@ -358,6 +388,7 @@
       "line": 4
     },
     {
+      "id": "15",
       "category": "sast",
       "message": "Possible hardcoded password: 'blerg'",
       "cve": "python/hardcoded/hardcoded-passwords.py:97c30f1d76d2a88913e3ce9ae74087874d740f87de8af697a9c455f01119f633:B106",
@@ -382,6 +413,7 @@
       "url": "https://docs.openstack.org/bandit/latest/plugins/b106_hardcoded_password_funcarg.html"
     },
     {
+      "id": "16",
       "category": "sast",
       "message": "Possible hardcoded password: 'root'",
       "cve": "python/hardcoded/hardcoded-passwords.py:7431c73a0bc16d94ece2a2e75ef38f302574d42c37ac0c3c38ad0b3bf8a59f10:B105",
@@ -406,6 +438,7 @@
       "url": "https://docs.openstack.org/bandit/latest/plugins/b105_hardcoded_password_string.html"
     },
     {
+      "id": "17",
       "category": "sast",
       "message": "Possible hardcoded password: ''",
       "cve": "python/hardcoded/hardcoded-passwords.py:d2d1857c27caedd49c57bfbcdc23afcc92bd66a22701fcdc632869aab4ca73ee:B105",
@@ -430,6 +463,7 @@
       "url": "https://docs.openstack.org/bandit/latest/plugins/b105_hardcoded_password_string.html"
     },
     {
+      "id": "18",
       "category": "sast",
       "message": "Possible hardcoded password: 'ajklawejrkl42348swfgkg'",
       "cve": "python/hardcoded/hardcoded-passwords.py:fb3866215a61393a5c9c32a3b60e2058171a23219c353f722cbd3567acab21d2:B105",
@@ -454,6 +488,7 @@
       "url": "https://docs.openstack.org/bandit/latest/plugins/b105_hardcoded_password_string.html"
     },
     {
+      "id": "19",
       "category": "sast",
       "message": "Possible hardcoded password: 'blerg'",
       "cve": "python/hardcoded/hardcoded-passwords.py:63c62a8b7e1e5224439bd26b28030585ac48741e28ca64561a6071080c560a5f:B105",
@@ -478,6 +513,7 @@
       "url": "https://docs.openstack.org/bandit/latest/plugins/b105_hardcoded_password_string.html"
     },
     {
+      "id": "20",
       "category": "sast",
       "message": "Possible hardcoded password: 'blerg'",
       "cve": "python/hardcoded/hardcoded-passwords.py:4311b06d08df8fa58229b341c531da8e1a31ec4520597bdff920cd5c098d86f9:B105",
@@ -502,6 +538,7 @@
       "url": "https://docs.openstack.org/bandit/latest/plugins/b105_hardcoded_password_string.html"
     },
     {
+      "id": "21",
       "category": "sast",
       "message": "Consider possible security implications associated with subprocess module.",
       "cve": "python/imports/imports-function.py:5858400c2f39047787702de44d03361ef8d954c9d14bd54ee1c2bef9e6a7df93:B404",
@@ -524,6 +561,7 @@
       "line": 4
     },
     {
+      "id": "22",
       "category": "sast",
       "message": "Consider possible security implications associated with pickle module.",
       "cve": "python/imports/imports-function.py:dbda3cf4190279d30e0aad7dd137eca11272b0b225e8af4e8bf39682da67d956:B403",
@@ -546,6 +584,7 @@
       "line": 2
     },
     {
+      "id": "23",
       "category": "sast",
       "message": "Consider possible security implications associated with Popen module.",
       "cve": "python/imports/imports-from.py:eb8a0db9cd1a8c1ab39a77e6025021b1261cc2a0b026b2f4a11fca4e0636d8dd:B404",
@@ -568,6 +607,7 @@
       "line": 7
     },
     {
+      "id": "24",
       "category": "sast",
       "message": "subprocess call with shell=True seems safe, but may be changed in the future, consider rewriting without shell",
       "cve": "python/imports/imports-aliases.py:f99f9721e27537fbcb6699a4cf39c6740d6234d2c6f06cfc2d9ea977313c483d:B602",
@@ -592,6 +632,7 @@
       "url": "https://docs.openstack.org/bandit/latest/plugins/b602_subprocess_popen_with_shell_equals_true.html"
     },
     {
+      "id": "25",
       "category": "sast",
       "message": "Consider possible security implications associated with subprocess module.",
       "cve": "python/imports/imports-from.py:332a12ab1146698f614a905ce6a6a5401497a12281aef200e80522711c69dcf4:B404",
@@ -614,6 +655,7 @@
       "line": 6
     },
     {
+      "id": "26",
       "category": "sast",
       "message": "Consider possible security implications associated with Popen module.",
       "cve": "python/imports/imports-from.py:0a48de4a3d5348853a03666cb574697e3982998355e7a095a798bd02a5947276:B404",
@@ -636,6 +678,7 @@
       "line": 1
     },
     {
+      "id": "27",
       "category": "sast",
       "message": "Consider possible security implications associated with pickle module.",
       "cve": "python/imports/imports-aliases.py:51b71661dff994bde3529639a727a678c8f5c4c96f00d300913f6d5be1bbdf26:B403",
@@ -658,6 +701,7 @@
       "line": 7
     },
     {
+      "id": "28",
       "category": "sast",
       "message": "Consider possible security implications associated with loads module.",
       "cve": "python/imports/imports-aliases.py:6ff02aeb3149c01ab68484d794a94f58d5d3e3bb0d58557ef4153644ea68ea54:B403",
@@ -680,6 +724,7 @@
       "line": 6
     },
     {
+      "id": "29",
       "category": "sast",
       "message": "Statically-sized arrays can be improperly restricted, leading to potential overflows or other issues (CWE-119!/CWE-120)",
       "cve": "c/subdir/utils.c:b466873101951fe96e1332f6728eb7010acbbd5dfc3b65d7d53571d091a06d9e:CWE-119!/CWE-120",
@@ -713,6 +758,7 @@
       "url": "https://cwe.mitre.org/data/definitions/119.html"
     },
     {
+      "id": "30",
       "category": "sast",
       "message": "Check when opening files - can an attacker redirect it (via symlinks), force the opening of special file type (e.g., device files), move things around to create a race condition, control its ancestors, or change its contents? (CWE-362)",
       "cve": "c/subdir/utils.c:bab681140fcc8fc3085b6bba74081b44ea145c1c98b5e70cf19ace2417d30770:CWE-362",
@@ -739,6 +785,7 @@
       "url": "https://cwe.mitre.org/data/definitions/362.html"
     },
     {
+      "id": "31",
       "category": "sast",
       "message": "Statically-sized arrays can be improperly restricted, leading to potential overflows or other issues (CWE-119!/CWE-120)",
       "cve": "cplusplus/src/hello.cpp:c8c6dd0afdae6814194cf0930b719f757ab7b379cf8f261e7f4f9f2f323a818a:CWE-119!/CWE-120",
@@ -772,6 +819,7 @@
       "url": "https://cwe.mitre.org/data/definitions/119.html"
     },
     {
+      "id": "32",
       "category": "sast",
       "message": "Does not check for buffer overflows when copying to destination [MS-banned] (CWE-120)",
       "cve": "cplusplus/src/hello.cpp:331c04062c4fe0c7c486f66f59e82ad146ab33cdd76ae757ca41f392d568cbd0:CWE-120",
@@ -799,4 +847,4 @@
       "url": "https://cwe.mitre.org/data/definitions/120.html"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/spec/fixtures/security_reports/master/gl-sast-report-bandit.json b/spec/fixtures/security_reports/master/gl-sast-report-bandit.json
index d0346479b85..690c58d049b 100644
--- a/spec/fixtures/security_reports/master/gl-sast-report-bandit.json
+++ b/spec/fixtures/security_reports/master/gl-sast-report-bandit.json
@@ -1,5 +1,5 @@
 {
-  "version": "14.0.4",
+  "version": "15.0.4",
   "vulnerabilities": [
     {
       "id": "985a5666dcae22adef5ac12f8a8a2dacf9b9b481ae5d87cd0ac1712b0fd64864",
@@ -26,6 +26,15 @@
     }
   ],
   "scan": {
+    "analyzer": {
+      "id": "find_sec_bugs_analyzer",
+      "name": "Find Security Bugs Analyzer",
+      "url": "https://gitlab.com",
+      "vendor": {
+        "name": "GitLab"
+      },
+      "version": "1.0.0"
+    },
     "scanner": {
       "id": "bandit",
       "name": "Bandit",
@@ -40,4 +49,4 @@
     "end_time": "2022-03-11T00:21:50",
     "status": "success"
   }
-}
\ No newline at end of file
+}
diff --git a/spec/fixtures/security_reports/master/gl-sast-report-gosec.json b/spec/fixtures/security_reports/master/gl-sast-report-gosec.json
index 4c385326c8c..ef1d06d2e4f 100644
--- a/spec/fixtures/security_reports/master/gl-sast-report-gosec.json
+++ b/spec/fixtures/security_reports/master/gl-sast-report-gosec.json
@@ -1,5 +1,5 @@
 {
-  "version": "14.0.4",
+  "version": "15.0.4",
   "vulnerabilities": [
     {
       "id": "2e5656ff30e2e7cc93c36b4845c8a689ddc47fdbccf45d834c67442fbaa89be0",
@@ -51,6 +51,15 @@
     }
   ],
   "scan": {
+    "analyzer": {
+      "id": "find_sec_bugs_analyzer",
+      "name": "Find Security Bugs Analyzer",
+      "url": "https://gitlab.com",
+      "vendor": {
+        "name": "GitLab"
+      },
+      "version": "1.0.0"
+    },
     "scanner": {
       "id": "gosec",
       "name": "Gosec",
@@ -65,4 +74,4 @@
     "end_time": "2022-03-15T20:33:17",
     "status": "success"
   }
-}
\ No newline at end of file
+}
diff --git a/spec/fixtures/security_reports/master/gl-sast-report-minimal.json b/spec/fixtures/security_reports/master/gl-sast-report-minimal.json
index 53d15224b30..d29571638ff 100644
--- a/spec/fixtures/security_reports/master/gl-sast-report-minimal.json
+++ b/spec/fixtures/security_reports/master/gl-sast-report-minimal.json
@@ -1,7 +1,8 @@
 {
-  "version": "14.0.0",
+  "version": "15.0.0",
   "vulnerabilities": [
     {
+      "id": "1",
       "category": "sast",
       "name": "Cipher with no integrity",
       "message": "Cipher with no integrity",
@@ -49,8 +50,19 @@
       }
     }
   ],
-  "remediations": [],
+  "remediations": [
+
+  ],
   "scan": {
+    "analyzer": {
+      "id": "find_sec_bugs_analyzer",
+      "name": "Find Security Bugs Analyzer",
+      "url": "https://gitlab.com",
+      "vendor": {
+        "name": "GitLab"
+      },
+      "version": "1.0.0"
+    },
     "scanner": {
       "id": "find_sec_bugs",
       "name": "Find Security Bugs",
@@ -65,4 +77,4 @@
     "start_time": "2022-08-10T21:37:00",
     "end_time": "2022-08-10T21:38:00"
   }
-}
\ No newline at end of file
+}
diff --git a/spec/fixtures/security_reports/master/gl-sast-report-semgrep-for-bandit.json b/spec/fixtures/security_reports/master/gl-sast-report-semgrep-for-bandit.json
index 037b9fb8d3e..c51abf46c13 100644
--- a/spec/fixtures/security_reports/master/gl-sast-report-semgrep-for-bandit.json
+++ b/spec/fixtures/security_reports/master/gl-sast-report-semgrep-for-bandit.json
@@ -1,5 +1,5 @@
 {
-  "version": "14.0.4",
+  "version": "15.0.4",
   "vulnerabilities": [
     {
       "id": "985a5666dcae22adef5ac12f8a8a2dacf9b9b481ae5d87cd0ac1712b0fd64864",
@@ -54,6 +54,15 @@
     }
   ],
   "scan": {
+    "analyzer": {
+      "id": "find_sec_bugs_analyzer",
+      "name": "Find Security Bugs Analyzer",
+      "url": "https://gitlab.com",
+      "vendor": {
+        "name": "GitLab"
+      },
+      "version": "1.0.0"
+    },
     "scanner": {
       "id": "semgrep",
       "name": "Semgrep",
@@ -68,4 +77,4 @@
     "end_time": "2022-03-11T18:48:22",
     "status": "success"
   }
-}
\ No newline at end of file
+}
diff --git a/spec/fixtures/security_reports/master/gl-sast-report-semgrep-for-gosec.json b/spec/fixtures/security_reports/master/gl-sast-report-semgrep-for-gosec.json
index 8fa85c30b56..9a6dd4190c5 100644
--- a/spec/fixtures/security_reports/master/gl-sast-report-semgrep-for-gosec.json
+++ b/spec/fixtures/security_reports/master/gl-sast-report-semgrep-for-gosec.json
@@ -1,5 +1,5 @@
 {
-  "version": "14.0.4",
+  "version": "15.0.4",
   "vulnerabilities": [
     {
       "id": "79f6537b7ec83c7717f5bd1a4f12645916caafefe2e4359148d889855505aa67",
@@ -53,6 +53,15 @@
     }
   ],
   "scan": {
+    "analyzer": {
+      "id": "find_sec_bugs_analyzer",
+      "name": "Find Security Bugs Analyzer",
+      "url": "https://gitlab.com",
+      "vendor": {
+        "name": "GitLab"
+      },
+      "version": "1.0.0"
+    },
     "scanner": {
       "id": "semgrep",
       "name": "Semgrep",
@@ -74,4 +83,4 @@
     "end_time": "2022-03-15T20:37:05",
     "status": "success"
   }
-}
\ No newline at end of file
+}
diff --git a/spec/fixtures/security_reports/master/gl-sast-report-semgrep-for-multiple-findings.json b/spec/fixtures/security_reports/master/gl-sast-report-semgrep-for-multiple-findings.json
index cbdfdb86f6b..e3659c70710 100644
--- a/spec/fixtures/security_reports/master/gl-sast-report-semgrep-for-multiple-findings.json
+++ b/spec/fixtures/security_reports/master/gl-sast-report-semgrep-for-multiple-findings.json
@@ -1,5 +1,5 @@
 {
-  "version": "14.0.4",
+  "version": "15.0.4",
   "vulnerabilities": [
     {
       "id": "985a5666dcae22adef5ac12f8a8a2dacf9b9b481ae5d87cd0ac1712b0fd64864",
@@ -104,6 +104,15 @@
     }
   ],
   "scan": {
+    "analyzer": {
+      "id": "semgrep_analyzer",
+      "name": "Semgrep Analyzer",
+      "url": "https://gitlab.com/",
+      "vendor": {
+        "name": "GitLab"
+      },
+      "version": "1.0.0"
+    },
     "scanner": {
       "id": "semgrep",
       "name": "Semgrep",
@@ -131,4 +140,4 @@
     "end_time": "2022-03-15T20:37:05",
     "status": "success"
   }
-}
\ No newline at end of file
+}
diff --git a/spec/fixtures/security_reports/master/gl-sast-report.json b/spec/fixtures/security_reports/master/gl-sast-report.json
index 0ec31252e97..1bd1f241a6d 100644
--- a/spec/fixtures/security_reports/master/gl-sast-report.json
+++ b/spec/fixtures/security_reports/master/gl-sast-report.json
@@ -1,7 +1,8 @@
 {
-  "version": "14.0.0",
+  "version": "15.0.0",
   "vulnerabilities": [
     {
+      "id": "1_481ae5d87cd0ac1712b0fd64864",
       "category": "sast",
       "name": "Predictable pseudorandom number generator",
       "message": "Predictable pseudorandom number generator",
@@ -39,6 +40,7 @@
       ]
     },
     {
+      "id": "2_481ae5d87cd0ac1712b0fd64864",
       "category": "sast",
       "name": "Predictable pseudorandom number generator",
       "message": "Predictable pseudorandom number generator",
@@ -66,6 +68,7 @@
       ]
     },
     {
+      "id": "3_481ae5d87cd0ac1712b0fd64864",
       "category": "sast",
       "name": "ECB mode is insecure",
       "message": "ECB mode is insecure",
@@ -100,6 +103,7 @@
       ]
     },
     {
+      "id": "4_481ae5d87cd0ac1712b0fd64864",
       "category": "sast",
       "name": "Hard coded key",
       "message": "Hard coded key",
@@ -134,6 +138,7 @@
       ]
     },
     {
+      "id": "5_481ae5d87cd0ac1712b0fd64864",
       "category": "sast",
       "name": "Cipher with no integrity",
       "message": "Cipher with no integrity",
@@ -181,8 +186,19 @@
       }
     }
   ],
-  "remediations": [],
+  "remediations": [
+
+  ],
   "scan": {
+    "analyzer": {
+      "id": "find_sec_bugs_analyzer",
+      "name": "Find Security Bugs Analyzer",
+      "url": "https://gitlab.com",
+      "vendor": {
+        "name": "GitLab"
+      },
+      "version": "1.0.0"
+    },
     "scanner": {
       "id": "find_sec_bugs",
       "name": "Find Security Bugs",
@@ -197,4 +213,4 @@
     "start_time": "2022-08-10T21:37:00",
     "end_time": "2022-08-10T21:38:00"
   }
-}
\ No newline at end of file
+}
diff --git a/spec/fixtures/security_reports/master/gl-secret-detection-report.json b/spec/fixtures/security_reports/master/gl-secret-detection-report.json
index cb97b60ced1..43c079e8769 100644
--- a/spec/fixtures/security_reports/master/gl-secret-detection-report.json
+++ b/spec/fixtures/security_reports/master/gl-secret-detection-report.json
@@ -1,5 +1,29 @@
 {
-  "version": "14.1.2",
+  "version": "15.0.0",
+  "scan": {
+    "analyzer": {
+      "id": "secret_detection_analyzer",
+      "name": "Secret Detection Analyzer",
+      "url": "https://gitlab.com",
+      "vendor": {
+        "name": "GitLab"
+      },
+      "version": "1.0.0"
+    },
+    "scanner": {
+      "id": "secret_detection",
+      "name": "Secret Detection",
+      "url": "https://gitlab.com",
+      "vendor": {
+        "name": "GitLab"
+      },
+      "version": "0.1.0"
+    },
+    "type": "sast",
+    "start_time": "2022-03-11T18:48:16",
+    "end_time": "2022-03-11T18:48:22",
+    "status": "success"
+  },
   "vulnerabilities": [
     {
       "id": "27d2322d519c94f803ffed1cf6d14e455df97e5a0668e229eb853fdb0d277d2c",
@@ -17,7 +41,8 @@
       "location": {
         "file": "aws-key.py",
         "dependency": {
-          "package": {}
+          "package": {
+          }
         },
         "commit": {
           "sha": "e9c3a56590d5bed4155c0d128f1552d52fdcc7ae"
@@ -32,5 +57,7 @@
       ]
     }
   ],
-  "remediations": []
-}
\ No newline at end of file
+  "remediations": [
+
+  ]
+}