Skip to content

Commit

Permalink
Unique sort ignore files (#683)
Browse files Browse the repository at this point in the history
  • Loading branch information
@danielhoherd
danielhoherd authored Jan 30, 2024
1 parent ae8ac35 commit 9a8fe0e
Show file tree
Hide file tree
Showing 45 changed files with 159 additions and 171 deletions.
3 changes: 3 additions & 0 deletions .pre-commit-config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@ repos:
- id: check-xml
- id: check-yaml
args: ["--allow-multiple-documents"]
- id: file-contents-sorter
args: ["--ignore-case", "--unique"]
files: "^.*ignore$"
- id: file-contents-sorter
args: ["--ignore-case", "--unique"]
files: "^.gitignore$"
Expand Down
2 changes: 1 addition & 1 deletion .prettierignore
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
statsd-exporter/test/statsd-test-config.js
statsd-exporter/test/statsd-test-config.js
1 change: 0 additions & 1 deletion alertmanager/trivyignore
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
# Upstream alertmanager images include several CVEs.
# We should try to remove these each time we update.

2 changes: 1 addition & 1 deletion awsesproxy/trivyignore
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Upstream awsesproxy images include several CVEs.
# We should try to remove these each time we update.
CVE-2023-39325
CVE-2023-39325
8 changes: 4 additions & 4 deletions awsesproxy/twistcliignore
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
CVE-2023-45285
CVE-2023-39326
CVE-2023-45283
CVE-2023-48795
CVE-2023-45284
CVE-2023-39326
CVE-2023-6237
CVE-2023-45285
CVE-2023-48795
CVE-2023-6129
CVE-2023-6237
8 changes: 5 additions & 3 deletions bin/twistcli_validator.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,11 @@
]


def cve_list_to_string(list):
if list:
return "\n" + "\n".join([f" - {item}" for item in list if item]) + "\n"
def cve_list_to_string(items: list):
sorted_items = sorted(items, key=lambda x: x.lower() if x else "")

if sorted_items:
return "\n" + "\n".join([f" - {item}" for item in sorted_items]) + "\n"
return "none\n"


Expand Down
2 changes: 1 addition & 1 deletion blackbox-exporter/trivyignore
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Upstream blackbox exporter service images include several CVEs.
# We should try to remove these each time we update.
CVE-2023-39325
GHSA-m425-mq94-257g
CVE-2023-39325
26 changes: 10 additions & 16 deletions blackbox-exporter/twistcliignore
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,15 @@
CVE-2023-6237
CVE-2023-39318
CVE-2023-39319
CVE-2023-39323
GHSA-m425-mq94-257g
CVE-2023-45287
CVE-2023-45285
CVE-2023-45285
CVE-2023-45283
CVE-2023-45283
CVE-2023-39325
CVE-2023-39326
CVE-2023-3978
CVE-2023-39319
CVE-2023-39318
CVE-2023-48795
CVE-2023-48795
CVE-2023-45284
CVE-2023-45284
CVE-2023-44487
CVE-2023-44487
CVE-2023-39326
CVE-2023-39326
CVE-2023-45283
CVE-2023-45284
CVE-2023-45285
CVE-2023-45287
CVE-2023-48795
CVE-2023-6129
CVE-2023-6237
GHSA-m425-mq94-257g
12 changes: 6 additions & 6 deletions curator/twistcliignore
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
GHSA-v8gr-m533-ghj9
CVE-2023-5752
CVE-2023-49083
CVE-2023-45285
CVE-2023-39326
CVE-2023-45283
CVE-2023-48795
CVE-2023-45284
CVE-2023-39326
CVE-2023-45285
CVE-2023-48795
CVE-2023-49083
CVE-2023-5752
CVE-2023-6129
CVE-2023-6237
GHSA-v8gr-m533-ghj9
1 change: 0 additions & 1 deletion dind-golang/trivyignore
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
# Upstream dind-golang images include several CVEs.
# We should try to remove these each time we update.

2 changes: 1 addition & 1 deletion dogstatsd/trivyignore
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Upstream dogstatsd service images include several CVEs.
# We should try to remove these each time we update.
CVE-2022-37434
CVE-2022-37434
2 changes: 1 addition & 1 deletion elasticsearch/trivyignore
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Upstream elasticsearch images include several CVEs.
GHSA-xpw8-rcwv-8f8p
CVE-2023-1370
GHSA-xpw8-rcwv-8f8p
14 changes: 6 additions & 8 deletions elasticsearch/twistcliignore
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
PRISMA-2023-0067
GHSA-xpw8-rcwv-8f8p
CVE-2023-44487
CVE-2023-44487
CVE-2023-1370
CVE-2020-15522
CVE-2023-35116
CVE-2023-35116
CVE-2020-9488
CVE-2022-45146
CVE-2022-45146
CVE-2023-1370
CVE-2023-35116
CVE-2023-44487
GHSA-xpw8-rcwv-8f8p
PRISMA-2023-0067
2 changes: 1 addition & 1 deletion fluentd/twistcliignore
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
CVE-2021-33621
CVE-2023-22795
CVE-2023-22795
6 changes: 3 additions & 3 deletions git-daemon/twistcliignore
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
CVE-2023-45285
CVE-2023-39326
CVE-2023-45283
CVE-2023-48795
CVE-2023-45284
CVE-2023-39326
CVE-2023-45285
CVE-2023-48795
CVE-2023-6129
CVE-2023-6237
6 changes: 3 additions & 3 deletions git-sync-relay/twistcliignore
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CVE-2023-45285
CVE-2023-39326
CVE-2023-45283
CVE-2023-48795
CVE-2023-45284
CVE-2023-39326
CVE-2023-45285
CVE-2023-48795
11 changes: 5 additions & 6 deletions git-sync/trivyignore
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
# Upstream git-sync images include several CVEs.
# We should try to remove these each time we update.
CVE-2022-1304
CVE-2022-42916
CVE-2022-43551
CVE-2019-8457
CVE-2021-33560
CVE-2020-16156
CVE-2022-29458
CVE-2021-33560
CVE-2021-41617
CVE-2020-16156
CVE-2022-1304
CVE-2022-21698
CVE-2022-29458
CVE-2022-42916
CVE-2022-43551
3 changes: 1 addition & 2 deletions grafana/trivyignore
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# The following are all within grafana-server, grafana-cli
# Upstream grafana images include several CVEs.
# We should try to remove these each time we update.

# The following are all within grafana-server, grafana-cli
GHSA-9763-4f94-gfch
10 changes: 5 additions & 5 deletions grafana/twistcliignore
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
CVE-2016-10735
CVE-2018-14041
CVE-2018-14042
CVE-2018-20676
CVE-2018-20677
CVE-2023-45285
CVE-2023-39326
CVE-2023-45283
GHSA-9763-4f94-gfch
CVE-2016-10735
CVE-2023-48795
CVE-2023-45284
CVE-2023-39326
CVE-2023-45285
CVE-2023-48795
GHSA-9763-4f94-gfch
8 changes: 4 additions & 4 deletions init/twistcliignore
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
CVE-2023-45285
CVE-2023-39326
CVE-2023-45283
CVE-2023-48795
CVE-2023-45284
CVE-2023-39326
CVE-2023-6237
CVE-2023-45285
CVE-2023-48795
CVE-2023-6129
CVE-2023-6237
2 changes: 1 addition & 1 deletion keda-metrics-apiserver/trivyignore
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Upstream registry service include several CVEs.
# We should try to remove these each time we update.
CVE-2022-41723
CVE-2022-41723
2 changes: 1 addition & 1 deletion keda/trivyignore
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Upstream registry service include several CVEs.
# We should try to remove these each time we update.
CVE-2022-41723
CVE-2022-41723
8 changes: 4 additions & 4 deletions kube-state/twistcliignore
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PRISMA-2022-0227
CVE-2023-45285
CVE-2023-39326
CVE-2023-45283
CVE-2023-48795
CVE-2023-45284
CVE-2023-39326
CVE-2023-45285
CVE-2023-48795
PRISMA-2022-0227
8 changes: 4 additions & 4 deletions nats-exporter/twistcliignore
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
CVE-2023-45285
CVE-2023-39326
CVE-2023-45283
CVE-2023-48795
CVE-2023-45284
CVE-2023-39326
CVE-2023-6237
CVE-2023-45285
CVE-2023-48795
CVE-2023-6129
CVE-2023-6237
2 changes: 1 addition & 1 deletion nats-server/trivyignore
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
CVE-2023-46129
CVE-2023-46129
8 changes: 4 additions & 4 deletions nats-server/twistcliignore
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
CVE-2023-45285
CVE-2023-39326
CVE-2023-45283
CVE-2023-48795
CVE-2023-45284
CVE-2023-39326
CVE-2023-6237
CVE-2023-45285
CVE-2023-48795
CVE-2023-6129
CVE-2023-6237
2 changes: 1 addition & 1 deletion nats-streaming/trivyignore
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
CVE-2023-46129
CVE-2023-47090
CVE-2023-46129
12 changes: 6 additions & 6 deletions nats-streaming/twistcliignore
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
CVE-2023-29406
CVE-2023-39319
CVE-2023-39318
CVE-2023-29409
CVE-2023-39318
CVE-2023-39319
CVE-2023-39323
CVE-2023-39326
CVE-2023-45283
CVE-2023-45284
CVE-2023-45285
CVE-2023-46129
CVE-2023-47090
CVE-2023-45285
CVE-2023-45283
CVE-2023-48795
CVE-2023-45284
CVE-2023-39326
2 changes: 1 addition & 1 deletion nginx/twistcliignore
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
CVE-2023-39325
PRISMA-2023-0056
CVE-2023-39325
8 changes: 4 additions & 4 deletions pgbouncer-exporter/twistcliignore
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
CVE-2023-45285
CVE-2023-39326
CVE-2023-45283
CVE-2023-48795
CVE-2023-45284
CVE-2023-39326
CVE-2023-6237
CVE-2023-45285
CVE-2023-48795
CVE-2023-6129
CVE-2023-6237
1 change: 0 additions & 1 deletion pgbouncer-krb/trivyignore
View file
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@

6 changes: 3 additions & 3 deletions pgbouncer/twistcliignore
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CVE-2023-45285
CVE-2023-39326
CVE-2023-45283
CVE-2023-48795
CVE-2023-45284
CVE-2023-39326
CVE-2023-45285
CVE-2023-48795
1 change: 0 additions & 1 deletion po-pgbouncer/trivyignore
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
# Upstream prometheus images include several CVEs.
# We should try to remove these each time we update.

7 changes: 3 additions & 4 deletions po-spilo/trivyignore
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# Upstream prometheus images include several CVEs.
# We should try to remove these each time we update.
CVE-2021-38561
CVE-2020-29652
CVE-2021-33194
CVE-2021-38561
CVE-2021-44716
CVE-2021-33194
CVE-2020-29652
CVE-2022-27191
CVE-2022-27191
8 changes: 4 additions & 4 deletions postgres-exporter/twistcliignore
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
CVE-2023-45285
CVE-2023-39326
CVE-2023-45283
CVE-2023-48795
CVE-2023-45284
CVE-2023-39326
CVE-2023-6237
CVE-2023-45285
CVE-2023-48795
CVE-2023-6129
CVE-2023-6237
8 changes: 4 additions & 4 deletions postgres-operator/trivyignore
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Upstream postgres-operator images include several CVEs.
# We should try to remove these each time we update.
CVE-2022-37434
CVE-2022-27191
CVE-2021-38561
CVE-2021-44716
CVE-2022-27191
CVE-2022-27664
CVE-2021-38561
CVE-2022-32149
CVE-2022-32149
CVE-2022-37434
2 changes: 1 addition & 1 deletion postgresql/trivyignore
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Upstream postgres images include several CVEs.
# We should try to remove these each time we update.
CVE-2022-1941
CVE-2022-29162
CVE-2022-1941
4 changes: 2 additions & 2 deletions prometheus/twistcliignore
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CVE-2023-40577
CVE-2023-45286
CVE-2023-48795
GHSA-jq35-85cj-fj4p
CVE-2023-45286
CVE-2023-40577
2 changes: 1 addition & 1 deletion redis/trivyignore
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Upstream redis service include several CVEs.
# We should try to remove these each time we update.
CVE-2022-29162
CVE-2023-27561
CVE-2023-27561
Loading

0 comments on commit 9a8fe0e

Please sign in to comment.