Merge branch 'main' into features/merge-lists-extends

.automation/build.py

@@ -954,12 +954,50 @@ def generate_descriptor_documentation(descriptor):
         "| ----------------- | -------------- | -------------- |",
     ]
     descriptor_md += [
+        f"| {descriptor.get('descriptor_id')}_PRE_COMMANDS | List of bash commands to run before the linters | None |",
+        f"| {descriptor.get('descriptor_id')}_POST_COMMANDS | List of bash commands to run after the linters | None |",
         f"| {descriptor.get('descriptor_id')}_FILTER_REGEX_INCLUDE | Custom regex including filter |  |",
         f"| {descriptor.get('descriptor_id')}_FILTER_REGEX_EXCLUDE | Custom regex excluding filter |  |",
         "",
     ]
     add_in_config_schema_file(
         [
+            [
+                f"{descriptor.get('descriptor_id')}_PRE_COMMANDS",
+                {
+                    "$id": f"#/properties/{descriptor.get('descriptor_id')}_PRE_COMMANDS",
+                    "type": "array",
+                    "title": f"Pre commands for {descriptor.get('descriptor_id')} descriptor",
+                    "examples": [
+                        [
+                            {
+                                "command": "composer install",
+                                "continue_if_failed": False,
+                                "cwd": "workspace",
+                            }
+                        ]
+                    ],
+                    "items": {"$ref": "#/definitions/command_info"},
+                },
+            ],
+            [
+                f"{descriptor.get('descriptor_id')}_POST_COMMANDS",
+                {
+                    "$id": f"#/properties/{descriptor.get('descriptor_id')}_POST_COMMANDS",
+                    "type": "array",
+                    "title": f"Post commands for {descriptor.get('descriptor_id')} descriptor",
+                    "examples": [
+                        [
+                            {
+                                "command": "npm run test",
+                                "continue_if_failed": False,
+                                "cwd": "workspace",
+                            }
+                        ]
+                    ],
+                    "items": {"$ref": "#/definitions/command_info"},
+                },
+            ],
             [
                 f"{descriptor.get('descriptor_id')}_FILTER_REGEX_INCLUDE",
                 {

.automation/generated/linter-versions.json

@@ -8,7 +8,7 @@
     "black": "24.3.0",
     "cfn-lint": "0.86.1",
     "checkmake": "0.2.0",
-    "checkov": "3.2.51",
+    "checkov": "3.2.53",
     "checkstyle": "10.15.0",
     "chktex": "1.7.8",
     "clang-format": "17.0.5",
@@ -37,7 +37,7 @@
     "golangci-lint": "1.57.2",
     "goodcheck": "3.1.0",
     "graphql-schema-linter": "3.0.1",
-    "grype": "0.74.7",
+    "grype": "0.75.0",
     "hadolint": "2.12.0",
     "helm": "3.14.2",
     "htmlhint": "1.1.4",
@@ -49,7 +49,7 @@
     "kubeconform": "0.6.4",
     "kubescape": "2.9.0",
     "kubeval": "0.16.1",
-    "lightning-flow-scanner": "2.20.0",
+    "lightning-flow-scanner": "2.21.0",
     "lintr": "0.0.0",
     "luacheck": "1.1.2",
     "lychee": "0.14.3",
@@ -74,7 +74,7 @@
     "psalm": "Psalm.5.23.1@",
     "puppet-lint": "4.2.4",
     "pylint": "3.1.0",
-    "pyright": "1.1.356",
+    "pyright": "1.1.357",
     "raku": "2020.10",
     "remark-lint": "14.0.2",
     "revive": "1.3.7",
@@ -95,22 +95,22 @@
     "shellcheck": "0.10.0",
     "shfmt": "3.8.0",
     "snakefmt": "0.10.0",
-    "snakemake": "8.10.4",
-    "spectral": "6.11.0",
+    "snakemake": "8.10.6",
+    "spectral": "6.11.1",
     "sql-lint": "1.0.0",
     "sqlfluff": "3.0.3",
     "standard": "17.1.0",
     "stylelint": "16.3.1",
     "swiftlint": "0.54.0",
-    "syft": "1.1.0",
-    "tekton-lint": "1.0.1",
+    "syft": "1.1.1",
+    "tekton-lint": "1.0.2",
     "terraform-fmt": "1.7.5",
     "terragrunt": "0.55.20",
     "terrascan": "1.18.11",
     "tflint": "0.50.3",
     "trivy": "0.50.1",
     "trivy-sbom": "0.50.1",
-    "trufflehog": "3.71.2",
+    "trufflehog": "3.72.0",
     "ts-standard": "12.0.2",
     "tsqllint": "1.15.3.0",
     "v8r": "3.0.0",

.automation/test/pre-post-test/.mega-linter.yml

@@ -20,9 +20,15 @@ PRE_COMMANDS:
 POST_COMMANDS:
   - command: npm run test
     cwd: "workspace"
+MARKDOWN_PRE_COMMANDS:
+  - command: echo 'descriptor pre-command has been run'
+    cwd: "root"
+MARKDOWN_POST_COMMANDS:
+  - command: echo 'descriptor post-command has been run'
+    cwd: "root"
 MARKDOWN_MARKDOWNLINT_PRE_COMMANDS:
   - command: echo 'linter pre-command has been run'
     cwd: "root"
 MARKDOWN_MARKDOWNLINT_POST_COMMANDS:
-  - command: echo 'linter pre-command has been run'
+  - command: echo 'linter post-command has been run'
     cwd: "root"

CHANGELOG.md

@@ -107,6 +107,15 @@ Note: Can be used with `oxsecurity/megalinter@beta` in your GitHub Action mega-l
   - [eslint-plugin-jsonc](https://ota-meshi.github.io/eslint-plugin-jsonc/) from 2.14.1 to **2.15.0** on 2024-04-01
   - [ruff](https://github.com/astral-sh/ruff) from 0.3.4 to **0.3.5** on 2024-04-01
   - [checkov](https://www.checkov.io/) from 3.2.50 to **3.2.51** on 2024-04-02
+  - [spectral](https://docs.stoplight.io/docs/spectral/674b27b261c3c-overview) from 6.11.0 to **6.11.1** on 2024-04-04
+  - [pyright](https://github.com/Microsoft/pyright) from 1.1.356 to **1.1.357** on 2024-04-04
+  - [checkov](https://www.checkov.io/) from 3.2.51 to **3.2.53** on 2024-04-04
+  - [grype](https://github.com/anchore/grype) from 0.74.7 to **0.75.0** on 2024-04-04
+  - [syft](https://github.com/anchore/syft) from 1.1.0 to **1.1.1** on 2024-04-04
+  - [trufflehog](https://github.com/trufflesecurity/trufflehog) from 3.71.2 to **3.72.0** on 2024-04-04
+  - [lightning-flow-scanner](https://github.com/Lightning-Flow-Scanner) from 2.20.0 to **2.21.0** on 2024-04-04
+  - [snakemake](https://snakemake.readthedocs.io/en/stable/) from 8.10.4 to **8.10.6** on 2024-04-04
+  - [tekton-lint](https://github.com/IBM/tekton-lint) from 1.0.1 to **1.0.2** on 2024-04-04
 <!-- linter-versions-end -->
 
 ## [v7.10.0] - 2024-03-10

README.md

@@ -23,7 +23,7 @@
 [![MegaLinter](https://github.com/oxsecurity/megalinter/workflows/MegaLinter/badge.svg?branch=main)](https://github.com/oxsecurity/megalinter/actions?query=workflow%3AMegaLinter+branch%3Amain)
 [![codecov](https://codecov.io/gh/oxsecurity/megalinter/branch/main/graph/badge.svg)](https://codecov.io/gh/oxsecurity/megalinter)
 <!-- gh-dependents-info-used-by-start -->
-[![Generated by github-dependents-info](https://img.shields.io/static/v1?label=Used%20by&message=2433&color=informational&logo=slickpic)](https://github.com/oxsecurity/megalinter/blob/main/./docs/used-by-stats.md)<!-- gh-dependents-info-used-by-end -->
+[![Generated by github-dependents-info](https://img.shields.io/static/v1?label=Used%20by&message=2435&color=informational&logo=slickpic)](https://github.com/oxsecurity/megalinter/blob/main/./docs/used-by-stats.md)<!-- gh-dependents-info-used-by-end -->
 [![Secured with Trivy](https://img.shields.io/badge/Trivy-secured-green?logo=docker)](https://github.com/aquasecurity/trivy)
 [![GitHub contributors](https://img.shields.io/github/contributors/oxsecurity/megalinter.svg)](https://github.com/oxsecurity/megalinter/graphs/contributors/)
 [![GitHub Sponsors](https://img.shields.io/github/sponsors/nvuillam)](https://github.com/sponsors/nvuillam)