Skip to content

Commit 760e32e

Browse files
gabriel-cxgabriel-cx
authored
Merge branch 'Checkmarx:master' into master
2 parents c8bde6c + cded4e5 commit 760e32e

File tree

508 files changed

+13278
-3571
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

508 files changed

+13278
-3571
lines changed

‎.github/scripts/docs-generator/docs-generator.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ def check_and_create_override_entry(meta_dict, template_dict):
9292
check_and_create_override_entry(meta_dict, template_dict)
9393
q_id = meta_dict['id']
9494
query_page = os.path.join('..', f"{meta_dict.get('platform').lower()}-queries", meta_dict.get('cloudProvider', '').lower(), meta_dict.get('id'))
95-
meta_dict['descriptionText'] += f' (<a href="{query_page}" target="_blank">read more</a>)'
95+
meta_dict['descriptionText'] = f'<a href="{query_page}" target="_blank">Query details</a>'
9696
template_dict[platform][sub_platform][severity][category][q_id] = meta_dict
9797
#
9898
# template dict ex:

‎.github/scripts/docs-generator/templates/general_template.md‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
## Queries List
22
This page contains all queries.
33

4-
| Query |Platform|Severity|Category|Description|Help|
5-
|-----------------------------|---|---|---|---|---|
4+
| Query |Platform|Severity|Category|More info|
5+
|-----------------------------|---|---|---|---|
66
{%- for platform in data %}
77
{%- for sub_platform in data[platform] -%}
88
{%- for severity in data[platform][sub_platform] -%}
99
{%- for id in data[platform][sub_platform][severity] %}
1010
|{{data[platform][sub_platform][severity][id]['queryName']}}<br/><sup><sub>{{id}}</sub></sup>|{{platform -}}
1111
|<span style="color:{{colors[severity]}}">{{severity}}</span>|{{data[platform][sub_platform][severity][id]['category'] -}}
12-
|{{data[platform][sub_platform][severity][id]['descriptionText'] -}}
13-
|<a href="{{data[platform][sub_platform][severity][id]['descriptionUrl']}}">Documentation</a><br/>|
12+
|{{data[platform][sub_platform][severity][id]['descriptionText'] -}}<br><a href="{{data[platform][sub_platform][severity][id]['descriptionUrl']}}">Documentation</a><br/>|
1413
{%- endfor -%}
1514
{%- endfor -%}
1615
{%- endfor -%}

‎.github/scripts/docs-generator/templates/platform_template.md‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,16 @@ This page contains all queries from {{platform}}.
55
{%- if sub_platform != 'default' %}
66

77
### {{sub_platform | upper}}
8-
Bellow are listed queries related with {{platform}} {{sub_platform | upper}}:
8+
Below are listed queries related to {{platform}} {{sub_platform | upper}}:
99

1010
{% endif %}
1111

12-
| Query |Severity|Category|Description|Help|
13-
|------------------------------|--------|--------|-----------|----|
12+
| Query |Severity|Category|More info|
13+
|------------------------------|--------|--------|-----------|
1414
{%- for severity in data[sub_platform] -%}
1515
{%- for id in data[sub_platform][severity] %}
1616
|{{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'] -}}
17-
|{{data[sub_platform][severity][id]['descriptionText'] -}}
18-
|<a href="{{data[sub_platform][severity][id]['descriptionUrl']}}">Documentation</a><br/>|
17+
|{{data[sub_platform][severity][id]['descriptionText'] -}}<br><a href="{{data[sub_platform][severity][id]['descriptionUrl']}}">Documentation</a><br/>|
1918
{%- endfor -%}
2019
{%- endfor -%}
21-
{%- endfor -%}
20+
{%- endfor -%}

‎.github/scripts/report/go.mod‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
module github.com/Checkmarx/e2e-report
22

3-
go 1.16
3+
go 1.21
44

5-
require github.com/tdewolff/minify/v2 v2.9.21
5+
require (
6+
github.com/rs/zerolog v1.31.0
7+
github.com/tdewolff/minify/v2 v2.9.21
8+
)
9+
10+
require (
11+
github.com/mattn/go-colorable v0.1.13 // indirect
12+
github.com/mattn/go-isatty v0.0.19 // indirect
13+
github.com/tdewolff/parse/v2 v2.5.19 // indirect
14+
golang.org/x/sys v0.12.0 // indirect
15+
)

‎.github/scripts/report/go.sum‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,18 @@
11
github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927/go.mod h1:h/aW8ynjgkuj+NQRlZcDbAbM1ORAbXjXX77sX7T289U=
2+
github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
23
github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
34
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
5+
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
46
github.com/matryer/try v0.0.0-20161228173917-9ac251b645a2/go.mod h1:0KeJpeMD6o+O4hW7qJOT7vyQPKrWmj26uf5wMc/IiIs=
7+
github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
8+
github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
9+
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
10+
github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
11+
github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
12+
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
13+
github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
14+
github.com/rs/zerolog v1.31.0 h1:FcTR3NnLWW+NnTwwhFWiJSZr4ECLpqCm6QsEnyvbV4A=
15+
github.com/rs/zerolog v1.31.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
516
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
617
github.com/tdewolff/minify/v2 v2.9.21 h1:nO4s1PEMy7aRjlIlbr3Jgr+bJby8QYuifa2Vs2f9lh4=
718
github.com/tdewolff/minify/v2 v2.9.21/go.mod h1:PoDBts2L7sCwUT28vTAlozGeD6qxjrrihtin4bR/RMM=
@@ -11,3 +22,7 @@ github.com/tdewolff/test v1.0.6 h1:76mzYJQ83Op284kMT+63iCNCI7NEERsIN8dLM+RiKr4=
1122
github.com/tdewolff/test v1.0.6/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE=
1223
golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
1324
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
25+
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
26+
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
27+
golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
28+
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

‎.github/scripts/samples-linters/yamllint_ansible.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,7 @@ rules:
66
indentation:
77
indent-sequences: consistent
88
comments-indentation: disable
9+
new-line-at-end-of-file: disable
10+
trailing-spaces: disable
911
ignore: |
1012
**/kms_key_with_full_permissions/test/positive.yaml

‎.github/workflows/alert-update-flags.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414

1515
steps:
1616
- name: Checkout project
17-
uses: actions/checkout@v3
17+
uses: actions/checkout@v4
1818
with:
1919
fetch-depth: 2
2020
- name: Execute diff and send email

‎.github/workflows/alert-update-terraform-modules.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212

1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1515
with:
1616
fetch-depth: 0
1717
- name: Execute diff and send email

‎.github/workflows/check-apache-license.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: check-apache-license
22
on:
33
pull_request_target:
44
types: [opened, synchronize, edited, reopened]
5-
branches:
5+
branches:
66
- master
77
jobs:
88
check-license:
@@ -12,7 +12,7 @@ jobs:
1212
USERNAME: ${{ github.event.pull_request.user.login }}
1313
steps:
1414
- name: Checkout code
15-
uses: actions/checkout@v3
15+
uses: actions/checkout@v4
1616
with:
1717
persist-credentials: false
1818
sparse-checkout: |
@@ -51,4 +51,4 @@ jobs:
5151
GITHUB_TOKEN: ${{ secrets.KICS_BOT_PAT }}
5252
- name: Workflow failed
5353
if: env.CHECK_FAILED == 'true'
54-
run: exit 1
54+
run: exit 1

‎.github/workflows/check-go-coverage.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Checkout Source
13-
uses: actions/checkout@v3
13+
uses: actions/checkout@v4
1414
with:
1515
fetch-depth: 0
16-
- name: Set up Go 1.20.x
16+
- name: Set up Go 1.21.x
1717
uses: actions/setup-go@v4
1818
with:
19-
go-version: 1.20.x
19+
go-version: 1.21.x
2020
- name: Run test metrics script
2121
id: testcov
2222
run: |
@@ -26,4 +26,4 @@ jobs:
2626
if: env.coverage < 80
2727
run: |
2828
echo "Go coverage is lower than 80%: ${{ env.coverage }}%"
29-
exit 1
29+
exit 1

0 commit comments

Comments
 (0)