From 4f2fbe39c086d78f8300e8a486599eab087722e2 Mon Sep 17 00:00:00 2001 From: Eli Schleifer Date: Wed, 6 Sep 2023 13:11:47 -0700 Subject: [PATCH 1/2] Upgrade trunk to 1.15.0; enable new security linters --- .trunk/.gitignore | 1 + .trunk/trunk.yaml | 31 +++++++++++++++++++------------ 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/.trunk/.gitignore b/.trunk/.gitignore index cf2f254..1e24652 100644 --- a/.trunk/.gitignore +++ b/.trunk/.gitignore @@ -2,6 +2,7 @@ *logs *actions *notifications +*tools plugins user_trunk.yaml user.yaml diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index 8316534..e19fa85 100644 --- a/.trunk/trunk.yaml +++ b/.trunk/trunk.yaml @@ -1,33 +1,40 @@ version: 0.1 cli: - version: 1.7.0 + version: 1.15.0 plugins: sources: - id: trunk - ref: v0.0.14 + ref: v1.2.2 uri: https://github.com/trunk-io/plugins lint: + disabled: + - bandit ignore: - linters: [ALL] paths: # Ignore generated files - meshtastic/*_pb2.py enabled: - - actionlint@1.6.23 - - black@23.3.0 + - checkov@2.4.9 + - osv-scanner@1.3.6 + - trivy@0.44.1 + - trufflehog@3.54.3 + - taplo@0.8.1 + - actionlint@1.6.25 + - black@23.7.0 - git-diff-check - - gitleaks@8.16.2 + - gitleaks@8.18.0 - isort@5.12.0 - - markdownlint@0.33.0 - - prettier@2.8.7 - - pylint@2.17.1 - - ruff@0.0.260 + - markdownlint@0.36.0 + - prettier@3.0.3 + - pylint@2.17.5 + - ruff@0.0.287 - shellcheck@0.9.0 - - shfmt@3.5.0 - - yamllint@1.30.0 + - shfmt@3.6.0 + - yamllint@1.32.0 runtimes: enabled: - - go@1.19.5 + - go@1.21.0 - node@18.12.1 - python@3.10.8 actions: From 29331cc3d2481aeddc105a975066e6649a882198 Mon Sep 17 00:00:00 2001 From: Eli Schleifer Date: Wed, 6 Sep 2023 13:16:27 -0700 Subject: [PATCH 2/2] sort linters --- .trunk/trunk.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index e19fa85..94add68 100644 --- a/.trunk/trunk.yaml +++ b/.trunk/trunk.yaml @@ -15,22 +15,22 @@ lint: # Ignore generated files - meshtastic/*_pb2.py enabled: - - checkov@2.4.9 - - osv-scanner@1.3.6 - - trivy@0.44.1 - - trufflehog@3.54.3 - - taplo@0.8.1 - actionlint@1.6.25 - black@23.7.0 + - checkov@2.4.9 - git-diff-check - gitleaks@8.18.0 - isort@5.12.0 - markdownlint@0.36.0 + - osv-scanner@1.3.6 - prettier@3.0.3 - pylint@2.17.5 - ruff@0.0.287 - shellcheck@0.9.0 - shfmt@3.6.0 + - taplo@0.8.1 + - trivy@0.44.1 + - trufflehog@3.54.3 - yamllint@1.32.0 runtimes: enabled: