Add latest changes from gitlab-org/gitlab@master

1 files changed, 58 insertions, 18 deletions

diff --git a/app/validators/json_schemas/security_ci_configuration_schemas/sast_ui_schema.json b/app/validators/json_schemas/security_ci_configuration_schemas/sast_ui_schema.json
index aa4dd60a9fb..cce2b28529f 100644
--- a/app/validators/json_schemas/security_ci_configuration_schemas/sast_ui_schema.json
+++ b/app/validators/json_schemas/security_ci_configuration_schemas/sast_ui_schema.json
@@ -4,43 +4,83 @@
             "field" : "SECURE_ANALYZERS_PREFIX",
             "label" : "Image prefix",
             "type": "string",
-            "default_value": "",
-            "value": "",
-            "description": "Analyzer image's registry prefix (or Name of the registry providing the analyzers' image)"
+            "default_value": "registry.gitlab.com/gitlab-org/security-products/analyzers",
+            "value": ""
         },
         {
             "field" : "SAST_EXCLUDED_PATHS",
             "label" : "Excluded Paths",
             "type": "string",
-            "default_value": "",
-            "value": "",
-            "description": "Comma-separated list of paths to be excluded from analyzer output. Patterns can be globs, file paths, or folder paths."
+            "default_value": "spec, test, tests, tmp",
+            "value": ""
         },
         {
             "field" : "SAST_ANALYZER_IMAGE_TAG",
             "label" : "Image tag",
             "type": "string",
-            "default_value": "",
-            "value": "",
-            "description": "Analyzer image's tag"
+            "options": [],
+            "default_value": "2",
+            "value": ""
+        },
+        {
+            "field" : "SAST_DISABLED",
+            "label" : "Disable SAST",
+            "type": "options",
+            "options": [
+                {
+                    "value" :"true",
+                    "label" : "true (disables SAST)"
+                },
+                {
+                    "value":"false",
+                    "label":"false (enables SAST)"
+                }
+            ],
+            "default_value": "false",
+            "value": ""
         }
     ],
     "pipeline": [
         {
             "field" : "stage",
             "label" : "Stage",
-            "type": "string",
-            "default_value": "",
-            "value": "",
-            "description": "Pipeline stage in which the scan jobs run"
+            "type": "dropdown",
+            "options": [
+                {
+                    "value" :"test",
+                    "label" : "test"
+                },
+                {
+                    "value":"build",
+                    "label":"build"
+                }
+            ],
+            "default_value": "test",
+            "value": ""
         },
         {
-            "field" : "SEARCH_MAX_DEPTH",
-            "label" : "Search maximum depth",
-            "type": "string",
+            "field" : "allow_failure",
+            "label" : "Allow Failure",
+            "type": "options",
+            "options": [
+                {
+                    "value" :"true",
+                    "label" : "Allows pipeline failure"
+                },
+                {
+                    "value": "false",
+                    "label": "Does not allow pipeline failure"
+                }
+            ],
+            "default_value": "true",
+            "value": ""
+        },
+        {
+            "field" : "rules",
+            "label" : "Rules",
+            "type": "multiline",
             "default_value": "",
-            "value": "",
-            "description": "Maximum depth of language and framework detection"
+            "value": ""
         }
     ],
     "analyzers": [