Merge branch 'main' of https://github.com/advanced-security/secret-scanning-custom-patterns into jwt-image-fp

Author: aegilops

.github/secret_scanning.yml

@@ -1,6 +1,6 @@
 paths-ignore:
-  - ".venv/*"
-  - "*/__snapshots__/*"
-  - "*/patterns.yml"
-  - "README.md"
-  - "*/README.md"
+  - .venv/**
+  - **/__snapshots__/**
+  - **/patterns.yml
+  - README.md
+  - **/README.md

.github/workflows/pr-markdown.yml

@@ -2,18 +2,14 @@ name: Markdown Validation
 
 on:
   pull_request:
-    branches: [ main, develop ]
+    branches: [main, develop]
 
 jobs:
   run:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
-
-      - uses: actions/setup-python@v4
-        with:
-          python-version: '3.10'
+      - uses: actions/checkout@v4
 
       - name: Get Token
         id: get_workflow_token
@@ -22,17 +18,16 @@ jobs:
           application_id: ${{ secrets.ADVANCED_SECURITY_APP_ID }}
           application_private_key: ${{ secrets.ADVANCED_SECURITY_APP_KEY }}
 
-      - name: Install Deps
-        run: python3 -m pip install pipenv && python3 -m pipenv install
+      - name: Generate Markdown
+        uses: advanced-security/secret-scanning-tools@v1
+        with:
+          mode: markdown
+          token: ${{ steps.get_workflow_token.outputs.token }}
 
-      # Run Validation
-      - name: Run Markdown Validation
+      - name: Check git status
         env:
-          GITHUB_TOKEN: ${{ steps.get_workflow_token.outputs.token }}
+          GH_TOKEN: ${{ steps.get_workflow_token.outputs.token }}
         run: |
-          pipenv run python ./.github/scripts/validate.py \
-            --markdown
-
           if [ -z "$(git status --porcelain)" ]; then
             gh pr comment --edit-last ${{ github.event.number }} \
               --body "## :white_check_mark: Markdown Validation Passed :rocket:!" || true

.github/workflows/validate.yml

@@ -1,10 +1,10 @@
-name: Main
+name: Results Validation
 
 on:
   push:
-    branches: [ main, develop ]
+    branches: [main, develop]
   pull_request:
-    branches: [ main, develop ]
+    branches: [main, develop]
 
   workflow_dispatch:
 
@@ -16,10 +16,7 @@ jobs:
       security-events: write
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
-        with:
-          python-version: '3.9'
+      - uses: actions/checkout@v4
 
       - name: Get Token
         id: get_workflow_token
@@ -28,13 +25,8 @@ jobs:
           application_id: ${{ secrets.ADVANCED_SECURITY_APP_ID }}
           application_private_key: ${{ secrets.ADVANCED_SECURITY_APP_KEY }}
 
-      - name: Install Deps
-        run: python3 -m pip install pipenv && python3 -m pipenv install
-
-      # Run Validation
-      - name: Run Validation
-        env:
-          GITHUB_TOKEN: ${{ steps.get_workflow_token.outputs.token }}
-        run: |
-          pipenv run python ./.github/scripts/validate.py \
-            --validate
+      - name: Validate results against snapshot
+        uses: advanced-security/secret-scanning-tools@v1
+        with:
+          mode: validate
+          token: ${{ steps.get_workflow_token.outputs.token }}