Merge branch 'main' into alpha

oxsecurity · Aug 12, 2024 · 4994262 · 4994262
2 parents 3209c45 + 5b518a9
commit 4994262
Show file tree

Hide file tree

Showing 196 changed files with 529 additions and 632 deletions.
diff --git a/.automation/generated/linter-helps.json b/.automation/generated/linter-helps.json
diff --git a/.automation/generated/linter-versions.json b/.automation/generated/linter-versions.json
@@ -44,7 +44,7 @@
     "isort": "5.13.2",
     "jscpd": "4.0.5",
     "jsonlint": "16.0.0",
-    "kics": "2.1.1",
+    "kics": "2.1.2",
     "ktlint": "1.3.1",
     "kubeconform": "0.6.7",
     "kubescape": "2.9.0",
@@ -72,7 +72,7 @@
     "powershell_formatter": "7.4.2",
     "prettier": "3.3.3",
     "proselint": "0.14.0",
-    "protolint": "0.50.4",
+    "protolint": "0.50.5",
     "psalm": "Psalm.5.25.0@",
     "puppet-lint": "4.2.4",
     "pylint": "3.2.6",
@@ -106,13 +106,13 @@
     "swiftlint": "0.56.1",
     "syft": "1.11.0",
     "tekton-lint": "1.1.0",
-    "terraform-fmt": "1.9.3",
-    "terragrunt": "0.66.1",
+    "terraform-fmt": "1.9.4",
+    "terragrunt": "0.66.3",
     "terrascan": "1.18.11",
     "tflint": "0.52.0",
     "trivy": "0.54.1",
     "trivy-sbom": "0.54.1",
-    "trufflehog": "3.81.6",
+    "trufflehog": "3.81.8",
     "ts-standard": "12.0.2",
     "tsqllint": "1.15.3.0",
     "v8r": "3.1.1",

diff --git a/.automation/test/pre-post-test/.mega-linter.yml b/.automation/test/pre-post-test/.mega-linter.yml
@@ -17,12 +17,18 @@ PRE_COMMANDS:
     cwd: "workspace"
   - command: pip install flake8-cognitive-complexity
     venv: flake8
+  - command: export MY_OUTPUT_VARIABLE="my output variable value" && export MY_OUTPUT_VARIABLE2="my output variable value2"
+    output_variables: ["MY_OUTPUT_VARIABLE", "MY_OUTPUT_VARIABLE2"]
+    cwd: "root"
 POST_COMMANDS:
   - command: npm run test
     cwd: "workspace"
 MARKDOWN_PRE_COMMANDS:
   - command: echo 'descriptor pre-command has been run'
     cwd: "root"
+  - command: export MY_OUTPUT_LINTER_VARIABLE="my output linter variable value" && export MY_OUTPUT_LINTER_VARIABLE2="my output linter variable value2"
+    output_variables: ["MY_OUTPUT_LINTER_VARIABLE", "MY_OUTPUT_LINTER_VARIABLE2"]
+    cwd: "root"
 MARKDOWN_POST_COMMANDS:
   - command: echo 'descriptor post-command has been run'
     cwd: "root"

diff --git a/.github/workflows/auto-update-linters.yml b/.github/workflows/auto-update-linters.yml
@@ -118,10 +118,10 @@ jobs:
             docs
             megalinter-reports
 
-      # Create pull request if there are updates
+      # Create pull request if there are updates or if the workflow has been launched manually
       - name: Create Pull Request
         id: cpr
-        if: steps.compute_versions.outputs.has_updated_versions == 1
+        if: (github.event_name == 'workflow_dispatch' || steps.compute_versions.outputs.has_updated_versions == 1)
         uses: peter-evans/create-pull-request@v6
         with:
           token: ${{ secrets.PAT || secrets.GITHUB_TOKEN  }}
@@ -131,7 +131,8 @@ jobs:
           title: "[automation] Auto-update linters version, help and documentation"
           body: "[automation] Auto-update linters version, help and documentation"
           labels: dependencies,automerge
-      - name: Create PR output
+      - name: Display Pull Request Info
+        if: (github.event_name == 'workflow_dispatch' || steps.compute_versions.outputs.has_updated_versions == 1)
         run: |
           echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}"
           echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"