Merge branch 'master' into joaom/kics-1218

Checkmarx · Mar 19, 2024 · 4ccbadf · 4ccbadf
2 parents 16d4d78 + dbd779a
commit 4ccbadf
Show file tree

Hide file tree

Showing 687 changed files with 31,154 additions and 17,334 deletions.
diff --git a/.github/scripts/coverage/get-coverage.py b/.github/scripts/coverage/get-coverage.py
@@ -140,9 +140,9 @@ def main():
     if os.environ.get('GITHUB_RUN_ID'):
         if total >= 90:
             color = 'brightgreen'
-        elif total >= 80:
+        elif total >= 70:
             color = 'green'
-        elif total >= 75:
+        elif total >= 50:
             color = 'orange'
         else:
             color = 'red'

diff --git a/.github/scripts/docs-generator/docs-generator.py b/.github/scripts/docs-generator/docs-generator.py
@@ -92,7 +92,7 @@ def check_and_create_override_entry(meta_dict, template_dict):
         check_and_create_override_entry(meta_dict, template_dict)
         q_id = meta_dict['id']
         query_page = os.path.join('..', f"{meta_dict.get('platform').lower()}-queries", meta_dict.get('cloudProvider', '').lower(), meta_dict.get('id'))
-        meta_dict['descriptionText'] += f' (<a href="{query_page}" target="_blank">read more</a>)'
+        meta_dict['descriptionText'] = f'<a href="{query_page}" target="_blank">Query details</a>'
         template_dict[platform][sub_platform][severity][category][q_id] = meta_dict
 #
 # template dict ex:

diff --git a/.github/scripts/docs-generator/templates/general_template.md b/.github/scripts/docs-generator/templates/general_template.md
@@ -1,16 +1,15 @@
 ## Queries List
 This page contains all queries.
 
-|            Query            |Platform|Severity|Category|Description|Help|
-|-----------------------------|---|---|---|---|---|
+ |            Query            |Platform|Severity|Category|More info|
+|-----------------------------|---|---|---|---|
 {%- for platform in data %}
 {%- for sub_platform in data[platform] -%}
   {%- for severity in data[platform][sub_platform] -%}
     {%- for id in data[platform][sub_platform][severity] %}
 |{{data[platform][sub_platform][severity][id]['queryName']}}<br/><sup><sub>{{id}}</sub></sup>|{{platform -}}
     |<span style="color:{{colors[severity]}}">{{severity}}</span>|{{data[platform][sub_platform][severity][id]['category'] -}}
-    |{{data[platform][sub_platform][severity][id]['descriptionText'] -}}
-    |<a href="{{data[platform][sub_platform][severity][id]['descriptionUrl']}}">Documentation</a><br/>|
+    |{{data[platform][sub_platform][severity][id]['descriptionText'] -}}<br><a href="{{data[platform][sub_platform][severity][id]['descriptionUrl']}}">Documentation</a><br/>|
     {%- endfor -%}
   {%- endfor -%}
 {%- endfor -%}

diff --git a/.github/scripts/docs-generator/templates/platform_template.md b/.github/scripts/docs-generator/templates/platform_template.md
@@ -5,17 +5,16 @@ This page contains all queries from {{platform}}.
 {%- if sub_platform != 'default' %}
 
 ### {{sub_platform | upper}}
-Bellow are listed queries related with {{platform}} {{sub_platform | upper}}:
+Below are listed queries related to {{platform}} {{sub_platform | upper}}:
 
 {% endif %}
 
-|            Query             |Severity|Category|Description|Help|
-|------------------------------|--------|--------|-----------|----|
+|            Query             |Severity|Category|More info|
+|------------------------------|--------|--------|-----------|
 {%- for severity in data[sub_platform] -%}
   {%- for id in data[sub_platform][severity] %}
 |{{data[sub_platform][severity][id]['queryName']}}<br/><sup><sub>{{id}}</sub></sup>|<span style="color:{{colors[severity]}}">{{severity}}</span>|{{data[sub_platform][severity][id]['category'] -}}
-    |{{data[sub_platform][severity][id]['descriptionText'] -}}
-    |<a href="{{data[sub_platform][severity][id]['descriptionUrl']}}">Documentation</a><br/>|
+    |{{data[sub_platform][severity][id]['descriptionText'] -}}<br><a href="{{data[sub_platform][severity][id]['descriptionUrl']}}">Documentation</a><br/>|
   {%- endfor -%}
 {%- endfor -%}
-{%- endfor -%}
+{%- endfor -%}
diff --git a/.github/scripts/kics-queries-repo-branch-creation/config-template/config.yml b/.github/scripts/kics-queries-repo-branch-creation/config-template/config.yml
diff --git a/.github/scripts/queries-validator/metadata-schema.json b/.github/scripts/queries-validator/metadata-schema.json
@@ -35,6 +35,7 @@
             "type": "string",
             "enum": [
                 "TRACE",
+                "CRITICAL",
                 "HIGH",
                 "MEDIUM",
                 "LOW",
@@ -77,7 +78,8 @@
                 "azure",
                 "common",
                 "gcp",
-                "nifcloud"
+                "nifcloud",
+                "tencentcloud"
             ]
         },
         "platform": {