Merge branch 'PRWLR-5093-design-the-fixer-class' into update-fixers-docs

.env

@@ -10,8 +10,6 @@ NEXT_PUBLIC_API_BASE_URL=${API_BASE_URL}
 NEXT_PUBLIC_API_DOCS_URL=http://prowler-api:8080/api/v1/docs
 AUTH_TRUST_HOST=true
 UI_PORT=3000
-# Temp URL for feeds need to use actual
-RSS_FEED_URL=https://prowler.com/blog/rss
 # openssl rand -base64 32
 AUTH_SECRET="N/c6mnaS5+SWq81+819OrzQZlmx1Vxtp/orjttJSmw8="
 # Google Tag Manager ID
@@ -74,7 +72,7 @@ DJANGO_SETTINGS_MODULE=config.django.production
 DJANGO_LOGGING_FORMATTER=human_readable
 # Select one of [DEBUG|INFO|WARNING|ERROR|CRITICAL]
 # Applies to both Django and Celery Workers
-DJANGO_LOGGING_LEVEL=DEBUG
+DJANGO_LOGGING_LEVEL=INFO
 # Defaults to the maximum available based on CPU cores if not set.
 DJANGO_WORKERS=4
 # Token lifetime is in minutes
@@ -127,14 +125,13 @@ jQIDAQAB
 DJANGO_SECRETS_ENCRYPTION_KEY="oE/ltOhp/n1TdbHjVmzcjDPLcLA41CVI/4Rk+UB5ESc="
 DJANGO_BROKER_VISIBILITY_TIMEOUT=86400
 DJANGO_SENTRY_DSN=
-DJANGO_THROTTLE_TOKEN_OBTAIN=50/minute
 
 # Sentry settings
 SENTRY_ENVIRONMENT=local
 SENTRY_RELEASE=local
 
 #### Prowler release version ####
-NEXT_PUBLIC_PROWLER_RELEASE_VERSION=v5.10.0
+NEXT_PUBLIC_PROWLER_RELEASE_VERSION=v5.7.5
 
 # Social login credentials
 SOCIAL_GOOGLE_OAUTH_CALLBACK_URL="${AUTH_URL}/api/auth/callback/google"

.github/labeler.yml

@@ -22,11 +22,6 @@ provider/kubernetes:
       - any-glob-to-any-file: "prowler/providers/kubernetes/**"
       - any-glob-to-any-file: "tests/providers/kubernetes/**"
 
-provider/m365:
-  - changed-files:
-      - any-glob-to-any-file: "prowler/providers/m365/**"
-      - any-glob-to-any-file: "tests/providers/m365/**"
-
 provider/github:
   - changed-files:
       - any-glob-to-any-file: "prowler/providers/github/**"
@@ -37,11 +32,6 @@ provider/iac:
       - any-glob-to-any-file: "prowler/providers/iac/**"
       - any-glob-to-any-file: "tests/providers/iac/**"
 
-provider/mongodbatlas:
-  - changed-files:
-      - any-glob-to-any-file: "prowler/providers/mongodbatlas/**"
-      - any-glob-to-any-file: "tests/providers/mongodbatlas/**"
-
 github_actions:
   - changed-files:
       - any-glob-to-any-file: ".github/workflows/*"
@@ -57,13 +47,11 @@ mutelist:
       - any-glob-to-any-file: "prowler/providers/azure/lib/mutelist/**"
       - any-glob-to-any-file: "prowler/providers/gcp/lib/mutelist/**"
       - any-glob-to-any-file: "prowler/providers/kubernetes/lib/mutelist/**"
-      - any-glob-to-any-file: "prowler/providers/mongodbatlas/lib/mutelist/**"
       - any-glob-to-any-file: "tests/lib/mutelist/**"
       - any-glob-to-any-file: "tests/providers/aws/lib/mutelist/**"
       - any-glob-to-any-file: "tests/providers/azure/lib/mutelist/**"
       - any-glob-to-any-file: "tests/providers/gcp/lib/mutelist/**"
       - any-glob-to-any-file: "tests/providers/kubernetes/lib/mutelist/**"
-      - any-glob-to-any-file: "tests/providers/mongodbatlas/lib/mutelist/**"
 
 integration/s3:
   - changed-files:
@@ -119,7 +107,3 @@ compliance:
 review-django-migrations:
   - changed-files:
       - any-glob-to-any-file: "api/src/backend/api/migrations/**"
-
-metadata-review:
-  - changed-files:
-      - any-glob-to-any-file: "**/*.metadata.json"

.github/pull_request_template.md

@@ -8,10 +8,6 @@ If fixes an issue please add it with `Fix #XXXX`
 
 Please include a summary of the change and which issue is fixed. List any dependencies that are required for this change.
 
-### Steps to review
-
-Please add a detailed description of how to review this PR.
-
 ### Checklist
 
 - Are there new checks included in this PR? Yes / No

.github/workflows/api-build-lint-push-containers.yml

@@ -6,7 +6,6 @@ on:
       - "master"
     paths:
       - "api/**"
-      - "prowler/**"
       - ".github/workflows/api-build-lint-push-containers.yml"
 
   # Uncomment the code below to test this action on PRs

.github/workflows/api-codeql.yml

@@ -48,12 +48,12 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
+      uses: github/codeql-action/init@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
       with:
         languages: ${{ matrix.language }}
         config-file: ./.github/codeql/api-codeql-config.yml
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
+      uses: github/codeql-action/analyze@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
       with:
         category: "/language:${{matrix.language}}"

.github/workflows/api-pull-request.yml

@@ -13,7 +13,6 @@ on:
       - "master"
       - "v5.*"
     paths:
-      - ".github/workflows/api-pull-request.yml"
       - "api/**"
 
 env:
@@ -82,9 +81,7 @@ jobs:
         id: are-non-ignored-files-changed
         uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c # v46.0.5
         with:
-          files: |
-            api/**
-            .github/workflows/api-pull-request.yml
+          files: api/**
           files_ignore: ${{ env.IGNORE_FILES }}
 
       - name: Replace @master with current branch in pyproject.toml
@@ -108,23 +105,6 @@ jobs:
         run: |
           poetry lock
 
-      - name: Update SDK's poetry.lock resolved_reference to latest commit - Only for push events to `master`
-        working-directory: ./api
-        if: steps.are-non-ignored-files-changed.outputs.any_changed == 'true' && github.event_name == 'push'
-        run: |
-          # Get the latest commit hash from the prowler-cloud/prowler repository
-          LATEST_COMMIT=$(curl -s "https://api.github.com/repos/prowler-cloud/prowler/commits/master" | jq -r '.sha')
-          echo "Latest commit hash: $LATEST_COMMIT"
-
-          # Update the resolved_reference specifically for prowler-cloud/prowler repository
-          sed -i '/url = "https:\/\/github\.com\/prowler-cloud\/prowler\.git"/,/resolved_reference = / {
-            s/resolved_reference = "[a-f0-9]\{40\}"/resolved_reference = "'"$LATEST_COMMIT"'"/
-          }' poetry.lock
-
-          # Verify the change was made
-          echo "Updated resolved_reference:"
-          grep -A2 -B2 "resolved_reference" poetry.lock
-
       - name: Set up Python ${{ matrix.python-version }}
         if: steps.are-non-ignored-files-changed.outputs.any_changed == 'true'
         uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
@@ -184,9 +164,8 @@ jobs:
         working-directory: ./api
         if: steps.are-non-ignored-files-changed.outputs.any_changed == 'true'
         # 76352, 76353, 77323 come from SDK, but they cannot upgrade it yet. It does not affect API
-        # TODO: Botocore needs urllib3 1.X so we need to ignore these vulnerabilities 77744,77745. Remove this once we upgrade to urllib3 2.X
         run: |
-          poetry run safety check --ignore 70612,66963,74429,76352,76353,77323,77744,77745
+          poetry run safety check --ignore 70612,66963,74429,76352,76353,77323
 
       - name: Vulture
         working-directory: ./api

.github/workflows/build-documentation-on-pr.yml

@@ -7,7 +7,6 @@ on:
       - 'v3'
     paths:
       - 'docs/**'
-      - '.github/workflows/build-documentation-on-pr.yml'
 
 env:
   PR_NUMBER: ${{ github.event.pull_request.number }}
@@ -17,20 +16,9 @@ jobs:
     name: Documentation Link
     runs-on: ubuntu-latest
     steps:
-      - name: Find existing documentation comment
-        uses: peter-evans/find-comment@3eae4d37986fb5a8592848f6a574fdf654e61f9e # v3.1.0
-        id: find-comment
-        with:
-          issue-number: ${{ env.PR_NUMBER }}
-          comment-author: 'github-actions[bot]'
-          body-includes: '<!-- prowler-docs-link -->'
-
-      - name: Create or update PR comment with the Prowler Documentation URI
+      - name: Leave PR comment with the Prowler Documentation URI
         uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
         with:
-          comment-id: ${{ steps.find-comment.outputs.comment-id }}
           issue-number: ${{ env.PR_NUMBER }}
           body: |
-            <!-- prowler-docs-link -->
             You can check the documentation for this PR here -> [Prowler Documentation](https://prowler-prowler-docs--${{ env.PR_NUMBER }}.com.readthedocs.build/projects/prowler-open-source/en/${{ env.PR_NUMBER }}/)
-          edit-mode: replace

.github/workflows/create-backport-label.yml

@@ -1,4 +1,4 @@
-name: Prowler - Create Backport Label
+name: Create Backport Label
 
 on:
   release:

.github/workflows/find-secrets.yml

@@ -11,7 +11,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: TruffleHog OSS
-        uses: trufflesecurity/trufflehog@a05cf0859455b5b16317ee22d809887a4043cdf0 # v3.90.2
+        uses: trufflesecurity/trufflehog@6641d4ba5b684fffe195b9820345de1bf19f3181 # v3.89.2
         with:
           path: ./
           base: ${{ github.event.repository.default_branch }}

.github/workflows/pr-conflict-checker.yml

@@ -1,167 +0,0 @@
-name: Prowler - PR Conflict Checker
-
-on:
-  pull_request:
-    types:
-      - opened
-      - synchronize
-      - reopened
-    branches:
-      - "master"
-      - "v5.*"
-  pull_request_target:
-    types:
-      - opened
-      - synchronize
-      - reopened
-    branches:
-      - "master"
-      - "v5.*"
-
-jobs:
-  conflict-checker:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      pull-requests: write
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      - name: Get changed files
-        id: changed-files
-        uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c # v46.0.5
-        with:
-          files: |
-            **
-
-      - name: Check for conflict markers
-        id: conflict-check
-        run: |
-          echo "Checking for conflict markers in changed files..."
-
-          CONFLICT_FILES=""
-          HAS_CONFLICTS=false
-
-          # Check each changed file for conflict markers
-          for file in ${{ steps.changed-files.outputs.all_changed_files }}; do
-            if [ -f "$file" ]; then
-              echo "Checking file: $file"
-
-              # Look for conflict markers
-              if grep -l "^<<<<<<<\|^=======\|^>>>>>>>" "$file" 2>/dev/null; then
-                echo "Conflict markers found in: $file"
-                CONFLICT_FILES="$CONFLICT_FILES$file "
-                HAS_CONFLICTS=true
-              fi
-            fi
-          done
-
-          if [ "$HAS_CONFLICTS" = true ]; then
-            echo "has_conflicts=true" >> $GITHUB_OUTPUT
-            echo "conflict_files=$CONFLICT_FILES" >> $GITHUB_OUTPUT
-            echo "Conflict markers detected in files: $CONFLICT_FILES"
-          else
-            echo "has_conflicts=false" >> $GITHUB_OUTPUT
-            echo "No conflict markers found in changed files"
-          fi
-
-      - name: Add conflict label
-        if: steps.conflict-check.outputs.has_conflicts == 'true'
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        with:
-          github-token: ${{ secrets.PROWLER_BOT_ACCESS_TOKEN }}
-          script: |
-            const { data: labels } = await github.rest.issues.listLabelsOnIssue({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: context.issue.number,
-            });
-
-            const hasConflictLabel = labels.some(label => label.name === 'has-conflicts');
-
-            if (!hasConflictLabel) {
-              await github.rest.issues.addLabels({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: context.issue.number,
-                labels: ['has-conflicts']
-              });
-              console.log('Added has-conflicts label');
-            } else {
-              console.log('has-conflicts label already exists');
-            }
-
-      - name: Remove conflict label
-        if: steps.conflict-check.outputs.has_conflicts == 'false'
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        with:
-          github-token: ${{ secrets.PROWLER_BOT_ACCESS_TOKEN }}
-          script: |
-            try {
-              await github.rest.issues.removeLabel({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: context.issue.number,
-                name: 'has-conflicts'
-              });
-              console.log('Removed has-conflicts label');
-            } catch (error) {
-              if (error.status === 404) {
-                console.log('has-conflicts label was not present');
-              } else {
-                throw error;
-              }
-            }
-
-      - name: Find existing conflict comment
-        if: steps.conflict-check.outputs.has_conflicts == 'true'
-        uses: peter-evans/find-comment@3eae4d37986fb5a8592848f6a574fdf654e61f9e # v3.1.0
-        id: find-comment
-        with:
-          issue-number: ${{ github.event.pull_request.number }}
-          comment-author: 'github-actions[bot]'
-          body-regex: '(⚠️ \*\*Conflict Markers Detected\*\*|✅ \*\*Conflict Markers Resolved\*\*)'
-
-      - name: Create or update conflict comment
-        if: steps.conflict-check.outputs.has_conflicts == 'true'
-        uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
-        with:
-          comment-id: ${{ steps.find-comment.outputs.comment-id }}
-          issue-number: ${{ github.event.pull_request.number }}
-          edit-mode: replace
-          body: |
-            ⚠️ **Conflict Markers Detected**
-
-            This pull request contains unresolved conflict markers in the following files:
-            ```
-            ${{ steps.conflict-check.outputs.conflict_files }}
-            ```
-
-            Please resolve these conflicts by:
-            1. Locating the conflict markers: `<<<<<<<`, `=======`, and `>>>>>>>`
-            2. Manually editing the files to resolve the conflicts
-            3. Removing all conflict markers
-            4. Committing and pushing the changes
-
-      - name: Find existing conflict comment when resolved
-        if: steps.conflict-check.outputs.has_conflicts == 'false'
-        uses: peter-evans/find-comment@3eae4d37986fb5a8592848f6a574fdf654e61f9e # v3.1.0
-        id: find-resolved-comment
-        with:
-          issue-number: ${{ github.event.pull_request.number }}
-          comment-author: 'github-actions[bot]'
-          body-regex: '(⚠️ \*\*Conflict Markers Detected\*\*|✅ \*\*Conflict Markers Resolved\*\*)'
-
-      - name: Update comment when conflicts resolved
-        if: steps.conflict-check.outputs.has_conflicts == 'false' && steps.find-resolved-comment.outputs.comment-id != ''
-        uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
-        with:
-          comment-id: ${{ steps.find-resolved-comment.outputs.comment-id }}
-          issue-number: ${{ github.event.pull_request.number }}
-          edit-mode: replace
-          body: |
-            ✅ **Conflict Markers Resolved**
-
-            All conflict markers have been successfully resolved in this pull request.

.github/workflows/prowler-release-preparation.yml

@@ -1,300 +0,0 @@
-name: Prowler - Release Preparation
-
-run-name: Prowler Release Preparation for ${{ inputs.prowler_version }}
-
-on:
-  workflow_dispatch:
-    inputs:
-      prowler_version:
-        description: 'Prowler version to release (e.g., 5.9.0)'
-        required: true
-        type: string
-
-env:
-  PROWLER_VERSION: ${{ github.event.inputs.prowler_version }}
-
-jobs:
-  prepare-release:
-    if: github.repository == 'prowler-cloud/prowler'
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      pull-requests: write
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      with:
-        fetch-depth: 0
-        token: ${{ secrets.PROWLER_BOT_ACCESS_TOKEN }}
-
-    - name: Set up Python
-      uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
-      with:
-        python-version: '3.12'
-
-    - name: Install Poetry
-      run: |
-        python3 -m pip install --user poetry
-        echo "$HOME/.local/bin" >> $GITHUB_PATH
-
-    - name: Configure Git
-      run: |
-        git config --global user.name "prowler-bot"
-        git config --global user.email "179230569+prowler-bot@users.noreply.github.com"
-
-    - name: Parse version and determine branch
-      run: |
-        # Validate version format (reusing pattern from sdk-bump-version.yml)
-        if [[ $PROWLER_VERSION =~ ^([0-9]+)\.([0-9]+)\.([0-9]+)$ ]]; then
-          MAJOR_VERSION=${BASH_REMATCH[1]}
-          MINOR_VERSION=${BASH_REMATCH[2]}
-          PATCH_VERSION=${BASH_REMATCH[3]}
-
-          # Export version components to environment
-          echo "MAJOR_VERSION=${MAJOR_VERSION}" >> "${GITHUB_ENV}"
-          echo "MINOR_VERSION=${MINOR_VERSION}" >> "${GITHUB_ENV}"
-          echo "PATCH_VERSION=${PATCH_VERSION}" >> "${GITHUB_ENV}"
-
-          # Determine branch name (format: v5.9)
-          BRANCH_NAME="v${MAJOR_VERSION}.${MINOR_VERSION}"
-          echo "BRANCH_NAME=${BRANCH_NAME}" >> "${GITHUB_ENV}"
-
-          # Calculate UI version (1.X.X format - matches Prowler minor version)
-          UI_VERSION="1.${MINOR_VERSION}.${PATCH_VERSION}"
-          echo "UI_VERSION=${UI_VERSION}" >> "${GITHUB_ENV}"
-
-          # Calculate API version (1.X.X format - one minor version ahead)
-          API_MINOR_VERSION=$((MINOR_VERSION + 1))
-          API_VERSION="1.${API_MINOR_VERSION}.${PATCH_VERSION}"
-          echo "API_VERSION=${API_VERSION}" >> "${GITHUB_ENV}"
-
-          echo "Prowler version: $PROWLER_VERSION"
-          echo "Branch name: $BRANCH_NAME"
-          echo "UI version: $UI_VERSION"
-          echo "API version: $API_VERSION"
-          echo "Is minor release: $([ $PATCH_VERSION -eq 0 ] && echo 'true' || echo 'false')"
-        else
-          echo "Invalid version syntax: '$PROWLER_VERSION' (must be N.N.N)" >&2
-          exit 1
-        fi
-
-    - name: Checkout existing branch for patch release
-      if: ${{ env.PATCH_VERSION != '0' }}
-      run: |
-        echo "Patch release detected, checking out existing branch $BRANCH_NAME..."
-        if git show-ref --verify --quiet "refs/heads/$BRANCH_NAME"; then
-          echo "Branch $BRANCH_NAME exists locally, checking out..."
-          git checkout "$BRANCH_NAME"
-        elif git show-ref --verify --quiet "refs/remotes/origin/$BRANCH_NAME"; then
-          echo "Branch $BRANCH_NAME exists remotely, checking out..."
-          git checkout -b "$BRANCH_NAME" "origin/$BRANCH_NAME"
-        else
-          echo "ERROR: Branch $BRANCH_NAME should exist for patch release $PROWLER_VERSION"
-          exit 1
-        fi
-
-    - name: Verify version in pyproject.toml
-      run: |
-        CURRENT_VERSION=$(grep '^version = ' pyproject.toml | sed -E 's/version = "([^"]+)"/\1/' | tr -d '[:space:]')
-        PROWLER_VERSION_TRIMMED=$(echo "$PROWLER_VERSION" | tr -d '[:space:]')
-        if [ "$CURRENT_VERSION" != "$PROWLER_VERSION_TRIMMED" ]; then
-          echo "ERROR: Version mismatch in pyproject.toml (expected: '$PROWLER_VERSION_TRIMMED', found: '$CURRENT_VERSION')"
-          exit 1
-        fi
-        echo "✓ pyproject.toml version: $CURRENT_VERSION"
-
-    - name: Verify version in prowler/config/config.py
-      run: |
-        CURRENT_VERSION=$(grep '^prowler_version = ' prowler/config/config.py | sed -E 's/prowler_version = "([^"]+)"/\1/' | tr -d '[:space:]')
-        PROWLER_VERSION_TRIMMED=$(echo "$PROWLER_VERSION" | tr -d '[:space:]')
-        if [ "$CURRENT_VERSION" != "$PROWLER_VERSION_TRIMMED" ]; then
-          echo "ERROR: Version mismatch in prowler/config/config.py (expected: '$PROWLER_VERSION_TRIMMED', found: '$CURRENT_VERSION')"
-          exit 1
-        fi
-        echo "✓ prowler/config/config.py version: $CURRENT_VERSION"
-
-    - name: Verify version in api/pyproject.toml
-      run: |
-        CURRENT_API_VERSION=$(grep '^version = ' api/pyproject.toml | sed -E 's/version = "([^"]+)"/\1/' | tr -d '[:space:]')
-        API_VERSION_TRIMMED=$(echo "$API_VERSION" | tr -d '[:space:]')
-        if [ "$CURRENT_API_VERSION" != "$API_VERSION_TRIMMED" ]; then
-          echo "ERROR: API version mismatch in api/pyproject.toml (expected: '$API_VERSION_TRIMMED', found: '$CURRENT_API_VERSION')"
-          exit 1
-        fi
-        echo "✓ api/pyproject.toml version: $CURRENT_API_VERSION"
-
-    - name: Verify prowler dependency in api/pyproject.toml
-      if: ${{ env.PATCH_VERSION != '0' }}
-      run: |
-        CURRENT_PROWLER_REF=$(grep 'prowler @ git+https://github.com/prowler-cloud/prowler.git@' api/pyproject.toml | sed -E 's/.*@([^"]+)".*/\1/' | tr -d '[:space:]')
-        BRANCH_NAME_TRIMMED=$(echo "$BRANCH_NAME" | tr -d '[:space:]')
-        if [ "$CURRENT_PROWLER_REF" != "$BRANCH_NAME_TRIMMED" ]; then
-          echo "ERROR: Prowler dependency mismatch in api/pyproject.toml (expected: '$BRANCH_NAME_TRIMMED', found: '$CURRENT_PROWLER_REF')"
-          exit 1
-        fi
-        echo "✓ api/pyproject.toml prowler dependency: $CURRENT_PROWLER_REF"
-
-    - name: Verify version in api/src/backend/api/v1/views.py
-      run: |
-        CURRENT_API_VERSION=$(grep 'spectacular_settings.VERSION = ' api/src/backend/api/v1/views.py | sed -E 's/.*spectacular_settings.VERSION = "([^"]+)".*/\1/' | tr -d '[:space:]')
-        API_VERSION_TRIMMED=$(echo "$API_VERSION" | tr -d '[:space:]')
-        if [ "$CURRENT_API_VERSION" != "$API_VERSION_TRIMMED" ]; then
-          echo "ERROR: API version mismatch in views.py (expected: '$API_VERSION_TRIMMED', found: '$CURRENT_API_VERSION')"
-          exit 1
-        fi
-        echo "✓ api/src/backend/api/v1/views.py version: $CURRENT_API_VERSION"
-
-    - name: Checkout existing release branch for minor release
-      if: ${{ env.PATCH_VERSION == '0' }}
-      run: |
-        echo "Minor release detected (patch = 0), checking out existing branch $BRANCH_NAME..."
-        if git show-ref --verify --quiet "refs/remotes/origin/$BRANCH_NAME"; then
-          echo "Branch $BRANCH_NAME exists remotely, checking out..."
-          git checkout -b "$BRANCH_NAME" "origin/$BRANCH_NAME"
-        else
-          echo "ERROR: Branch $BRANCH_NAME should exist for minor release $PROWLER_VERSION. Please create it manually first."
-          exit 1
-        fi
-
-    - name: Prepare prowler dependency update for minor release
-      if: ${{ env.PATCH_VERSION == '0' }}
-      run: |
-        CURRENT_PROWLER_REF=$(grep 'prowler @ git+https://github.com/prowler-cloud/prowler.git@' api/pyproject.toml | sed -E 's/.*@([^"]+)".*/\1/' | tr -d '[:space:]')
-        BRANCH_NAME_TRIMMED=$(echo "$BRANCH_NAME" | tr -d '[:space:]')
-
-        # Create a temporary branch for the PR
-        TEMP_BRANCH="update-api-dependency-$BRANCH_NAME_TRIMMED-$(date +%s)"
-        echo "TEMP_BRANCH=$TEMP_BRANCH" >> $GITHUB_ENV
-
-        # Switch back to master and create temp branch
-        git checkout master
-        git checkout -b "$TEMP_BRANCH"
-
-        # Minor release: update the dependency to use the release branch
-        echo "Updating prowler dependency from '$CURRENT_PROWLER_REF' to '$BRANCH_NAME_TRIMMED'"
-        sed -i "s|prowler @ git+https://github.com/prowler-cloud/prowler.git@[^\"]*\"|prowler @ git+https://github.com/prowler-cloud/prowler.git@$BRANCH_NAME_TRIMMED\"|" api/pyproject.toml
-
-        # Verify the change was made
-        UPDATED_PROWLER_REF=$(grep 'prowler @ git+https://github.com/prowler-cloud/prowler.git@' api/pyproject.toml | sed -E 's/.*@([^"]+)".*/\1/' | tr -d '[:space:]')
-        if [ "$UPDATED_PROWLER_REF" != "$BRANCH_NAME_TRIMMED" ]; then
-          echo "ERROR: Failed to update prowler dependency in api/pyproject.toml"
-          exit 1
-        fi
-
-        # Update poetry lock file
-        echo "Updating poetry.lock file..."
-        cd api
-        poetry lock
-        cd ..
-
-        # Commit and push the temporary branch
-        git add api/pyproject.toml api/poetry.lock
-        git commit -m "chore(api): update prowler dependency to $BRANCH_NAME_TRIMMED for release $PROWLER_VERSION"
-        git push origin "$TEMP_BRANCH"
-
-        echo "✓ Prepared prowler dependency update to: $UPDATED_PROWLER_REF"
-
-    - name: Create Pull Request against release branch
-      if: ${{ env.PATCH_VERSION == '0' }}
-      uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
-      with:
-        token: ${{ secrets.PROWLER_BOT_ACCESS_TOKEN }}
-        branch: ${{ env.TEMP_BRANCH }}
-        base: ${{ env.BRANCH_NAME }}
-        title: "chore(api): Update prowler dependency to ${{ env.BRANCH_NAME }} for release ${{ env.PROWLER_VERSION }}"
-        body: |
-          ### Description
-
-          Updates the API prowler dependency for release ${{ env.PROWLER_VERSION }}.
-
-          **Changes:**
-          - Updates `api/pyproject.toml` prowler dependency from `@master` to `@${{ env.BRANCH_NAME }}`
-          - Updates `api/poetry.lock` file with resolved dependencies
-
-          This PR should be merged into the `${{ env.BRANCH_NAME }}` release branch.
-
-          ### License
-
-          By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
-        author: prowler-bot <179230569+prowler-bot@users.noreply.github.com>
-        labels: |
-          component/api
-          no-changelog
-
-    - name: Extract changelog entries
-      run: |
-        set -e
-
-        # Function to extract changelog for a specific version
-        extract_changelog() {
-          local file="$1"
-          local version="$2"
-          local output_file="$3"
-
-          if [ ! -f "$file" ]; then
-            echo "Warning: $file not found, skipping..."
-            touch "$output_file"
-            return
-          fi
-
-          # Extract changelog section for this version
-          awk -v version="$version" '
-            /^## \[v?'"$version"'\]/ { found=1; next }
-            found && /^## \[v?[0-9]+\.[0-9]+\.[0-9]+\]/ { found=0 }
-            found && !/^## \[v?'"$version"'\]/ { print }
-          ' "$file" > "$output_file"
-
-          # Remove --- separators
-          sed -i '/^---$/d' "$output_file"
-
-          # Remove trailing empty lines
-          sed -i '/^$/d' "$output_file"
-        }
-
-        # Extract changelogs
-        echo "Extracting changelog entries..."
-        extract_changelog "prowler/CHANGELOG.md" "$PROWLER_VERSION" "prowler_changelog.md"
-        extract_changelog "api/CHANGELOG.md" "$API_VERSION" "api_changelog.md"
-        extract_changelog "ui/CHANGELOG.md" "$UI_VERSION" "ui_changelog.md"
-
-        # Combine changelogs in order: UI, API, SDK
-        > combined_changelog.md
-
-        if [ -s "ui_changelog.md" ]; then
-          echo "## UI" >> combined_changelog.md
-          echo "" >> combined_changelog.md
-          cat ui_changelog.md >> combined_changelog.md
-          echo "" >> combined_changelog.md
-        fi
-
-        if [ -s "api_changelog.md" ]; then
-          echo "## API" >> combined_changelog.md
-          echo "" >> combined_changelog.md
-          cat api_changelog.md >> combined_changelog.md
-          echo "" >> combined_changelog.md
-        fi
-
-        if [ -s "prowler_changelog.md" ]; then
-          echo "## SDK" >> combined_changelog.md
-          echo "" >> combined_changelog.md
-          cat prowler_changelog.md >> combined_changelog.md
-          echo "" >> combined_changelog.md
-        fi
-
-        echo "Combined changelog preview:"
-        cat combined_changelog.md
-
-    - name: Create draft release
-      uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8 # v2.3.2
-      with:
-        tag_name: ${{ env.PROWLER_VERSION }}
-        name: Prowler ${{ env.PROWLER_VERSION }}
-        body_path: combined_changelog.md
-        draft: true
-        target_commitish: ${{ env.PATCH_VERSION == '0' && 'master' || env.BRANCH_NAME }}
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-    - name: Clean up temporary files
-      run: |
-        rm -f prowler_changelog.md api_changelog.md ui_changelog.md combined_changelog.md

.github/workflows/pull-request-check-changelog.yml

@@ -1,4 +1,4 @@
-name: Prowler - Check Changelog
+name: Check Changelog
 
 on:
   pull_request:
@@ -13,7 +13,7 @@ jobs:
       contents: read
       pull-requests: write
     env:
-      MONITORED_FOLDERS: "api ui prowler dashboard"
+      MONITORED_FOLDERS: "api ui prowler"
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -55,20 +55,29 @@ jobs:
           comment-author: 'github-actions[bot]'
           body-includes: '<!-- changelog-check -->'
 
-      - name: Update PR comment with changelog status
-        if: github.event.pull_request.head.repo.full_name == github.repository
+      - name: Comment on PR if changelog is missing
+        if: github.event.pull_request.head.repo.full_name == github.repository && steps.check_folders.outputs.missing_changelogs != ''
         uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
         with:
           issue-number: ${{ github.event.pull_request.number }}
           comment-id: ${{ steps.find_comment.outputs.comment-id }}
-          edit-mode: replace
           body: |
             <!-- changelog-check -->
-            ${{ steps.check_folders.outputs.missing_changelogs != '' && format('⚠️ **Changes detected in the following folders without a corresponding update to the `CHANGELOG.md`:**
+            ⚠️ **Changes detected in the following folders without a corresponding update to the `CHANGELOG.md`:**
 
-            {0}
+            ${{ steps.check_folders.outputs.missing_changelogs }}
 
-            Please add an entry to the corresponding `CHANGELOG.md` file to maintain a clear history of changes.', steps.check_folders.outputs.missing_changelogs) || '✅ All necessary `CHANGELOG.md` files have been updated. Great job! 🎉' }}
+            Please add an entry to the corresponding `CHANGELOG.md` file to maintain a clear history of changes.
+
+      - name: Comment on PR if all changelogs are present
+        if: github.event.pull_request.head.repo.full_name == github.repository && steps.check_folders.outputs.missing_changelogs == ''
+        uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
+        with:
+          issue-number: ${{ github.event.pull_request.number }}
+          comment-id: ${{ steps.find_comment.outputs.comment-id }}
+          body: |
+            <!-- changelog-check -->
+            ✅ All necessary `CHANGELOG.md` files have been updated. Great job! 🎉
 
       - name: Fail if changelog is missing
         if: steps.check_folders.outputs.missing_changelogs != ''

.github/workflows/pull-request-merged.yml

@@ -27,12 +27,11 @@ jobs:
           token: ${{ secrets.PROWLER_BOT_ACCESS_TOKEN }}
           repository: ${{ secrets.CLOUD_DISPATCH }}
           event-type: prowler-pull-request-merged
-          client-payload: |
-            {
-              "PROWLER_COMMIT_SHA": "${{ github.event.pull_request.merge_commit_sha }}",
-              "PROWLER_COMMIT_SHORT_SHA": "${{ env.SHORT_SHA }}",
-              "PROWLER_PR_TITLE": ${{ toJson(github.event.pull_request.title) }},
-              "PROWLER_PR_LABELS": ${{ toJson(github.event.pull_request.labels.*.name) }},
-              "PROWLER_PR_BODY": ${{ toJson(github.event.pull_request.body) }},
-              "PROWLER_PR_URL": ${{ toJson(github.event.pull_request.html_url) }}
-            }
+          client-payload: '{
+            "PROWLER_COMMIT_SHA": "${{ github.event.pull_request.merge_commit_sha }}",
+            "PROWLER_COMMIT_SHORT_SHA": "${{ env.SHORT_SHA }}",
+            "PROWLER_PR_TITLE": "${{ github.event.pull_request.title }}",
+            "PROWLER_PR_LABELS": ${{ toJson(github.event.pull_request.labels.*.name) }},
+            "PROWLER_PR_BODY": ${{ toJson(github.event.pull_request.body) }},
+            "PROWLER_PR_URL":${{ toJson(github.event.pull_request.html_url) }}
+          }'

.github/workflows/sdk-build-lint-push-containers.yml

@@ -157,22 +157,6 @@ jobs:
           cache-from: type=gha
           cache-to: type=gha,mode=max
 
-#      - name: Push README to Docker Hub (toniblyx)
-#        uses: peter-evans/dockerhub-description@432a30c9e07499fd01da9f8a49f0faf9e0ca5b77 # v4.0.2
-#        with:
-#          username: ${{ secrets.DOCKERHUB_USERNAME }}
-#          password: ${{ secrets.DOCKERHUB_TOKEN }}
-#          repository: ${{ env.DOCKER_HUB_REPOSITORY }}/${{ env.IMAGE_NAME }}
-#          readme-filepath: ./README.md
-#
-#      - name: Push README to Docker Hub (prowlercloud)
-#        uses: peter-evans/dockerhub-description@432a30c9e07499fd01da9f8a49f0faf9e0ca5b77 # v4.0.2
-#        with:
-#          username: ${{ secrets.DOCKERHUB_USERNAME }}
-#          password: ${{ secrets.DOCKERHUB_TOKEN }}
-#          repository: ${{ env.PROWLERCLOUD_DOCKERHUB_REPOSITORY }}/${{ env.PROWLERCLOUD_DOCKERHUB_IMAGE }}
-#          readme-filepath: ./README.md
-
   dispatch-action:
     needs: container-build-push
     runs-on: ubuntu-latest

.github/workflows/sdk-bump-version.yml

@@ -12,6 +12,7 @@ env:
 jobs:
   bump-version:
     name: Bump Version
+    if: github.repository == 'prowler-cloud/prowler'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

.github/workflows/sdk-codeql.yml

@@ -56,12 +56,12 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
+      uses: github/codeql-action/init@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
       with:
         languages: ${{ matrix.language }}
         config-file: ./.github/codeql/sdk-codeql-config.yml
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
+      uses: github/codeql-action/analyze@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
       with:
         category: "/language:${{matrix.language}}"

.github/workflows/sdk-pull-request.yml

@@ -102,15 +102,8 @@ jobs:
         run: |
           poetry run vulture --exclude "contrib,api,ui" --min-confidence 100 .
 
-      - name: Dockerfile - Check if Dockerfile has changed
-        id: dockerfile-changed-files
-        uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c # v46.0.5
-        with:
-          files: |
-            Dockerfile
-
       - name: Hadolint
-        if: steps.dockerfile-changed-files.outputs.any_changed == 'true'
+        if: steps.are-non-ignored-files-changed.outputs.any_changed == 'true'
         run: |
           /tmp/hadolint Dockerfile --ignore=DL3013
 
@@ -234,21 +227,6 @@ jobs:
         run: |
           poetry run pytest -n auto --cov=./prowler/providers/iac --cov-report=xml:iac_coverage.xml tests/providers/iac
 
-      # Test MongoDB Atlas
-      - name: MongoDB Atlas - Check if any file has changed
-        id: mongodb-atlas-changed-files
-        uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c # v46.0.5
-        with:
-          files: |
-            ./prowler/providers/mongodbatlas/**
-            ./tests/providers/mongodbatlas/**
-            .poetry.lock
-
-      - name: MongoDB Atlas - Test
-        if: steps.mongodb-atlas-changed-files.outputs.any_changed == 'true'
-        run: |
-          poetry run pytest -n auto --cov=./prowler/providers/mongodbatlas --cov-report=xml:mongodb_atlas_coverage.xml tests/providers/mongodbatlas
-
       # Common Tests
       - name: Lib - Test
         if: steps.are-non-ignored-files-changed.outputs.any_changed == 'true'

.github/workflows/ui-codeql.yml

@@ -48,12 +48,12 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
+        uses: github/codeql-action/init@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
         with:
           languages: ${{ matrix.language }}
           config-file: ./.github/codeql/ui-codeql-config.yml
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
+        uses: github/codeql-action/analyze@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
         with:
           category: "/language:${{matrix.language}}"

.github/workflows/ui-e2e-tests.yml

@@ -1,98 +0,0 @@
-name: UI - E2E Tests
-
-on:
-  pull_request:
-    branches:
-      - master
-      - "v5.*"
-    paths:
-      - '.github/workflows/ui-e2e-tests.yml'
-      - 'ui/**'
-
-jobs:
-  e2e-tests:
-    if: github.repository == 'prowler-cloud/prowler'
-    runs-on: ubuntu-latest
-    env:
-      AUTH_SECRET: 'fallback-ci-secret-for-testing'
-      AUTH_TRUST_HOST: true
-      NEXTAUTH_URL: 'http://localhost:3000'
-      NEXT_PUBLIC_API_BASE_URL: 'http://localhost:8080/api/v1'
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - name: Start API services
-        run: |
-          # Override docker-compose image tag to use latest instead of stable
-          # This overrides any PROWLER_API_VERSION set in .env file
-          export PROWLER_API_VERSION=latest
-          echo "Using PROWLER_API_VERSION=${PROWLER_API_VERSION}"
-          docker compose up -d api worker worker-beat
-      - name: Wait for API to be ready
-        run: |
-          echo "Waiting for prowler-api..."
-          timeout=150  # 5 minutes max
-          elapsed=0
-          while [ $elapsed -lt $timeout ]; do
-            if curl -s ${NEXT_PUBLIC_API_BASE_URL}/docs >/dev/null 2>&1; then
-              echo "Prowler API is ready!"
-              exit 0
-            fi
-            echo "Waiting for prowler-api... (${elapsed}s elapsed)"
-            sleep 5
-            elapsed=$((elapsed + 5))
-          done
-          echo "Timeout waiting for prowler-api to start"
-          exit 1
-      - name: Load database fixtures for E2E tests
-        run: |
-          docker compose exec -T api sh -c '
-            echo "Loading all fixtures from api/fixtures/dev/..."
-            for fixture in api/fixtures/dev/*.json; do
-              if [ -f "$fixture" ]; then
-                echo "Loading $fixture"
-                poetry run python manage.py loaddata "$fixture" --database admin
-              fi
-            done
-            echo "All database fixtures loaded successfully!"
-          '
-      - name: Setup Node.js environment
-        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
-        with:
-          node-version: '20.x'
-          cache: 'npm'
-          cache-dependency-path: './ui/package-lock.json'
-      - name: Install UI dependencies
-        working-directory: ./ui
-        run: npm ci
-      - name: Build UI application
-        working-directory: ./ui
-        run: npm run build
-      - name: Cache Playwright browsers
-        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
-        id: playwright-cache
-        with:
-          path: ~/.cache/ms-playwright
-          key: ${{ runner.os }}-playwright-${{ hashFiles('ui/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-playwright-
-      - name: Install Playwright browsers
-        working-directory: ./ui
-        if: steps.playwright-cache.outputs.cache-hit != 'true'
-        run: npm run test:e2e:install
-      - name: Run E2E tests
-        working-directory: ./ui
-        run: npm run test:e2e
-      - name: Upload test reports
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        if: failure()
-        with:
-          name: playwright-report
-          path: ui/playwright-report/
-          retention-days: 30
-      - name: Cleanup services
-        if: always()
-        run: |
-          echo "Shutting down services..."
-          docker compose down -v || true
-          echo "Cleanup completed"

.github/workflows/ui-pull-request.yml

@@ -46,6 +46,52 @@ jobs:
         working-directory: ./ui
         run: npm run build
 
+  e2e-tests:
+    runs-on: ubuntu-latest
+    env:
+      AUTH_SECRET: 'fallback-ci-secret-for-testing'
+      AUTH_TRUST_HOST: true
+      NEXTAUTH_URL: http://localhost:3000
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          persist-credentials: false
+      - name: Setup Node.js
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
+        with:
+          node-version: '20.x'
+          cache: 'npm'
+          cache-dependency-path: './ui/package-lock.json'
+      - name: Install dependencies
+        working-directory: ./ui
+        run: npm ci
+      - name: Cache Playwright browsers
+        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
+        id: playwright-cache
+        with:
+          path: ~/.cache/ms-playwright
+          key: ${{ runner.os }}-playwright-${{ hashFiles('ui/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-playwright-
+      - name: Install Playwright browsers
+        working-directory: ./ui
+        if: steps.playwright-cache.outputs.cache-hit != 'true'
+        run: npm run test:e2e:install
+      - name: Build the application
+        working-directory: ./ui
+        run: npm run build
+      - name: Run Playwright tests
+        working-directory: ./ui
+        run: npm run test:e2e
+      - name: Upload Playwright report
+        uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
+        if: failure()
+        with:
+          name: playwright-report
+          path: ui/playwright-report/
+          retention-days: 30
+
   test-container-build:
     runs-on: ubuntu-latest
     steps:

.gitignore

@@ -75,6 +75,3 @@ node_modules
 
 # Persistent data
 _data/
-
-# Claude
-CLAUDE.md

.pre-commit-config.yaml

@@ -115,8 +115,7 @@ repos:
       - id: safety
         name: safety
         description: "Safety is a tool that checks your installed dependencies for known security vulnerabilities"
-        # TODO: Botocore needs urllib3 1.X so we need to ignore these vulnerabilities 77744,77745. Remove this once we upgrade to urllib3 2.X
-        entry: bash -c 'safety check --ignore 70612,66963,74429,76352,76353,77744,77745'
+        entry: bash -c 'safety check --ignore 70612,66963,74429,76352,76353'
         language: system
 
       - id: vulture

README.md

@@ -19,16 +19,19 @@
   <a href="https://goto.prowler.com/slack"><img alt="Slack Shield" src="https://img.shields.io/badge/slack-prowler-brightgreen.svg?logo=slack"></a>
   <a href="https://pypi.org/project/prowler/"><img alt="Python Version" src="https://img.shields.io/pypi/v/prowler.svg"></a>
   <a href="https://pypi.python.org/pypi/prowler/"><img alt="Python Version" src="https://img.shields.io/pypi/pyversions/prowler.svg"></a>
-  <a href="https://pypistats.org/packages/prowler"><img alt="PyPI Downloads" src="https://img.shields.io/pypi/dw/prowler.svg?label=downloads"></a>
+  <a href="https://pypistats.org/packages/prowler"><img alt="PyPI Prowler Downloads" src="https://img.shields.io/pypi/dw/prowler.svg?label=prowler%20downloads"></a>
   <a href="https://hub.docker.com/r/toniblyx/prowler"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/toniblyx/prowler"></a>
+  <a href="https://hub.docker.com/r/toniblyx/prowler"><img alt="Docker" src="https://img.shields.io/docker/cloud/build/toniblyx/prowler"></a>
+  <a href="https://hub.docker.com/r/toniblyx/prowler"><img alt="Docker" src="https://img.shields.io/docker/image-size/toniblyx/prowler"></a>
   <a href="https://gallery.ecr.aws/prowler-cloud/prowler"><img width="120" height=19" alt="AWS ECR Gallery" src="https://user-images.githubusercontent.com/3985464/151531396-b6535a68-c907-44eb-95a1-a09508178616.png"></a>
   <a href="https://codecov.io/gh/prowler-cloud/prowler"><img src="https://codecov.io/gh/prowler-cloud/prowler/graph/badge.svg?token=OflBGsdpDl"/></a>
 </p>
 <p align="center">
-    <a href="https://github.com/prowler-cloud/prowler/releases"><img alt="Version" src="https://img.shields.io/github/v/release/prowler-cloud/prowler"></a>
+  <a href="https://github.com/prowler-cloud/prowler"><img alt="Repo size" src="https://img.shields.io/github/repo-size/prowler-cloud/prowler"></a>
+  <a href="https://github.com/prowler-cloud/prowler/issues"><img alt="Issues" src="https://img.shields.io/github/issues/prowler-cloud/prowler"></a>
+  <a href="https://github.com/prowler-cloud/prowler/releases"><img alt="Version" src="https://img.shields.io/github/v/release/prowler-cloud/prowler"></a>
   <a href="https://github.com/prowler-cloud/prowler/releases"><img alt="Version" src="https://img.shields.io/github/release-date/prowler-cloud/prowler"></a>
   <a href="https://github.com/prowler-cloud/prowler"><img alt="Contributors" src="https://img.shields.io/github/contributors-anon/prowler-cloud/prowler"></a>
-  <a href="https://github.com/prowler-cloud/prowler/issues"><img alt="Issues" src="https://img.shields.io/github/issues/prowler-cloud/prowler"></a>
   <a href="https://github.com/prowler-cloud/prowler"><img alt="License" src="https://img.shields.io/github/license/prowler-cloud/prowler"></a>
   <a href="https://twitter.com/ToniBlyx"><img alt="Twitter" src="https://img.shields.io/twitter/follow/toniblyx?style=social"></a>
   <a href="https://twitter.com/prowlercloud"><img alt="Twitter" src="https://img.shields.io/twitter/follow/prowlercloud?style=social"></a>
@@ -52,11 +55,15 @@ Prowler includes hundreds of built-in controls to ensure compliance with standar
 - **National Security Standards:** ENS (Spanish National Security Scheme)
 - **Custom Security Frameworks:** Tailored to your needs
 
+## Prowler CLI and Prowler Cloud
+
+Prowler offers a Command Line Interface (CLI), known as Prowler Open Source, and an additional service built on top of it, called <a href="https://prowler.com">Prowler Cloud</a>.
+
 ## Prowler App
 
 Prowler App is a web-based application that simplifies running Prowler across your cloud provider accounts. It provides a user-friendly interface to visualize the results and streamline your security assessments.
 
-![Prowler App](docs/products/img/overview.png)
+![Prowler App](docs/img/overview.png)
 
 >For more details, refer to the [Prowler App Documentation](https://docs.prowler.com/projects/prowler-open-source/en/latest/#prowler-app-installation)
 
@@ -73,36 +80,28 @@ prowler <provider>
 ```console
 prowler dashboard
 ```
-![Prowler Dashboard](docs/products/img/dashboard.png)
+![Prowler Dashboard](docs/img/dashboard.png)
 
 # Prowler at a Glance
-> [!Tip]
-> For the most accurate and up-to-date information about checks, services, frameworks, and categories, visit [**Prowler Hub**](https://hub.prowler.com).
 
-
-| Provider | Checks | Services | [Compliance Frameworks](https://docs.prowler.com/projects/prowler-open-source/en/latest/tutorials/compliance/) | [Categories](https://docs.prowler.com/projects/prowler-open-source/en/latest/tutorials/misc/#categories) | Support | Stage | Interface |
-|---|---|---|---|---|---|---|---|
-| AWS | 576 | 82 | 36 | 10 | Official | Stable | UI, API, CLI |
-| GCP | 79 | 13 | 10 | 3 | Official | Stable | UI, API, CLI |
-| Azure | 162 | 19 | 11 | 4 | Official | Stable | UI, API, CLI |
-| Kubernetes | 83 | 7 | 5 | 7 | Official | Stable | UI, API, CLI |
-| GitHub | 17 | 2 | 1 | 0 | Official | Stable | UI, API, CLI |
-| M365 | 70 | 7 | 3 | 2 | Official | Stable | UI, API, CLI |
-| IaC | [See `trivy` docs.](https://trivy.dev/latest/docs/coverage/iac/) | N/A | N/A | N/A | Official | Beta | CLI |
-| MongoDB Atlas | 10 | 3 | 0 | 0 | Official | Beta | CLI |
-| NHN | 6 | 2 | 1 | 0 | Unofficial | Beta | CLI |
+| Provider | Checks | Services | [Compliance Frameworks](https://docs.prowler.com/projects/prowler-open-source/en/latest/tutorials/compliance/) | [Categories](https://docs.prowler.com/projects/prowler-open-source/en/latest/tutorials/misc/#categories) |
+|---|---|---|---|---|
+| AWS | 567 | 82 | 36 | 10 |
+| GCP | 79 | 13 | 10 | 3 |
+| Azure | 142 | 18 | 10 | 3 |
+| Kubernetes | 83 | 7 | 5 | 7 |
+| GitHub | 16 | 2 | 1 | 0 |
+| M365 | 69 | 7 | 3 | 2 |
+| NHN (Unofficial) | 6 | 2 | 1 | 0 |
 
 > [!Note]
 > The numbers in the table are updated periodically.
 
-
+> [!Tip]
+> For the most accurate and up-to-date information about checks, services, frameworks, and categories, visit [**Prowler Hub**](https://hub.prowler.com).
 
 > [!Note]
-> Use the following commands to list Prowler's available checks, services, compliance frameworks, and categories:
-> - `prowler <provider> --list-checks`
-> - `prowler <provider> --list-services`
-> - `prowler <provider> --list-compliance`
-> - `prowler <provider> --list-categories`
+> Use the following commands to list Prowler's available checks, services, compliance frameworks, and categories: `prowler <provider> --list-checks`, `prowler <provider> --list-services`, `prowler <provider> --list-compliance` and `prowler <provider> --list-categories`.
 
 # 💻 Installation
 
@@ -137,14 +136,6 @@ If your workstation's architecture is incompatible, you can resolve this by:
 
 > Once configured, access the Prowler App at http://localhost:3000. Sign up using your email and password to get started.
 
-### Common Issues with Docker Pull Installation
-
-> [!Note]
-  If you want to use AWS role assumption (e.g., with the "Connect assuming IAM Role" option), you may need to mount your local `.aws` directory into the container as a volume (e.g., `- "${HOME}/.aws:/home/prowler/.aws:ro"`). There are several ways to configure credentials for Docker containers. See the [Troubleshooting](./docs/troubleshooting.md) section for more details and examples.
-
-You can find more information in the [Troubleshooting](./docs/troubleshooting.md) section.
-
-
 ### From GitHub
 
 **Requirements**
@@ -240,7 +231,7 @@ The following versions of Prowler CLI are available, depending on your requireme
 
 The container images are available here:
 - Prowler CLI:
-    - [DockerHub](https://hub.docker.com/r/prowlercloud/prowler/tags)
+    - [DockerHub](https://hub.docker.com/r/toniblyx/prowler/tags)
     - [AWS Public ECR](https://gallery.ecr.aws/prowler-cloud/prowler)
 - Prowler App:
     - [DockerHub - Prowler UI](https://hub.docker.com/r/prowlercloud/prowler-ui/tags)
@@ -275,7 +266,7 @@ python prowler-cli.py -v
 - **Prowler API**: A backend service, developed with Django REST Framework, responsible for running Prowler scans and storing the generated results.
 - **Prowler SDK**: A Python SDK designed to extend the functionality of the Prowler CLI for advanced capabilities.
 
-![Prowler App Architecture](docs/products/img/prowler-app-architecture.png)
+![Prowler App Architecture](docs/img/prowler-app-architecture.png)
 
 ## Prowler CLI
 

SECURITY.md

@@ -1,65 +1,23 @@
-# Security
+# Security Policy
 
-## Reporting Vulnerabilities
+## Software Security
+As an **AWS Partner** and we have passed the [AWS Foundation Technical Review (FTR)](https://aws.amazon.com/partners/foundational-technical-review/) and we use the following tools and automation to make sure our code is secure and dependencies up-to-dated:
 
-At Prowler, we consider the security of our open source software and systems a top priority. But no matter how much effort we put into system security, there can still be vulnerabilities present.
+- `bandit` for code security review.
+- `safety` and `dependabot` for dependencies.
+- `hadolint` and `dockle` for our containers security.
+- `snyk` in Docker Hub.
+- `clair` in Amazon ECR.
+- `vulture`, `flake8`, `black` and `pylint` for formatting and best practices.
 
-If you discover a vulnerability, we would like to know about it so we can take steps to address it as quickly as possible. We would like to ask you to help us better protect our users, our clients and our systems.
+## Reporting a Vulnerability
 
-When reporting vulnerabilities, please consider (1) attack scenario / exploitability, and (2) the security impact of the bug. The following issues are considered out of scope:
+If you would like to report a vulnerability or have a security concern regarding Prowler Open Source or ProwlerPro service, please submit the information by contacting to https://support.prowler.com.
 
-- Social engineering support or attacks requiring social engineering.
-- Clickjacking on pages with no sensitive actions.
-- Cross-Site Request Forgery (CSRF) on unauthenticated forms or forms with no sensitive actions.
-- Attacks requiring Man-In-The-Middle (MITM) or physical access to a user's device.
-- Previously known vulnerable libraries without a working Proof of Concept (PoC).
-- Comma Separated Values (CSV) injection without demonstrating a vulnerability.
-- Missing best practices in SSL/TLS configuration.
-- Any activity that could lead to the disruption of service (DoS).
-- Rate limiting or brute force issues on non-authentication endpoints.
-- Missing best practices in Content Security Policy (CSP).
-- Missing HttpOnly or Secure flags on cookies.
-- Configuration of or missing security headers.
-- Missing email best practices, such as invalid, incomplete, or missing SPF/DKIM/DMARC records.
-- Vulnerabilities only affecting users of outdated or unpatched browsers (less than two stable versions behind).
-- Software version disclosure, banner identification issues, or descriptive error messages.
-- Tabnabbing.
-- Issues that require unlikely user interaction.
-- Improper logout functionality and improper session timeout.
-- CORS misconfiguration without an exploitation scenario.
-- Broken link hijacking.
-- Automated scanning results (e.g., sqlmap, Burp active scanner) that have not been manually verified.
-- Content spoofing and text injection issues without a clear attack vector.
-- Email spoofing without exploiting security flaws.
-- Dead links or broken links.
-- User enumeration.
+The information you share with ProwlerPro as part of this process is kept confidential within ProwlerPro. We will only share this information with a third party if the vulnerability you report is found to affect a third-party product, in which case we will share this information with the third-party product's author or manufacturer. Otherwise, we will only share this information as permitted by you.
 
-Testing guidelines:
-- Do not run automated scanners on other customer projects. Running automated scanners can run up costs for our users. Aggressively configured scanners might inadvertently disrupt services, exploit vulnerabilities, lead to system instability or breaches and violate Terms of Service from our upstream providers. Our own security systems won't be able to distinguish hostile reconnaissance from whitehat research. If you wish to run an automated scanner, notify us at support@prowler.com and only run it on your own Prowler app project. Do NOT attack Prowler in usage of other customers.
-- Do not take advantage of the vulnerability or problem you have discovered, for example by downloading more data than necessary to demonstrate the vulnerability or deleting or modifying other people's data.
+We will review the submitted report, and assign it a tracking number. We will then respond to you, acknowledging receipt of the report, and outline the next steps in the process.
 
-Reporting guidelines:
-- File a report through our Support Desk at https://support.prowler.com
-- If it is about a lack of a security functionality, please file a feature request instead at https://github.com/prowler-cloud/prowler/issues
-- Do provide sufficient information to reproduce the problem, so we will be able to resolve it as quickly as possible.
-- If you have further questions and want direct interaction with the Prowler team, please contact us at via our Community Slack at goto.prowler.com/slack.
+You will receive a non-automated response to your initial contact within 24 hours, confirming receipt of your reported vulnerability.
 
-Disclosure guidelines:
-- In order to protect our users and customers, do not reveal the problem to others until we have researched, addressed and informed our affected customers.
-- If you want to publicly share your research about Prowler at a conference, in a blog or any other public forum, you should share a draft with us for review and approval at least 30 days prior to the publication date. Please note that the following should not be included:
-    - Data regarding any Prowler user or customer projects.
-    - Prowler customers' data.
-    - Information about Prowler employees, contractors or partners.
-
-What we promise:
-- We will respond to your report within 5 business days with our evaluation of the report and an expected resolution date.
-- If you have followed the instructions above, we will not take any legal action against you in regard to the report.
-- We will handle your report with strict confidentiality, and not pass on your personal details to third parties without your permission.
-- We will keep you informed of the progress towards resolving the problem.
-- In the public information concerning the problem reported, we will give your name as the discoverer of the problem (unless you desire otherwise).
-
-We strive to resolve all problems as quickly as possible, and we would like to play an active role in the ultimate publication on the problem after it is resolved.
-
----
-
-For more information about our security policies, please refer to our [Security](https://docs.prowler.com/projects/prowler-open-source/en/latest/security/) section in our documentation.
+We will coordinate public notification of any validated vulnerability with you. Where possible, we prefer that our respective public disclosures be posted simultaneously.

api/.env.example

@@ -19,8 +19,6 @@ DJANGO_REFRESH_TOKEN_LIFETIME=1440
 DJANGO_CACHE_MAX_AGE=3600
 DJANGO_STALE_WHILE_REVALIDATE=60
 DJANGO_SECRETS_ENCRYPTION_KEY=""
-# Throttle, two options: Empty means no throttle; or if desired use one in DRF format: https://www.django-rest-framework.org/api-guide/throttling/#setting-the-throttling-policy
-DJANGO_THROTTLE_TOKEN_OBTAIN=50/minute
 # Decide whether to allow Django manage database table partitions
 DJANGO_MANAGE_DB_PARTITIONS=[True|False]
 DJANGO_CELERY_DEADLOCK_ATTEMPTS=5

api/CHANGELOG.md

@@ -2,58 +2,7 @@
 
 All notable changes to the **Prowler API** are documented in this file.
 
-## [Unreleased]
-
-### Added
-- IaC (Infrastructure as Code) provider support for remote repositories [(#TBD)](https://github.com/prowler-cloud/prowler/pull/TBD)
-
----
-
-## [1.13.0] (Prowler 5.12.0)
-
-### Added
-- Integration with JIRA, enabling sending findings to a JIRA project [(#8622)](https://github.com/prowler-cloud/prowler/pull/8622), [(#8637)](https://github.com/prowler-cloud/prowler/pull/8637)
-- `GET /overviews/findings_severity` now supports `filter[status]` and `filter[status__in]` to aggregate by specific statuses (`FAIL`, `PASS`)[(#8186)](https://github.com/prowler-cloud/prowler/pull/8186)
-- Throttling options for `/api/v1/tokens` using the `DJANGO_THROTTLE_TOKEN_OBTAIN` environment variable [(#8647)](https://github.com/prowler-cloud/prowler/pull/8647)
-
----
-
-## [1.12.0] (Prowler 5.11.0)
-
-### Added
-- Lighthouse support for OpenAI GPT-5 [(#8527)](https://github.com/prowler-cloud/prowler/pull/8527)
-- Integration with Amazon Security Hub, enabling sending findings to Security Hub [(#8365)](https://github.com/prowler-cloud/prowler/pull/8365)
-- Generate ASFF output for AWS providers with SecurityHub integration enabled [(#8569)](https://github.com/prowler-cloud/prowler/pull/8569)
-
-### Fixed
-- GitHub provider always scans user instead of organization when using provider UID [(#8587)](https://github.com/prowler-cloud/prowler/pull/8587)
-
-## [1.11.0] (Prowler 5.10.0)
-
-### Added
-- Github provider support [(#8271)](https://github.com/prowler-cloud/prowler/pull/8271)
-- Integration with Amazon S3, enabling storage and retrieval of scan data via S3 buckets [(#8056)](https://github.com/prowler-cloud/prowler/pull/8056)
-
-### Fixed
-- Avoid sending errors to Sentry in M365 provider when user authentication fails [(#8420)](https://github.com/prowler-cloud/prowler/pull/8420)
-
----
-
-## [1.10.2] (Prowler v5.9.2)
-
-### Changed
-- Optimized queries for resources views [(#8336)](https://github.com/prowler-cloud/prowler/pull/8336)
-
----
-
-## [v1.10.1] (Prowler v5.9.1)
-
-### Fixed
-- Calculate failed findings during scans to prevent heavy database queries [(#8322)](https://github.com/prowler-cloud/prowler/pull/8322)
-
----
-
-## [v1.10.0] (Prowler v5.9.0)
+## [v1.10.0] (Prowler UNRELEASED)
 
 ### Added
 - SSO with SAML support [(#8175)](https://github.com/prowler-cloud/prowler/pull/8175)
@@ -63,16 +12,12 @@ All notable changes to the **Prowler API** are documented in this file.
 - `/processors` endpoints to post-process findings. Currently, only the Mutelist processor is supported to allow to mute findings.
 - Optimized the underlying queries for resources endpoints [(#8112)](https://github.com/prowler-cloud/prowler/pull/8112)
 - Optimized include parameters for resources view [(#8229)](https://github.com/prowler-cloud/prowler/pull/8229)
-- Optimized overview background tasks [(#8300)](https://github.com/prowler-cloud/prowler/pull/8300)
 
 ### Fixed
 - Search filter for findings and resources [(#8112)](https://github.com/prowler-cloud/prowler/pull/8112)
-- RBAC is now applied to `GET /overviews/providers` [(#8277)](https://github.com/prowler-cloud/prowler/pull/8277)
-
-### Changed
-- `POST /schedules/daily` returns a `409 CONFLICT` if already created [(#8258)](https://github.com/prowler-cloud/prowler/pull/8258)
 
 ### Security
+
 - Enhanced password validation to enforce 12+ character passwords with special characters, uppercase, lowercase, and numbers [(#8225)](https://github.com/prowler-cloud/prowler/pull/8225)
 
 ---

api/Dockerfile

@@ -36,25 +36,6 @@ RUN ARCH=$(uname -m) && \
     ln -s /opt/microsoft/powershell/7/pwsh /usr/bin/pwsh && \
     rm /tmp/powershell.tar.gz
 
-# Install Trivy for IaC scanning
-ARG TRIVY_VERSION=0.66.0
-RUN ARCH=$(uname -m) && \
-    if [ "$ARCH" = "x86_64" ]; then \
-        TRIVY_ARCH="Linux-64bit" ; \
-    elif [ "$ARCH" = "aarch64" ]; then \
-        TRIVY_ARCH="Linux-ARM64" ; \
-    else \
-        echo "Unsupported architecture for Trivy: $ARCH" && exit 1 ; \
-    fi && \
-    wget --progress=dot:giga "https://github.com/aquasecurity/trivy/releases/download/v${TRIVY_VERSION}/trivy_${TRIVY_VERSION}_${TRIVY_ARCH}.tar.gz" -O /tmp/trivy.tar.gz && \
-    tar zxf /tmp/trivy.tar.gz -C /tmp && \
-    mv /tmp/trivy /usr/local/bin/trivy && \
-    chmod +x /usr/local/bin/trivy && \
-    rm /tmp/trivy.tar.gz && \
-    # Create trivy cache directory with proper permissions
-    mkdir -p /tmp/.cache/trivy && \
-    chmod 777 /tmp/.cache/trivy
-
 # Add prowler user
 RUN addgroup --gid 1000 prowler && \
     adduser --uid 1000 --gid 1000 --disabled-password --gecos "" prowler
@@ -63,9 +44,6 @@ USER prowler
 
 WORKDIR /home/prowler
 
-# Ensure output directory exists
-RUN mkdir -p /tmp/prowler_api_output
-
 COPY pyproject.toml ./
 
 RUN pip install --no-cache-dir --upgrade pip && \

api/docker-entrypoint.sh

@@ -32,7 +32,7 @@ start_prod_server() {
 
 start_worker() {
   echo "Starting the worker..."
-  poetry run python -m celery -A config.celery worker -l "${DJANGO_LOGGING_LEVEL:-info}" -Q celery,scans,scan-reports,deletion,backfill,overview,integrations -E --max-tasks-per-child 1
+  poetry run python -m celery -A config.celery worker -l "${DJANGO_LOGGING_LEVEL:-info}" -Q celery,scans,scan-reports,deletion,backfill,overview -E --max-tasks-per-child 1
 }
 
 start_worker_beat() {

api/pyproject.toml

@@ -24,14 +24,13 @@ dependencies = [
   "drf-spectacular-jsonapi==0.5.1",
   "gunicorn==23.0.0",
   "lxml==5.3.2",
-  "prowler @ git+https://github.com/prowler-cloud/prowler.git@iac-in-the-app",
+  "prowler @ git+https://github.com/prowler-cloud/prowler.git@master",
   "psycopg2-binary==2.9.9",
   "pytest-celery[redis] (>=1.0.1,<2.0.0)",
   "sentry-sdk[django] (>=2.20.0,<3.0.0)",
   "uuid6==2024.7.10",
   "openai (>=1.82.0,<2.0.0)",
-  "xmlsec==1.3.14",
-  "h2 (==4.3.0)"
+  "xmlsec==1.3.14"
 ]
 description = "Prowler's API (Django/DRF)"
 license = "Apache-2.0"
@@ -39,7 +38,7 @@ name = "prowler-api"
 package-mode = false
 # Needed for the SDK compatibility
 requires-python = ">=3.11,<3.13"
-version = "1.13.0"
+version = "1.10.0"
 
 [project.scripts]
 celery = "src.backend.config.settings.celery"

api/src/backend/api/db_utils.py

@@ -175,29 +175,6 @@ def create_objects_in_batches(
             model.objects.bulk_create(chunk, batch_size)
 
 
-def update_objects_in_batches(
-    tenant_id: str, model, objects: list, fields: list, batch_size: int = 500
-):
-    """
-    Bulk-update model instances in repeated, per-tenant RLS transactions.
-
-    All chunks execute in their own transaction, so no single transaction
-    grows too large.
-
-    Args:
-        tenant_id (str): UUID string of the tenant under which to set RLS.
-        model: Django model class whose `.objects.bulk_update()` will be called.
-        objects (list): List of model instances (saved) to bulk-update.
-        fields (list): List of field names to update.
-        batch_size (int): Maximum number of objects per bulk_update call.
-    """
-    total = len(objects)
-    for start in range(0, total, batch_size):
-        chunk = objects[start : start + batch_size]
-        with rls_transaction(value=tenant_id, parameter=POSTGRES_TENANT_VAR):
-            model.objects.bulk_update(chunk, fields, batch_size)
-
-
 # Postgres Enums
 
 

api/src/backend/api/exceptions.py

@@ -78,21 +78,3 @@ def custom_exception_handler(exc, context):
                 message_item["message"] for message_item in exc.detail["messages"]
             ]
     return exception_handler(exc, context)
-
-
-class ConflictException(APIException):
-    status_code = status.HTTP_409_CONFLICT
-    default_detail = "A conflict occurred. The resource already exists."
-    default_code = "conflict"
-
-    def __init__(self, detail=None, code=None, pointer=None):
-        error_detail = {
-            "detail": detail or self.default_detail,
-            "status": self.status_code,
-            "code": self.default_code,
-        }
-
-        if pointer:
-            error_detail["source"] = {"pointer": pointer}
-
-        super().__init__(detail=[error_detail])

api/src/backend/api/filters.py

@@ -2,7 +2,7 @@ from datetime import date, datetime, timedelta, timezone
 
 from dateutil.parser import parse
 from django.conf import settings
-from django.db.models import F, Q
+from django.db.models import Q
 from django_filters.rest_framework import (
     BaseInFilter,
     BooleanFilter,
@@ -28,7 +28,6 @@ from api.models import (
     Integration,
     Invitation,
     Membership,
-    OverviewStatusChoices,
     PermissionChoices,
     Processor,
     Provider,
@@ -751,72 +750,6 @@ class ScanSummaryFilter(FilterSet):
         }
 
 
-class ScanSummarySeverityFilter(ScanSummaryFilter):
-    """Filter for findings_severity ScanSummary endpoint - includes status filters"""
-
-    # Custom status filters - only for severity grouping endpoint
-    status = ChoiceFilter(method="filter_status", choices=OverviewStatusChoices.choices)
-    status__in = CharInFilter(method="filter_status_in", lookup_expr="in")
-
-    def filter_status(self, queryset, name, value):
-        # Validate the status value
-        if value not in [choice[0] for choice in OverviewStatusChoices.choices]:
-            raise ValidationError(f"Invalid status value: {value}")
-
-        # Apply the filter by annotating the queryset with the status field
-        if value == OverviewStatusChoices.FAIL:
-            return queryset.annotate(status_count=F("fail"))
-        elif value == OverviewStatusChoices.PASS:
-            return queryset.annotate(status_count=F("_pass"))
-        else:
-            return queryset.annotate(status_count=F("total"))
-
-    def filter_status_in(self, queryset, name, value):
-        # Validate the status values
-        valid_statuses = [choice[0] for choice in OverviewStatusChoices.choices]
-        for status_val in value:
-            if status_val not in valid_statuses:
-                raise ValidationError(f"Invalid status value: {status_val}")
-
-        # If all statuses or no valid statuses, use total
-        if (
-            set(value)
-            >= {
-                OverviewStatusChoices.FAIL,
-                OverviewStatusChoices.PASS,
-            }
-            or not value
-        ):
-            return queryset.annotate(status_count=F("total"))
-
-        # Build the sum expression based on status values
-        sum_expression = None
-        for status in value:
-            if status == OverviewStatusChoices.FAIL:
-                field_expr = F("fail")
-            elif status == OverviewStatusChoices.PASS:
-                field_expr = F("_pass")
-            else:
-                continue
-
-            if sum_expression is None:
-                sum_expression = field_expr
-            else:
-                sum_expression = sum_expression + field_expr
-
-        if sum_expression is None:
-            return queryset.annotate(status_count=F("total"))
-
-        return queryset.annotate(status_count=sum_expression)
-
-    class Meta:
-        model = ScanSummary
-        fields = {
-            "inserted_at": ["date", "gte", "lte"],
-            "region": ["exact", "icontains", "in"],
-        }
-
-
 class ServiceOverviewFilter(ScanSummaryFilter):
     def is_valid(self):
         # Check if at least one of the inserted_at filters is present
@@ -860,23 +793,3 @@ class ProcessorFilter(FilterSet):
         field_name="processor_type",
         lookup_expr="in",
     )
-
-
-class IntegrationJiraFindingsFilter(FilterSet):
-    # To be expanded as needed
-    finding_id = UUIDFilter(field_name="id", lookup_expr="exact")
-    finding_id__in = UUIDInFilter(field_name="id", lookup_expr="in")
-
-    class Meta:
-        model = Finding
-        fields = {}
-
-    def filter_queryset(self, queryset):
-        # Validate that there is at least one filter provided
-        if not self.data:
-            raise ValidationError(
-                {
-                    "findings": "No finding filters provided. At least one filter is required."
-                }
-            )
-        return super().filter_queryset(queryset)

api/src/backend/api/fixtures/dev/0_dev_users.json

@@ -24,18 +24,5 @@
       "is_active": true,
       "date_joined": "2024-09-18T09:04:20.850Z"
     }
-  },
-  {
-    "model": "api.user",
-    "pk": "6d4f8a91-3c2e-4b5a-8f7d-1e9c5b2a4d6f",
-    "fields": {
-      "password": "pbkdf2_sha256$870000$Z63pGJ7nre48hfcGbk5S0O$rQpKczAmijs96xa+gPVJifpT3Fetb8DOusl5Eq6gxac=",
-      "last_login": null,
-      "name": "E2E Test User",
-      "email": "e2e@prowler.com",
-      "company_name": "Prowler E2E Tests",
-      "is_active": true,
-      "date_joined": "2024-01-01T00:00:00.850Z"
-    }
   }
 ]

api/src/backend/api/fixtures/dev/1_dev_tenants.json

@@ -46,24 +46,5 @@
       "role": "member",
       "date_joined": "2024-09-19T11:03:59.712Z"
     }
-  },
-  {
-    "model": "api.tenant",
-    "pk": "7c8f94a3-e2d1-4b3a-9f87-2c4d5e6f1a2b",
-    "fields": {
-      "inserted_at": "2024-01-01T00:00:00Z",
-      "updated_at": "2024-01-01T00:00:00Z",
-      "name": "E2E Test Tenant"
-    }
-  },
-  {
-    "model": "api.membership",
-    "pk": "9b1a2c3d-4e5f-6789-abc1-23456789def0",
-    "fields": {
-      "user": "6d4f8a91-3c2e-4b5a-8f7d-1e9c5b2a4d6f",
-      "tenant": "7c8f94a3-e2d1-4b3a-9f87-2c4d5e6f1a2b",
-      "role": "owner",
-      "date_joined": "2024-01-01T00:00:00.000Z"
-    }
   }
 ]

api/src/backend/api/fixtures/dev/6_dev_rbac.json

@@ -149,32 +149,5 @@
       "user": "8b38e2eb-6689-4f1e-a4ba-95b275130200",
       "inserted_at": "2024-11-20T15:36:14.302Z"
     }
-  },
-  {
-    "model": "api.role",
-    "pk": "a5b6c7d8-9e0f-1234-5678-90abcdef1234",
-    "fields": {
-      "tenant": "7c8f94a3-e2d1-4b3a-9f87-2c4d5e6f1a2b",
-      "name": "e2e_admin",
-      "manage_users": true,
-      "manage_account": true,
-      "manage_billing": true,
-      "manage_providers": true,
-      "manage_integrations": true,
-      "manage_scans": true,
-      "unlimited_visibility": true,
-      "inserted_at": "2024-01-01T00:00:00.000Z",
-      "updated_at": "2024-01-01T00:00:00.000Z"
-    }
-  },
-  {
-    "model": "api.userrolerelationship",
-    "pk": "f1e2d3c4-b5a6-9876-5432-10fedcba9876",
-    "fields": {
-      "tenant": "7c8f94a3-e2d1-4b3a-9f87-2c4d5e6f1a2b",
-      "role": "a5b6c7d8-9e0f-1234-5678-90abcdef1234",
-      "user": "6d4f8a91-3c2e-4b5a-8f7d-1e9c5b2a4d6f",
-      "inserted_at": "2024-01-01T00:00:00.000Z"
-    }
   }
 ]

api/src/backend/api/migrations/0040_rfm_tenant_resource_index_partitions.py

@@ -1,30 +0,0 @@
-from functools import partial
-
-from django.db import migrations
-
-from api.db_utils import create_index_on_partitions, drop_index_on_partitions
-
-
-class Migration(migrations.Migration):
-    atomic = False
-
-    dependencies = [
-        ("api", "0039_resource_resources_failed_findings_idx"),
-    ]
-
-    operations = [
-        migrations.RunPython(
-            partial(
-                create_index_on_partitions,
-                parent_table="resource_finding_mappings",
-                index_name="rfm_tenant_resource_idx",
-                columns="tenant_id, resource_id",
-                method="BTREE",
-            ),
-            reverse_code=partial(
-                drop_index_on_partitions,
-                parent_table="resource_finding_mappings",
-                index_name="rfm_tenant_resource_idx",
-            ),
-        ),
-    ]

api/src/backend/api/migrations/0041_rfm_tenant_resource_parent_partitions.py

@@ -1,17 +0,0 @@
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("api", "0040_rfm_tenant_resource_index_partitions"),
-    ]
-
-    operations = [
-        migrations.AddIndex(
-            model_name="resourcefindingmapping",
-            index=models.Index(
-                fields=["tenant_id", "resource_id"],
-                name="rfm_tenant_resource_idx",
-            ),
-        ),
-    ]

api/src/backend/api/migrations/0042_scan_scans_prov_ins_desc_idx.py

@@ -1,23 +0,0 @@
-from django.contrib.postgres.operations import AddIndexConcurrently
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    atomic = False
-
-    dependencies = [
-        ("api", "0041_rfm_tenant_resource_parent_partitions"),
-        ("django_celery_beat", "0019_alter_periodictasks_options"),
-    ]
-
-    operations = [
-        AddIndexConcurrently(
-            model_name="scan",
-            index=models.Index(
-                condition=models.Q(("state", "completed")),
-                fields=["tenant_id", "provider_id", "-inserted_at"],
-                include=("id",),
-                name="scans_prov_ins_desc_idx",
-            ),
-        ),
-    ]

api/src/backend/api/migrations/0043_github_provider.py

@@ -1,33 +0,0 @@
-# Generated by Django 5.1.7 on 2025-07-09 14:44
-
-from django.db import migrations
-
-import api.db_utils
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("api", "0042_scan_scans_prov_ins_desc_idx"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="provider",
-            name="provider",
-            field=api.db_utils.ProviderEnumField(
-                choices=[
-                    ("aws", "AWS"),
-                    ("azure", "Azure"),
-                    ("gcp", "GCP"),
-                    ("kubernetes", "Kubernetes"),
-                    ("m365", "M365"),
-                    ("github", "GitHub"),
-                ],
-                default="aws",
-            ),
-        ),
-        migrations.RunSQL(
-            "ALTER TYPE provider ADD VALUE IF NOT EXISTS 'github';",
-            reverse_sql=migrations.RunSQL.noop,
-        ),
-    ]

api/src/backend/api/migrations/0044_integration_unique_configuration_per_tenant.py

@@ -1,19 +0,0 @@
-# Generated by Django 5.1.10 on 2025-07-17 11:52
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("api", "0043_github_provider"),
-    ]
-
-    operations = [
-        migrations.AddConstraint(
-            model_name="integration",
-            constraint=models.UniqueConstraint(
-                fields=("configuration", "tenant"),
-                name="unique_configuration_per_tenant",
-            ),
-        ),
-    ]

api/src/backend/api/migrations/0045_alter_scan_output_location.py

@@ -1,17 +0,0 @@
-# Generated by Django 5.1.10 on 2025-07-21 16:08
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("api", "0044_integration_unique_configuration_per_tenant"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="scan",
-            name="output_location",
-            field=models.CharField(blank=True, max_length=4096, null=True),
-        ),
-    ]

api/src/backend/api/migrations/0046_lighthouse_gpt5.py

@@ -1,33 +0,0 @@
-# Generated by Django 5.1.10 on 2025-08-20 09:04
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("api", "0045_alter_scan_output_location"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="lighthouseconfiguration",
-            name="model",
-            field=models.CharField(
-                choices=[
-                    ("gpt-4o-2024-11-20", "GPT-4o v2024-11-20"),
-                    ("gpt-4o-2024-08-06", "GPT-4o v2024-08-06"),
-                    ("gpt-4o-2024-05-13", "GPT-4o v2024-05-13"),
-                    ("gpt-4o", "GPT-4o Default"),
-                    ("gpt-4o-mini-2024-07-18", "GPT-4o Mini v2024-07-18"),
-                    ("gpt-4o-mini", "GPT-4o Mini Default"),
-                    ("gpt-5-2025-08-07", "GPT-5 v2025-08-07"),
-                    ("gpt-5", "GPT-5 Default"),
-                    ("gpt-5-mini-2025-08-07", "GPT-5 Mini v2025-08-07"),
-                    ("gpt-5-mini", "GPT-5 Mini Default"),
-                ],
-                default="gpt-4o-2024-08-06",
-                help_text="Must be one of the supported model names",
-                max_length=50,
-            ),
-        ),
-    ]

api/src/backend/api/migrations/0047_remove_integration_unique_configuration_per_tenant.py

@@ -1,16 +0,0 @@
-# Generated by Django 5.1.10 on 2025-08-20 08:24
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("api", "0046_lighthouse_gpt5"),
-    ]
-
-    operations = [
-        migrations.RemoveConstraint(
-            model_name="integration",
-            name="unique_configuration_per_tenant",
-        ),
-    ]

api/src/backend/api/migrations/0048_iac_provider.py

@@ -1,34 +0,0 @@
-# Generated by Django 5.1.10 on 2025-09-09 09:25
-
-from django.db import migrations
-
-import api.db_utils
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("api", "0047_remove_integration_unique_configuration_per_tenant"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="provider",
-            name="provider",
-            field=api.db_utils.ProviderEnumField(
-                choices=[
-                    ("aws", "AWS"),
-                    ("azure", "Azure"),
-                    ("gcp", "GCP"),
-                    ("kubernetes", "Kubernetes"),
-                    ("m365", "M365"),
-                    ("github", "GitHub"),
-                    ("iac", "IaC"),
-                ],
-                default="aws",
-            ),
-        ),
-        migrations.RunSQL(
-            "ALTER TYPE provider ADD VALUE IF NOT EXISTS 'iac';",
-            reverse_sql=migrations.RunSQL.noop,
-        ),
-    ]

api/src/backend/api/models.py

@@ -74,15 +74,6 @@ class StatusChoices(models.TextChoices):
     MANUAL = "MANUAL", _("Manual")
 
 
-class OverviewStatusChoices(models.TextChoices):
-    """
-    Status filters allowed in overview/severity endpoints.
-    """
-
-    FAIL = "FAIL", _("Fail")
-    PASS = "PASS", _("Pass")
-
-
 class StateChoices(models.TextChoices):
     AVAILABLE = "available", _("Available")
     SCHEDULED = "scheduled", _("Scheduled")
@@ -214,8 +205,6 @@ class Provider(RowLevelSecurityProtectedModel):
         GCP = "gcp", _("GCP")
         KUBERNETES = "kubernetes", _("Kubernetes")
         M365 = "m365", _("M365")
-        GITHUB = "github", _("GitHub")
-        IAC = "iac", _("IaC")
 
     @staticmethod
     def validate_aws_uid(value):
@@ -276,29 +265,6 @@ class Provider(RowLevelSecurityProtectedModel):
                 pointer="/data/attributes/uid",
             )
 
-    @staticmethod
-    def validate_github_uid(value):
-        if not re.match(r"^[a-zA-Z0-9][a-zA-Z0-9-]{0,38}$", value):
-            raise ModelValidationError(
-                detail="GitHub provider ID must be a valid GitHub username or organization name (1-39 characters, "
-                "starting with alphanumeric, containing only alphanumeric characters and hyphens).",
-                code="github-uid",
-                pointer="/data/attributes/uid",
-            )
-
-    @staticmethod
-    def validate_iac_uid(value):
-        # Validate that it's a valid repository URL (git URL format)
-        if not re.match(
-            r"^(https?://|git@|ssh://)[^\s/]+[^\s]*\.git$|^(https?://)[^\s/]+[^\s]*$",
-            value,
-        ):
-            raise ModelValidationError(
-                detail="IaC provider ID must be a valid repository URL (e.g., https://github.com/user/repo or https://github.com/user/repo.git).",
-                code="iac-uid",
-                pointer="/data/attributes/uid",
-            )
-
     id = models.UUIDField(primary_key=True, default=uuid4, editable=False)
     inserted_at = models.DateTimeField(auto_now_add=True, editable=False)
     updated_at = models.DateTimeField(auto_now=True, editable=False)
@@ -461,7 +427,7 @@ class Scan(RowLevelSecurityProtectedModel):
     scheduler_task = models.ForeignKey(
         PeriodicTask, on_delete=models.SET_NULL, null=True, blank=True
     )
-    output_location = models.CharField(blank=True, null=True, max_length=4096)
+    output_location = models.CharField(blank=True, null=True, max_length=200)
     provider = models.ForeignKey(
         Provider,
         on_delete=models.CASCADE,
@@ -510,13 +476,6 @@ class Scan(RowLevelSecurityProtectedModel):
                 condition=Q(state=StateChoices.COMPLETED),
                 name="scans_prov_state_ins_desc_idx",
             ),
-            # TODO This might replace `scans_prov_state_ins_desc_idx` completely. Review usage
-            models.Index(
-                fields=["tenant_id", "provider_id", "-inserted_at"],
-                condition=Q(state=StateChoices.COMPLETED),
-                include=["id"],
-                name="scans_prov_ins_desc_idx",
-            ),
         ]
 
     class JSONAPIMeta:
@@ -901,10 +860,6 @@ class ResourceFindingMapping(PostgresPartitionedModel, RowLevelSecurityProtected
                 fields=["tenant_id", "finding_id"],
                 name="rfm_tenant_finding_idx",
             ),
-            models.Index(
-                fields=["tenant_id", "resource_id"],
-                name="rfm_tenant_resource_idx",
-            ),
         ]
         constraints = [
             models.UniqueConstraint(
@@ -1369,7 +1324,7 @@ class ScanSummary(RowLevelSecurityProtectedModel):
 
 class Integration(RowLevelSecurityProtectedModel):
     class IntegrationChoices(models.TextChoices):
-        AMAZON_S3 = "amazon_s3", _("Amazon S3")
+        S3 = "amazon_s3", _("Amazon S3")
         AWS_SECURITY_HUB = "aws_security_hub", _("AWS Security Hub")
         JIRA = "jira", _("JIRA")
         SLACK = "slack", _("Slack")
@@ -1771,10 +1726,6 @@ class LighthouseConfiguration(RowLevelSecurityProtectedModel):
         GPT_4O = "gpt-4o", _("GPT-4o Default")
         GPT_4O_MINI_2024_07_18 = "gpt-4o-mini-2024-07-18", _("GPT-4o Mini v2024-07-18")
         GPT_4O_MINI = "gpt-4o-mini", _("GPT-4o Mini Default")
-        GPT_5_2025_08_07 = "gpt-5-2025-08-07", _("GPT-5 v2025-08-07")
-        GPT_5 = "gpt-5", _("GPT-5 Default")
-        GPT_5_MINI_2025_08_07 = "gpt-5-mini-2025-08-07", _("GPT-5 Mini v2025-08-07")
-        GPT_5_MINI = "gpt-5-mini", _("GPT-5 Mini Default")
 
     id = models.UUIDField(primary_key=True, default=uuid4, editable=False)
     inserted_at = models.DateTimeField(auto_now_add=True, editable=False)

api/src/backend/api/schema_hooks.py

@@ -1,95 +0,0 @@
-def _pick_task_response_component(components):
-    schemas = components.get("schemas", {}) or {}
-    for candidate in ("TaskResponse",):
-        if candidate in schemas:
-            return candidate
-    return None
-
-
-def _extract_task_example_from_components(components):
-    schemas = components.get("schemas", {}) or {}
-    candidate = "TaskResponse"
-    doc = schemas.get(candidate)
-    if isinstance(doc, dict) and "example" in doc:
-        return doc["example"]
-
-    res = schemas.get(candidate)
-    if isinstance(res, dict) and "example" in res:
-        example = res["example"]
-        return example if "data" in example else {"data": example}
-
-    # Fallback
-    return {
-        "data": {
-            "type": "tasks",
-            "id": "497f6eca-6276-4993-bfeb-53cbbbba6f08",
-            "attributes": {
-                "inserted_at": "2019-08-24T14:15:22Z",
-                "completed_at": "2019-08-24T14:15:22Z",
-                "name": "string",
-                "state": "available",
-                "result": None,
-                "task_args": None,
-                "metadata": None,
-            },
-        }
-    }
-
-
-def attach_task_202_examples(result, generator, request, public):  # noqa: F841
-    if not isinstance(result, dict):
-        return result
-
-    components = result.get("components", {}) or {}
-    task_resp_component = _pick_task_response_component(components)
-    task_example = _extract_task_example_from_components(components)
-
-    paths = result.get("paths", {}) or {}
-    for path_item in paths.values():
-        if not isinstance(path_item, dict):
-            continue
-
-        for method_obj in path_item.values():
-            if not isinstance(method_obj, dict):
-                continue
-
-            responses = method_obj.get("responses", {}) or {}
-            resp_202 = responses.get("202")
-            if not isinstance(resp_202, dict):
-                continue
-
-            content = resp_202.get("content", {}) or {}
-            jsonapi = content.get("application/vnd.api+json")
-            if not isinstance(jsonapi, dict):
-                continue
-
-            # Inject example if missing
-            if "examples" not in jsonapi and "example" not in jsonapi:
-                jsonapi["examples"] = {
-                    "Task queued": {
-                        "summary": "Task queued",
-                        "value": task_example,
-                    }
-                }
-
-            # Rewrite schema $ref if needed
-            if task_resp_component:
-                schema = jsonapi.get("schema")
-                must_replace = False
-                if not isinstance(schema, dict):
-                    must_replace = True
-                else:
-                    ref = schema.get("$ref")
-                    if not ref:
-                        must_replace = True
-                    else:
-                        current = ref.split("/")[-1]
-                        if current != task_resp_component:
-                            must_replace = True
-
-                if must_replace:
-                    jsonapi["schema"] = {
-                        "$ref": f"#/components/schemas/{task_resp_component}"
-                    }
-
-    return result

api/src/backend/api/tests/test_db_utils.py

@@ -13,7 +13,6 @@ from api.db_utils import (
     enum_to_choices,
     generate_random_token,
     one_week_from_now,
-    update_objects_in_batches,
 )
 from api.models import Provider
 
@@ -228,88 +227,3 @@ class TestCreateObjectsInBatches:
 
         qs = Provider.objects.filter(tenant=tenant)
         assert qs.count() == total
-
-
-@pytest.mark.django_db
-class TestUpdateObjectsInBatches:
-    @pytest.fixture
-    def tenant(self, tenants_fixture):
-        return tenants_fixture[0]
-
-    def make_provider_instances(self, tenant, count):
-        """
-        Return a list of `count` unsaved Provider instances for the given tenant.
-        """
-        base_uid = 2000
-        return [
-            Provider(
-                tenant=tenant,
-                uid=str(base_uid + i),
-                provider=Provider.ProviderChoices.AWS,
-            )
-            for i in range(count)
-        ]
-
-    def test_exact_multiple_of_batch(self, tenant):
-        total = 6
-        batch_size = 3
-        objs = self.make_provider_instances(tenant, total)
-        create_objects_in_batches(str(tenant.id), Provider, objs, batch_size=batch_size)
-
-        # Fetch them back, mutate the `uid` field, then update in batches
-        providers = list(Provider.objects.filter(tenant=tenant))
-        for p in providers:
-            p.uid = f"{p.uid}_upd"
-
-        update_objects_in_batches(
-            tenant_id=str(tenant.id),
-            model=Provider,
-            objects=providers,
-            fields=["uid"],
-            batch_size=batch_size,
-        )
-
-        qs = Provider.objects.filter(tenant=tenant, uid__endswith="_upd")
-        assert qs.count() == total
-
-    def test_non_multiple_of_batch(self, tenant):
-        total = 7
-        batch_size = 3
-        objs = self.make_provider_instances(tenant, total)
-        create_objects_in_batches(str(tenant.id), Provider, objs, batch_size=batch_size)
-
-        providers = list(Provider.objects.filter(tenant=tenant))
-        for p in providers:
-            p.uid = f"{p.uid}_upd"
-
-        update_objects_in_batches(
-            tenant_id=str(tenant.id),
-            model=Provider,
-            objects=providers,
-            fields=["uid"],
-            batch_size=batch_size,
-        )
-
-        qs = Provider.objects.filter(tenant=tenant, uid__endswith="_upd")
-        assert qs.count() == total
-
-    def test_batch_size_default(self, tenant):
-        default_size = settings.DJANGO_DELETION_BATCH_SIZE
-        total = default_size + 2
-        objs = self.make_provider_instances(tenant, total)
-        create_objects_in_batches(str(tenant.id), Provider, objs)
-
-        providers = list(Provider.objects.filter(tenant=tenant))
-        for p in providers:
-            p.uid = f"{p.uid}_upd"
-
-        # Update without specifying batch_size (uses default)
-        update_objects_in_batches(
-            tenant_id=str(tenant.id),
-            model=Provider,
-            objects=providers,
-            fields=["uid"],
-        )
-
-        qs = Provider.objects.filter(tenant=tenant, uid__endswith="_upd")
-        assert qs.count() == total

api/src/backend/api/tests/test_rbac.py

@@ -1,7 +1,6 @@
 from unittest.mock import ANY, Mock, patch
 
 import pytest
-from conftest import TODAY
 from django.urls import reverse
 from rest_framework import status
 
@@ -410,87 +409,3 @@ class TestLimitedVisibility:
         assert (
             response.json()["data"]["relationships"]["providers"]["meta"]["count"] == 1
         )
-
-    def test_overviews_providers(
-        self,
-        authenticated_client_rbac_limited,
-        scan_summaries_fixture,
-        providers_fixture,
-    ):
-        # By default, the associated provider is the one which has the overview data
-        response = authenticated_client_rbac_limited.get(reverse("overview-providers"))
-
-        assert response.status_code == status.HTTP_200_OK
-        assert len(response.json()["data"]) > 0
-
-        # Changing the provider visibility, no data should be returned
-        # Only the associated provider to that group is changed
-        new_provider = providers_fixture[1]
-        ProviderGroupMembership.objects.all().update(provider=new_provider)
-
-        response = authenticated_client_rbac_limited.get(reverse("overview-providers"))
-
-        assert response.status_code == status.HTTP_200_OK
-        assert len(response.json()["data"]) == 0
-
-    @pytest.mark.parametrize(
-        "endpoint_name",
-        [
-            "findings",
-            "findings_severity",
-        ],
-    )
-    def test_overviews_findings(
-        self,
-        endpoint_name,
-        authenticated_client_rbac_limited,
-        scan_summaries_fixture,
-        providers_fixture,
-    ):
-        # By default, the associated provider is the one which has the overview data
-        response = authenticated_client_rbac_limited.get(
-            reverse(f"overview-{endpoint_name}")
-        )
-
-        assert response.status_code == status.HTTP_200_OK
-        values = response.json()["data"]["attributes"].values()
-        assert any(value > 0 for value in values)
-
-        # Changing the provider visibility, no data should be returned
-        # Only the associated provider to that group is changed
-        new_provider = providers_fixture[1]
-        ProviderGroupMembership.objects.all().update(provider=new_provider)
-
-        response = authenticated_client_rbac_limited.get(
-            reverse(f"overview-{endpoint_name}")
-        )
-
-        assert response.status_code == status.HTTP_200_OK
-        data = response.json()["data"]["attributes"].values()
-        assert all(value == 0 for value in data)
-
-    def test_overviews_services(
-        self,
-        authenticated_client_rbac_limited,
-        scan_summaries_fixture,
-        providers_fixture,
-    ):
-        # By default, the associated provider is the one which has the overview data
-        response = authenticated_client_rbac_limited.get(
-            reverse("overview-services"), {"filter[inserted_at]": TODAY}
-        )
-
-        assert response.status_code == status.HTTP_200_OK
-        assert len(response.json()["data"]) > 0
-
-        # Changing the provider visibility, no data should be returned
-        # Only the associated provider to that group is changed
-        new_provider = providers_fixture[1]
-        ProviderGroupMembership.objects.all().update(provider=new_provider)
-
-        response = authenticated_client_rbac_limited.get(
-            reverse("overview-services"), {"filter[inserted_at]": TODAY}
-        )
-
-        assert response.status_code == status.HTTP_200_OK
-        assert len(response.json()["data"]) == 0

api/src/backend/api/tests/test_serializers.py

@@ -1,100 +0,0 @@
-import pytest
-from rest_framework.exceptions import ValidationError
-
-from api.v1.serializer_utils.integrations import S3ConfigSerializer
-
-
-class TestS3ConfigSerializer:
-    """Test cases for S3ConfigSerializer validation."""
-
-    def test_validate_output_directory_valid_paths(self):
-        """Test that valid output directory paths are accepted."""
-        serializer = S3ConfigSerializer()
-
-        # Test normal paths
-        assert serializer.validate_output_directory("test") == "test"
-        assert serializer.validate_output_directory("test/folder") == "test/folder"
-        assert serializer.validate_output_directory("my-folder_123") == "my-folder_123"
-
-        # Test paths with leading slashes (should be normalized)
-        assert serializer.validate_output_directory("/test") == "test"
-        assert serializer.validate_output_directory("/test/folder") == "test/folder"
-
-        # Test paths with excessive slashes (should be normalized)
-        assert serializer.validate_output_directory("///test") == "test"
-        assert serializer.validate_output_directory("///////test") == "test"
-        assert serializer.validate_output_directory("test//folder") == "test/folder"
-        assert serializer.validate_output_directory("test///folder") == "test/folder"
-
-    def test_validate_output_directory_empty_values(self):
-        """Test that empty values raise validation errors."""
-        serializer = S3ConfigSerializer()
-
-        with pytest.raises(
-            ValidationError, match="Output directory cannot be empty or just"
-        ):
-            serializer.validate_output_directory(".")
-
-        with pytest.raises(
-            ValidationError, match="Output directory cannot be empty or just"
-        ):
-            serializer.validate_output_directory("/")
-
-    def test_validate_output_directory_invalid_characters(self):
-        """Test that invalid characters are rejected."""
-        serializer = S3ConfigSerializer()
-
-        invalid_chars = ["<", ">", ":", '"', "|", "?", "*"]
-
-        for char in invalid_chars:
-            with pytest.raises(
-                ValidationError, match="Output directory contains invalid characters"
-            ):
-                serializer.validate_output_directory(f"test{char}folder")
-
-    def test_validate_output_directory_too_long(self):
-        """Test that paths that are too long are rejected."""
-        serializer = S3ConfigSerializer()
-
-        # Create a path longer than 900 characters
-        long_path = "a" * 901
-
-        with pytest.raises(ValidationError, match="Output directory path is too long"):
-            serializer.validate_output_directory(long_path)
-
-    def test_validate_output_directory_edge_cases(self):
-        """Test edge cases for output directory validation."""
-        serializer = S3ConfigSerializer()
-
-        # Test path at the limit (900 characters)
-        path_at_limit = "a" * 900
-        assert serializer.validate_output_directory(path_at_limit) == path_at_limit
-
-        # Test complex normalization
-        assert serializer.validate_output_directory("//test/../folder//") == "folder"
-        assert serializer.validate_output_directory("/test/./folder/") == "test/folder"
-
-    def test_s3_config_serializer_full_validation(self):
-        """Test the full S3ConfigSerializer with valid data."""
-        data = {
-            "bucket_name": "my-test-bucket",
-            "output_directory": "///////test",  # This should be normalized
-        }
-
-        serializer = S3ConfigSerializer(data=data)
-        assert serializer.is_valid()
-
-        validated_data = serializer.validated_data
-        assert validated_data["bucket_name"] == "my-test-bucket"
-        assert validated_data["output_directory"] == "test"  # Normalized
-
-    def test_s3_config_serializer_invalid_data(self):
-        """Test the full S3ConfigSerializer with invalid data."""
-        data = {
-            "bucket_name": "my-test-bucket",
-            "output_directory": "test<invalid",  # Contains invalid character
-        }
-
-        serializer = S3ConfigSerializer(data=data)
-        assert not serializer.is_valid()
-        assert "output_directory" in serializer.errors

api/src/backend/api/tests/test_utils.py

@@ -6,18 +6,16 @@ from rest_framework.exceptions import NotFound, ValidationError
 
 from api.db_router import MainRouter
 from api.exceptions import InvitationTokenExpiredException
-from api.models import Integration, Invitation, Provider
+from api.models import Invitation, Provider
 from api.utils import (
     get_prowler_provider_kwargs,
     initialize_prowler_provider,
     merge_dicts,
-    prowler_integration_connection_test,
     prowler_provider_connection_test,
     return_prowler_provider,
     validate_invitation,
 )
 from prowler.providers.aws.aws_provider import AwsProvider
-from prowler.providers.aws.lib.security_hub.security_hub import SecurityHubConnection
 from prowler.providers.azure.azure_provider import AzureProvider
 from prowler.providers.gcp.gcp_provider import GcpProvider
 from prowler.providers.kubernetes.kubernetes_provider import KubernetesProvider
@@ -199,10 +197,6 @@ class TestGetProwlerProviderKwargs:
                 Provider.ProviderChoices.M365.value,
                 {},
             ),
-            (
-                Provider.ProviderChoices.GITHUB.value,
-                {"organizations": ["provider_uid"]},
-            ),
         ],
     )
     def test_get_prowler_provider_kwargs(self, provider_type, expected_extra_kwargs):
@@ -396,258 +390,3 @@ class TestValidateInvitation:
             mock_db.get.assert_called_once_with(
                 token="VALID_TOKEN", email__iexact="user@example.com"
             )
-
-
-class TestProwlerIntegrationConnectionTest:
-    """Test prowler_integration_connection_test function for SecurityHub regions reset."""
-
-    @patch("api.utils.SecurityHub")
-    def test_security_hub_connection_failure_resets_regions(
-        self, mock_security_hub_class
-    ):
-        """Test that SecurityHub connection failure resets regions to empty dict."""
-        # Create integration with existing regions configuration
-        integration = MagicMock()
-        integration.integration_type = Integration.IntegrationChoices.AWS_SECURITY_HUB
-        integration.credentials = {
-            "aws_access_key_id": "test_key",
-            "aws_secret_access_key": "test_secret",
-        }
-        integration.configuration = {
-            "send_only_fails": True,
-            "regions": {
-                "us-east-1": True,
-                "us-west-2": True,
-                "eu-west-1": False,
-                "ap-south-1": False,
-            },
-        }
-
-        # Mock provider relationship
-        mock_provider = MagicMock()
-        mock_provider.uid = "123456789012"
-        mock_relationship = MagicMock()
-        mock_relationship.provider = mock_provider
-        integration.integrationproviderrelationship_set.first.return_value = (
-            mock_relationship
-        )
-
-        # Mock failed SecurityHub connection
-        mock_connection = SecurityHubConnection(
-            is_connected=False,
-            error=Exception("SecurityHub testing"),
-            enabled_regions=set(),
-            disabled_regions=set(),
-        )
-        mock_security_hub_class.test_connection.return_value = mock_connection
-
-        # Call the function
-        result = prowler_integration_connection_test(integration)
-
-        # Assertions
-        assert result.is_connected is False
-        assert str(result.error) == "SecurityHub testing"
-
-        # Verify regions were completely reset to empty dict
-        assert integration.configuration["regions"] == {}
-
-        # Verify save was called to persist the change
-        integration.save.assert_called_once()
-
-        # Verify test_connection was called with correct parameters
-        mock_security_hub_class.test_connection.assert_called_once_with(
-            aws_account_id="123456789012",
-            raise_on_exception=False,
-            aws_access_key_id="test_key",
-            aws_secret_access_key="test_secret",
-        )
-
-    @patch("api.utils.SecurityHub")
-    def test_security_hub_connection_success_saves_regions(
-        self, mock_security_hub_class
-    ):
-        """Test that successful SecurityHub connection saves regions correctly."""
-        integration = MagicMock()
-        integration.integration_type = Integration.IntegrationChoices.AWS_SECURITY_HUB
-        integration.credentials = {
-            "aws_access_key_id": "valid_key",
-            "aws_secret_access_key": "valid_secret",
-        }
-        integration.configuration = {"send_only_fails": False}
-
-        # Mock provider relationship
-        mock_provider = MagicMock()
-        mock_provider.uid = "123456789012"
-        mock_relationship = MagicMock()
-        mock_relationship.provider = mock_provider
-        integration.integrationproviderrelationship_set.first.return_value = (
-            mock_relationship
-        )
-
-        # Mock successful SecurityHub connection with regions
-        mock_connection = SecurityHubConnection(
-            is_connected=True,
-            error=None,
-            enabled_regions={"us-east-1", "eu-west-1"},
-            disabled_regions={"ap-south-1"},
-        )
-        mock_security_hub_class.test_connection.return_value = mock_connection
-
-        result = prowler_integration_connection_test(integration)
-
-        assert result.is_connected is True
-
-        # Verify regions were saved correctly
-        assert integration.configuration["regions"]["us-east-1"] is True
-        assert integration.configuration["regions"]["eu-west-1"] is True
-        assert integration.configuration["regions"]["ap-south-1"] is False
-        integration.save.assert_called_once()
-
-    @patch("api.utils.rls_transaction")
-    @patch("api.utils.Jira")
-    def test_jira_connection_success_basic_auth(
-        self, mock_jira_class, mock_rls_transaction
-    ):
-        integration = MagicMock()
-        integration.integration_type = Integration.IntegrationChoices.JIRA
-        integration.tenant_id = "test-tenant-id"
-        integration.credentials = {
-            "user_mail": "test@example.com",
-            "api_token": "test_api_token",
-            "domain": "example.atlassian.net",
-        }
-        integration.configuration = {}
-
-        # Mock successful JIRA connection with projects
-        mock_connection = MagicMock()
-        mock_connection.is_connected = True
-        mock_connection.error = None
-        mock_connection.projects = {"PROJ1": "Project 1", "PROJ2": "Project 2"}
-        mock_jira_class.test_connection.return_value = mock_connection
-
-        # Mock rls_transaction context manager
-        mock_rls_transaction.return_value.__enter__ = MagicMock()
-        mock_rls_transaction.return_value.__exit__ = MagicMock()
-
-        result = prowler_integration_connection_test(integration)
-
-        assert result.is_connected is True
-        assert result.error is None
-
-        # Verify JIRA connection was called with correct parameters including domain from credentials
-        mock_jira_class.test_connection.assert_called_once_with(
-            user_mail="test@example.com",
-            api_token="test_api_token",
-            domain="example.atlassian.net",
-            raise_on_exception=False,
-        )
-
-        # Verify rls_transaction was called with correct tenant_id
-        mock_rls_transaction.assert_called_once_with("test-tenant-id")
-
-        # Verify projects were saved to integration configuration
-        assert integration.configuration["projects"] == {
-            "PROJ1": "Project 1",
-            "PROJ2": "Project 2",
-        }
-
-        # Verify integration.save() was called
-        integration.save.assert_called_once()
-
-    @patch("api.utils.rls_transaction")
-    @patch("api.utils.Jira")
-    def test_jira_connection_failure_invalid_credentials(
-        self, mock_jira_class, mock_rls_transaction
-    ):
-        integration = MagicMock()
-        integration.integration_type = Integration.IntegrationChoices.JIRA
-        integration.tenant_id = "test-tenant-id"
-        integration.credentials = {
-            "user_mail": "invalid@example.com",
-            "api_token": "invalid_token",
-            "domain": "invalid.atlassian.net",
-        }
-        integration.configuration = {}
-
-        # Mock failed JIRA connection
-        mock_connection = MagicMock()
-        mock_connection.is_connected = False
-        mock_connection.error = Exception("Authentication failed: Invalid credentials")
-        mock_connection.projects = {}  # Empty projects when connection fails
-        mock_jira_class.test_connection.return_value = mock_connection
-
-        # Mock rls_transaction context manager
-        mock_rls_transaction.return_value.__enter__ = MagicMock()
-        mock_rls_transaction.return_value.__exit__ = MagicMock()
-
-        result = prowler_integration_connection_test(integration)
-
-        assert result.is_connected is False
-        assert "Authentication failed: Invalid credentials" in str(result.error)
-
-        # Verify JIRA connection was called with correct parameters
-        mock_jira_class.test_connection.assert_called_once_with(
-            user_mail="invalid@example.com",
-            api_token="invalid_token",
-            domain="invalid.atlassian.net",
-            raise_on_exception=False,
-        )
-
-        # Verify rls_transaction was called even on failure
-        mock_rls_transaction.assert_called_once_with("test-tenant-id")
-
-        # Verify empty projects dict was saved to integration configuration
-        assert integration.configuration["projects"] == {}
-
-        # Verify integration.save() was called even on connection failure
-        integration.save.assert_called_once()
-
-    @patch("api.utils.rls_transaction")
-    @patch("api.utils.Jira")
-    def test_jira_connection_projects_update_with_existing_configuration(
-        self, mock_jira_class, mock_rls_transaction
-    ):
-        """Test that projects are properly updated when integration already has configuration data"""
-        integration = MagicMock()
-        integration.integration_type = Integration.IntegrationChoices.JIRA
-        integration.tenant_id = "test-tenant-id"
-        integration.credentials = {
-            "user_mail": "test@example.com",
-            "api_token": "test_api_token",
-            "domain": "example.atlassian.net",
-        }
-        integration.configuration = {
-            "issue_types": ["Task"],  # Existing configuration
-            "projects": {"OLD_PROJ": "Old Project"},  # Will be overwritten
-        }
-
-        # Mock successful JIRA connection with new projects
-        mock_connection = MagicMock()
-        mock_connection.is_connected = True
-        mock_connection.error = None
-        mock_connection.projects = {
-            "NEW_PROJ1": "New Project 1",
-            "NEW_PROJ2": "New Project 2",
-        }
-        mock_jira_class.test_connection.return_value = mock_connection
-
-        # Mock rls_transaction context manager
-        mock_rls_transaction.return_value.__enter__ = MagicMock()
-        mock_rls_transaction.return_value.__exit__ = MagicMock()
-
-        result = prowler_integration_connection_test(integration)
-
-        assert result.is_connected is True
-        assert result.error is None
-
-        # Verify projects were updated (old projects replaced with new ones)
-        assert integration.configuration["projects"] == {
-            "NEW_PROJ1": "New Project 1",
-            "NEW_PROJ2": "New Project 2",
-        }
-
-        # Verify other configuration fields were preserved
-        assert integration.configuration["issue_types"] == ["Task"]
-
-        # Verify integration.save() was called
-        integration.save.assert_called_once()

api/src/backend/api/tests/test_views.py

@@ -14,13 +14,7 @@ import jwt
 import pytest
 from allauth.socialaccount.models import SocialAccount, SocialApp
 from botocore.exceptions import ClientError, NoCredentialsError
-from conftest import (
-    API_JSON_CONTENT_TYPE,
-    TEST_PASSWORD,
-    TEST_USER,
-    TODAY,
-    today_after_n_days,
-)
+from conftest import API_JSON_CONTENT_TYPE, TEST_PASSWORD, TEST_USER
 from django.conf import settings
 from django.http import JsonResponse
 from django.test import RequestFactory
@@ -53,6 +47,14 @@ from api.models import (
 from api.rls import Tenant
 from api.v1.views import ComplianceOverviewViewSet, TenantFinishACSView
 
+TODAY = str(datetime.today().date())
+
+
+def today_after_n_days(n_days: int) -> str:
+    return datetime.strftime(
+        datetime.today().date() + timedelta(days=n_days), "%Y-%m-%d"
+    )
+
 
 class TestViewSet:
     def test_security_headers(self, client):
@@ -966,41 +968,6 @@ class TestProviderViewSet:
                     "uid": "subdomain1.subdomain2.subdomain3.subdomain4.domain.net",
                     "alias": "test",
                 },
-                {
-                    "provider": "github",
-                    "uid": "test-user",
-                    "alias": "test",
-                },
-                {
-                    "provider": "github",
-                    "uid": "test-organization",
-                    "alias": "GitHub Org",
-                },
-                {
-                    "provider": "github",
-                    "uid": "prowler-cloud",
-                    "alias": "Prowler",
-                },
-                {
-                    "provider": "github",
-                    "uid": "microsoft",
-                    "alias": "Microsoft",
-                },
-                {
-                    "provider": "github",
-                    "uid": "a12345678901234567890123456789012345678",
-                    "alias": "Long Username",
-                },
-                {
-                    "provider": "iac",
-                    "uid": "https://github.com/user/repo.git",
-                    "alias": "Git Repo",
-                },
-                {
-                    "provider": "iac",
-                    "uid": "https://gitlab.com/user/project",
-                    "alias": "GitLab Repo",
-                },
             ]
         ),
     )
@@ -1114,69 +1081,6 @@ class TestProviderViewSet:
                     "m365-uid",
                     "uid",
                 ),
-                (
-                    {
-                        "provider": "github",
-                        "uid": "-invalid-start",
-                        "alias": "test",
-                    },
-                    "github-uid",
-                    "uid",
-                ),
-                (
-                    {
-                        "provider": "github",
-                        "uid": "invalid@username",
-                        "alias": "test",
-                    },
-                    "github-uid",
-                    "uid",
-                ),
-                (
-                    {
-                        "provider": "github",
-                        "uid": "invalid_username",
-                        "alias": "test",
-                    },
-                    "github-uid",
-                    "uid",
-                ),
-                (
-                    {
-                        "provider": "github",
-                        "uid": "a" * 40,
-                        "alias": "test",
-                    },
-                    "github-uid",
-                    "uid",
-                ),
-                (
-                    {
-                        "provider": "iac",
-                        "uid": "not-a-url",
-                        "alias": "test",
-                    },
-                    "iac-uid",
-                    "uid",
-                ),
-                (
-                    {
-                        "provider": "iac",
-                        "uid": "ftp://invalid-protocol.com/repo",
-                        "alias": "test",
-                    },
-                    "iac-uid",
-                    "uid",
-                ),
-                (
-                    {
-                        "provider": "iac",
-                        "uid": "http://",
-                        "alias": "test",
-                    },
-                    "iac-uid",
-                    "uid",
-                ),
             ]
         ),
     )
@@ -5286,8 +5190,6 @@ class TestComplianceOverviewViewSet:
             assert "description" in attributes
             assert "status" in attributes
 
-    # TODO: This test may fail randomly because requirements are not ordered
-    @pytest.mark.xfail
     def test_compliance_overview_requirements_manual(
         self, authenticated_client, compliance_requirements_overviews_fixture
     ):
@@ -5594,30 +5496,6 @@ class TestScheduleViewSet:
         )
         assert response.status_code == status.HTTP_404_NOT_FOUND
 
-    @patch("api.v1.views.Task.objects.get")
-    def test_schedule_daily_already_scheduled(
-        self,
-        mock_task_get,
-        authenticated_client,
-        providers_fixture,
-        tasks_fixture,
-    ):
-        provider, *_ = providers_fixture
-        prowler_task = tasks_fixture[0]
-        mock_task_get.return_value = prowler_task
-        json_payload = {
-            "provider_id": str(provider.id),
-        }
-        response = authenticated_client.post(
-            reverse("schedule-daily"), data=json_payload, format="json"
-        )
-        assert response.status_code == status.HTTP_202_ACCEPTED
-
-        response = authenticated_client.post(
-            reverse("schedule-daily"), data=json_payload, format="json"
-        )
-        assert response.status_code == status.HTTP_409_CONFLICT
-
 
 @pytest.mark.django_db
 class TestIntegrationViewSet:
@@ -5678,7 +5556,7 @@ class TestIntegrationViewSet:
         [
             # Amazon S3 - AWS credentials
             (
-                Integration.IntegrationChoices.AMAZON_S3,
+                Integration.IntegrationChoices.S3,
                 {
                     "bucket_name": "bucket-name",
                     "output_directory": "output-directory",
@@ -5690,7 +5568,7 @@ class TestIntegrationViewSet:
             ),
             # Amazon S3 - No credentials (AWS self-hosted)
             (
-                Integration.IntegrationChoices.AMAZON_S3,
+                Integration.IntegrationChoices.S3,
                 {
                     "bucket_name": "bucket-name",
                     "output_directory": "output-directory",
@@ -5716,7 +5594,6 @@ class TestIntegrationViewSet:
                     "integration_type": integration_type,
                     "configuration": configuration,
                     "credentials": credentials,
-                    "enabled": True,
                 },
                 "relationships": {
                     "providers": {
@@ -5734,7 +5611,6 @@ class TestIntegrationViewSet:
         assert Integration.objects.count() == 1
         integration = Integration.objects.first()
         assert integration.configuration == data["data"]["attributes"]["configuration"]
-        assert integration.enabled == data["data"]["attributes"]["enabled"]
         assert (
             integration.integration_type
             == data["data"]["attributes"]["integration_type"]
@@ -5745,47 +5621,6 @@ class TestIntegrationViewSet:
             == data["data"]["relationships"]["providers"]["data"][0]["id"]
         )
 
-    def test_integrations_create_valid_jira(
-        self,
-        authenticated_client,
-    ):
-        """Jira integrations are special"""
-        data = {
-            "data": {
-                "type": "integrations",
-                "attributes": {
-                    "integration_type": Integration.IntegrationChoices.JIRA,
-                    "configuration": {},
-                    "credentials": {
-                        "domain": "prowlerdomain",
-                        "api_token": "this-is-an-api-token-for-jira-that-works-for-sure",
-                        "user_mail": "testing@prowler.com",
-                    },
-                    "enabled": True,
-                },
-            }
-        }
-        response = authenticated_client.post(
-            reverse("integration-list"),
-            data=json.dumps(data),
-            content_type="application/vnd.api+json",
-        )
-        assert response.status_code == status.HTTP_201_CREATED
-        assert Integration.objects.count() == 1
-        integration = Integration.objects.first()
-        integration_configuration = response.json()["data"]["attributes"][
-            "configuration"
-        ]
-        assert "projects" in integration_configuration
-        assert "issue_types" in integration_configuration
-        assert "domain" in integration_configuration
-        assert integration.enabled == data["data"]["attributes"]["enabled"]
-        assert (
-            integration.integration_type
-            == data["data"]["attributes"]["integration_type"]
-        )
-        assert "credentials" not in response.json()["data"]["attributes"]
-
     def test_integrations_create_valid_relationships(
         self,
         authenticated_client,
@@ -5797,7 +5632,7 @@ class TestIntegrationViewSet:
             "data": {
                 "type": "integrations",
                 "attributes": {
-                    "integration_type": Integration.IntegrationChoices.AMAZON_S3,
+                    "integration_type": Integration.IntegrationChoices.S3,
                     "configuration": {
                         "bucket_name": "bucket-name",
                         "output_directory": "output-directory",
@@ -5884,46 +5719,6 @@ class TestIntegrationViewSet:
                     "invalid",
                     None,
                 ),
-                (
-                    {
-                        "integration_type": "jira",
-                        "configuration": {
-                            "projects": ["JIRA"],
-                        },
-                        "credentials": {"domain": "prowlerdomain"},
-                    },
-                    "invalid",
-                    "configuration",
-                ),
-                (
-                    {
-                        "integration_type": "jira",
-                        "credentialss": {
-                            "domain": "prowlerdomain",
-                            "api_token": "api-token",
-                            "user_mail": "test@prowler.com",
-                        },
-                    },
-                    "required",
-                    "configuration",
-                ),
-                (
-                    {
-                        "integration_type": "jira",
-                        "configuration": {},
-                    },
-                    "required",
-                    "credentials",
-                ),
-                (
-                    {
-                        "integration_type": "jira",
-                        "configuration": {},
-                        "credentials": {"api_token": "api-token"},
-                    },
-                    "invalid",
-                    "credentials",
-                ),
             ]
         ),
     )
@@ -6072,11 +5867,11 @@ class TestIntegrationViewSet:
                 ("inserted_at", TODAY, 2),
                 ("inserted_at.gte", "2024-01-01", 2),
                 ("inserted_at.lte", "2024-01-01", 0),
-                ("integration_type", Integration.IntegrationChoices.AMAZON_S3, 2),
+                ("integration_type", Integration.IntegrationChoices.S3, 2),
                 ("integration_type", Integration.IntegrationChoices.SLACK, 0),
                 (
                     "integration_type__in",
-                    f"{Integration.IntegrationChoices.AMAZON_S3},{Integration.IntegrationChoices.SLACK}",
+                    f"{Integration.IntegrationChoices.S3},{Integration.IntegrationChoices.SLACK}",
                     2,
                 ),
             ]
@@ -6113,217 +5908,6 @@ class TestIntegrationViewSet:
         )
         assert response.status_code == status.HTTP_400_BAD_REQUEST
 
-    def test_integrations_create_duplicate_amazon_s3(
-        self, authenticated_client, providers_fixture
-    ):
-        provider = providers_fixture[0]
-
-        # Create first S3 integration
-        data = {
-            "data": {
-                "type": "integrations",
-                "attributes": {
-                    "integration_type": Integration.IntegrationChoices.AMAZON_S3,
-                    "configuration": {
-                        "bucket_name": "test-bucket",
-                        "output_directory": "test-output",
-                    },
-                    "credentials": {
-                        "role_arn": "arn:aws:iam::123456789012:role/test-role",
-                        "external_id": "test-external-id",
-                    },
-                    "enabled": True,
-                },
-                "relationships": {
-                    "providers": {
-                        "data": [{"type": "providers", "id": str(provider.id)}]
-                    }
-                },
-            }
-        }
-
-        # First creation should succeed
-        response = authenticated_client.post(
-            reverse("integration-list"),
-            data=json.dumps(data),
-            content_type="application/vnd.api+json",
-        )
-        assert response.status_code == status.HTTP_201_CREATED
-
-        # Attempt to create duplicate should return 409
-        response = authenticated_client.post(
-            reverse("integration-list"),
-            data=json.dumps(data),
-            content_type="application/vnd.api+json",
-        )
-        assert response.status_code == status.HTTP_409_CONFLICT
-        assert (
-            "This integration already exists" in response.json()["errors"][0]["detail"]
-        )
-        assert (
-            response.json()["errors"][0]["source"]["pointer"]
-            == "/data/attributes/configuration"
-        )
-
-    def test_integrations_create_duplicate_jira(self, authenticated_client):
-        # Create first JIRA integration
-        data = {
-            "data": {
-                "type": "integrations",
-                "attributes": {
-                    "integration_type": Integration.IntegrationChoices.JIRA,
-                    "configuration": {},
-                    "credentials": {
-                        "user_mail": "test@example.com",
-                        "api_token": "test-api-token",
-                        "domain": "prowlerdomain",
-                    },
-                    "enabled": True,
-                },
-            }
-        }
-
-        # First creation should succeed
-        response = authenticated_client.post(
-            reverse("integration-list"),
-            data=json.dumps(data),
-            content_type="application/vnd.api+json",
-        )
-        assert response.status_code == status.HTTP_201_CREATED
-
-        # Attempt to create duplicate should return 409
-        response = authenticated_client.post(
-            reverse("integration-list"),
-            data=json.dumps(data),
-            content_type="application/vnd.api+json",
-        )
-        assert response.status_code == status.HTTP_409_CONFLICT
-        assert (
-            "This integration already exists" in response.json()["errors"][0]["detail"]
-        )
-        assert (
-            response.json()["errors"][0]["source"]["pointer"]
-            == "/data/attributes/configuration"
-        )
-
-    def test_integrations_update_jira_configuration_readonly(
-        self, authenticated_client
-    ):
-        # Create JIRA integration first
-        create_data = {
-            "data": {
-                "type": "integrations",
-                "attributes": {
-                    "integration_type": Integration.IntegrationChoices.JIRA,
-                    "configuration": {},
-                    "credentials": {
-                        "user_mail": "test@example.com",
-                        "api_token": "test-api-token",
-                        "domain": "initial-domain",
-                    },
-                    "enabled": True,
-                },
-            }
-        }
-
-        # Create the integration
-        response = authenticated_client.post(
-            reverse("integration-list"),
-            data=json.dumps(create_data),
-            content_type="application/vnd.api+json",
-        )
-        assert response.status_code == status.HTTP_201_CREATED
-        integration_id = response.json()["data"]["id"]
-
-        # Attempt to update configuration - should be ignored/not allowed
-        update_data = {
-            "data": {
-                "type": "integrations",
-                "id": integration_id,
-                "attributes": {
-                    "configuration": {
-                        "projects": {"NEW_PROJECT": "New Project"},
-                        "issue_types": ["Epic", "Story"],
-                        "domain": "malicious-domain",
-                    }
-                },
-            }
-        }
-
-        response = authenticated_client.patch(
-            reverse("integration-detail", kwargs={"pk": integration_id}),
-            data=json.dumps(update_data),
-            content_type="application/vnd.api+json",
-        )
-        assert response.status_code == status.HTTP_400_BAD_REQUEST
-
-    def test_integrations_update_jira_credentials_domain_reflects_in_configuration(
-        self, authenticated_client
-    ):
-        # Create JIRA integration first
-        create_data = {
-            "data": {
-                "type": "integrations",
-                "attributes": {
-                    "integration_type": Integration.IntegrationChoices.JIRA,
-                    "configuration": {},
-                    "credentials": {
-                        "user_mail": "test@example.com",
-                        "api_token": "test-api-token",
-                        "domain": "original-domain",
-                    },
-                    "enabled": True,
-                },
-            }
-        }
-
-        # Create the integration
-        response = authenticated_client.post(
-            reverse("integration-list"),
-            data=json.dumps(create_data),
-            content_type="application/vnd.api+json",
-        )
-        assert response.status_code == status.HTTP_201_CREATED
-        integration_id = response.json()["data"]["id"]
-
-        # Verify initial domain in configuration
-        initial_integration = response.json()["data"]
-        assert (
-            initial_integration["attributes"]["configuration"]["domain"]
-            == "original-domain"
-        )
-
-        # Update credentials with new domain
-        update_data = {
-            "data": {
-                "type": "integrations",
-                "id": integration_id,
-                "attributes": {
-                    "credentials": {
-                        "user_mail": "updated@example.com",
-                        "api_token": "updated-api-token",
-                        "domain": "updated-domain",
-                    }
-                },
-            }
-        }
-
-        response = authenticated_client.patch(
-            reverse("integration-detail", kwargs={"pk": integration_id}),
-            data=json.dumps(update_data),
-            content_type="application/vnd.api+json",
-        )
-        assert response.status_code == status.HTTP_200_OK
-
-        # Verify the new domain is reflected in configuration
-        updated_integration = response.json()["data"]
-        configuration = updated_integration["attributes"]["configuration"]
-        assert configuration["domain"] == "updated-domain"
-
-        # Verify other configuration fields are preserved
-        assert "projects" in configuration
-        assert "issue_types" in configuration
-
 
 @pytest.mark.django_db
 class TestSAMLTokenValidation:

api/src/backend/api/utils.py

@@ -6,19 +6,13 @@ from django.db.models import Subquery
 from rest_framework.exceptions import NotFound, ValidationError
 
 from api.db_router import MainRouter
-from api.db_utils import rls_transaction
 from api.exceptions import InvitationTokenExpiredException
-from api.models import Integration, Invitation, Processor, Provider, Resource
+from api.models import Invitation, Processor, Provider, Resource
 from api.v1.serializers import FindingMetadataSerializer
-from prowler.lib.outputs.jira.jira import Jira, JiraBasicAuthError
 from prowler.providers.aws.aws_provider import AwsProvider
-from prowler.providers.aws.lib.s3.s3 import S3
-from prowler.providers.aws.lib.security_hub.security_hub import SecurityHub
 from prowler.providers.azure.azure_provider import AzureProvider
 from prowler.providers.common.models import Connection
 from prowler.providers.gcp.gcp_provider import GcpProvider
-from prowler.providers.github.github_provider import GithubProvider
-from prowler.providers.iac.iac_provider import IacProvider
 from prowler.providers.kubernetes.kubernetes_provider import KubernetesProvider
 from prowler.providers.m365.m365_provider import M365Provider
 
@@ -61,22 +55,14 @@ def merge_dicts(default_dict: dict, replacement_dict: dict) -> dict:
 
 def return_prowler_provider(
     provider: Provider,
-) -> [
-    AwsProvider
-    | AzureProvider
-    | GcpProvider
-    | GithubProvider
-    | IacProvider
-    | KubernetesProvider
-    | M365Provider
-]:
+) -> [AwsProvider | AzureProvider | GcpProvider | KubernetesProvider | M365Provider]:
     """Return the Prowler provider class based on the given provider type.
 
     Args:
         provider (Provider): The provider object containing the provider type and associated secrets.
 
     Returns:
-        AwsProvider | AzureProvider | GcpProvider | GithubProvider | IacProvider | KubernetesProvider | M365Provider: The corresponding provider class.
+        AwsProvider | AzureProvider | GcpProvider | KubernetesProvider | M365Provider: The corresponding provider class.
 
     Raises:
         ValueError: If the provider type specified in `provider.provider` is not supported.
@@ -92,10 +78,6 @@ def return_prowler_provider(
             prowler_provider = KubernetesProvider
         case Provider.ProviderChoices.M365.value:
             prowler_provider = M365Provider
-        case Provider.ProviderChoices.GITHUB.value:
-            prowler_provider = GithubProvider
-        case Provider.ProviderChoices.IAC.value:
-            prowler_provider = IacProvider
         case _:
             raise ValueError(f"Provider type {provider.provider} not supported")
     return prowler_provider
@@ -126,22 +108,6 @@ def get_prowler_provider_kwargs(
         }
     elif provider.provider == Provider.ProviderChoices.KUBERNETES.value:
         prowler_provider_kwargs = {**prowler_provider_kwargs, "context": provider.uid}
-    elif provider.provider == Provider.ProviderChoices.GITHUB.value:
-        if provider.uid:
-            prowler_provider_kwargs = {
-                **prowler_provider_kwargs,
-                "organizations": [provider.uid],
-            }
-    elif provider.provider == Provider.ProviderChoices.IAC.value:
-        # For IaC provider, uid contains the repository URL
-        # Extract the access token if present in the secret
-        prowler_provider_kwargs = {
-            "scan_repository_url": provider.uid,
-        }
-        if "access_token" in provider.secret.secret:
-            prowler_provider_kwargs["oauth_app_token"] = provider.secret.secret[
-                "access_token"
-            ]
 
     if mutelist_processor:
         mutelist_content = mutelist_processor.configuration.get("Mutelist", {})
@@ -154,15 +120,7 @@ def get_prowler_provider_kwargs(
 def initialize_prowler_provider(
     provider: Provider,
     mutelist_processor: Processor | None = None,
-) -> (
-    AwsProvider
-    | AzureProvider
-    | GcpProvider
-    | GithubProvider
-    | IacProvider
-    | KubernetesProvider
-    | M365Provider
-):
+) -> AwsProvider | AzureProvider | GcpProvider | KubernetesProvider | M365Provider:
     """Initialize a Prowler provider instance based on the given provider type.
 
     Args:
@@ -170,8 +128,8 @@ def initialize_prowler_provider(
         mutelist_processor (Processor): The mutelist processor object containing the mutelist configuration.
 
     Returns:
-        AwsProvider | AzureProvider | GcpProvider | GithubProvider | IacProvider | KubernetesProvider | M365Provider: An instance of the corresponding provider class
-            (`AwsProvider`, `AzureProvider`, `GcpProvider`, `GithubProvider`, `IacProvider`, `KubernetesProvider` or `M365Provider`) initialized with the
+        AwsProvider | AzureProvider | GcpProvider | KubernetesProvider | M365Provider: An instance of the corresponding provider class
+            (`AwsProvider`, `AzureProvider`, `GcpProvider`, `KubernetesProvider` or `M365Provider`) initialized with the
             provider's secrets.
     """
     prowler_provider = return_prowler_provider(provider)
@@ -195,94 +153,9 @@ def prowler_provider_connection_test(provider: Provider) -> Connection:
     except Provider.secret.RelatedObjectDoesNotExist as secret_error:
         return Connection(is_connected=False, error=secret_error)
 
-    # For IaC provider, construct the kwargs properly for test_connection
-    if provider.provider == Provider.ProviderChoices.IAC.value:
-        # Don't pass repository_url from secret, use scan_repository_url with the UID
-        iac_test_kwargs = {
-            "scan_repository_url": provider.uid,
-            "raise_on_exception": False,
-        }
-        # Add access_token if present in the secret
-        if "access_token" in prowler_provider_kwargs:
-            iac_test_kwargs["access_token"] = prowler_provider_kwargs["access_token"]
-        return prowler_provider.test_connection(**iac_test_kwargs)
-    else:
-        return prowler_provider.test_connection(
-            **prowler_provider_kwargs,
-            provider_id=provider.uid,
-            raise_on_exception=False,
-        )
-
-
-def prowler_integration_connection_test(integration: Integration) -> Connection:
-    """Test the connection to a Prowler integration based on the given integration type.
-
-    Args:
-        integration (Integration): The integration object containing the integration type and associated credentials.
-
-    Returns:
-        Connection: A connection object representing the result of the connection test for the specified integration.
-    """
-    if integration.integration_type == Integration.IntegrationChoices.AMAZON_S3:
-        return S3.test_connection(
-            **integration.credentials,
-            bucket_name=integration.configuration["bucket_name"],
-            raise_on_exception=False,
-        )
-    # TODO: It is possible that we can unify the connection test for all integrations, but need refactoring
-    # to avoid code duplication. Actually the AWS integrations are similar, so SecurityHub and S3 can be unified
-    # making some changes in the SDK.
-    elif (
-        integration.integration_type == Integration.IntegrationChoices.AWS_SECURITY_HUB
-    ):
-        # Get the provider associated with this integration
-        provider_relationship = integration.integrationproviderrelationship_set.first()
-        if not provider_relationship:
-            return Connection(
-                is_connected=False, error="No provider associated with this integration"
-            )
-
-        credentials = (
-            integration.credentials
-            if integration.credentials
-            else provider_relationship.provider.secret.secret
-        )
-        connection = SecurityHub.test_connection(
-            aws_account_id=provider_relationship.provider.uid,
-            raise_on_exception=False,
-            **credentials,
-        )
-
-        # Only save regions if connection is successful
-        if connection.is_connected:
-            regions_status = {r: True for r in connection.enabled_regions}
-            regions_status.update({r: False for r in connection.disabled_regions})
-
-            # Save regions information in the integration configuration
-            integration.configuration["regions"] = regions_status
-            integration.save()
-        else:
-            # Reset regions information if connection fails
-            integration.configuration["regions"] = {}
-            integration.save()
-
-        return connection
-    elif integration.integration_type == Integration.IntegrationChoices.JIRA:
-        jira_connection = Jira.test_connection(
-            **integration.credentials,
-            raise_on_exception=False,
-        )
-        project_keys = jira_connection.projects if jira_connection.is_connected else {}
-        with rls_transaction(str(integration.tenant_id)):
-            integration.configuration["projects"] = project_keys
-            integration.save()
-        return jira_connection
-    elif integration.integration_type == Integration.IntegrationChoices.SLACK:
-        pass
-    else:
-        raise ValueError(
-            f"Integration type {integration.integration_type} not supported"
-        )
+    return prowler_provider.test_connection(
+        **prowler_provider_kwargs, provider_id=provider.uid, raise_on_exception=False
+    )
 
 
 def validate_invitation(
@@ -376,17 +249,3 @@ def get_findings_metadata_no_aggregations(tenant_id: str, filtered_queryset):
     serializer.is_valid(raise_exception=True)
 
     return serializer.data
-
-
-def initialize_prowler_integration(integration: Integration) -> Jira:
-    # TODO Refactor other integrations to use this function
-    if integration.integration_type == Integration.IntegrationChoices.JIRA:
-        try:
-            return Jira(**integration.credentials)
-        except JiraBasicAuthError as jira_auth_error:
-            with rls_transaction(str(integration.tenant_id)):
-                integration.configuration["projects"] = {}
-                integration.connected = False
-                integration.connection_last_checked_at = datetime.now(tz=timezone.utc)
-                integration.save()
-            raise jira_auth_error

api/src/backend/api/v1/serializer_utils/integrations.py

@@ -1,6 +1,3 @@
-import os
-import re
-
 from drf_spectacular.utils import extend_schema_field
 from rest_framework_json_api import serializers
 
@@ -9,70 +6,7 @@ from api.v1.serializer_utils.base import BaseValidateSerializer
 
 class S3ConfigSerializer(BaseValidateSerializer):
     bucket_name = serializers.CharField()
-    output_directory = serializers.CharField(allow_blank=True)
-
-    def validate_output_directory(self, value):
-        """
-        Validate the output_directory field to ensure it's a properly formatted path.
-        Prevents paths with excessive slashes like "///////test".
-        If empty, sets a default value.
-        """
-        # If empty or None, set default value
-        if not value:
-            return "output"
-
-        # Normalize the path to remove excessive slashes
-        normalized_path = os.path.normpath(value)
-
-        # Remove leading slashes for S3 paths
-        if normalized_path.startswith("/"):
-            normalized_path = normalized_path.lstrip("/")
-
-        # Check for invalid characters or patterns
-        if re.search(r'[<>:"|?*]', normalized_path):
-            raise serializers.ValidationError(
-                'Output directory contains invalid characters. Avoid: < > : " | ? *'
-            )
-
-        # Check for empty path after normalization
-        if not normalized_path or normalized_path == ".":
-            raise serializers.ValidationError(
-                "Output directory cannot be empty or just '.' or '/'."
-            )
-
-        # Check for paths that are too long (S3 key limit is 1024 characters, leave some room for filename)
-        if len(normalized_path) > 900:
-            raise serializers.ValidationError(
-                "Output directory path is too long (max 900 characters)."
-            )
-
-        return normalized_path
-
-    class Meta:
-        resource_name = "integrations"
-
-
-class SecurityHubConfigSerializer(BaseValidateSerializer):
-    send_only_fails = serializers.BooleanField(default=False)
-    archive_previous_findings = serializers.BooleanField(default=False)
-    regions = serializers.DictField(default=dict, read_only=True)
-
-    def to_internal_value(self, data):
-        validated_data = super().to_internal_value(data)
-        # Always initialize regions as empty dict
-        validated_data["regions"] = {}
-        return validated_data
-
-    class Meta:
-        resource_name = "integrations"
-
-
-class JiraConfigSerializer(BaseValidateSerializer):
-    domain = serializers.CharField(read_only=True)
-    issue_types = serializers.ListField(
-        read_only=True, child=serializers.CharField(), default=["Task"]
-    )
-    projects = serializers.DictField(read_only=True)
+    output_directory = serializers.CharField()
 
     class Meta:
         resource_name = "integrations"
@@ -93,15 +27,6 @@ class AWSCredentialSerializer(BaseValidateSerializer):
         resource_name = "integrations"
 
 
-class JiraCredentialSerializer(BaseValidateSerializer):
-    user_mail = serializers.EmailField(required=True)
-    api_token = serializers.CharField(required=True)
-    domain = serializers.CharField(required=True)
-
-    class Meta:
-        resource_name = "integrations"
-
-
 @extend_schema_field(
     {
         "oneOf": [
@@ -153,27 +78,6 @@ class JiraCredentialSerializer(BaseValidateSerializer):
                     },
                 },
             },
-            {
-                "type": "object",
-                "title": "JIRA Credentials",
-                "properties": {
-                    "user_mail": {
-                        "type": "string",
-                        "format": "email",
-                        "description": "The email address of the JIRA user account.",
-                    },
-                    "api_token": {
-                        "type": "string",
-                        "description": "The API token for authentication with JIRA. This can be generated from your "
-                        "Atlassian account settings.",
-                    },
-                    "domain": {
-                        "type": "string",
-                        "description": "The JIRA domain/instance URL (e.g., 'your-domain.atlassian.net').",
-                    },
-                },
-                "required": ["user_mail", "api_token", "domain"],
-            },
         ]
     }
 )
@@ -194,40 +98,10 @@ class IntegrationCredentialField(serializers.JSONField):
                     },
                     "output_directory": {
                         "type": "string",
-                        "description": "The directory path within the bucket where files will be saved. Optional - "
-                        'defaults to "output" if not provided. Path will be normalized to remove '
-                        'excessive slashes and invalid characters are not allowed (< > : " | ? *). '
-                        "Maximum length is 900 characters.",
-                        "maxLength": 900,
-                        "pattern": '^[^<>:"|?*]+$',
-                        "default": "output",
+                        "description": "The directory path within the bucket where files will be saved.",
                     },
                 },
-                "required": ["bucket_name"],
-            },
-            {
-                "type": "object",
-                "title": "AWS Security Hub",
-                "properties": {
-                    "send_only_fails": {
-                        "type": "boolean",
-                        "default": False,
-                        "description": "If true, only findings with status 'FAIL' will be sent to Security Hub.",
-                    },
-                    "archive_previous_findings": {
-                        "type": "boolean",
-                        "default": False,
-                        "description": "If true, archives findings that are not present in the current execution.",
-                    },
-                },
-            },
-            {
-                "type": "object",
-                "title": "JIRA",
-                "description": "JIRA integration does not accept any configuration in the payload. Leave it as an "
-                "empty JSON object (`{}`).",
-                "properties": {},
-                "additionalProperties": False,
+                "required": ["bucket_name", "output_directory"],
             },
         ]
     }

api/src/backend/api/v1/serializer_utils/providers.py

@@ -176,58 +176,6 @@ from rest_framework_json_api import serializers
                 },
                 "required": ["kubeconfig_content"],
             },
-            {
-                "type": "object",
-                "title": "GitHub Personal Access Token",
-                "properties": {
-                    "personal_access_token": {
-                        "type": "string",
-                        "description": "GitHub personal access token for authentication.",
-                    }
-                },
-                "required": ["personal_access_token"],
-            },
-            {
-                "type": "object",
-                "title": "GitHub OAuth App Token",
-                "properties": {
-                    "oauth_app_token": {
-                        "type": "string",
-                        "description": "GitHub OAuth App token for authentication.",
-                    }
-                },
-                "required": ["oauth_app_token"],
-            },
-            {
-                "type": "object",
-                "title": "GitHub App Credentials",
-                "properties": {
-                    "github_app_id": {
-                        "type": "integer",
-                        "description": "GitHub App ID for authentication.",
-                    },
-                    "github_app_key": {
-                        "type": "string",
-                        "description": "Path to the GitHub App private key file.",
-                    },
-                },
-                "required": ["github_app_id", "github_app_key"],
-            },
-            {
-                "type": "object",
-                "title": "IaC Repository Credentials",
-                "properties": {
-                    "repository_url": {
-                        "type": "string",
-                        "description": "Repository URL to scan for IaC files.",
-                    },
-                    "access_token": {
-                        "type": "string",
-                        "description": "Optional access token for private repositories.",
-                    },
-                },
-                "required": ["repository_url"],
-            },
         ]
     }
 )

api/src/backend/api/v1/serializers.py

@@ -15,7 +15,6 @@ from rest_framework_simplejwt.exceptions import TokenError
 from rest_framework_simplejwt.serializers import TokenObtainPairSerializer
 from rest_framework_simplejwt.tokens import RefreshToken
 
-from api.exceptions import ConflictException
 from api.models import (
     Finding,
     Integration,
@@ -46,10 +45,7 @@ from api.v1.serializer_utils.integrations import (
     AWSCredentialSerializer,
     IntegrationConfigField,
     IntegrationCredentialField,
-    JiraConfigSerializer,
-    JiraCredentialSerializer,
     S3ConfigSerializer,
-    SecurityHubConfigSerializer,
 )
 from api.v1.serializer_utils.processors import ProcessorConfigField
 from api.v1.serializer_utils.providers import ProviderSecretField
@@ -1221,10 +1217,6 @@ class BaseWriteProviderSecretSerializer(BaseWriteSerializer):
                 serializer = AzureProviderSecret(data=secret)
             elif provider_type == Provider.ProviderChoices.GCP.value:
                 serializer = GCPProviderSecret(data=secret)
-            elif provider_type == Provider.ProviderChoices.GITHUB.value:
-                serializer = GithubProviderSecret(data=secret)
-            elif provider_type == Provider.ProviderChoices.IAC.value:
-                serializer = IacProviderSecret(data=secret)
             elif provider_type == Provider.ProviderChoices.KUBERNETES.value:
                 serializer = KubernetesProviderSecret(data=secret)
             elif provider_type == Provider.ProviderChoices.M365.value:
@@ -1304,24 +1296,6 @@ class KubernetesProviderSecret(serializers.Serializer):
         resource_name = "provider-secrets"
 
 
-class GithubProviderSecret(serializers.Serializer):
-    personal_access_token = serializers.CharField(required=False)
-    oauth_app_token = serializers.CharField(required=False)
-    github_app_id = serializers.IntegerField(required=False)
-    github_app_key_content = serializers.CharField(required=False)
-
-    class Meta:
-        resource_name = "provider-secrets"
-
-
-class IacProviderSecret(serializers.Serializer):
-    repository_url = serializers.CharField()
-    access_token = serializers.CharField(required=False)
-
-    class Meta:
-        resource_name = "provider-secrets"
-
-
 class AWSRoleAssumptionProviderSecret(serializers.Serializer):
     role_arn = serializers.CharField()
     external_id = serializers.CharField()
@@ -1964,62 +1938,6 @@ class ScheduleDailyCreateSerializer(serializers.Serializer):
 
 
 class BaseWriteIntegrationSerializer(BaseWriteSerializer):
-    def validate(self, attrs):
-        integration_type = attrs.get("integration_type")
-
-        if (
-            integration_type == Integration.IntegrationChoices.AMAZON_S3
-            and Integration.objects.filter(
-                configuration=attrs.get("configuration")
-            ).exists()
-        ):
-            raise ConflictException(
-                detail="This integration already exists.",
-                pointer="/data/attributes/configuration",
-            )
-
-        if (
-            integration_type == Integration.IntegrationChoices.JIRA
-            and Integration.objects.filter(
-                configuration__contains={
-                    "domain": attrs.get("configuration").get("domain")
-                }
-            ).exists()
-        ):
-            raise ConflictException(
-                detail="This integration already exists.",
-                pointer="/data/attributes/configuration",
-            )
-
-        # Check if any provider already has a SecurityHub integration
-        if hasattr(self, "instance") and self.instance and not integration_type:
-            integration_type = self.instance.integration_type
-
-        if (
-            integration_type == Integration.IntegrationChoices.AWS_SECURITY_HUB
-            and "providers" in attrs
-        ):
-            providers = attrs.get("providers", [])
-            tenant_id = self.context.get("tenant_id")
-            for provider in providers:
-                # For updates, exclude the current instance from the check
-                query = IntegrationProviderRelationship.objects.filter(
-                    provider=provider,
-                    integration__integration_type=Integration.IntegrationChoices.AWS_SECURITY_HUB,
-                    tenant_id=tenant_id,
-                )
-                if hasattr(self, "instance") and self.instance:
-                    query = query.exclude(integration=self.instance)
-
-                if query.exists():
-                    raise ConflictException(
-                        detail=f"Provider {provider.id} already has a Security Hub integration. Only one "
-                        "Security Hub integration is allowed per provider.",
-                        pointer="/data/relationships/providers",
-                    )
-
-        return super().validate(attrs)
-
     @staticmethod
     def validate_integration_data(
         integration_type: str,
@@ -2027,49 +1945,17 @@ class BaseWriteIntegrationSerializer(BaseWriteSerializer):
         configuration: dict,
         credentials: dict,
     ):
-        if integration_type == Integration.IntegrationChoices.AMAZON_S3:
+        if integration_type == Integration.IntegrationChoices.S3:
             config_serializer = S3ConfigSerializer
             credentials_serializers = [AWSCredentialSerializer]
-        elif integration_type == Integration.IntegrationChoices.AWS_SECURITY_HUB:
-            if providers:
-                if len(providers) > 1:
-                    raise serializers.ValidationError(
-                        {
-                            "providers": "Only one provider is supported for the Security Hub integration."
-                        }
-                    )
-                if providers[0].provider != Provider.ProviderChoices.AWS:
-                    raise serializers.ValidationError(
-                        {
-                            "providers": "The provider must be AWS type for the Security Hub integration."
-                        }
-                    )
-            config_serializer = SecurityHubConfigSerializer
-            credentials_serializers = [AWSCredentialSerializer]
-        elif integration_type == Integration.IntegrationChoices.JIRA:
-            if providers:
-                raise serializers.ValidationError(
-                    {
-                        "providers": "Relationship field is not accepted. This integration applies to all providers."
-                    }
-                )
-            if configuration:
-                raise serializers.ValidationError(
-                    {
-                        "configuration": "This integration does not support custom configuration."
-                    }
-                )
-            config_serializer = JiraConfigSerializer
-            # Create non-editable configuration for JIRA integration
-            default_jira_issue_types = ["Task"]
-            configuration.update(
-                {
-                    "projects": {},
-                    "issue_types": default_jira_issue_types,
-                    "domain": credentials.get("domain"),
-                }
-            )
-            credentials_serializers = [JiraCredentialSerializer]
+            # TODO: This will be required for AWS Security Hub
+            # if providers and not all(
+            #     provider.provider == Provider.ProviderChoices.AWS
+            #     for provider in providers
+            # ):
+            #     raise serializers.ValidationError(
+            #         {"providers": "All providers must be AWS for the S3 integration."}
+            #     )
         else:
             raise serializers.ValidationError(
                 {
@@ -2077,11 +1963,7 @@ class BaseWriteIntegrationSerializer(BaseWriteSerializer):
                 }
             )
 
-        serializer_instance = config_serializer(data=configuration)
-        serializer_instance.is_valid(raise_exception=True)
-
-        # Apply the validated (and potentially transformed) data back to configuration
-        configuration.update(serializer_instance.validated_data)
+        config_serializer(data=configuration).is_valid(raise_exception=True)
 
         for cred_serializer in credentials_serializers:
             try:
@@ -2133,10 +2015,6 @@ class IntegrationSerializer(RLSSerializer):
                 for provider in representation["providers"]
                 if provider["id"] in allowed_provider_ids
             ]
-        if instance.integration_type == Integration.IntegrationChoices.JIRA:
-            representation["configuration"].update(
-                {"domain": instance.credentials.get("domain")}
-            )
         return representation
 
 
@@ -2164,6 +2042,7 @@ class IntegrationCreateSerializer(BaseWriteIntegrationSerializer):
             "inserted_at": {"read_only": True},
             "updated_at": {"read_only": True},
             "connected": {"read_only": True},
+            "enabled": {"read_only": True},
             "connection_last_checked_at": {"read_only": True},
         }
 
@@ -2173,18 +2052,10 @@ class IntegrationCreateSerializer(BaseWriteIntegrationSerializer):
         configuration = attrs.get("configuration")
         credentials = attrs.get("credentials")
 
-        if (
-            not providers
-            and integration_type == Integration.IntegrationChoices.AWS_SECURITY_HUB
-        ):
-            raise serializers.ValidationError(
-                {"providers": "At least one provider is required for this integration."}
-            )
-
+        validated_attrs = super().validate(attrs)
         self.validate_integration_data(
             integration_type, providers, configuration, credentials
         )
-        validated_attrs = super().validate(attrs)
         return validated_attrs
 
     def create(self, validated_data):
@@ -2237,16 +2108,13 @@ class IntegrationUpdateSerializer(BaseWriteIntegrationSerializer):
     def validate(self, attrs):
         integration_type = self.instance.integration_type
         providers = attrs.get("providers")
-        if integration_type != Integration.IntegrationChoices.JIRA:
-            configuration = attrs.get("configuration") or self.instance.configuration
-        else:
-            configuration = attrs.get("configuration", {})
+        configuration = attrs.get("configuration") or self.instance.configuration
         credentials = attrs.get("credentials") or self.instance.credentials
 
+        validated_attrs = super().validate(attrs)
         self.validate_integration_data(
             integration_type, providers, configuration, credentials
         )
-        validated_attrs = super().validate(attrs)
         return validated_attrs
 
     def update(self, instance, validated_data):
@@ -2261,62 +2129,8 @@ class IntegrationUpdateSerializer(BaseWriteIntegrationSerializer):
             ]
             IntegrationProviderRelationship.objects.bulk_create(new_relationships)
 
-        # Preserve regions field for Security Hub integrations
-        if instance.integration_type == Integration.IntegrationChoices.AWS_SECURITY_HUB:
-            if "configuration" in validated_data:
-                # Preserve the existing regions field if it exists
-                existing_regions = instance.configuration.get("regions", {})
-                validated_data["configuration"]["regions"] = existing_regions
-
         return super().update(instance, validated_data)
 
-    def to_representation(self, instance):
-        representation = super().to_representation(instance)
-        # Ensure JIRA integrations show updated domain in configuration from credentials
-        if instance.integration_type == Integration.IntegrationChoices.JIRA:
-            representation["configuration"].update(
-                {"domain": instance.credentials.get("domain")}
-            )
-        return representation
-
-
-class IntegrationJiraDispatchSerializer(serializers.Serializer):
-    """
-    Serializer for dispatching findings to JIRA integration.
-    """
-
-    project_key = serializers.CharField(required=True)
-    issue_type = serializers.ChoiceField(required=True, choices=["Task"])
-
-    class JSONAPIMeta:
-        resource_name = "integrations-jira-dispatches"
-
-    def validate(self, attrs):
-        validated_attrs = super().validate(attrs)
-        integration_instance = Integration.objects.get(
-            id=self.context.get("integration_id")
-        )
-        if integration_instance.integration_type != Integration.IntegrationChoices.JIRA:
-            raise ValidationError(
-                {"integration_type": "The given integration is not a JIRA integration"}
-            )
-
-        if not integration_instance.enabled:
-            raise ValidationError(
-                {"integration": "The given integration is not enabled"}
-            )
-
-        project_key = attrs.get("project_key")
-        if project_key not in integration_instance.configuration.get("projects", {}):
-            raise ValidationError(
-                {
-                    "project_key": "The given project key is not available for this JIRA integration. Refresh the "
-                    "connection if this is an error."
-                }
-            )
-
-        return validated_attrs
-
 
 # Processors
 

api/src/backend/api/v1/urls.py

@@ -12,7 +12,6 @@ from api.v1.views import (
     FindingViewSet,
     GithubSocialLoginView,
     GoogleSocialLoginView,
-    IntegrationJiraViewSet,
     IntegrationViewSet,
     InvitationAcceptViewSet,
     InvitationViewSet,
@@ -74,13 +73,6 @@ tenants_router.register(
 users_router = routers.NestedSimpleRouter(router, r"users", lookup="user")
 users_router.register(r"memberships", MembershipViewSet, basename="user-membership")
 
-integrations_router = routers.NestedSimpleRouter(
-    router, r"integrations", lookup="integration"
-)
-integrations_router.register(
-    r"jira", IntegrationJiraViewSet, basename="integration-jira"
-)
-
 urlpatterns = [
     path("tokens", CustomTokenObtainView.as_view(), name="token-obtain"),
     path("tokens/refresh", CustomTokenRefreshView.as_view(), name="token-refresh"),
@@ -170,7 +162,6 @@ urlpatterns = [
     path("", include(router.urls)),
     path("", include(tenants_router.urls)),
     path("", include(users_router.urls)),
-    path("", include(integrations_router.urls)),
     path("schema", SchemaView.as_view(), name="schema"),
     path("docs", SpectacularRedocView.as_view(url_name="schema"), name="docs"),
 ]

api/src/backend/api/v1/views.py

@@ -22,7 +22,7 @@ from django.conf import settings as django_settings
 from django.contrib.postgres.aggregates import ArrayAgg
 from django.contrib.postgres.search import SearchQuery
 from django.db import transaction
-from django.db.models import Count, F, Prefetch, Q, Subquery, Sum
+from django.db.models import Count, F, Prefetch, Q, Sum
 from django.db.models.functions import Coalesce
 from django.http import HttpResponse
 from django.shortcuts import redirect
@@ -57,12 +57,10 @@ from tasks.beat import schedule_provider_scan
 from tasks.jobs.export import get_s3_client
 from tasks.tasks import (
     backfill_scan_resource_summaries_task,
-    check_integration_connection_task,
     check_lighthouse_connection_task,
     check_provider_connection_task,
     delete_provider_task,
     delete_tenant_task,
-    jira_integration_task,
     perform_scan_task,
 )
 
@@ -76,10 +74,8 @@ from api.db_utils import rls_transaction
 from api.exceptions import TaskFailedException
 from api.filters import (
     ComplianceOverviewFilter,
-    CustomDjangoFilterBackend,
     FindingFilter,
     IntegrationFilter,
-    IntegrationJiraFindingsFilter,
     InvitationFilter,
     LatestFindingFilter,
     LatestResourceFilter,
@@ -92,13 +88,13 @@ from api.filters import (
     RoleFilter,
     ScanFilter,
     ScanSummaryFilter,
-    ScanSummarySeverityFilter,
     ServiceOverviewFilter,
     TaskFilter,
     TenantFilter,
     UserFilter,
 )
 from api.models import (
+    ComplianceOverview,
     ComplianceRequirementOverview,
     Finding,
     Integration,
@@ -146,7 +142,6 @@ from api.v1.serializers import (
     FindingMetadataSerializer,
     FindingSerializer,
     IntegrationCreateSerializer,
-    IntegrationJiraDispatchSerializer,
     IntegrationSerializer,
     IntegrationUpdateSerializer,
     InvitationAcceptSerializer,
@@ -219,8 +214,6 @@ class RelationshipViewSchema(JsonApiAutoSchema):
     description="Obtain a token by providing valid credentials and an optional tenant ID.",
 )
 class CustomTokenObtainView(GenericAPIView):
-    throttle_scope = "token-obtain"
-
     resource_name = "tokens"
     serializer_class = TokenSerializer
     http_method_names = ["post"]
@@ -300,7 +293,7 @@ class SchemaView(SpectacularAPIView):
 
     def get(self, request, *args, **kwargs):
         spectacular_settings.TITLE = "Prowler API"
-        spectacular_settings.VERSION = "1.13.0"
+        spectacular_settings.VERSION = "1.10.0"
         spectacular_settings.DESCRIPTION = (
             "Prowler API specification.\n\nThis file is auto-generated."
         )
@@ -320,11 +313,6 @@ class SchemaView(SpectacularAPIView):
                 "description": "Endpoints for tenant invitations management, allowing retrieval and filtering of "
                 "invitations, creating new invitations, accepting and revoking them.",
             },
-            {
-                "name": "Role",
-                "description": "Endpoints for managing RBAC roles within tenants, allowing creation, retrieval, "
-                "updating, and deletion of role configurations and permissions.",
-            },
             {
                 "name": "Provider",
                 "description": "Endpoints for managing providers (AWS, GCP, Azure, etc...).",
@@ -333,20 +321,10 @@ class SchemaView(SpectacularAPIView):
                 "name": "Provider Group",
                 "description": "Endpoints for managing provider groups.",
             },
-            {
-                "name": "Task",
-                "description": "Endpoints for task management, allowing retrieval of task status and "
-                "revoking tasks that have not started.",
-            },
             {
                 "name": "Scan",
                 "description": "Endpoints for triggering manual scans and viewing scan results.",
             },
-            {
-                "name": "Schedule",
-                "description": "Endpoints for managing scan schedules, allowing configuration of automated "
-                "scans with different scheduling options.",
-            },
             {
                 "name": "Resource",
                 "description": "Endpoints for managing resources discovered by scans, allowing "
@@ -358,9 +336,8 @@ class SchemaView(SpectacularAPIView):
                 "findings that result from scans.",
             },
             {
-                "name": "Processor",
-                "description": "Endpoints for managing post-processors used to process Prowler findings, including "
-                "registration, configuration, and deletion of post-processing actions.",
+                "name": "Overview",
+                "description": "Endpoints for retrieving aggregated summaries of resources from the system.",
             },
             {
                 "name": "Compliance Overview",
@@ -368,8 +345,9 @@ class SchemaView(SpectacularAPIView):
                 " compliance framework ID.",
             },
             {
-                "name": "Overview",
-                "description": "Endpoints for retrieving aggregated summaries of resources from the system.",
+                "name": "Task",
+                "description": "Endpoints for task management, allowing retrieval of task status and "
+                "revoking tasks that have not started.",
             },
             {
                 "name": "Integration",
@@ -377,15 +355,14 @@ class SchemaView(SpectacularAPIView):
                 " retrieval, and deletion of integrations such as S3, JIRA, or other services.",
             },
             {
-                "name": "Lighthouse AI",
-                "description": "Endpoints for managing Lighthouse AI configurations, including creation, retrieval, "
-                "updating, and deletion of configurations such as OpenAI keys, models, and business "
-                "context.",
+                "name": "Lighthouse",
+                "description": "Endpoints for managing Lighthouse configurations, including creation, retrieval, "
+                "updating, and deletion of configurations such as OpenAI keys, models, and business context.",
             },
             {
-                "name": "SAML",
-                "description": "Endpoints for Single Sign-On authentication management via SAML for seamless user "
-                "authentication.",
+                "name": "Processor",
+                "description": "Endpoints for managing post-processors used to process Prowler findings, including "
+                "registration, configuration, and deletion of post-processing actions.",
             },
         ]
         return super().get(request, *args, **kwargs)
@@ -2018,21 +1995,6 @@ class ResourceViewSet(PaginateByPkMixin, BaseRLSViewSet):
             )
         )
 
-    def _should_prefetch_findings(self) -> bool:
-        fields_param = self.request.query_params.get("fields[resources]", "")
-        include_param = self.request.query_params.get("include", "")
-        return (
-            fields_param == ""
-            or "findings" in fields_param.split(",")
-            or "findings" in include_param.split(",")
-        )
-
-    def _get_findings_prefetch(self):
-        findings_queryset = Finding.all_objects.defer("scan", "resources").filter(
-            tenant_id=self.request.tenant_id
-        )
-        return [Prefetch("findings", queryset=findings_queryset)]
-
     def get_serializer_class(self):
         if self.action in ["metadata", "metadata_latest"]:
             return ResourceMetadataSerializer
@@ -2056,11 +2018,7 @@ class ResourceViewSet(PaginateByPkMixin, BaseRLSViewSet):
             filtered_queryset,
             manager=Resource.all_objects,
             select_related=["provider"],
-            prefetch_related=(
-                self._get_findings_prefetch()
-                if self._should_prefetch_findings()
-                else []
-            ),
+            prefetch_related=["findings"],
         )
 
     def retrieve(self, request, *args, **kwargs):
@@ -2085,18 +2043,14 @@ class ResourceViewSet(PaginateByPkMixin, BaseRLSViewSet):
         tenant_id = request.tenant_id
         filtered_queryset = self.filter_queryset(self.get_queryset())
 
-        latest_scans = (
-            Scan.all_objects.filter(
-                tenant_id=tenant_id,
-                state=StateChoices.COMPLETED,
-            )
+        latest_scan_ids = (
+            Scan.all_objects.filter(tenant_id=tenant_id, state=StateChoices.COMPLETED)
             .order_by("provider_id", "-inserted_at")
             .distinct("provider_id")
-            .values("provider_id")
+            .values_list("id", flat=True)
         )
-
         filtered_queryset = filtered_queryset.filter(
-            provider_id__in=Subquery(latest_scans)
+            tenant_id=tenant_id, provider__scan__in=latest_scan_ids
         )
 
         return self.paginate_by_pk(
@@ -2104,11 +2058,7 @@ class ResourceViewSet(PaginateByPkMixin, BaseRLSViewSet):
             filtered_queryset,
             manager=Resource.all_objects,
             select_related=["provider"],
-            prefetch_related=(
-                self._get_findings_prefetch()
-                if self._should_prefetch_findings()
-                else []
-            ),
+            prefetch_related=["findings"],
         )
 
     @action(detail=False, methods=["get"], url_name="metadata")
@@ -3056,9 +3006,7 @@ class RoleProviderGroupRelationshipView(RelationshipView, BaseRLSViewSet):
                 description="Compliance overviews metadata obtained successfully",
                 response=ComplianceOverviewMetadataSerializer,
             ),
-            202: OpenApiResponse(
-                description="The task is in progress", response=TaskSerializer
-            ),
+            202: OpenApiResponse(description="The task is in progress"),
             500: OpenApiResponse(
                 description="Compliance overviews generation task failed"
             ),
@@ -3090,9 +3038,7 @@ class RoleProviderGroupRelationshipView(RelationshipView, BaseRLSViewSet):
                 description="Compliance requirement details obtained successfully",
                 response=ComplianceOverviewDetailSerializer(many=True),
             ),
-            202: OpenApiResponse(
-                description="The task is in progress", response=TaskSerializer
-            ),
+            202: OpenApiResponse(description="The task is in progress"),
             500: OpenApiResponse(
                 description="Compliance overviews generation task failed"
             ),
@@ -3523,7 +3469,7 @@ class ComplianceOverviewViewSet(BaseRLSViewSet, TaskManagementMixin):
 )
 @method_decorator(CACHE_DECORATOR, name="list")
 class OverviewViewSet(BaseRLSViewSet):
-    queryset = ScanSummary.objects.all()
+    queryset = ComplianceOverview.objects.all()
     http_method_names = ["get"]
     ordering = ["-inserted_at"]
     # RBAC required permissions (implicit -> MANAGE_PROVIDERS enable unlimited visibility or check the visibility of
@@ -3534,10 +3480,19 @@ class OverviewViewSet(BaseRLSViewSet):
         role = get_role(self.request.user)
         providers = get_providers(role)
 
-        if not role.unlimited_visibility:
-            self.allowed_providers = providers
+        def _get_filtered_queryset(model):
+            if role.unlimited_visibility:
+                return model.all_objects.filter(tenant_id=self.request.tenant_id)
+            return model.all_objects.filter(
+                tenant_id=self.request.tenant_id, scan__provider__in=providers
+            )
 
-        return ScanSummary.all_objects.filter(tenant_id=self.request.tenant_id)
+        if self.action == "providers":
+            return _get_filtered_queryset(Finding)
+        elif self.action in ("findings", "findings_severity", "services"):
+            return _get_filtered_queryset(ScanSummary)
+        else:
+            return super().get_queryset()
 
     def get_serializer_class(self):
         if self.action == "providers":
@@ -3553,10 +3508,8 @@ class OverviewViewSet(BaseRLSViewSet):
     def get_filterset_class(self):
         if self.action == "providers":
             return None
-        elif self.action == "findings":
+        elif self.action in ["findings", "findings_severity"]:
             return ScanSummaryFilter
-        elif self.action == "findings_severity":
-            return ScanSummarySeverityFilter
         elif self.action == "services":
             return ServiceOverviewFilter
         return None
@@ -3572,24 +3525,18 @@ class OverviewViewSet(BaseRLSViewSet):
     @action(detail=False, methods=["get"], url_name="providers")
     def providers(self, request):
         tenant_id = self.request.tenant_id
-        queryset = self.get_queryset()
-        provider_filter = (
-            {"provider__in": self.allowed_providers}
-            if hasattr(self, "allowed_providers")
-            else {}
-        )
 
         latest_scan_ids = (
-            Scan.all_objects.filter(
-                tenant_id=tenant_id, state=StateChoices.COMPLETED, **provider_filter
-            )
+            Scan.all_objects.filter(tenant_id=tenant_id, state=StateChoices.COMPLETED)
             .order_by("provider_id", "-inserted_at")
             .distinct("provider_id")
             .values_list("id", flat=True)
         )
 
         findings_aggregated = (
-            queryset.filter(scan_id__in=latest_scan_ids)
+            ScanSummary.all_objects.filter(
+                tenant_id=tenant_id, scan_id__in=latest_scan_ids
+            )
             .values(
                 "scan__provider_id",
                 provider=F("scan__provider__provider"),
@@ -3625,7 +3572,7 @@ class OverviewViewSet(BaseRLSViewSet):
             )
 
         return Response(
-            self.get_serializer(overview, many=True).data,
+            OverviewProviderSerializer(overview, many=True).data,
             status=status.HTTP_200_OK,
         )
 
@@ -3634,16 +3581,9 @@ class OverviewViewSet(BaseRLSViewSet):
         tenant_id = self.request.tenant_id
         queryset = self.get_queryset()
         filtered_queryset = self.filter_queryset(queryset)
-        provider_filter = (
-            {"provider__in": self.allowed_providers}
-            if hasattr(self, "allowed_providers")
-            else {}
-        )
 
         latest_scan_ids = (
-            Scan.all_objects.filter(
-                tenant_id=tenant_id, state=StateChoices.COMPLETED, **provider_filter
-            )
+            Scan.all_objects.filter(tenant_id=tenant_id, state=StateChoices.COMPLETED)
             .order_by("provider_id", "-inserted_at")
             .distinct("provider_id")
             .values_list("id", flat=True)
@@ -3678,23 +3618,11 @@ class OverviewViewSet(BaseRLSViewSet):
     @action(detail=False, methods=["get"], url_name="findings_severity")
     def findings_severity(self, request):
         tenant_id = self.request.tenant_id
-
-        # Load only required fields
-        queryset = self.get_queryset().only(
-            "tenant_id", "scan_id", "severity", "fail", "_pass", "total"
-        )
-
+        queryset = self.get_queryset()
         filtered_queryset = self.filter_queryset(queryset)
-        provider_filter = (
-            {"provider__in": self.allowed_providers}
-            if hasattr(self, "allowed_providers")
-            else {}
-        )
 
         latest_scan_ids = (
-            Scan.all_objects.filter(
-                tenant_id=tenant_id, state=StateChoices.COMPLETED, **provider_filter
-            )
+            Scan.all_objects.filter(tenant_id=tenant_id, state=StateChoices.COMPLETED)
             .order_by("provider_id", "-inserted_at")
             .distinct("provider_id")
             .values_list("id", flat=True)
@@ -3703,24 +3631,18 @@ class OverviewViewSet(BaseRLSViewSet):
             tenant_id=tenant_id, scan_id__in=latest_scan_ids
         )
 
-        # The filter will have added a status_count annotation if any status filter was used
-        if "status_count" in filtered_queryset.query.annotations:
-            sum_expression = Sum("status_count")
-        else:
-            sum_expression = Sum("total")
-
         severity_counts = (
             filtered_queryset.values("severity")
-            .annotate(count=sum_expression)
+            .annotate(count=Sum("total"))
             .order_by("severity")
         )
 
         severity_data = {sev[0]: 0 for sev in SeverityChoices}
-        severity_data.update(
-            {item["severity"]: item["count"] for item in severity_counts}
-        )
 
-        serializer = self.get_serializer(severity_data)
+        for item in severity_counts:
+            severity_data[item["severity"]] = item["count"]
+
+        serializer = OverviewSeveritySerializer(severity_data)
         return Response(serializer.data, status=status.HTTP_200_OK)
 
     @action(detail=False, methods=["get"], url_name="services")
@@ -3728,16 +3650,9 @@ class OverviewViewSet(BaseRLSViewSet):
         tenant_id = self.request.tenant_id
         queryset = self.get_queryset()
         filtered_queryset = self.filter_queryset(queryset)
-        provider_filter = (
-            {"provider__in": self.allowed_providers}
-            if hasattr(self, "allowed_providers")
-            else {}
-        )
 
         latest_scan_ids = (
-            Scan.all_objects.filter(
-                tenant_id=tenant_id, state=StateChoices.COMPLETED, **provider_filter
-            )
+            Scan.all_objects.filter(tenant_id=tenant_id, state=StateChoices.COMPLETED)
             .order_by("provider_id", "-inserted_at")
             .distinct("provider_id")
             .values_list("id", flat=True)
@@ -3755,7 +3670,7 @@ class OverviewViewSet(BaseRLSViewSet):
             .order_by("service")
         )
 
-        serializer = self.get_serializer(services_data, many=True)
+        serializer = OverviewServiceSerializer(services_data, many=True)
 
         return Response(serializer.data, status=status.HTTP_200_OK)
 
@@ -3879,138 +3794,32 @@ class IntegrationViewSet(BaseRLSViewSet):
         context["allowed_providers"] = self.allowed_providers
         return context
 
-    @extend_schema(
-        tags=["Integration"],
-        summary="Check integration connection",
-        description="Try to verify integration connection",
-        request=None,
-        responses={202: OpenApiResponse(response=TaskSerializer)},
-    )
-    @action(detail=True, methods=["post"], url_name="connection")
-    def connection(self, request, pk=None):
-        get_object_or_404(Integration, pk=pk)
-        with transaction.atomic():
-            task = check_integration_connection_task.delay(
-                integration_id=pk, tenant_id=self.request.tenant_id
-            )
-        prowler_task = Task.objects.get(id=task.id)
-        serializer = TaskSerializer(prowler_task)
-        return Response(
-            data=serializer.data,
-            status=status.HTTP_202_ACCEPTED,
-            headers={
-                "Content-Location": reverse(
-                    "task-detail", kwargs={"pk": prowler_task.id}
-                )
-            },
-        )
-
-
-@extend_schema_view(
-    dispatches=extend_schema(
-        tags=["Integration"],
-        summary="Send findings to a Jira integration",
-        description="Send a set of filtered findings to the given integration. At least one finding filter must be "
-        "provided.",
-        responses={202: OpenApiResponse(response=TaskSerializer)},
-        filters=True,
-    )
-)
-class IntegrationJiraViewSet(BaseRLSViewSet):
-    queryset = Finding.all_objects.all()
-    serializer_class = IntegrationJiraDispatchSerializer
-    http_method_names = ["post"]
-    filter_backends = [CustomDjangoFilterBackend]
-    filterset_class = IntegrationJiraFindingsFilter
-    # RBAC required permissions
-    required_permissions = [Permissions.MANAGE_INTEGRATIONS]
-
-    @extend_schema(exclude=True)
-    def create(self, request, *args, **kwargs):
-        raise MethodNotAllowed(method="POST")
-
-    def get_queryset(self):
-        tenant_id = self.request.tenant_id
-        user_roles = get_role(self.request.user)
-        if user_roles.unlimited_visibility:
-            # User has unlimited visibility, return all findings
-            queryset = Finding.all_objects.filter(tenant_id=tenant_id)
-        else:
-            # User lacks permission, filter findings based on provider groups associated with the role
-            queryset = Finding.all_objects.filter(
-                scan__provider__in=get_providers(user_roles)
-            )
-
-        return queryset
-
-    @action(detail=False, methods=["post"], url_name="dispatches")
-    def dispatches(self, request, integration_pk=None):
-        get_object_or_404(Integration, pk=integration_pk)
-        serializer = self.get_serializer(
-            data=request.data, context={"integration_id": integration_pk}
-        )
-        serializer.is_valid(raise_exception=True)
-
-        if self.filter_queryset(self.get_queryset()).count() == 0:
-            raise ValidationError(
-                {"findings": "No findings match the provided filters"}
-            )
-
-        finding_ids = [
-            str(finding_id)
-            for finding_id in self.filter_queryset(self.get_queryset()).values_list(
-                "id", flat=True
-            )
-        ]
-        project_key = serializer.validated_data["project_key"]
-        issue_type = serializer.validated_data["issue_type"]
-
-        with transaction.atomic():
-            task = jira_integration_task.delay(
-                tenant_id=self.request.tenant_id,
-                integration_id=integration_pk,
-                project_key=project_key,
-                issue_type=issue_type,
-                finding_ids=finding_ids,
-            )
-        prowler_task = Task.objects.get(id=task.id)
-        serializer = TaskSerializer(prowler_task)
-        return Response(
-            data=serializer.data,
-            status=status.HTTP_202_ACCEPTED,
-            headers={
-                "Content-Location": reverse(
-                    "task-detail", kwargs={"pk": prowler_task.id}
-                )
-            },
-        )
-
 
 @extend_schema_view(
     list=extend_schema(
-        tags=["Lighthouse AI"],
-        summary="List all Lighthouse AI configurations",
-        description="Retrieve a list of all Lighthouse AI configurations.",
+        tags=["Lighthouse"],
+        summary="List all Lighthouse configurations",
+        description="Retrieve a list of all Lighthouse configurations.",
     ),
     create=extend_schema(
-        tags=["Lighthouse AI"],
-        summary="Create a new Lighthouse AI configuration",
-        description="Create a new Lighthouse AI configuration with the specified details.",
+        tags=["Lighthouse"],
+        summary="Create a new Lighthouse configuration",
+        description="Create a new Lighthouse configuration with the specified details.",
     ),
     partial_update=extend_schema(
-        tags=["Lighthouse AI"],
-        summary="Partially update a Lighthouse AI configuration",
-        description="Update certain fields of an existing Lighthouse AI configuration.",
+        tags=["Lighthouse"],
+        summary="Partially update a Lighthouse configuration",
+        description="Update certain fields of an existing Lighthouse configuration.",
     ),
     destroy=extend_schema(
-        tags=["Lighthouse AI"],
-        summary="Delete a Lighthouse AI configuration",
-        description="Remove a Lighthouse AI configuration by its ID.",
+        tags=["Lighthouse"],
+        summary="Delete a Lighthouse configuration",
+        description="Remove a Lighthouse configuration by its ID.",
     ),
     connection=extend_schema(
-        tags=["Lighthouse AI"],
+        tags=["Lighthouse"],
         summary="Check the connection to the OpenAI API",
-        description="Verify the connection to the OpenAI API for a specific Lighthouse AI configuration.",
+        description="Verify the connection to the OpenAI API for a specific Lighthouse configuration.",
         request=None,
         responses={202: OpenApiResponse(response=TaskSerializer)},
     ),

api/src/backend/config/django/base.py

@@ -108,13 +108,6 @@ REST_FRAMEWORK = {
     ),
     "TEST_REQUEST_DEFAULT_FORMAT": "vnd.api+json",
     "JSON_API_UNIFORM_EXCEPTIONS": True,
-    "DEFAULT_THROTTLE_CLASSES": [
-        "rest_framework.throttling.ScopedRateThrottle",
-    ],
-    "DEFAULT_THROTTLE_RATES": {
-        "token-obtain": env("DJANGO_THROTTLE_TOKEN_OBTAIN", default=None),
-        "dj_rest_auth": None,
-    },
 }
 
 SPECTACULAR_SETTINGS = {
@@ -123,9 +116,6 @@ SPECTACULAR_SETTINGS = {
     "PREPROCESSING_HOOKS": [
         "drf_spectacular_jsonapi.hooks.fix_nested_path_parameters",
     ],
-    "POSTPROCESSING_HOOKS": [
-        "api.schema_hooks.attach_task_202_examples",
-    ],
     "TITLE": "API Reference - Prowler",
 }
 

api/src/backend/config/settings/sentry.py

@@ -69,9 +69,6 @@ IGNORED_EXCEPTIONS = [
     "AzureClientIdAndClientSecretNotBelongingToTenantIdError",
     "AzureHTTPResponseError",
     "Error with credentials provided",
-    # PowerShell Errors in User Authentication
-    "Microsoft Teams User Auth connection failed: Please check your permissions and try again.",
-    "Exchange Online User Auth connection failed: Please check your permissions and try again.",
 ]
 
 

api/src/backend/conftest.py

@@ -46,19 +46,12 @@ from api.v1.serializers import TokenSerializer
 from prowler.lib.check.models import Severity
 from prowler.lib.outputs.finding import Status
 
-TODAY = str(datetime.today().date())
 API_JSON_CONTENT_TYPE = "application/vnd.api+json"
 NO_TENANT_HTTP_STATUS = status.HTTP_401_UNAUTHORIZED
 TEST_USER = "dev@prowler.com"
 TEST_PASSWORD = "testing_psswd"
 
 
-def today_after_n_days(n_days: int) -> str:
-    return datetime.strftime(
-        datetime.today().date() + timedelta(days=n_days), "%Y-%m-%d"
-    )
-
-
 @pytest.fixture(scope="module")
 def enforce_test_user_db_connection(django_db_setup, django_db_blocker):
     """Ensure tests use the test user for database connections."""
@@ -1065,7 +1058,7 @@ def integrations_fixture(providers_fixture):
         enabled=True,
         connected=True,
         integration_type="amazon_s3",
-        configuration={"key": "value1"},
+        configuration={"key": "value"},
         credentials={"psswd": "1234"},
     )
     IntegrationProviderRelationship.objects.create(

api/src/backend/tasks/beat.py

@@ -2,10 +2,10 @@ import json
 from datetime import datetime, timedelta, timezone
 
 from django_celery_beat.models import IntervalSchedule, PeriodicTask
+from rest_framework_json_api.serializers import ValidationError
 from tasks.tasks import perform_scheduled_scan_task
 
 from api.db_utils import rls_transaction
-from api.exceptions import ConflictException
 from api.models import Provider, Scan, StateChoices
 
 
@@ -24,9 +24,15 @@ def schedule_provider_scan(provider_instance: Provider):
     if PeriodicTask.objects.filter(
         interval=schedule, name=task_name, task="scan-perform-scheduled"
     ).exists():
-        raise ConflictException(
-            detail="There is already a scheduled scan for this provider.",
-            pointer="/data/attributes/provider_id",
+        raise ValidationError(
+            [
+                {
+                    "detail": "There is already a scheduled scan for this provider.",
+                    "status": 400,
+                    "source": {"pointer": "/data/attributes/provider_id"},
+                    "code": "invalid",
+                }
+            ]
         )
 
     with rls_transaction(tenant_id):

api/src/backend/tasks/jobs/connection.py

@@ -3,11 +3,8 @@ from datetime import datetime, timezone
 import openai
 from celery.utils.log import get_task_logger
 
-from api.models import Integration, LighthouseConfiguration, Provider
-from api.utils import (
-    prowler_integration_connection_test,
-    prowler_provider_connection_test,
-)
+from api.models import LighthouseConfiguration, Provider
+from api.utils import prowler_provider_connection_test
 
 logger = get_task_logger(__name__)
 
@@ -86,35 +83,3 @@ def check_lighthouse_connection(lighthouse_config_id: str):
         lighthouse_config.is_active = False
         lighthouse_config.save()
         return {"connected": False, "error": str(e), "available_models": []}
-
-
-def check_integration_connection(integration_id: str):
-    """
-    Business logic to check the connection status of an integration.
-
-    Args:
-        integration_id (str): The primary key of the Integration instance to check.
-    """
-    integration = Integration.objects.filter(pk=integration_id, enabled=True).first()
-
-    if not integration:
-        logger.info(f"Integration {integration_id} is not enabled")
-        return {"connected": False, "error": "Integration is not enabled"}
-
-    try:
-        result = prowler_integration_connection_test(integration)
-    except Exception as e:
-        logger.warning(
-            f"Unexpected exception checking {integration.integration_type} integration connection: {str(e)}"
-        )
-        raise e
-
-    # Update integration connection status
-    integration.connected = result.is_connected
-    integration.connection_last_checked_at = datetime.now(tz=timezone.utc)
-    integration.save()
-
-    return {
-        "connected": result.is_connected,
-        "error": str(result.error) if result.error else None,
-    }

api/src/backend/tasks/jobs/export.py

@@ -8,22 +8,18 @@ from botocore.exceptions import ClientError, NoCredentialsError, ParamValidation
 from celery.utils.log import get_task_logger
 from django.conf import settings
 
-from api.db_utils import rls_transaction
-from api.models import Scan
 from prowler.config.config import (
     csv_file_suffix,
     html_file_suffix,
-    json_asff_file_suffix,
     json_ocsf_file_suffix,
+    output_file_timestamp,
 )
-from prowler.lib.outputs.asff.asff import ASFF
 from prowler.lib.outputs.compliance.aws_well_architected.aws_well_architected import (
     AWSWellArchitected,
 )
 from prowler.lib.outputs.compliance.cis.cis_aws import AWSCIS
 from prowler.lib.outputs.compliance.cis.cis_azure import AzureCIS
 from prowler.lib.outputs.compliance.cis.cis_gcp import GCPCIS
-from prowler.lib.outputs.compliance.cis.cis_github import GithubCIS
 from prowler.lib.outputs.compliance.cis.cis_kubernetes import KubernetesCIS
 from prowler.lib.outputs.compliance.cis.cis_m365 import M365CIS
 from prowler.lib.outputs.compliance.ens.ens_aws import AWSENS
@@ -97,13 +93,6 @@ COMPLIANCE_CLASS_MAP = {
         (lambda name: name == "prowler_threatscore_m365", ProwlerThreatScoreM365),
         (lambda name: name.startswith("iso27001_"), M365ISO27001),
     ],
-    "github": [
-        (lambda name: name.startswith("cis_"), GithubCIS),
-    ],
-    "iac": [
-        # IaC provider doesn't have specific compliance frameworks yet
-        # Trivy handles its own compliance checks
-    ],
 }
 
 
@@ -115,7 +104,6 @@ OUTPUT_FORMATS_MAPPING = {
         "kwargs": {},
     },
     "json-ocsf": {"class": OCSF, "suffix": json_ocsf_file_suffix, "kwargs": {}},
-    "json-asff": {"class": ASFF, "suffix": json_asff_file_suffix, "kwargs": {}},
     "html": {"class": HTML, "suffix": html_file_suffix, "kwargs": {"stats": {}}},
 }
 
@@ -179,7 +167,7 @@ def get_s3_client():
     return s3_client
 
 
-def _upload_to_s3(tenant_id: str, zip_path: str, scan_id: str) -> str | None:
+def _upload_to_s3(tenant_id: str, zip_path: str, scan_id: str) -> str:
     """
     Upload the specified ZIP file to an S3 bucket.
     If the S3 bucket environment variables are not configured,
@@ -196,7 +184,7 @@ def _upload_to_s3(tenant_id: str, zip_path: str, scan_id: str) -> str | None:
     """
     bucket = base.DJANGO_OUTPUT_S3_AWS_OUTPUT_BUCKET
     if not bucket:
-        return
+        return None
 
     try:
         s3 = get_s3_client()
@@ -256,19 +244,15 @@ def _generate_output_directory(
     # Sanitize the prowler provider name to ensure it is a valid directory name
     prowler_provider_sanitized = re.sub(r"[^\w\-]", "-", prowler_provider)
 
-    with rls_transaction(tenant_id):
-        started_at = Scan.objects.get(id=scan_id).started_at
-
-    timestamp = started_at.strftime("%Y%m%d%H%M%S")
     path = (
         f"{output_directory}/{tenant_id}/{scan_id}/prowler-output-"
-        f"{prowler_provider_sanitized}-{timestamp}"
+        f"{prowler_provider_sanitized}-{output_file_timestamp}"
     )
     os.makedirs("/".join(path.split("/")[:-1]), exist_ok=True)
 
     compliance_path = (
         f"{output_directory}/{tenant_id}/{scan_id}/compliance/prowler-output-"
-        f"{prowler_provider_sanitized}-{timestamp}"
+        f"{prowler_provider_sanitized}-{output_file_timestamp}"
     )
     os.makedirs("/".join(compliance_path.split("/")[:-1]), exist_ok=True)
 

api/src/backend/tasks/jobs/integrations.py

@@ -1,506 +0,0 @@
-import os
-from glob import glob
-
-from celery.utils.log import get_task_logger
-from config.django.base import DJANGO_FINDINGS_BATCH_SIZE
-from tasks.utils import batched
-
-from api.db_utils import rls_transaction
-from api.models import Finding, Integration, Provider
-from api.utils import initialize_prowler_integration, initialize_prowler_provider
-from prowler.lib.outputs.asff.asff import ASFF
-from prowler.lib.outputs.compliance.generic.generic import GenericCompliance
-from prowler.lib.outputs.csv.csv import CSV
-from prowler.lib.outputs.finding import Finding as FindingOutput
-from prowler.lib.outputs.html.html import HTML
-from prowler.lib.outputs.ocsf.ocsf import OCSF
-from prowler.providers.aws.aws_provider import AwsProvider
-from prowler.providers.aws.lib.s3.s3 import S3
-from prowler.providers.aws.lib.security_hub.security_hub import SecurityHub
-from prowler.providers.common.models import Connection
-
-logger = get_task_logger(__name__)
-
-
-def get_s3_client_from_integration(
-    integration: Integration,
-) -> tuple[bool, S3 | Connection]:
-    """
-    Create and return a boto3 S3 client using AWS credentials from an integration.
-
-    Args:
-        integration (Integration): The integration to get the S3 client from.
-
-    Returns:
-        tuple[bool, S3 | Connection]: A tuple containing a boolean indicating if the connection was successful and the S3 client or connection object.
-    """
-    s3 = S3(
-        **integration.credentials,
-        bucket_name=integration.configuration["bucket_name"],
-        output_directory=integration.configuration["output_directory"],
-    )
-
-    connection = s3.test_connection(
-        **integration.credentials,
-        bucket_name=integration.configuration["bucket_name"],
-    )
-
-    if connection.is_connected:
-        return True, s3
-
-    return False, connection
-
-
-def upload_s3_integration(
-    tenant_id: str, provider_id: str, output_directory: str
-) -> bool:
-    """
-    Upload the specified output files to an S3 bucket from an integration.
-    Reconstructs output objects from files in the output directory instead of using serialized data.
-
-    Args:
-        tenant_id (str): The tenant identifier, used as part of the S3 key prefix.
-        provider_id (str): The provider identifier, used as part of the S3 key prefix.
-        output_directory (str): Path to the directory containing output files.
-
-    Returns:
-        bool: True if all integrations were executed, False otherwise.
-
-    Raises:
-        botocore.exceptions.ClientError: If the upload attempt to S3 fails for any reason.
-    """
-    logger.info(f"Processing S3 integrations for provider {provider_id}")
-
-    try:
-        with rls_transaction(tenant_id):
-            integrations = list(
-                Integration.objects.filter(
-                    integrationproviderrelationship__provider_id=provider_id,
-                    integration_type=Integration.IntegrationChoices.AMAZON_S3,
-                    enabled=True,
-                )
-            )
-
-        if not integrations:
-            logger.error(f"No S3 integrations found for provider {provider_id}")
-            return False
-
-        integration_executions = 0
-        for integration in integrations:
-            try:
-                connected, s3 = get_s3_client_from_integration(integration)
-            except Exception as e:
-                logger.info(
-                    f"S3 connection failed for integration {integration.id}: {e}"
-                )
-                integration.connected = False
-                integration.save()
-                continue
-
-            if connected:
-                try:
-                    # Reconstruct generated_outputs from files in output directory
-                    # This approach scans the output directory for files and creates the appropriate
-                    # output objects based on file extensions and naming patterns.
-                    generated_outputs = {"regular": [], "compliance": []}
-
-                    # Find and recreate regular outputs (CSV, HTML, OCSF)
-                    output_file_patterns = {
-                        ".csv": CSV,
-                        ".html": HTML,
-                        ".ocsf.json": OCSF,
-                        ".asff.json": ASFF,
-                    }
-
-                    base_dir = os.path.dirname(output_directory)
-                    for extension, output_class in output_file_patterns.items():
-                        pattern = f"{output_directory}*{extension}"
-                        for file_path in glob(pattern):
-                            if os.path.exists(file_path):
-                                output = output_class(findings=[], file_path=file_path)
-                                output.create_file_descriptor(file_path)
-                                generated_outputs["regular"].append(output)
-
-                    # Find and recreate compliance outputs
-                    compliance_pattern = os.path.join(base_dir, "compliance", "*.csv")
-                    for file_path in glob(compliance_pattern):
-                        if os.path.exists(file_path):
-                            output = GenericCompliance(
-                                findings=[],
-                                compliance=None,
-                                file_path=file_path,
-                                file_extension=".csv",
-                            )
-                            output.create_file_descriptor(file_path)
-                            generated_outputs["compliance"].append(output)
-
-                    # Use send_to_bucket with recreated generated_outputs objects
-                    s3.send_to_bucket(generated_outputs)
-                except Exception as e:
-                    logger.error(
-                        f"S3 upload failed for integration {integration.id}: {e}"
-                    )
-                    continue
-                integration_executions += 1
-            else:
-                integration.connected = False
-                integration.save()
-                logger.error(
-                    f"S3 upload failed, connection failed for integration {integration.id}: {s3.error}"
-                )
-
-        result = integration_executions == len(integrations)
-        if result:
-            logger.info(
-                f"All the S3 integrations completed successfully for provider {provider_id}"
-            )
-        else:
-            logger.info(f"Some S3 integrations failed for provider {provider_id}")
-        return result
-    except Exception as e:
-        logger.error(f"S3 integrations failed for provider {provider_id}: {str(e)}")
-        return False
-
-
-def get_security_hub_client_from_integration(
-    integration: Integration, tenant_id: str, findings: list
-) -> tuple[bool, SecurityHub | Connection]:
-    """
-    Create and return a SecurityHub client using AWS credentials from an integration.
-
-    Args:
-        integration (Integration): The integration to get the Security Hub client from.
-        tenant_id (str): The tenant identifier.
-        findings (list): List of findings in ASFF format to send to Security Hub.
-
-    Returns:
-        tuple[bool, SecurityHub | Connection]: A tuple containing a boolean indicating
-        if the connection was successful and the SecurityHub client or connection object.
-    """
-    # Get the provider associated with this integration
-    with rls_transaction(tenant_id):
-        provider_relationship = integration.integrationproviderrelationship_set.first()
-        if not provider_relationship:
-            return Connection(
-                is_connected=False, error="No provider associated with this integration"
-            )
-        provider_uid = provider_relationship.provider.uid
-        provider_secret = provider_relationship.provider.secret.secret
-
-    credentials = (
-        integration.credentials if integration.credentials else provider_secret
-    )
-    connection = SecurityHub.test_connection(
-        aws_account_id=provider_uid,
-        raise_on_exception=False,
-        **credentials,
-    )
-
-    if connection.is_connected:
-        all_security_hub_regions = AwsProvider.get_available_aws_service_regions(
-            "securityhub", connection.partition
-        )
-
-        # Create regions status dictionary
-        regions_status = {}
-        for region in set(all_security_hub_regions):
-            regions_status[region] = region in connection.enabled_regions
-
-        # Save regions information in the integration configuration
-        with rls_transaction(tenant_id):
-            integration.configuration["regions"] = regions_status
-            integration.save()
-
-        # Create SecurityHub client with all necessary parameters
-        security_hub = SecurityHub(
-            aws_account_id=provider_uid,
-            findings=findings,
-            send_only_fails=integration.configuration.get("send_only_fails", False),
-            aws_security_hub_available_regions=list(connection.enabled_regions),
-            **credentials,
-        )
-        return True, security_hub
-    else:
-        # Reset regions information if connection fails
-        with rls_transaction(tenant_id):
-            integration.configuration["regions"] = {}
-            integration.save()
-
-    return False, connection
-
-
-def upload_security_hub_integration(
-    tenant_id: str, provider_id: str, scan_id: str
-) -> bool:
-    """
-    Upload findings to AWS Security Hub using configured integrations.
-
-    This function retrieves findings from the database, transforms them to ASFF format,
-    and sends them to AWS Security Hub using the configured integration credentials.
-
-    Args:
-        tenant_id (str): The tenant identifier.
-        provider_id (str): The provider identifier.
-        scan_id (str): The scan identifier for which to send findings.
-
-    Returns:
-        bool: True if all integrations executed successfully, False otherwise.
-    """
-    logger.info(f"Processing Security Hub integrations for provider {provider_id}")
-
-    try:
-        with rls_transaction(tenant_id):
-            # Get Security Hub integrations for this provider
-            integrations = list(
-                Integration.objects.filter(
-                    integrationproviderrelationship__provider_id=provider_id,
-                    integration_type=Integration.IntegrationChoices.AWS_SECURITY_HUB,
-                    enabled=True,
-                )
-            )
-
-            if not integrations:
-                logger.error(
-                    f"No Security Hub integrations found for provider {provider_id}"
-                )
-                return False
-
-            # Get the provider object
-            provider = Provider.objects.get(id=provider_id)
-
-            # Initialize prowler provider for finding transformation
-            prowler_provider = initialize_prowler_provider(provider)
-
-        # Process each Security Hub integration
-        integration_executions = 0
-        total_findings_sent = {}  # Track findings sent per integration
-
-        for integration in integrations:
-            try:
-                # Initialize Security Hub client for this integration
-                # We'll create the client once and reuse it for all batches
-                security_hub_client = None
-                send_only_fails = integration.configuration.get(
-                    "send_only_fails", False
-                )
-                total_findings_sent[integration.id] = 0
-
-                # Process findings in batches to avoid memory issues
-                has_findings = False
-                batch_number = 0
-
-                with rls_transaction(tenant_id):
-                    qs = (
-                        Finding.all_objects.filter(tenant_id=tenant_id, scan_id=scan_id)
-                        .order_by("uid")
-                        .iterator()
-                    )
-
-                    for batch, _ in batched(qs, DJANGO_FINDINGS_BATCH_SIZE):
-                        batch_number += 1
-                        has_findings = True
-
-                        # Transform findings for this batch
-                        transformed_findings = [
-                            FindingOutput.transform_api_finding(
-                                finding, prowler_provider
-                            )
-                            for finding in batch
-                        ]
-
-                        # Convert to ASFF format
-                        asff_transformer = ASFF(
-                            findings=transformed_findings,
-                            file_path="",
-                            file_extension="json",
-                        )
-                        asff_transformer.transform(transformed_findings)
-
-                        # Get the batch of ASFF findings
-                        batch_asff_findings = asff_transformer.data
-
-                        if batch_asff_findings:
-                            # Create Security Hub client for first batch or reuse existing
-                            if not security_hub_client:
-                                connected, security_hub = (
-                                    get_security_hub_client_from_integration(
-                                        integration, tenant_id, batch_asff_findings
-                                    )
-                                )
-
-                                if not connected:
-                                    logger.error(
-                                        f"Security Hub connection failed for integration {integration.id}: "
-                                        f"{security_hub.error}"
-                                    )
-                                    integration.connected = False
-                                    integration.save()
-                                    break  # Skip this integration
-
-                                security_hub_client = security_hub
-                                logger.info(
-                                    f"Sending {'fail' if send_only_fails else 'all'} findings to Security Hub via "
-                                    f"integration {integration.id}"
-                                )
-                            else:
-                                # Update findings in existing client for this batch
-                                security_hub_client._findings_per_region = (
-                                    security_hub_client.filter(
-                                        batch_asff_findings, send_only_fails
-                                    )
-                                )
-
-                            # Send this batch to Security Hub
-                            try:
-                                findings_sent = (
-                                    security_hub_client.batch_send_to_security_hub()
-                                )
-                                total_findings_sent[integration.id] += findings_sent
-
-                                if findings_sent > 0:
-                                    logger.debug(
-                                        f"Sent batch {batch_number} with {findings_sent} findings to Security Hub"
-                                    )
-                            except Exception as batch_error:
-                                logger.error(
-                                    f"Failed to send batch {batch_number} to Security Hub: {str(batch_error)}"
-                                )
-
-                        # Clear memory after processing each batch
-                        asff_transformer._data.clear()
-                        del batch_asff_findings
-                        del transformed_findings
-
-                if not has_findings:
-                    logger.info(
-                        f"No findings to send to Security Hub for scan {scan_id}"
-                    )
-                    integration_executions += 1
-                elif security_hub_client:
-                    if total_findings_sent[integration.id] > 0:
-                        logger.info(
-                            f"Successfully sent {total_findings_sent[integration.id]} total findings to Security Hub via integration {integration.id}"
-                        )
-                        integration_executions += 1
-                    else:
-                        logger.warning(
-                            f"No findings were sent to Security Hub via integration {integration.id}"
-                        )
-
-                    # Archive previous findings if configured to do so
-                    if integration.configuration.get(
-                        "archive_previous_findings", False
-                    ):
-                        logger.info(
-                            f"Archiving previous findings in Security Hub via integration {integration.id}"
-                        )
-                        try:
-                            findings_archived = (
-                                security_hub_client.archive_previous_findings()
-                            )
-                            logger.info(
-                                f"Successfully archived {findings_archived} previous findings in Security Hub"
-                            )
-                        except Exception as archive_error:
-                            logger.warning(
-                                f"Failed to archive previous findings: {str(archive_error)}"
-                            )
-
-            except Exception as e:
-                logger.error(
-                    f"Security Hub integration {integration.id} failed: {str(e)}"
-                )
-                continue
-
-        result = integration_executions == len(integrations)
-        if result:
-            logger.info(
-                f"All Security Hub integrations completed successfully for provider {provider_id}"
-            )
-        else:
-            logger.error(
-                f"Some Security Hub integrations failed for provider {provider_id}"
-            )
-
-        return result
-
-    except Exception as e:
-        logger.error(
-            f"Security Hub integrations failed for provider {provider_id}: {str(e)}"
-        )
-        return False
-
-
-def send_findings_to_jira(
-    tenant_id: str,
-    integration_id: str,
-    project_key: str,
-    issue_type: str,
-    finding_ids: list[str],
-):
-    with rls_transaction(tenant_id):
-        integration = Integration.objects.get(id=integration_id)
-        jira_integration = initialize_prowler_integration(integration)
-
-    num_tickets_created = 0
-    for finding_id in finding_ids:
-        with rls_transaction(tenant_id):
-            finding_instance = (
-                Finding.all_objects.select_related("scan__provider")
-                .prefetch_related("resources")
-                .get(id=finding_id)
-            )
-
-            # Extract resource information
-            resource = (
-                finding_instance.resources.first()
-                if finding_instance.resources.exists()
-                else None
-            )
-            resource_uid = resource.uid if resource else ""
-            resource_name = resource.name if resource else ""
-            resource_tags = {}
-            if resource and hasattr(resource, "tags"):
-                resource_tags = resource.get_tags(tenant_id)
-
-            # Get region
-            region = resource.region if resource and resource.region else ""
-
-            # Extract remediation information from check_metadata
-            check_metadata = finding_instance.check_metadata
-            remediation = check_metadata.get("remediation", {})
-            recommendation = remediation.get("recommendation", {})
-            remediation_code = remediation.get("code", {})
-
-            # Send the individual finding to Jira
-            result = jira_integration.send_finding(
-                check_id=finding_instance.check_id,
-                check_title=check_metadata.get("checktitle", ""),
-                severity=finding_instance.severity,
-                status=finding_instance.status,
-                status_extended=finding_instance.status_extended or "",
-                provider=finding_instance.scan.provider.provider,
-                region=region,
-                resource_uid=resource_uid,
-                resource_name=resource_name,
-                risk=check_metadata.get("risk", ""),
-                recommendation_text=recommendation.get("text", ""),
-                recommendation_url=recommendation.get("url", ""),
-                remediation_code_native_iac=remediation_code.get("nativeiac", ""),
-                remediation_code_terraform=remediation_code.get("terraform", ""),
-                remediation_code_cli=remediation_code.get("cli", ""),
-                remediation_code_other=remediation_code.get("other", ""),
-                resource_tags=resource_tags,
-                compliance=finding_instance.compliance or {},
-                project_key=project_key,
-                issue_type=issue_type,
-            )
-            if result:
-                num_tickets_created += 1
-            else:
-                logger.error(f"Failed to send finding {finding_id} to Jira")
-
-    return {
-        "created_count": num_tickets_created,
-        "failed_count": len(finding_ids) - num_tickets_created,
-    }

api/src/backend/tasks/jobs/scan.py

@@ -1,24 +1,19 @@
 import json
 import time
-from collections import defaultdict
 from copy import deepcopy
 from datetime import datetime, timezone
 
 from celery.utils.log import get_task_logger
 from config.settings.celery import CELERY_DEADLOCK_ATTEMPTS
 from django.db import IntegrityError, OperationalError
-from django.db.models import Case, Count, IntegerField, Prefetch, Sum, When
+from django.db.models import Case, Count, IntegerField, OuterRef, Subquery, Sum, When
 from tasks.utils import CustomEncoder
 
 from api.compliance import (
     PROWLER_COMPLIANCE_OVERVIEW_TEMPLATE,
     generate_scan_compliance,
 )
-from api.db_utils import (
-    create_objects_in_batches,
-    rls_transaction,
-    update_objects_in_batches,
-)
+from api.db_utils import create_objects_in_batches, rls_transaction
 from api.exceptions import ProviderConnectionError
 from api.models import (
     ComplianceRequirementOverview,
@@ -108,10 +103,7 @@ def _store_resources(
 
 
 def perform_prowler_scan(
-    tenant_id: str,
-    scan_id: str,
-    provider_id: str,
-    checks_to_execute: list[str] | None = None,
+    tenant_id: str, scan_id: str, provider_id: str, checks_to_execute: list[str] = None
 ):
     """
     Perform a scan using Prowler and store the findings and resources in the database.
@@ -183,7 +175,6 @@ def perform_prowler_scan(
         resource_cache = {}
         tag_cache = {}
         last_status_cache = {}
-        resource_failed_findings_cache = defaultdict(int)
 
         for progress, findings in prowler_scan.scan():
             for finding in findings:
@@ -209,9 +200,6 @@ def perform_prowler_scan(
                                     },
                                 )
                                 resource_cache[resource_uid] = resource_instance
-
-                                # Initialize all processed resources in the cache
-                                resource_failed_findings_cache[resource_uid] = 0
                             else:
                                 resource_instance = resource_cache[resource_uid]
 
@@ -325,11 +313,6 @@ def perform_prowler_scan(
                     )
                     finding_instance.add_resources([resource_instance])
 
-                    # Increment failed_findings_count cache if the finding status is FAIL and not muted
-                    if status == FindingStatus.FAIL and not finding.muted:
-                        resource_uid = finding.resource_uid
-                        resource_failed_findings_cache[resource_uid] += 1
-
                 # Update scan resource summaries
                 scan_resource_cache.add(
                     (
@@ -347,24 +330,6 @@ def perform_prowler_scan(
 
         scan_instance.state = StateChoices.COMPLETED
 
-        # Update failed_findings_count for all resources in batches if scan completed successfully
-        if resource_failed_findings_cache:
-            resources_to_update = []
-            for resource_uid, failed_count in resource_failed_findings_cache.items():
-                if resource_uid in resource_cache:
-                    resource_instance = resource_cache[resource_uid]
-                    resource_instance.failed_findings_count = failed_count
-                    resources_to_update.append(resource_instance)
-
-            if resources_to_update:
-                update_objects_in_batches(
-                    tenant_id=tenant_id,
-                    model=Resource,
-                    objects=resources_to_update,
-                    fields=["failed_findings_count"],
-                    batch_size=1000,
-                )
-
     except Exception as e:
         logger.error(f"Error performing scan {scan_id}: {e}")
         exception = e
@@ -411,6 +376,7 @@ def perform_prowler_scan(
 def aggregate_findings(tenant_id: str, scan_id: str):
     """
     Aggregates findings for a given scan and stores the results in the ScanSummary table.
+    Also updates the failed_findings_count for each resource based on the latest findings.
 
     This function retrieves all findings associated with a given `scan_id` and calculates various
     metrics such as counts of failed, passed, and muted findings, as well as their deltas (new,
@@ -439,6 +405,8 @@ def aggregate_findings(tenant_id: str, scan_id: str):
         - muted_new: Muted findings with a delta of 'new'.
         - muted_changed: Muted findings with a delta of 'changed'.
     """
+    _update_resource_failed_findings_count(tenant_id, scan_id)
+
     with rls_transaction(tenant_id):
         findings = Finding.objects.filter(tenant_id=tenant_id, scan_id=scan_id)
 
@@ -563,6 +531,53 @@ def aggregate_findings(tenant_id: str, scan_id: str):
         ScanSummary.objects.bulk_create(scan_aggregations, batch_size=3000)
 
 
+def _update_resource_failed_findings_count(tenant_id: str, scan_id: str):
+    """
+    Update the failed_findings_count field for resources based on the latest findings.
+
+    This function calculates the number of failed findings for each resource by:
+    1. Getting the latest finding for each finding.uid
+    2. Counting failed findings per resource
+    3. Updating the failed_findings_count field for each resource
+
+    Args:
+        tenant_id (str): The ID of the tenant to which the scan belongs.
+        scan_id (str): The ID of the scan for which to update resource counts.
+    """
+
+    with rls_transaction(tenant_id):
+        scan = Scan.objects.get(pk=scan_id)
+        provider_id = scan.provider_id
+
+        resources = list(
+            Resource.all_objects.filter(tenant_id=tenant_id, provider_id=provider_id)
+        )
+
+    # For each resource, calculate failed findings count based on latest findings
+    for resource in resources:
+        with rls_transaction(tenant_id):
+            # Get the latest finding for each finding.uid that affects this resource
+            latest_findings_subquery = (
+                Finding.all_objects.filter(
+                    tenant_id=tenant_id, uid=OuterRef("uid"), resources=resource
+                )
+                .order_by("-inserted_at")
+                .values("id")[:1]
+            )
+
+            # Count failed findings from the latest findings
+            failed_count = Finding.all_objects.filter(
+                tenant_id=tenant_id,
+                resources=resource,
+                id__in=Subquery(latest_findings_subquery),
+                status=FindingStatus.FAIL,
+                muted=False,
+            ).count()
+
+            resource.failed_findings_count = failed_count
+            resource.save(update_fields=["failed_findings_count"])
+
+
 def create_compliance_requirements(tenant_id: str, scan_id: str):
     """
     Create detailed compliance requirement overview records for a scan.
@@ -588,27 +603,18 @@ def create_compliance_requirements(tenant_id: str, scan_id: str):
             prowler_provider = return_prowler_provider(provider_instance)
 
         # Get check status data by region from findings
-        findings = (
-            Finding.all_objects.filter(scan_id=scan_id, muted=False)
-            .only("id", "check_id", "status")
-            .prefetch_related(
-                Prefetch(
-                    "resources",
-                    queryset=Resource.objects.only("id", "region"),
-                    to_attr="small_resources",
-                )
-            )
-            .iterator(chunk_size=1000)
-        )
-
         check_status_by_region = {}
         with rls_transaction(tenant_id):
+            findings = Finding.objects.filter(scan_id=scan_id, muted=False)
             for finding in findings:
-                for resource in finding.small_resources:
+                # Get region from resources
+                for resource in finding.resources.all():
                     region = resource.region
-                    current_status = check_status_by_region.setdefault(region, {})
-                    if current_status.get(finding.check_id) != "FAIL":
-                        current_status[finding.check_id] = finding.status
+                    region_dict = check_status_by_region.setdefault(region, {})
+                    current_status = region_dict.get(finding.check_id)
+                    if current_status == "FAIL":
+                        continue
+                    region_dict[finding.check_id] = finding.status
 
         try:
             # Try to get regions from provider

api/src/backend/tasks/tasks.py

@@ -2,17 +2,13 @@ from datetime import datetime, timedelta, timezone
 from pathlib import Path
 from shutil import rmtree
 
-from celery import chain, group, shared_task
+from celery import chain, shared_task
 from celery.utils.log import get_task_logger
 from config.celery import RLSTask
 from config.django.base import DJANGO_FINDINGS_BATCH_SIZE, DJANGO_TMP_OUTPUT_DIRECTORY
 from django_celery_beat.models import PeriodicTask
 from tasks.jobs.backfill import backfill_resource_scan_summaries
-from tasks.jobs.connection import (
-    check_integration_connection,
-    check_lighthouse_connection,
-    check_provider_connection,
-)
+from tasks.jobs.connection import check_lighthouse_connection, check_provider_connection
 from tasks.jobs.deletion import delete_provider, delete_tenant
 from tasks.jobs.export import (
     COMPLIANCE_CLASS_MAP,
@@ -21,11 +17,6 @@ from tasks.jobs.export import (
     _generate_output_directory,
     _upload_to_s3,
 )
-from tasks.jobs.integrations import (
-    send_findings_to_jira,
-    upload_s3_integration,
-    upload_security_hub_integration,
-)
 from tasks.jobs.scan import (
     aggregate_findings,
     create_compliance_requirements,
@@ -36,7 +27,7 @@ from tasks.utils import batched, get_next_execution_datetime
 from api.compliance import get_compliance_frameworks
 from api.db_utils import rls_transaction
 from api.decorators import set_tenant
-from api.models import Finding, Integration, Provider, Scan, ScanSummary, StateChoices
+from api.models import Finding, Provider, Scan, ScanSummary, StateChoices
 from api.utils import initialize_prowler_provider
 from api.v1.serializers import ScanTaskSerializer
 from prowler.lib.check.compliance_models import Compliance
@@ -63,11 +54,6 @@ def _perform_scan_complete_tasks(tenant_id: str, scan_id: str, provider_id: str)
         generate_outputs_task.si(
             scan_id=scan_id, provider_id=provider_id, tenant_id=tenant_id
         ),
-        check_integrations_task.si(
-            tenant_id=tenant_id,
-            provider_id=provider_id,
-            scan_id=scan_id,
-        ),
     ).apply_async()
 
 
@@ -88,18 +74,6 @@ def check_provider_connection_task(provider_id: str):
     return check_provider_connection(provider_id=provider_id)
 
 
-@shared_task(base=RLSTask, name="integration-connection-check")
-@set_tenant
-def check_integration_connection_task(integration_id: str):
-    """
-    Task to check the connection status of an integration.
-
-    Args:
-        integration_id (str): The primary key of the Integration instance to check.
-    """
-    return check_integration_connection(integration_id=integration_id)
-
-
 @shared_task(
     base=RLSTask, name="provider-deletion", queue="deletion", autoretry_for=(Exception,)
 )
@@ -328,30 +302,12 @@ def generate_outputs_task(scan_id: str, provider_id: str, tenant_id: str):
         ScanSummary.objects.filter(scan_id=scan_id)
     )
 
-    # Check if we need to generate ASFF output for AWS providers with SecurityHub integration
-    generate_asff = False
-    if provider_type == "aws":
-        security_hub_integrations = Integration.objects.filter(
-            integrationproviderrelationship__provider_id=provider_id,
-            integration_type=Integration.IntegrationChoices.AWS_SECURITY_HUB,
-            enabled=True,
-        )
-        generate_asff = security_hub_integrations.exists()
-
-    qs = (
-        Finding.all_objects.filter(tenant_id=tenant_id, scan_id=scan_id)
-        .order_by("uid")
-        .iterator()
-    )
+    qs = Finding.all_objects.filter(scan_id=scan_id).order_by("uid").iterator()
     for batch, is_last in batched(qs, DJANGO_FINDINGS_BATCH_SIZE):
         fos = [FindingOutput.transform_api_finding(f, prowler_provider) for f in batch]
 
         # Outputs
         for mode, cfg in OUTPUT_FORMATS_MAPPING.items():
-            # Skip ASFF generation if not needed
-            if mode == "json-asff" and not generate_asff:
-                continue
-
             cls = cfg["class"]
             suffix = cfg["suffix"]
             extra = cfg.get("kwargs", {}).copy()
@@ -405,34 +361,7 @@ def generate_outputs_task(scan_id: str, provider_id: str, tenant_id: str):
     compressed = _compress_output_files(out_dir)
     upload_uri = _upload_to_s3(tenant_id, compressed, scan_id)
 
-    # S3 integrations (need output_directory)
-    with rls_transaction(tenant_id):
-        s3_integrations = Integration.objects.filter(
-            integrationproviderrelationship__provider_id=provider_id,
-            integration_type=Integration.IntegrationChoices.AMAZON_S3,
-            enabled=True,
-        )
-
-    if s3_integrations:
-        # Pass the output directory path to S3 integration task to reconstruct objects from files
-        s3_integration_task.apply_async(
-            kwargs={
-                "tenant_id": tenant_id,
-                "provider_id": provider_id,
-                "output_directory": out_dir,
-            }
-        ).get(
-            disable_sync_subtasks=False
-        )  # TODO: This synchronous execution is NOT recommended
-        # We're forced to do this because we need the files to exist before deletion occurs.
-        # Once we have the periodic file cleanup task implemented, we should:
-        # 1. Remove this .get() call and make it fully async
-        # 2. For Cloud deployments, develop a secondary approach where outputs are stored
-        #    directly in S3 and read from there, eliminating local file dependencies
-
     if upload_uri:
-        # TODO: We need to create a new periodic task to delete the output files
-        # This task shouldn't be responsible for deleting the output files
         try:
             rmtree(Path(compressed).parent, ignore_errors=True)
         except Exception as e:
@@ -443,10 +372,7 @@ def generate_outputs_task(scan_id: str, provider_id: str, tenant_id: str):
 
     Scan.all_objects.filter(id=scan_id).update(output_location=final_location)
     logger.info(f"Scan outputs at {final_location}")
-
-    return {
-        "upload": did_upload,
-    }
+    return {"upload": did_upload}
 
 
 @shared_task(name="backfill-scan-resource-summaries", queue="backfill")
@@ -494,122 +420,3 @@ def check_lighthouse_connection_task(lighthouse_config_id: str, tenant_id: str =
             - 'available_models' (list): List of available models if connection is successful.
     """
     return check_lighthouse_connection(lighthouse_config_id=lighthouse_config_id)
-
-
-@shared_task(name="integration-check")
-def check_integrations_task(tenant_id: str, provider_id: str, scan_id: str = None):
-    """
-    Check and execute all configured integrations for a provider.
-
-    Args:
-        tenant_id (str): The tenant identifier
-        provider_id (str): The provider identifier
-        scan_id (str, optional): The scan identifier for integrations that need scan data
-    """
-    logger.info(f"Checking integrations for provider {provider_id}")
-
-    try:
-        integration_tasks = []
-        with rls_transaction(tenant_id):
-            integrations = Integration.objects.filter(
-                integrationproviderrelationship__provider_id=provider_id,
-                enabled=True,
-            )
-
-            if not integrations.exists():
-                logger.info(f"No integrations configured for provider {provider_id}")
-                return {"integrations_processed": 0}
-
-            # Security Hub integration
-            security_hub_integrations = integrations.filter(
-                integration_type=Integration.IntegrationChoices.AWS_SECURITY_HUB
-            )
-            if security_hub_integrations.exists():
-                integration_tasks.append(
-                    security_hub_integration_task.s(
-                        tenant_id=tenant_id, provider_id=provider_id, scan_id=scan_id
-                    )
-                )
-
-        # TODO: Add other integration types here
-        # slack_integrations = integrations.filter(
-        #     integration_type=Integration.IntegrationChoices.SLACK
-        # )
-        # if slack_integrations.exists():
-        #     integration_tasks.append(
-        #        slack_integration_task.s(
-        #            tenant_id=tenant_id,
-        #            provider_id=provider_id,
-        #        )
-        #     )
-
-    except Exception as e:
-        logger.error(f"Integration check failed for provider {provider_id}: {str(e)}")
-        return {"integrations_processed": 0, "error": str(e)}
-
-    # Execute all integration tasks in parallel if any were found
-    if integration_tasks:
-        job = group(integration_tasks)
-        job.apply_async()
-        logger.info(f"Launched {len(integration_tasks)} integration task(s)")
-
-    return {"integrations_processed": len(integration_tasks)}
-
-
-@shared_task(
-    base=RLSTask,
-    name="integration-s3",
-    queue="integrations",
-)
-def s3_integration_task(
-    tenant_id: str,
-    provider_id: str,
-    output_directory: str,
-):
-    """
-    Process S3 integrations for a provider.
-
-    Args:
-        tenant_id (str): The tenant identifier
-        provider_id (str): The provider identifier
-        output_directory (str): Path to the directory containing output files
-    """
-    return upload_s3_integration(tenant_id, provider_id, output_directory)
-
-
-@shared_task(
-    base=RLSTask,
-    name="integration-security-hub",
-    queue="integrations",
-)
-def security_hub_integration_task(
-    tenant_id: str,
-    provider_id: str,
-    scan_id: str,
-):
-    """
-    Process Security Hub integrations for a provider.
-
-    Args:
-        tenant_id (str): The tenant identifier
-        provider_id (str): The provider identifier
-        scan_id (str): The scan identifier
-    """
-    return upload_security_hub_integration(tenant_id, provider_id, scan_id)
-
-
-@shared_task(
-    base=RLSTask,
-    name="integration-jira",
-    queue="integrations",
-)
-def jira_integration_task(
-    tenant_id: str,
-    integration_id: str,
-    project_key: str,
-    issue_type: str,
-    finding_ids: list[str],
-):
-    return send_findings_to_jira(
-        tenant_id, integration_id, project_key, issue_type, finding_ids
-    )

api/src/backend/tasks/tests/test_beat.py

@@ -3,9 +3,9 @@ from unittest.mock import patch
 
 import pytest
 from django_celery_beat.models import IntervalSchedule, PeriodicTask
+from rest_framework_json_api.serializers import ValidationError
 from tasks.beat import schedule_provider_scan
 
-from api.exceptions import ConflictException
 from api.models import Scan
 
 
@@ -48,8 +48,8 @@ class TestScheduleProviderScan:
         with patch("tasks.tasks.perform_scheduled_scan_task.apply_async"):
             schedule_provider_scan(provider_instance)
 
-        # Now, try scheduling again, should raise ConflictException
-        with pytest.raises(ConflictException) as exc_info:
+        # Now, try scheduling again, should raise ValidationError
+        with pytest.raises(ValidationError) as exc_info:
             schedule_provider_scan(provider_instance)
 
         assert "There is already a scheduled scan for this provider." in str(

api/src/backend/tasks/tests/test_connection.py

@@ -1,15 +1,10 @@
-import uuid
 from datetime import datetime, timezone
 from unittest.mock import MagicMock, patch
 
 import pytest
-from tasks.jobs.connection import (
-    check_integration_connection,
-    check_lighthouse_connection,
-    check_provider_connection,
-)
+from tasks.jobs.connection import check_lighthouse_connection, check_provider_connection
 
-from api.models import Integration, LighthouseConfiguration, Provider
+from api.models import LighthouseConfiguration, Provider
 
 
 @pytest.mark.parametrize(
@@ -132,128 +127,3 @@ def test_check_lighthouse_connection_missing_api_key(mock_lighthouse_get):
     assert result["available_models"] == []
     assert mock_lighthouse_instance.is_active is False
     mock_lighthouse_instance.save.assert_called_once()
-
-
-@pytest.mark.django_db
-class TestCheckIntegrationConnection:
-    def setup_method(self):
-        self.integration_id = str(uuid.uuid4())
-
-    @patch("tasks.jobs.connection.Integration.objects.filter")
-    @patch("tasks.jobs.connection.prowler_integration_connection_test")
-    def test_check_integration_connection_success(
-        self, mock_prowler_test, mock_integration_filter
-    ):
-        """Test successful integration connection check with enabled=True filter."""
-        mock_integration = MagicMock()
-        mock_integration.id = self.integration_id
-        mock_integration.integration_type = Integration.IntegrationChoices.AMAZON_S3
-
-        mock_queryset = MagicMock()
-        mock_queryset.first.return_value = mock_integration
-        mock_integration_filter.return_value = mock_queryset
-
-        mock_connection_result = MagicMock()
-        mock_connection_result.is_connected = True
-        mock_connection_result.error = None
-        mock_prowler_test.return_value = mock_connection_result
-
-        result = check_integration_connection(integration_id=self.integration_id)
-
-        # Verify that Integration.objects.filter was called with enabled=True filter
-        mock_integration_filter.assert_called_once_with(
-            pk=self.integration_id, enabled=True
-        )
-        mock_queryset.first.assert_called_once()
-        mock_prowler_test.assert_called_once_with(mock_integration)
-
-        # Verify the integration properties were updated
-        assert mock_integration.connected is True
-        assert mock_integration.connection_last_checked_at is not None
-        mock_integration.save.assert_called_once()
-
-        # Verify the return value
-        assert result["connected"] is True
-        assert result["error"] is None
-
-    @patch("tasks.jobs.connection.Integration.objects.filter")
-    @patch("tasks.jobs.connection.prowler_integration_connection_test")
-    def test_check_integration_connection_failure(
-        self, mock_prowler_test, mock_integration_filter
-    ):
-        """Test failed integration connection check."""
-        mock_integration = MagicMock()
-        mock_integration.id = self.integration_id
-
-        mock_queryset = MagicMock()
-        mock_queryset.first.return_value = mock_integration
-        mock_integration_filter.return_value = mock_queryset
-
-        test_error = Exception("Connection failed")
-        mock_connection_result = MagicMock()
-        mock_connection_result.is_connected = False
-        mock_connection_result.error = test_error
-        mock_prowler_test.return_value = mock_connection_result
-
-        result = check_integration_connection(integration_id=self.integration_id)
-
-        # Verify that Integration.objects.filter was called with enabled=True filter
-        mock_integration_filter.assert_called_once_with(
-            pk=self.integration_id, enabled=True
-        )
-        mock_queryset.first.assert_called_once()
-
-        # Verify the integration properties were updated
-        assert mock_integration.connected is False
-        assert mock_integration.connection_last_checked_at is not None
-        mock_integration.save.assert_called_once()
-
-        # Verify the return value
-        assert result["connected"] is False
-        assert result["error"] == str(test_error)
-
-    @patch("tasks.jobs.connection.Integration.objects.filter")
-    def test_check_integration_connection_not_enabled(self, mock_integration_filter):
-        """Test that disabled integrations return proper error response."""
-        # Mock that no enabled integration is found
-        mock_queryset = MagicMock()
-        mock_queryset.first.return_value = None
-        mock_integration_filter.return_value = mock_queryset
-
-        result = check_integration_connection(integration_id=self.integration_id)
-
-        # Verify the filter was called with enabled=True
-        mock_integration_filter.assert_called_once_with(
-            pk=self.integration_id, enabled=True
-        )
-        mock_queryset.first.assert_called_once()
-
-        # Verify the return value matches the expected error response
-        assert result["connected"] is False
-        assert result["error"] == "Integration is not enabled"
-
-    @patch("tasks.jobs.connection.Integration.objects.filter")
-    @patch("tasks.jobs.connection.prowler_integration_connection_test")
-    def test_check_integration_connection_exception(
-        self, mock_prowler_test, mock_integration_filter
-    ):
-        """Test integration connection check when prowler test raises exception."""
-        mock_integration = MagicMock()
-        mock_integration.id = self.integration_id
-
-        mock_queryset = MagicMock()
-        mock_queryset.first.return_value = mock_integration
-        mock_integration_filter.return_value = mock_queryset
-
-        test_exception = Exception("Unexpected error during connection test")
-        mock_prowler_test.side_effect = test_exception
-
-        with pytest.raises(Exception, match="Unexpected error during connection test"):
-            check_integration_connection(integration_id=self.integration_id)
-
-        # Verify that Integration.objects.filter was called with enabled=True filter
-        mock_integration_filter.assert_called_once_with(
-            pk=self.integration_id, enabled=True
-        )
-        mock_queryset.first.assert_called_once()
-        mock_prowler_test.assert_called_once_with(mock_integration)

api/src/backend/tasks/tests/test_export.py

@@ -1,7 +1,5 @@
 import os
-import uuid
 import zipfile
-from datetime import datetime
 from pathlib import Path
 from unittest.mock import MagicMock, patch
 
@@ -129,26 +127,14 @@ class TestOutputs:
         _upload_to_s3("tenant", str(zip_path), "scan")
         mock_logger.assert_called()
 
-    @patch("tasks.jobs.export.rls_transaction")
-    @patch("tasks.jobs.export.Scan")
-    def test_generate_output_directory_creates_paths(
-        self, mock_scan, mock_rls_transaction, tmpdir
-    ):
-        # Mock the scan object with a started_at timestamp
-        mock_scan_instance = MagicMock()
-        mock_scan_instance.started_at = datetime(2023, 6, 15, 10, 30, 45)
-        mock_scan.objects.get.return_value = mock_scan_instance
-
-        # Mock rls_transaction as a context manager
-        mock_rls_transaction.return_value.__enter__ = MagicMock()
-        mock_rls_transaction.return_value.__exit__ = MagicMock(return_value=False)
+    def test_generate_output_directory_creates_paths(self, tmpdir):
+        from prowler.config.config import output_file_timestamp
 
         base_tmp = Path(str(tmpdir.mkdir("generate_output")))
         base_dir = str(base_tmp)
-        tenant_id = str(uuid.uuid4())
-        scan_id = str(uuid.uuid4())
+        tenant_id = "t1"
+        scan_id = "s1"
         provider = "aws"
-        expected_timestamp = "20230615103045"
 
         path, compliance = _generate_output_directory(
             base_dir, provider, tenant_id, scan_id
@@ -157,29 +143,17 @@ class TestOutputs:
         assert os.path.isdir(os.path.dirname(path))
         assert os.path.isdir(os.path.dirname(compliance))
 
-        assert path.endswith(f"{provider}-{expected_timestamp}")
-        assert compliance.endswith(f"{provider}-{expected_timestamp}")
+        assert path.endswith(f"{provider}-{output_file_timestamp}")
+        assert compliance.endswith(f"{provider}-{output_file_timestamp}")
 
-    @patch("tasks.jobs.export.rls_transaction")
-    @patch("tasks.jobs.export.Scan")
-    def test_generate_output_directory_invalid_character(
-        self, mock_scan, mock_rls_transaction, tmpdir
-    ):
-        # Mock the scan object with a started_at timestamp
-        mock_scan_instance = MagicMock()
-        mock_scan_instance.started_at = datetime(2023, 6, 15, 10, 30, 45)
-        mock_scan.objects.get.return_value = mock_scan_instance
-
-        # Mock rls_transaction as a context manager
-        mock_rls_transaction.return_value.__enter__ = MagicMock()
-        mock_rls_transaction.return_value.__exit__ = MagicMock(return_value=False)
+    def test_generate_output_directory_invalid_character(self, tmpdir):
+        from prowler.config.config import output_file_timestamp
 
         base_tmp = Path(str(tmpdir.mkdir("generate_output")))
         base_dir = str(base_tmp)
-        tenant_id = str(uuid.uuid4())
-        scan_id = str(uuid.uuid4())
+        tenant_id = "t1"
+        scan_id = "s1"
         provider = "aws/test@check"
-        expected_timestamp = "20230615103045"
 
         path, compliance = _generate_output_directory(
             base_dir, provider, tenant_id, scan_id
@@ -188,5 +162,5 @@ class TestOutputs:
         assert os.path.isdir(os.path.dirname(path))
         assert os.path.isdir(os.path.dirname(compliance))
 
-        assert path.endswith(f"aws-test-check-{expected_timestamp}")
-        assert compliance.endswith(f"aws-test-check-{expected_timestamp}")
+        assert path.endswith(f"aws-test-check-{output_file_timestamp}")
+        assert compliance.endswith(f"aws-test-check-{output_file_timestamp}")

api/src/backend/tasks/tests/test_tasks.py

@@ -1,16 +1,9 @@
 import uuid
+from pathlib import Path
 from unittest.mock import MagicMock, patch
 
 import pytest
-from tasks.tasks import (
-    _perform_scan_complete_tasks,
-    check_integrations_task,
-    generate_outputs_task,
-    s3_integration_task,
-    security_hub_integration_task,
-)
-
-from api.models import Integration
+from tasks.tasks import _perform_scan_complete_tasks, generate_outputs_task
 
 
 # TODO Move this to outputs/reports jobs
@@ -34,6 +27,7 @@ class TestGenerateOutputs:
             assert result == {"upload": False}
             mock_filter.assert_called_once_with(scan_id=self.scan_id)
 
+    @patch("tasks.tasks.rmtree")
     @patch("tasks.tasks._upload_to_s3")
     @patch("tasks.tasks._compress_output_files")
     @patch("tasks.tasks.get_compliance_frameworks")
@@ -52,6 +46,7 @@ class TestGenerateOutputs:
         mock_get_available_frameworks,
         mock_compress,
         mock_upload,
+        mock_rmtree,
     ):
         mock_scan_summary_filter.return_value.exists.return_value = True
 
@@ -101,7 +96,6 @@ class TestGenerateOutputs:
                 return_value=("out-dir", "comp-dir"),
             ),
             patch("tasks.tasks.Scan.all_objects.filter") as mock_scan_update,
-            patch("tasks.tasks.rmtree"),
         ):
             mock_compress.return_value = "/tmp/zipped.zip"
             mock_upload.return_value = "s3://bucket/zipped.zip"
@@ -116,6 +110,9 @@ class TestGenerateOutputs:
             mock_scan_update.return_value.update.assert_called_once_with(
                 output_location="s3://bucket/zipped.zip"
             )
+            mock_rmtree.assert_called_once_with(
+                Path("/tmp/zipped.zip").parent, ignore_errors=True
+            )
 
     def test_generate_outputs_fails_upload(self):
         with (
@@ -147,7 +144,6 @@ class TestGenerateOutputs:
             patch("tasks.tasks._compress_output_files", return_value="/tmp/compressed"),
             patch("tasks.tasks._upload_to_s3", return_value=None),
             patch("tasks.tasks.Scan.all_objects.filter") as mock_scan_update,
-            patch("tasks.tasks.rmtree"),
         ):
             mock_filter.return_value.exists.return_value = True
             mock_findings.return_value.order_by.return_value.iterator.return_value = [
@@ -157,7 +153,7 @@ class TestGenerateOutputs:
 
             result = generate_outputs_task(
                 scan_id="scan",
-                provider_id=self.provider_id,
+                provider_id="provider",
                 tenant_id=self.tenant_id,
             )
 
@@ -189,7 +185,6 @@ class TestGenerateOutputs:
             patch("tasks.tasks._compress_output_files", return_value="/tmp/compressed"),
             patch("tasks.tasks._upload_to_s3", return_value="s3://bucket/f.zip"),
             patch("tasks.tasks.Scan.all_objects.filter"),
-            patch("tasks.tasks.rmtree"),
         ):
             mock_filter.return_value.exists.return_value = True
             mock_findings.return_value.order_by.return_value.iterator.return_value = [
@@ -260,8 +255,8 @@ class TestGenerateOutputs:
             ),
             patch("tasks.tasks._compress_output_files", return_value="outdir.zip"),
             patch("tasks.tasks._upload_to_s3", return_value="s3://bucket/outdir.zip"),
-            patch("tasks.tasks.Scan.all_objects.filter"),
             patch("tasks.tasks.rmtree"),
+            patch("tasks.tasks.Scan.all_objects.filter"),
             patch(
                 "tasks.tasks.batched",
                 return_value=[
@@ -338,13 +333,13 @@ class TestGenerateOutputs:
             ),
             patch("tasks.tasks._compress_output_files", return_value="outdir.zip"),
             patch("tasks.tasks._upload_to_s3", return_value="s3://bucket/outdir.zip"),
+            patch("tasks.tasks.rmtree"),
             patch(
                 "tasks.tasks.Scan.all_objects.filter",
                 return_value=MagicMock(update=lambda **kw: None),
             ),
             patch("tasks.tasks.batched", return_value=two_batches),
             patch("tasks.tasks.OUTPUT_FORMATS_MAPPING", {}),
-            patch("tasks.tasks.rmtree"),
             patch(
                 "tasks.tasks.COMPLIANCE_CLASS_MAP",
                 {"aws": [(lambda name: True, TrackingComplianceWriter)]},
@@ -363,7 +358,6 @@ class TestGenerateOutputs:
         assert writer.transform_calls == [([raw2], compliance_obj, "cis")]
         assert result == {"upload": True}
 
-    # TODO: We need to add a periodic task to delete old output files
     def test_generate_outputs_logs_rmtree_exception(self, caplog):
         mock_finding_output = MagicMock()
         mock_finding_output.compliance = {"cis": ["requirement-1", "requirement-2"]}
@@ -421,56 +415,6 @@ class TestGenerateOutputs:
                     )
                     assert "Error deleting output files" in caplog.text
 
-    @patch("tasks.tasks.rls_transaction")
-    @patch("tasks.tasks.Integration.objects.filter")
-    def test_generate_outputs_filters_enabled_s3_integrations(
-        self, mock_integration_filter, mock_rls
-    ):
-        """Test that generate_outputs_task only processes enabled S3 integrations."""
-        with (
-            patch("tasks.tasks.ScanSummary.objects.filter") as mock_summary,
-            patch("tasks.tasks.Provider.objects.get"),
-            patch("tasks.tasks.initialize_prowler_provider"),
-            patch("tasks.tasks.Compliance.get_bulk"),
-            patch("tasks.tasks.get_compliance_frameworks", return_value=[]),
-            patch("tasks.tasks.Finding.all_objects.filter") as mock_findings,
-            patch(
-                "tasks.tasks._generate_output_directory", return_value=("out", "comp")
-            ),
-            patch("tasks.tasks.FindingOutput._transform_findings_stats"),
-            patch("tasks.tasks.FindingOutput.transform_api_finding"),
-            patch("tasks.tasks._compress_output_files", return_value="/tmp/compressed"),
-            patch("tasks.tasks._upload_to_s3", return_value="s3://bucket/file.zip"),
-            patch("tasks.tasks.Scan.all_objects.filter"),
-            patch("tasks.tasks.rmtree"),
-            patch("tasks.tasks.s3_integration_task.apply_async") as mock_s3_task,
-        ):
-            mock_summary.return_value.exists.return_value = True
-            mock_findings.return_value.order_by.return_value.iterator.return_value = [
-                [MagicMock()],
-                True,
-            ]
-            mock_integration_filter.return_value = [MagicMock()]
-            mock_rls.return_value.__enter__.return_value = None
-
-            with (
-                patch("tasks.tasks.OUTPUT_FORMATS_MAPPING", {}),
-                patch("tasks.tasks.COMPLIANCE_CLASS_MAP", {"aws": []}),
-            ):
-                generate_outputs_task(
-                    scan_id=self.scan_id,
-                    provider_id=self.provider_id,
-                    tenant_id=self.tenant_id,
-                )
-
-            # Verify the S3 integrations filters
-            mock_integration_filter.assert_called_once_with(
-                integrationproviderrelationship__provider_id=self.provider_id,
-                integration_type=Integration.IntegrationChoices.AMAZON_S3,
-                enabled=True,
-            )
-            mock_s3_task.assert_called_once()
-
 
 class TestScanCompleteTasks:
     @patch("tasks.tasks.create_compliance_requirements_task.apply_async")
@@ -492,540 +436,3 @@ class TestScanCompleteTasks:
             provider_id="provider-id",
             tenant_id="tenant-id",
         )
-
-
-@pytest.mark.django_db
-class TestCheckIntegrationsTask:
-    def setup_method(self):
-        self.scan_id = str(uuid.uuid4())
-        self.provider_id = str(uuid.uuid4())
-        self.tenant_id = str(uuid.uuid4())
-        self.output_directory = "/tmp/some-output-dir"
-
-    @patch("tasks.tasks.rls_transaction")
-    @patch("tasks.tasks.Integration.objects.filter")
-    def test_check_integrations_no_integrations(
-        self, mock_integration_filter, mock_rls
-    ):
-        mock_integration_filter.return_value.exists.return_value = False
-        # Ensure rls_transaction is mocked
-        mock_rls.return_value.__enter__.return_value = None
-
-        result = check_integrations_task(
-            tenant_id=self.tenant_id,
-            provider_id=self.provider_id,
-        )
-
-        assert result == {"integrations_processed": 0}
-        mock_integration_filter.assert_called_once_with(
-            integrationproviderrelationship__provider_id=self.provider_id,
-            enabled=True,
-        )
-
-    @patch("tasks.tasks.security_hub_integration_task")
-    @patch("tasks.tasks.group")
-    @patch("tasks.tasks.rls_transaction")
-    @patch("tasks.tasks.Integration.objects.filter")
-    def test_check_integrations_security_hub_success(
-        self, mock_integration_filter, mock_rls, mock_group, mock_security_hub_task
-    ):
-        """Test that SecurityHub integrations are processed correctly."""
-        # Mock that we have SecurityHub integrations
-        mock_integrations = MagicMock()
-        mock_integrations.exists.return_value = True
-
-        # Mock SecurityHub integrations to return existing integrations
-        mock_security_hub_integrations = MagicMock()
-        mock_security_hub_integrations.exists.return_value = True
-
-        # Set up the filter chain
-        mock_integration_filter.return_value = mock_integrations
-        mock_integrations.filter.return_value = mock_security_hub_integrations
-
-        # Mock the task signature
-        mock_task_signature = MagicMock()
-        mock_security_hub_task.s.return_value = mock_task_signature
-
-        # Mock group job
-        mock_job = MagicMock()
-        mock_group.return_value = mock_job
-
-        # Ensure rls_transaction is mocked
-        mock_rls.return_value.__enter__.return_value = None
-
-        # Execute the function
-        result = check_integrations_task(
-            tenant_id=self.tenant_id,
-            provider_id=self.provider_id,
-            scan_id="test-scan-id",
-        )
-
-        # Should process 1 SecurityHub integration
-        assert result == {"integrations_processed": 1}
-
-        # Verify the integration filter was called
-        mock_integration_filter.assert_called_once_with(
-            integrationproviderrelationship__provider_id=self.provider_id,
-            enabled=True,
-        )
-
-        # Verify SecurityHub integrations were filtered
-        mock_integrations.filter.assert_called_once_with(
-            integration_type=Integration.IntegrationChoices.AWS_SECURITY_HUB
-        )
-
-        # Verify SecurityHub task was created with correct parameters
-        mock_security_hub_task.s.assert_called_once_with(
-            tenant_id=self.tenant_id,
-            provider_id=self.provider_id,
-            scan_id="test-scan-id",
-        )
-
-        # Verify group was called and job was executed
-        mock_group.assert_called_once_with([mock_task_signature])
-        mock_job.apply_async.assert_called_once()
-
-    @patch("tasks.tasks.rls_transaction")
-    @patch("tasks.tasks.Integration.objects.filter")
-    def test_check_integrations_disabled_integrations_ignored(
-        self, mock_integration_filter, mock_rls
-    ):
-        """Test that disabled integrations are not processed."""
-        mock_integration_filter.return_value.exists.return_value = False
-        mock_rls.return_value.__enter__.return_value = None
-
-        result = check_integrations_task(
-            tenant_id=self.tenant_id,
-            provider_id=self.provider_id,
-        )
-
-        assert result == {"integrations_processed": 0}
-        mock_integration_filter.assert_called_once_with(
-            integrationproviderrelationship__provider_id=self.provider_id,
-            enabled=True,
-        )
-
-    @patch("tasks.tasks.s3_integration_task")
-    @patch("tasks.tasks.Integration.objects.filter")
-    @patch("tasks.tasks.ScanSummary.objects.filter")
-    @patch("tasks.tasks.Provider.objects.get")
-    @patch("tasks.tasks.initialize_prowler_provider")
-    @patch("tasks.tasks.Compliance.get_bulk")
-    @patch("tasks.tasks.get_compliance_frameworks")
-    @patch("tasks.tasks.Finding.all_objects.filter")
-    @patch("tasks.tasks._generate_output_directory")
-    @patch("tasks.tasks.FindingOutput._transform_findings_stats")
-    @patch("tasks.tasks.FindingOutput.transform_api_finding")
-    @patch("tasks.tasks._compress_output_files")
-    @patch("tasks.tasks._upload_to_s3")
-    @patch("tasks.tasks.Scan.all_objects.filter")
-    @patch("tasks.tasks.rmtree")
-    def test_generate_outputs_with_asff_for_aws_with_security_hub(
-        self,
-        mock_rmtree,
-        mock_scan_update,
-        mock_upload,
-        mock_compress,
-        mock_transform_finding,
-        mock_transform_stats,
-        mock_generate_dir,
-        mock_findings,
-        mock_get_frameworks,
-        mock_compliance_bulk,
-        mock_initialize_provider,
-        mock_provider_get,
-        mock_scan_summary,
-        mock_integration_filter,
-        mock_s3_task,
-    ):
-        """Test that ASFF output is generated for AWS providers with SecurityHub integration."""
-        # Setup
-        mock_scan_summary_qs = MagicMock()
-        mock_scan_summary_qs.exists.return_value = True
-        mock_scan_summary.return_value = mock_scan_summary_qs
-
-        # Mock AWS provider
-        mock_provider = MagicMock()
-        mock_provider.uid = "aws-account-123"
-        mock_provider.provider = "aws"
-        mock_provider_get.return_value = mock_provider
-
-        # Mock SecurityHub integration exists
-        mock_security_hub_integrations = MagicMock()
-        mock_security_hub_integrations.exists.return_value = True
-        mock_integration_filter.return_value = mock_security_hub_integrations
-
-        # Mock s3_integration_task
-        mock_s3_task.apply_async.return_value.get.return_value = True
-
-        # Mock other necessary components
-        mock_initialize_provider.return_value = MagicMock()
-        mock_compliance_bulk.return_value = {}
-        mock_get_frameworks.return_value = []
-        mock_generate_dir.return_value = ("out-dir", "comp-dir")
-        mock_transform_stats.return_value = {"stats": "data"}
-
-        # Mock findings
-        mock_finding = MagicMock()
-        mock_findings.return_value.order_by.return_value.iterator.return_value = [
-            [mock_finding],
-            True,
-        ]
-        mock_transform_finding.return_value = MagicMock(compliance={})
-
-        # Track which output formats were created
-        created_writers = {}
-
-        def track_writer_creation(cls_type):
-            def factory(*args, **kwargs):
-                writer = MagicMock()
-                writer._data = []
-                writer.transform = MagicMock()
-                writer.batch_write_data_to_file = MagicMock()
-                created_writers[cls_type] = writer
-                return writer
-
-            return factory
-
-        # Mock OUTPUT_FORMATS_MAPPING with tracking
-        with patch(
-            "tasks.tasks.OUTPUT_FORMATS_MAPPING",
-            {
-                "csv": {
-                    "class": track_writer_creation("csv"),
-                    "suffix": ".csv",
-                    "kwargs": {},
-                },
-                "json-asff": {
-                    "class": track_writer_creation("asff"),
-                    "suffix": ".asff.json",
-                    "kwargs": {},
-                },
-                "json-ocsf": {
-                    "class": track_writer_creation("ocsf"),
-                    "suffix": ".ocsf.json",
-                    "kwargs": {},
-                },
-            },
-        ):
-            mock_compress.return_value = "/tmp/compressed.zip"
-            mock_upload.return_value = "s3://bucket/file.zip"
-
-            # Execute
-            result = generate_outputs_task(
-                scan_id=self.scan_id,
-                provider_id=self.provider_id,
-                tenant_id=self.tenant_id,
-            )
-
-            # Verify ASFF was created for AWS with SecurityHub
-            assert "asff" in created_writers, "ASFF writer should be created"
-            assert "csv" in created_writers, "CSV writer should be created"
-            assert "ocsf" in created_writers, "OCSF writer should be created"
-
-            # Verify SecurityHub integration was checked
-            assert mock_integration_filter.call_count == 2
-            mock_integration_filter.assert_any_call(
-                integrationproviderrelationship__provider_id=self.provider_id,
-                integration_type=Integration.IntegrationChoices.AWS_SECURITY_HUB,
-                enabled=True,
-            )
-
-            assert result == {"upload": True}
-
-    @patch("tasks.tasks.s3_integration_task")
-    @patch("tasks.tasks.Integration.objects.filter")
-    @patch("tasks.tasks.ScanSummary.objects.filter")
-    @patch("tasks.tasks.Provider.objects.get")
-    @patch("tasks.tasks.initialize_prowler_provider")
-    @patch("tasks.tasks.Compliance.get_bulk")
-    @patch("tasks.tasks.get_compliance_frameworks")
-    @patch("tasks.tasks.Finding.all_objects.filter")
-    @patch("tasks.tasks._generate_output_directory")
-    @patch("tasks.tasks.FindingOutput._transform_findings_stats")
-    @patch("tasks.tasks.FindingOutput.transform_api_finding")
-    @patch("tasks.tasks._compress_output_files")
-    @patch("tasks.tasks._upload_to_s3")
-    @patch("tasks.tasks.Scan.all_objects.filter")
-    @patch("tasks.tasks.rmtree")
-    def test_generate_outputs_no_asff_for_aws_without_security_hub(
-        self,
-        mock_rmtree,
-        mock_scan_update,
-        mock_upload,
-        mock_compress,
-        mock_transform_finding,
-        mock_transform_stats,
-        mock_generate_dir,
-        mock_findings,
-        mock_get_frameworks,
-        mock_compliance_bulk,
-        mock_initialize_provider,
-        mock_provider_get,
-        mock_scan_summary,
-        mock_integration_filter,
-        mock_s3_task,
-    ):
-        """Test that ASFF output is NOT generated for AWS providers without SecurityHub integration."""
-        # Setup
-        mock_scan_summary_qs = MagicMock()
-        mock_scan_summary_qs.exists.return_value = True
-        mock_scan_summary.return_value = mock_scan_summary_qs
-
-        # Mock AWS provider
-        mock_provider = MagicMock()
-        mock_provider.uid = "aws-account-123"
-        mock_provider.provider = "aws"
-        mock_provider_get.return_value = mock_provider
-
-        # Mock NO SecurityHub integration
-        mock_security_hub_integrations = MagicMock()
-        mock_security_hub_integrations.exists.return_value = False
-        mock_integration_filter.return_value = mock_security_hub_integrations
-
-        # Mock other necessary components
-        mock_initialize_provider.return_value = MagicMock()
-        mock_compliance_bulk.return_value = {}
-        mock_get_frameworks.return_value = []
-        mock_generate_dir.return_value = ("out-dir", "comp-dir")
-        mock_transform_stats.return_value = {"stats": "data"}
-
-        # Mock findings
-        mock_finding = MagicMock()
-        mock_findings.return_value.order_by.return_value.iterator.return_value = [
-            [mock_finding],
-            True,
-        ]
-        mock_transform_finding.return_value = MagicMock(compliance={})
-
-        # Track which output formats were created
-        created_writers = {}
-
-        def track_writer_creation(cls_type):
-            def factory(*args, **kwargs):
-                writer = MagicMock()
-                writer._data = []
-                writer.transform = MagicMock()
-                writer.batch_write_data_to_file = MagicMock()
-                created_writers[cls_type] = writer
-                return writer
-
-            return factory
-
-        # Mock OUTPUT_FORMATS_MAPPING with tracking
-        with patch(
-            "tasks.tasks.OUTPUT_FORMATS_MAPPING",
-            {
-                "csv": {
-                    "class": track_writer_creation("csv"),
-                    "suffix": ".csv",
-                    "kwargs": {},
-                },
-                "json-asff": {
-                    "class": track_writer_creation("asff"),
-                    "suffix": ".asff.json",
-                    "kwargs": {},
-                },
-                "json-ocsf": {
-                    "class": track_writer_creation("ocsf"),
-                    "suffix": ".ocsf.json",
-                    "kwargs": {},
-                },
-            },
-        ):
-            mock_compress.return_value = "/tmp/compressed.zip"
-            mock_upload.return_value = "s3://bucket/file.zip"
-
-            # Execute
-            result = generate_outputs_task(
-                scan_id=self.scan_id,
-                provider_id=self.provider_id,
-                tenant_id=self.tenant_id,
-            )
-
-            # Verify ASFF was NOT created when no SecurityHub integration
-            assert "asff" not in created_writers, "ASFF writer should NOT be created"
-            assert "csv" in created_writers, "CSV writer should be created"
-            assert "ocsf" in created_writers, "OCSF writer should be created"
-
-            # Verify SecurityHub integration was checked
-            assert mock_integration_filter.call_count == 2
-            mock_integration_filter.assert_any_call(
-                integrationproviderrelationship__provider_id=self.provider_id,
-                integration_type=Integration.IntegrationChoices.AWS_SECURITY_HUB,
-                enabled=True,
-            )
-
-            assert result == {"upload": True}
-
-    @patch("tasks.tasks.ScanSummary.objects.filter")
-    @patch("tasks.tasks.Provider.objects.get")
-    @patch("tasks.tasks.initialize_prowler_provider")
-    @patch("tasks.tasks.Compliance.get_bulk")
-    @patch("tasks.tasks.get_compliance_frameworks")
-    @patch("tasks.tasks.Finding.all_objects.filter")
-    @patch("tasks.tasks._generate_output_directory")
-    @patch("tasks.tasks.FindingOutput._transform_findings_stats")
-    @patch("tasks.tasks.FindingOutput.transform_api_finding")
-    @patch("tasks.tasks._compress_output_files")
-    @patch("tasks.tasks._upload_to_s3")
-    @patch("tasks.tasks.Scan.all_objects.filter")
-    @patch("tasks.tasks.rmtree")
-    def test_generate_outputs_no_asff_for_non_aws_provider(
-        self,
-        mock_rmtree,
-        mock_scan_update,
-        mock_upload,
-        mock_compress,
-        mock_transform_finding,
-        mock_transform_stats,
-        mock_generate_dir,
-        mock_findings,
-        mock_get_frameworks,
-        mock_compliance_bulk,
-        mock_initialize_provider,
-        mock_provider_get,
-        mock_scan_summary,
-    ):
-        """Test that ASFF output is NOT generated for non-AWS providers (e.g., Azure, GCP)."""
-        # Setup
-        mock_scan_summary_qs = MagicMock()
-        mock_scan_summary_qs.exists.return_value = True
-        mock_scan_summary.return_value = mock_scan_summary_qs
-
-        # Mock Azure provider (non-AWS)
-        mock_provider = MagicMock()
-        mock_provider.uid = "azure-subscription-123"
-        mock_provider.provider = "azure"  # Non-AWS provider
-        mock_provider_get.return_value = mock_provider
-
-        # Mock other necessary components
-        mock_initialize_provider.return_value = MagicMock()
-        mock_compliance_bulk.return_value = {}
-        mock_get_frameworks.return_value = []
-        mock_generate_dir.return_value = ("out-dir", "comp-dir")
-        mock_transform_stats.return_value = {"stats": "data"}
-
-        # Mock findings
-        mock_finding = MagicMock()
-        mock_findings.return_value.order_by.return_value.iterator.return_value = [
-            [mock_finding],
-            True,
-        ]
-        mock_transform_finding.return_value = MagicMock(compliance={})
-
-        # Track which output formats were created
-        created_writers = {}
-
-        def track_writer_creation(cls_type):
-            def factory(*args, **kwargs):
-                writer = MagicMock()
-                writer._data = []
-                writer.transform = MagicMock()
-                writer.batch_write_data_to_file = MagicMock()
-                created_writers[cls_type] = writer
-                return writer
-
-            return factory
-
-        # Mock OUTPUT_FORMATS_MAPPING with tracking
-        with patch(
-            "tasks.tasks.OUTPUT_FORMATS_MAPPING",
-            {
-                "csv": {
-                    "class": track_writer_creation("csv"),
-                    "suffix": ".csv",
-                    "kwargs": {},
-                },
-                "json-asff": {
-                    "class": track_writer_creation("asff"),
-                    "suffix": ".asff.json",
-                    "kwargs": {},
-                },
-                "json-ocsf": {
-                    "class": track_writer_creation("ocsf"),
-                    "suffix": ".ocsf.json",
-                    "kwargs": {},
-                },
-            },
-        ):
-            mock_compress.return_value = "/tmp/compressed.zip"
-            mock_upload.return_value = "s3://bucket/file.zip"
-
-            # Execute
-            result = generate_outputs_task(
-                scan_id=self.scan_id,
-                provider_id=self.provider_id,
-                tenant_id=self.tenant_id,
-            )
-
-            # Verify ASFF was NOT created for non-AWS provider
-            assert (
-                "asff" not in created_writers
-            ), "ASFF writer should NOT be created for non-AWS providers"
-            assert "csv" in created_writers, "CSV writer should be created"
-            assert "ocsf" in created_writers, "OCSF writer should be created"
-
-            assert result == {"upload": True}
-
-    @patch("tasks.tasks.upload_s3_integration")
-    def test_s3_integration_task_success(self, mock_upload):
-        mock_upload.return_value = True
-        output_directory = "/tmp/prowler_api_output/test"
-
-        result = s3_integration_task(
-            tenant_id=self.tenant_id,
-            provider_id=self.provider_id,
-            output_directory=output_directory,
-        )
-
-        assert result is True
-        mock_upload.assert_called_once_with(
-            self.tenant_id, self.provider_id, output_directory
-        )
-
-    @patch("tasks.tasks.upload_s3_integration")
-    def test_s3_integration_task_failure(self, mock_upload):
-        mock_upload.return_value = False
-        output_directory = "/tmp/prowler_api_output/test"
-
-        result = s3_integration_task(
-            tenant_id=self.tenant_id,
-            provider_id=self.provider_id,
-            output_directory=output_directory,
-        )
-
-        assert result is False
-        mock_upload.assert_called_once_with(
-            self.tenant_id, self.provider_id, output_directory
-        )
-
-    @patch("tasks.tasks.upload_security_hub_integration")
-    def test_security_hub_integration_task_success(self, mock_upload):
-        """Test successful SecurityHub integration task execution."""
-        mock_upload.return_value = True
-        scan_id = "test-scan-123"
-
-        result = security_hub_integration_task(
-            tenant_id=self.tenant_id,
-            provider_id=self.provider_id,
-            scan_id=scan_id,
-        )
-
-        assert result is True
-        mock_upload.assert_called_once_with(self.tenant_id, self.provider_id, scan_id)
-
-    @patch("tasks.tasks.upload_security_hub_integration")
-    def test_security_hub_integration_task_failure(self, mock_upload):
-        """Test SecurityHub integration task handling failure."""
-        mock_upload.return_value = False
-        scan_id = "test-scan-123"
-
-        result = security_hub_integration_task(
-            tenant_id=self.tenant_id,
-            provider_id=self.provider_id,
-            scan_id=scan_id,
-        )
-
-        assert result is False
-        mock_upload.assert_called_once_with(self.tenant_id, self.provider_id, scan_id)

api/tests/performance/scenarios/resources.py

@@ -1,234 +0,0 @@
-from locust import events, task
-from utils.config import (
-    L_PROVIDER_NAME,
-    M_PROVIDER_NAME,
-    RESOURCES_UI_FIELDS,
-    S_PROVIDER_NAME,
-    TARGET_INSERTED_AT,
-)
-from utils.helpers import (
-    APIUserBase,
-    get_api_token,
-    get_auth_headers,
-    get_dynamic_filters_pairs,
-    get_next_resource_filter,
-    get_scan_id_from_provider_name,
-)
-
-GLOBAL = {
-    "token": None,
-    "scan_ids": {},
-    "resource_filters": None,
-    "large_resource_filters": None,
-}
-
-
-@events.test_start.add_listener
-def on_test_start(environment, **kwargs):
-    GLOBAL["token"] = get_api_token(environment.host)
-
-    GLOBAL["scan_ids"]["small"] = get_scan_id_from_provider_name(
-        environment.host, GLOBAL["token"], S_PROVIDER_NAME
-    )
-    GLOBAL["scan_ids"]["medium"] = get_scan_id_from_provider_name(
-        environment.host, GLOBAL["token"], M_PROVIDER_NAME
-    )
-    GLOBAL["scan_ids"]["large"] = get_scan_id_from_provider_name(
-        environment.host, GLOBAL["token"], L_PROVIDER_NAME
-    )
-
-    GLOBAL["resource_filters"] = get_dynamic_filters_pairs(
-        environment.host, GLOBAL["token"], "resources"
-    )
-    GLOBAL["large_resource_filters"] = get_dynamic_filters_pairs(
-        environment.host, GLOBAL["token"], "resources", GLOBAL["scan_ids"]["large"]
-    )
-
-
-class APIUser(APIUserBase):
-    def on_start(self):
-        self.token = GLOBAL["token"]
-        self.s_scan_id = GLOBAL["scan_ids"]["small"]
-        self.m_scan_id = GLOBAL["scan_ids"]["medium"]
-        self.l_scan_id = GLOBAL["scan_ids"]["large"]
-        self.available_resource_filters = GLOBAL["resource_filters"]
-        self.available_resource_filters_large_scan = GLOBAL["large_resource_filters"]
-
-    @task
-    def resources_default(self):
-        name = "/resources"
-        page_number = self._next_page(name)
-        endpoint = (
-            f"/resources?page[number]={page_number}"
-            f"&filter[updated_at]={TARGET_INSERTED_AT}"
-        )
-        self.client.get(endpoint, headers=get_auth_headers(self.token), name=name)
-
-    @task(3)
-    def resources_default_ui_fields(self):
-        name = "/resources?fields"
-        page_number = self._next_page(name)
-        endpoint = (
-            f"/resources?page[number]={page_number}"
-            f"&fields[resources]={','.join(RESOURCES_UI_FIELDS)}"
-            f"&filter[updated_at]={TARGET_INSERTED_AT}"
-        )
-        self.client.get(endpoint, headers=get_auth_headers(self.token), name=name)
-
-    @task(3)
-    def resources_default_include(self):
-        name = "/resources?include"
-        page = self._next_page(name)
-        endpoint = (
-            f"/resources?page[number]={page}"
-            f"&filter[updated_at]={TARGET_INSERTED_AT}"
-            f"&include=provider"
-        )
-        self.client.get(endpoint, headers=get_auth_headers(self.token), name=name)
-
-    @task(3)
-    def resources_metadata(self):
-        name = "/resources/metadata"
-        endpoint = f"/resources/metadata?filter[updated_at]={TARGET_INSERTED_AT}"
-        self.client.get(endpoint, headers=get_auth_headers(self.token), name=name)
-
-    @task
-    def resources_scan_small(self):
-        name = "/resources?filter[scan_id] - 50k"
-        page_number = self._next_page(name)
-        endpoint = (
-            f"/resources?page[number]={page_number}" f"&filter[scan]={self.s_scan_id}"
-        )
-        self.client.get(endpoint, headers=get_auth_headers(self.token), name=name)
-
-    @task
-    def resources_metadata_scan_small(self):
-        name = "/resources/metadata?filter[scan_id] - 50k"
-        endpoint = f"/resources/metadata?&filter[scan]={self.s_scan_id}"
-        self.client.get(
-            endpoint,
-            headers=get_auth_headers(self.token),
-            name=name,
-        )
-
-    @task(2)
-    def resources_scan_medium(self):
-        name = "/resources?filter[scan_id] - 250k"
-        page_number = self._next_page(name)
-        endpoint = (
-            f"/resources?page[number]={page_number}" f"&filter[scan]={self.m_scan_id}"
-        )
-        self.client.get(endpoint, headers=get_auth_headers(self.token), name=name)
-
-    @task
-    def resources_metadata_scan_medium(self):
-        name = "/resources/metadata?filter[scan_id] - 250k"
-        endpoint = f"/resources/metadata?&filter[scan]={self.m_scan_id}"
-        self.client.get(
-            endpoint,
-            headers=get_auth_headers(self.token),
-            name=name,
-        )
-
-    @task
-    def resources_scan_large(self):
-        name = "/resources?filter[scan_id] - 500k"
-        page_number = self._next_page(name)
-        endpoint = (
-            f"/resources?page[number]={page_number}" f"&filter[scan]={self.l_scan_id}"
-        )
-        self.client.get(endpoint, headers=get_auth_headers(self.token), name=name)
-
-    @task
-    def resources_scan_large_include(self):
-        name = "/resources?filter[scan_id]&include - 500k"
-        page_number = self._next_page(name)
-        endpoint = (
-            f"/resources?page[number]={page_number}"
-            f"&filter[scan]={self.l_scan_id}"
-            f"&include=provider"
-        )
-        self.client.get(endpoint, headers=get_auth_headers(self.token), name=name)
-
-    @task
-    def resources_metadata_scan_large(self):
-        endpoint = f"/resources/metadata?&filter[scan]={self.l_scan_id}"
-        self.client.get(
-            endpoint,
-            headers=get_auth_headers(self.token),
-            name="/resources/metadata?filter[scan_id] - 500k",
-        )
-
-    @task(2)
-    def resources_filters(self):
-        name = "/resources?filter[resource_filter]&include"
-        filter_name, filter_value = get_next_resource_filter(
-            self.available_resource_filters
-        )
-
-        endpoint = (
-            f"/resources?filter[{filter_name}]={filter_value}"
-            f"&filter[updated_at]={TARGET_INSERTED_AT}"
-            f"&include=provider"
-        )
-        self.client.get(endpoint, headers=get_auth_headers(self.token), name=name)
-
-    @task(3)
-    def resources_metadata_filters(self):
-        name = "/resources/metadata?filter[resource_filter]"
-        filter_name, filter_value = get_next_resource_filter(
-            self.available_resource_filters
-        )
-
-        endpoint = (
-            f"/resources/metadata?filter[{filter_name}]={filter_value}"
-            f"&filter[updated_at]={TARGET_INSERTED_AT}"
-        )
-        self.client.get(endpoint, headers=get_auth_headers(self.token), name=name)
-
-    @task(3)
-    def resources_metadata_filters_scan_large(self):
-        name = "/resources/metadata?filter[resource_filter]&filter[scan_id] - 500k"
-        filter_name, filter_value = get_next_resource_filter(
-            self.available_resource_filters
-        )
-
-        endpoint = (
-            f"/resources/metadata?filter[{filter_name}]={filter_value}"
-            f"&filter[scan]={self.l_scan_id}"
-        )
-        self.client.get(endpoint, headers=get_auth_headers(self.token), name=name)
-
-    @task(2)
-    def resourcess_filter_large_scan_include(self):
-        name = "/resources?filter[resource_filter][scan]&include - 500k"
-        filter_name, filter_value = get_next_resource_filter(
-            self.available_resource_filters
-        )
-
-        endpoint = (
-            f"/resources?filter[{filter_name}]={filter_value}"
-            f"&filter[scan]={self.l_scan_id}"
-            f"&include=provider"
-        )
-        self.client.get(endpoint, headers=get_auth_headers(self.token), name=name)
-
-    @task(3)
-    def resources_latest_default_ui_fields(self):
-        name = "/resources/latest?fields"
-        page_number = self._next_page(name)
-        endpoint = (
-            f"/resources/latest?page[number]={page_number}"
-            f"&fields[resources]={','.join(RESOURCES_UI_FIELDS)}"
-        )
-        self.client.get(endpoint, headers=get_auth_headers(self.token), name=name)
-
-    @task(3)
-    def resources_latest_metadata_filters(self):
-        name = "/resources/metadata/latest?filter[resource_filter]"
-        filter_name, filter_value = get_next_resource_filter(
-            self.available_resource_filters
-        )
-
-        endpoint = f"/resources/metadata/latest?filter[{filter_name}]={filter_value}"
-        self.client.get(endpoint, headers=get_auth_headers(self.token), name=name)

api/tests/performance/utils/config.py

@@ -13,23 +13,6 @@ FINDINGS_RESOURCE_METADATA = {
     "resource_types": "resource_type",
     "services": "service",
 }
-RESOURCE_METADATA = {
-    "regions": "region",
-    "types": "type",
-    "services": "service",
-}
-
-RESOURCES_UI_FIELDS = [
-    "name",
-    "failed_findings_count",
-    "region",
-    "service",
-    "type",
-    "provider",
-    "inserted_at",
-    "updated_at",
-    "uid",
-]
 
 S_PROVIDER_NAME = "provider-50k"
 M_PROVIDER_NAME = "provider-250k"

api/tests/performance/utils/helpers.py

@@ -7,7 +7,6 @@ from locust import HttpUser, between
 from utils.config import (
     BASE_HEADERS,
     FINDINGS_RESOURCE_METADATA,
-    RESOURCE_METADATA,
     TARGET_INSERTED_AT,
     USER_EMAIL,
     USER_PASSWORD,
@@ -122,16 +121,13 @@ def get_scan_id_from_provider_name(host: str, token: str, provider_name: str) ->
     return response.json()["data"][0]["id"]
 
 
-def get_dynamic_filters_pairs(
-    host: str, token: str, endpoint: str, scan_id: str = ""
-) -> dict:
+def get_resource_filters_pairs(host: str, token: str, scan_id: str = "") -> dict:
     """
-    Retrieves and maps metadata filter values from a given endpoint.
+    Retrieves and maps resource metadata filter values from the findings endpoint.
 
     Args:
         host (str): The host URL of the API.
         token (str): Bearer token for authentication.
-        endpoint (str): The API endpoint to query for metadata.
         scan_id (str, optional): Optional scan ID to filter metadata. Defaults to using inserted_at timestamp.
 
     Returns:
@@ -140,28 +136,22 @@ def get_dynamic_filters_pairs(
     Raises:
         AssertionError: If the request fails or does not return a 200 status code.
     """
-    metadata_mapping = (
-        FINDINGS_RESOURCE_METADATA if endpoint == "findings" else RESOURCE_METADATA
-    )
-    date_filter = "inserted_at" if endpoint == "findings" else "updated_at"
     metadata_filters = (
         f"filter[scan]={scan_id}"
         if scan_id
-        else f"filter[{date_filter}]={TARGET_INSERTED_AT}"
+        else f"filter[inserted_at]={TARGET_INSERTED_AT}"
     )
     response = requests.get(
-        f"{host}/{endpoint}/metadata?{metadata_filters}",
-        headers=get_auth_headers(token),
+        f"{host}/findings/metadata?{metadata_filters}", headers=get_auth_headers(token)
     )
     assert (
         response.status_code == 200
     ), f"Failed to get resource filters values: {response.text}"
     attributes = response.json()["data"]["attributes"]
-
     return {
-        metadata_mapping[key]: values
+        FINDINGS_RESOURCE_METADATA[key]: values
         for key, values in attributes.items()
-        if key in metadata_mapping.keys()
+        if key in FINDINGS_RESOURCE_METADATA.keys()
     }
 
 

contrib/wazuh/prowler-wrapper.py

@@ -23,7 +23,6 @@ import argparse
 import json
 import os
 import re
-import shlex
 import signal
 import socket
 import subprocess
@@ -146,11 +145,11 @@ def _get_script_arguments():
 
 def _run_prowler(prowler_args):
     _debug("Running prowler with args: {0}".format(prowler_args), 1)
-    _prowler_command = shlex.split(
-        "{prowler}/prowler {args}".format(prowler=PATH_TO_PROWLER, args=prowler_args)
+    _prowler_command = "{prowler}/prowler {args}".format(
+        prowler=PATH_TO_PROWLER, args=prowler_args
     )
-    _debug("Running command: {0}".format(" ".join(_prowler_command)), 2)
-    _process = subprocess.Popen(_prowler_command, stdout=subprocess.PIPE)
+    _debug("Running command: {0}".format(_prowler_command), 2)
+    _process = subprocess.Popen(_prowler_command, stdout=subprocess.PIPE, shell=True)
     _output, _error = _process.communicate()
     _debug("Raw prowler output: {0}".format(_output), 3)
     _debug("Raw prowler error: {0}".format(_error), 3)

dashboard/assets/markdown-styles.css

@@ -1,34 +0,0 @@
-/* Override Tailwind CSS reset for markdown content */
-.markdown-content ul {
-    list-style: disc !important;
-    margin-left: 20px !important;
-    padding-left: 10px !important;
-    margin-bottom: 8px !important;
-}
-
-.markdown-content ol {
-    list-style: decimal !important;
-    margin-left: 20px !important;
-    padding-left: 10px !important;
-    margin-bottom: 8px !important;
-}
-
-.markdown-content li {
-    margin-bottom: 4px !important;
-    display: list-item !important;
-}
-
-.markdown-content p {
-    margin-bottom: 8px !important;
-}
-
-/* Ensure nested lists work properly */
-.markdown-content ul ul {
-    margin-top: 4px !important;
-    margin-bottom: 4px !important;
-}
-
-.markdown-content ol ol {
-    margin-top: 4px !important;
-    margin-bottom: 4px !important;
-}

dashboard/compliance/cis_4_0_azure.py

@@ -1,25 +0,0 @@
-import warnings
-
-from dashboard.common_methods import get_section_containers_cis
-
-warnings.filterwarnings("ignore")
-
-
-def get_table(data):
-
-    aux = data[
-        [
-            "REQUIREMENTS_ID",
-            "REQUIREMENTS_DESCRIPTION",
-            "REQUIREMENTS_ATTRIBUTES_SECTION",
-            "CHECKID",
-            "STATUS",
-            "REGION",
-            "ACCOUNTID",
-            "RESOURCEID",
-        ]
-    ].copy()
-
-    return get_section_containers_cis(
-        aux, "REQUIREMENTS_ID", "REQUIREMENTS_ATTRIBUTES_SECTION"
-    )

dashboard/pages/overview.py

@@ -1,4 +1,5 @@
 # Standard library imports
+import csv
 import glob
 import json
 import os
@@ -19,6 +20,7 @@ from dash.dependencies import Input, Output
 # Config import
 from dashboard.config import (
     critical_color,
+    encoding_format,
     fail_color,
     folder_path_overview,
     high_color,
@@ -44,7 +46,6 @@ from dashboard.lib.dropdowns import (
     create_table_row_dropdown,
 )
 from dashboard.lib.layouts import create_layout_overview
-from prowler.lib.logger import logger
 
 # Suppress warnings
 warnings.filterwarnings("ignore")
@@ -54,13 +55,11 @@ warnings.filterwarnings("ignore")
 csv_files = []
 
 for file in glob.glob(os.path.join(folder_path_overview, "*.csv")):
-    try:
-        df = pd.read_csv(file, sep=";")
-        num_rows = len(df)
+    with open(file, "r", newline="", encoding=encoding_format) as csvfile:
+        reader = csv.reader(csvfile)
+        num_rows = sum(1 for row in reader)
         if num_rows > 1:
             csv_files.append(file)
-    except Exception:
-        logger.error(f"Error reading file {file}")
 
 
 # Import logos providers
@@ -192,13 +191,7 @@ else:
         data.rename(columns={"RESOURCE_ID": "RESOURCE_UID"}, inplace=True)
 
     # Remove dupplicates on the finding_uid colummn but keep the last one taking into account the timestamp
-    data["DATE"] = data["TIMESTAMP"].dt.date
-    data = (
-        data.sort_values("TIMESTAMP")
-        .groupby(["DATE", "FINDING_UID"], as_index=False)
-        .last()
-    )
-    data["TIMESTAMP"] = pd.to_datetime(data["TIMESTAMP"])
+    data = data.sort_values("TIMESTAMP").drop_duplicates("FINDING_UID", keep="last")
 
     data["ASSESSMENT_TIME"] = data["TIMESTAMP"].dt.strftime("%Y-%m-%d")
     data_valid = pd.DataFrame()
@@ -1654,39 +1647,6 @@ def generate_table(data, index, color_mapping_severity, color_mapping_status):
                                     [
                                         html.Div(
                                             [
-                                                # Description as first details item
-                                                html.Div(
-                                                    [
-                                                        html.P(
-                                                            html.Strong(
-                                                                "Description: ",
-                                                                style={
-                                                                    "margin-bottom": "8px"
-                                                                },
-                                                            )
-                                                        ),
-                                                        html.Div(
-                                                            dcc.Markdown(
-                                                                str(
-                                                                    data.get(
-                                                                        "DESCRIPTION",
-                                                                        "",
-                                                                    )
-                                                                ),
-                                                                dangerously_allow_html=True,
-                                                                style={
-                                                                    "margin-left": "0px",
-                                                                    "padding-left": "10px",
-                                                                },
-                                                            ),
-                                                            className="markdown-content",
-                                                            style={
-                                                                "margin-left": "0px",
-                                                                "padding-left": "10px",
-                                                            },
-                                                        ),
-                                                    ],
-                                                ),
                                                 html.Div(
                                                     [
                                                         html.P(
@@ -1826,27 +1786,19 @@ def generate_table(data, index, color_mapping_severity, color_mapping_status):
                                                         html.P(
                                                             html.Strong(
                                                                 "Risk: ",
-                                                                style={},
+                                                                style={
+                                                                    "margin-right": "5px"
+                                                                },
                                                             )
                                                         ),
-                                                        html.Div(
-                                                            dcc.Markdown(
-                                                                str(
-                                                                    data.get("RISK", "")
-                                                                ),
-                                                                dangerously_allow_html=True,
-                                                                style={
-                                                                    "margin-left": "0px",
-                                                                    "padding-left": "10px",
-                                                                },
-                                                            ),
-                                                            className="markdown-content",
+                                                        html.P(
+                                                            str(data.get("RISK", "")),
                                                             style={
-                                                                "margin-left": "0px",
-                                                                "padding-left": "10px",
+                                                                "margin-left": "5px"
                                                             },
                                                         ),
                                                     ],
+                                                    style={"display": "flex"},
                                                 ),
                                                 html.Div(
                                                     [
@@ -1888,32 +1840,23 @@ def generate_table(data, index, color_mapping_severity, color_mapping_status):
                                                             html.Strong(
                                                                 "Recommendation: ",
                                                                 style={
-                                                                    "margin-bottom": "8px"
+                                                                    "margin-right": "5px"
                                                                 },
                                                             )
                                                         ),
-                                                        html.Div(
-                                                            dcc.Markdown(
-                                                                str(
-                                                                    data.get(
-                                                                        "REMEDIATION_RECOMMENDATION_TEXT",
-                                                                        "",
-                                                                    )
-                                                                ),
-                                                                dangerously_allow_html=True,
-                                                                style={
-                                                                    "margin-left": "0px",
-                                                                    "padding-left": "10px",
-                                                                },
+                                                        html.P(
+                                                            str(
+                                                                data.get(
+                                                                    "REMEDIATION_RECOMMENDATION_TEXT",
+                                                                    "",
+                                                                )
                                                             ),
-                                                            className="markdown-content",
                                                             style={
-                                                                "margin-left": "0px",
-                                                                "padding-left": "10px",
+                                                                "margin-left": "5px"
                                                             },
                                                         ),
                                                     ],
-                                                    style={"margin-bottom": "15px"},
+                                                    style={"display": "flex"},
                                                 ),
                                                 html.Div(
                                                     [

docker-compose-dev.yml

@@ -16,7 +16,7 @@ services:
     volumes:
       - "./api/src/backend:/home/prowler/backend"
       - "./api/pyproject.toml:/home/prowler/pyproject.toml"
-      - "outputs:/tmp/prowler_api_output"
+      - "/tmp/prowler_api_output:/tmp/prowler_api_output"
     depends_on:
       postgres:
         condition: service_healthy
@@ -87,7 +87,7 @@ services:
       - path: .env
         required: false
     volumes:
-      - "outputs:/tmp/prowler_api_output"
+      - "/tmp/prowler_api_output:/tmp/prowler_api_output"
     depends_on:
       valkey:
         condition: service_healthy
@@ -115,7 +115,3 @@ services:
     entrypoint:
       - "../docker-entrypoint.sh"
       - "beat"
-
-volumes:
-  outputs:
-    driver: local

docker-compose.yml

@@ -8,7 +8,7 @@ services:
     ports:
       - "${DJANGO_PORT:-8080}:${DJANGO_PORT:-8080}"
     volumes:
-      - "output:/tmp/prowler_api_output"
+      - "/tmp/prowler_api_output:/tmp/prowler_api_output"
     depends_on:
       postgres:
         condition: service_healthy
@@ -68,7 +68,7 @@ services:
       - path: .env
         required: false
     volumes:
-      - "output:/tmp/prowler_api_output"
+      - "/tmp/prowler_api_output:/tmp/prowler_api_output"
     depends_on:
       valkey:
         condition: service_healthy
@@ -91,7 +91,3 @@ services:
     entrypoint:
       - "../docker-entrypoint.sh"
       - "beat"
-
-volumes:
-  output:
-    driver: local

docs/about.md

@@ -0,0 +1,24 @@
+---
+hide:
+- toc
+---
+# About
+
+## Author
+Prowler was created by **Toni de la Fuente** in 2016.
+
+| ![](img/toni.png)<br>[![Twitter URL](https://img.shields.io/twitter/url/https/twitter.com/toniblyx.svg?style=social&label=Follow%20%40toniblyx)](https://twitter.com/toniblyx) [![Twitter URL](https://img.shields.io/twitter/url/https/twitter.com/prowlercloud.svg?style=social&label=Follow%20%40prowlercloud)](https://twitter.com/prowlercloud)|
+|:--:|
+| <b>Toni de la Fuente </b>|
+
+## Maintainers
+Prowler is maintained by the Engineers of the **Prowler Team** :
+
+| ![](img/nacho.png)[![Twitter URL](https://img.shields.io/twitter/url/https/twitter.com/NachoRivCor.svg?style=social&label=Follow%20%40NachoRivCor)](https://twitter.com/NachoRivCor) | ![](img/sergio.png)[![Twitter URL](https://img.shields.io/twitter/url/https/twitter.com/sergargar1.svg?style=social&label=Follow%20%40sergargar1)](https://twitter.com/sergargar1) |![](img/pepe.png)[![Twitter URL](https://img.shields.io/twitter/url/https/twitter.com/jfagoagas.svg?style=social&label=Follow%20%40jfagoagas)](https://twitter.com/jfagoagas) |
+|:--:|:--:|:--:
+| <b>Nacho Rivera</b>| <b>Sergio Garcia</b>| <b>Pepe Fagoaga</b>|
+
+## License
+
+Prowler is licensed as **Apache License 2.0** as specified in each file. You may obtain a copy of the License at
+<http://www.apache.org/licenses/LICENSE-2.0>

docs/basic-usage/prowler-app.md

@@ -1,61 +0,0 @@
-## Access Prowler App
-
-After [installation](../installation/prowler-app.md), navigate to [http://localhost:3000](http://localhost:3000) and sign up with email and password.
-
-<img src="../../img/sign-up-button.png" alt="Sign Up Button" width="320"/>
-<img src="../../img/sign-up.png" alt="Sign Up" width="285"/>
-
-???+ note "User creation and default tenant behavior"
-
-    When creating a new user, the behavior depends on whether an invitation is provided:
-
-    - **Without an invitation**:
-
-        - A new tenant is automatically created.
-        - The new user is assigned to this tenant.
-        - A set of **RBAC admin permissions** is generated and assigned to the user for the newly-created tenant.
-
-    - **With an invitation**: The user is added to the specified tenant with the permissions defined in the invitation.
-
-    This mechanism ensures that the first user in a newly created tenant has administrative permissions within that tenant.
-
-## Log In
-
-Access Prowler App by logging in with **email and password**.
-
-<img src="../../img/log-in.png" alt="Log In" width="285"/>
-
-## Add Cloud Provider
-
-Configure a cloud provider for scanning:
-
-1. Navigate to `Settings > Cloud Providers` and click `Add Account`.
-2. Select the cloud provider.
-3. Enter the provider's identifier (Optional: Add an alias):
-    - **AWS**: Account ID
-    - **GCP**: Project ID
-    - **Azure**: Subscription ID
-    - **Kubernetes**: Cluster ID
-    - **M365**: Domain ID
-4. Follow the guided instructions to add and authenticate your credentials.
-
-## Start a Scan
-
-Once credentials are successfully added and validated, Prowler initiates a scan of your cloud environment.
-
-Click `Go to Scans` to monitor progress.
-
-## View Results
-
-Review findings during scan execution in the following sections:
-
-- **Overview** – Provides a high-level summary of your scans.
-  <img src="../../products/img/overview.png" alt="Overview" width="700"/>
-
-- **Compliance** – Displays compliance insights based on security frameworks.
-  <img src="../../img/compliance.png" alt="Compliance" width="700"/>
-
-> For detailed usage instructions, refer to the [Prowler App Guide](../tutorials/prowler-app.md).
-
-???+ note
-    Prowler will automatically scan all configured providers every **24 hours**, ensuring your cloud environment stays continuously monitored.

docs/basic-usage/prowler-cli.md

@@ -1,282 +0,0 @@
-## Running Prowler
-
-Running Prowler requires specifying the provider (e.g `aws`, `gcp`, `azure`, `kubernetes`, `m365`, `github`, `iac` or `mongodbatlas`):
-
-???+ note
-    If no provider is specified, AWS is used by default for backward compatibility with Prowler v2.
-
-```console
-prowler <provider>
-```
-![Prowler Execution](../img/short-display.png)
-
-???+ note
-    Running the `prowler` command without options will uses environment variable credentials. Refer to the Authentication section of each provider for credential configuration details.
-
-## Verbose Output
-
-If you prefer the former verbose output, use: `--verbose`. This allows seeing more info while Prowler is running, minimal output is displayed unless verbosity is enabled.
-
-## Report Generation
-
-By default, Prowler generates CSV, JSON-OCSF, and HTML reports. To generate a JSON-ASFF report (used by AWS Security Hub), specify `-M` or `--output-modes`:
-
-```console
-prowler <provider> -M csv json-asff json-ocsf html
-```
-The HTML report is saved in the output directory, alongside other reports. It will look like this:
-
-![Prowler Execution](../img/html-output.png)
-
-## Listing Available Checks and Services
-
-List all available checks or services within a provider using `-l`/`--list-checks` or `--list-services`.
-
-```console
-prowler <provider> --list-checks
-prowler <provider> --list-services
-```
-## Running Specific Checks or Services
-
-Execute specific checks or services using `-c`/`checks` or `-s`/`services`:
-
-```console
-prowler azure --checks storage_blob_public_access_level_is_disabled
-prowler aws --services s3 ec2
-prowler gcp --services iam compute
-prowler kubernetes --services etcd apiserver
-```
-## Excluding Checks and Services
-
-Checks and services can be excluded with `-e`/`--excluded-checks` or `--excluded-services`:
-
-```console
-prowler aws --excluded-checks s3_bucket_public_access
-prowler azure --excluded-services defender iam
-prowler gcp --excluded-services kms
-prowler kubernetes --excluded-services controllermanager
-```
-## Additional Options
-
-Explore more advanced time-saving execution methods in the [Miscellaneous](../tutorials/misc.md) section.
-
-Access the help menu and view all available options with `-h`/`--help`:
-
-```console
-prowler --help
-```
-
-## AWS
-
-Use a custom AWS profile with `-p`/`--profile` and/or specific AWS regions with `-f`/`--filter-region`:
-
-```console
-prowler aws --profile custom-profile -f us-east-1 eu-south-2
-```
-
-???+ note
-    By default, `prowler` will scan all AWS regions.
-
-See more details about AWS Authentication in the [Authentication Section](../tutorials/aws/authentication.md) section.
-
-## Azure
-
-Azure requires specifying the auth method:
-
-```console
-# To use service principal authentication
-prowler azure --sp-env-auth
-
-# To use az cli authentication
-prowler azure --az-cli-auth
-
-# To use browser authentication
-prowler azure --browser-auth --tenant-id "XXXXXXXX"
-
-# To use managed identity auth
-prowler azure --managed-identity-auth
-```
-
-See more details about Azure Authentication in the [Authentication Section](../tutorials/azure/authentication.md)
-
-By default, Prowler scans all accessible subscriptions. Scan specific subscriptions using the following flag (using az cli auth as example):
-
-```console
-prowler azure --az-cli-auth --subscription-ids <subscription ID 1> <subscription ID 2> ... <subscription ID N>
-```
-## Google Cloud
-
-- **User Account Credentials**
-
-    By default, Prowler uses **User Account credentials**. Configure accounts using:
-
-    - `gcloud init` – Set up a new account.
-    - `gcloud config set account <account>` – Switch to an existing account.
-
-    Once configured, obtain access credentials using: `gcloud auth application-default login`.
-
-- **Service Account Authentication**
-
-    Alternatively, you can use Service Account credentials:
-
-    Generate and download Service Account keys in JSON format. Refer to [Google IAM documentation](https://cloud.google.com/iam/docs/creating-managing-service-account-keys) for details.
-
-    Provide the key file location using this argument:
-
-    ```console
-    prowler gcp --credentials-file path
-    ```
-
-- **Scanning Specific GCP Projects**
-
-    By default, Prowler scans all accessible GCP projects. Scan specific projects with the `--project-ids` flag:
-
-    ```console
-    prowler gcp --project-ids <Project ID 1> <Project ID 2> ... <Project ID N>
-    ```
-
-- **GCP Retry Configuration**
-
-    Configure the maximum number of retry attempts for Google Cloud SDK API calls with the `--gcp-retries-max-attempts` flag:
-
-    ```console
-    prowler gcp --gcp-retries-max-attempts 5
-    ```
-
-    This is useful when experiencing quota exceeded errors (HTTP 429) to increase the number of automatic retry attempts.
-
-## Kubernetes
-
-Prowler enables security scanning of Kubernetes clusters, supporting both **in-cluster** and **external** execution.
-
-- **Non In-Cluster Execution**
-
-    ```console
-    prowler kubernetes --kubeconfig-file path
-    ```
-    ???+ note
-        If no `--kubeconfig-file` is provided, Prowler will use the default KubeConfig file location (`~/.kube/config`).
-
-- **In-Cluster Execution**
-
-    To run Prowler inside the cluster, apply the provided YAML configuration to deploy a job in a new namespace:
-
-    ```console
-    kubectl apply -f kubernetes/prowler-sa.yaml
-    kubectl apply -f kubernetes/job.yaml
-    kubectl apply -f kubernetes/prowler-role.yaml
-    kubectl apply -f kubernetes/prowler-rolebinding.yaml
-    kubectl get pods --namespace prowler-ns --> prowler-XXXXX
-    kubectl logs prowler-XXXXX --namespace prowler-ns
-    ```
-
-    ???+ note
-        By default, Prowler scans all namespaces in the active Kubernetes context. Use the `--context`flag to specify the context to be scanned and `--namespaces` to restrict scanning to specific namespaces.
-
-## Microsoft 365
-
-Microsoft 365 requires specifying the auth method:
-
-```console
-
-# To use service principal authentication for MSGraph and PowerShell modules
-prowler m365 --sp-env-auth
-
-# To use both service principal (for MSGraph) and user credentials (for PowerShell modules)
-prowler m365 --env-auth
-
-# To use az cli authentication
-prowler m365 --az-cli-auth
-
-# To use browser authentication
-prowler m365 --browser-auth --tenant-id "XXXXXXXX"
-
-```
-
-See more details about M365 Authentication in the [Authentication Section](../tutorials/microsoft365/authentication.md) section.
-
-## GitHub
-
-Prowler enables security scanning of your **GitHub account**, including **Repositories**, **Organizations** and **Applications**.
-
-- **Supported Authentication Methods**
-
-    Authenticate using one of the following methods:
-
-    ```console
-    # Personal Access Token (PAT):
-    prowler github --personal-access-token pat
-
-    # OAuth App Token:
-    prowler github --oauth-app-token oauth_token
-
-    # GitHub App Credentials:
-    prowler github --github-app-id app_id --github-app-key app_key
-    ```
-
-    ???+ note
-        If no login method is explicitly provided, Prowler will automatically attempt to authenticate using environment variables in the following order of precedence:
-
-        1. `GITHUB_PERSONAL_ACCESS_TOKEN`
-        2. `OAUTH_APP_TOKEN`
-        3. `GITHUB_APP_ID` and `GITHUB_APP_KEY`
-
-## Infrastructure as Code (IaC)
-
-Prowler's Infrastructure as Code (IaC) provider enables you to scan local or remote infrastructure code for security and compliance issues using [Trivy](https://trivy.dev/). This provider supports a wide range of IaC frameworks, allowing you to assess your code before deployment.
-
-```console
-# Scan a directory for IaC files
-prowler iac --scan-path ./my-iac-directory
-
-# Scan a remote GitHub repository (public or private)
-prowler iac --scan-repository-url https://github.com/user/repo.git
-
-# Authenticate to a private repo with GitHub username and PAT
-prowler iac --scan-repository-url https://github.com/user/repo.git \
-  --github-username <username> --personal-access-token <token>
-
-# Authenticate to a private repo with OAuth App Token
-prowler iac --scan-repository-url https://github.com/user/repo.git \
-  --oauth-app-token <oauth_token>
-
-# Specify frameworks to scan (default: all)
-prowler iac --scan-path ./my-iac-directory --frameworks terraform kubernetes
-
-# Exclude specific paths
-prowler iac --scan-path ./my-iac-directory --exclude-path ./my-iac-directory/test,./my-iac-directory/examples
-```
-
-???+ note
-    - `--scan-path` and `--scan-repository-url` are mutually exclusive; only one can be specified at a time.
-    - For remote repository scans, authentication can be provided via CLI flags or environment variables (`GITHUB_OAUTH_APP_TOKEN`, `GITHUB_USERNAME`, `GITHUB_PERSONAL_ACCESS_TOKEN`). CLI flags take precedence.
-    - The IaC provider does not require cloud authentication for local scans.
-    - It is ideal for CI/CD pipelines and local development environments.
-    - For more details on supported scanners, see the [Trivy documentation](https://trivy.dev/latest/docs/scanner/vulnerability/)
-
-See more details about IaC scanning in the [IaC Tutorial](../tutorials/iac/getting-started-iac.md) section.
-
-## MongoDB Atlas
-
-Prowler allows you to scan your MongoDB Atlas cloud database deployments for security and compliance issues.
-
-Authentication is done using MongoDB Atlas API key pairs:
-
-```console
-# Using command-line arguments
-prowler mongodbatlas --atlas-public-key <public_key> --atlas-private-key <private_key>
-
-# Using environment variables
-export ATLAS_PUBLIC_KEY=<public_key>
-export ATLAS_PRIVATE_KEY=<private_key>
-prowler mongodbatlas
-```
-
-You can filter scans to specific organizations or projects:
-
-```console
-# Scan specific project
-prowler mongodbatlas --atlas-project-id <project_id>
-```
-
-See more details about MongoDB Atlas Authentication in [MongoDB Atlas Authentication](../tutorials/mongodbatlas/authentication.md)

docs/developer-guide/aws-details.md

@@ -2,7 +2,7 @@
 
 In this page you can find all the details about [Amazon Web Services (AWS)](https://aws.amazon.com/) provider implementation in Prowler.
 
-By default, Prowler will audit just one account and organization settings per scan. To configure it, follow the [AWS getting started guide](../tutorials/aws/getting-started-aws.md).
+By default, Prowler will audit just one account and organization settings per scan. To configure it, follow the [getting started](../index.md#aws) page.
 
 ## AWS Provider Classes Architecture
 

docs/developer-guide/azure-details.md

@@ -2,7 +2,7 @@
 
 In this page you can find all the details about [Microsoft Azure](https://azure.microsoft.com/) provider implementation in Prowler.
 
-By default, Prowler will audit all the subscriptions that it is able to list in the Microsoft Entra tenant, and tenant Entra ID service. To configure it, follow the [Azure getting started guide](../tutorials/azure/getting-started-azure.md).
+By default, Prowler will audit all the subscriptions that it is able to list in the Microsoft Entra tenant, and tenant Entra ID service. To configure it, follow the [getting started](../index.md#azure) page.
 
 ## Azure Provider Classes Architecture
 

docs/developer-guide/check-metadata-guidelines.md

@@ -1,213 +0,0 @@
-# Check Metadata Guidelines
-
-## Introduction
-
-This guide provides comprehensive guidelines for creating check metadata in Prowler. For basic information on check metadata structure, refer to the [check metadata](./checks.md#metadata-structure-for-prowler-checks) section.
-
-## Check Title Guidelines
-
-### Writing Guidelines
-
-1. **Determine Resource Finding Scope (Singular vs. Plural)**:
-   When determining whether to use singular or plural in the check title, examine the code for certain patterns. If the code contains a loop that generates an individual report for each resource, use the singular form. If the code produces a single report that covers all resources collectively, use the plural form. For organization- or account-wide checks, select the scope that best matches the breadth of the evaluation. Additionally, review the `status_extended` field messages in the code, as they often provide clues about whether the check is scoped to individual resources or to groups of resources.
-   Analyze the detection code to determine if the check reports on individual resources or aggregated resources:
-    - **Singular**: Use when the check creates one report per resource (e.g., "EC2 instance has IMDSv2 enforced", "S3 bucket does not allow public write access").
-    - **Plural**: Use when the check creates one report for all resources together (e.g., "All EC2 instances have IMDSv2 enforced", "S3 buckets do not allow public write access").
-2. **Describe the Compliant (*PASS*) State**:
-   Always write the title to describe the **desired, compliant state** of the resources. The title should reflect what it looks like when the audited resource is following the check's requirements.
-3. **Be Specific and Factual**:
-   Include the exact secure configuration being verified. Avoid vague or generic terms like "properly configured".
-4. **Avoid Redundant or Action Words**:
-   Do not include verbs like "Check", "Verify", "Ensure", or "Monitor". The title is a declarative statement of the secure condition.
-5. **Length Limit**:
-   Keep the title under 150 characters.
-
-### Common Mistakes to Avoid
-
-- Starting with verbs like "Check", "Verify", "Ensure", "Make sure". Always start with the affected resource instead.
-- Being too vague or generic (e.g., "Ensure security groups are properly configured", what does it mean? "properly configured" is not a clear description of the compliant state).
-- Focusing on the non-compliant state instead of the compliant state.
-- Using unclear scope and resource identification.
-
-## Check Type Guidelines (AWS Only)
-
-### AWS Security Hub Type Format
-
-AWS Security Hub uses a three-part type taxonomy:
-
-- **Namespace**: The top-level security domain.
-- **Category**: The security control family or area.
-- **Classifier**: The specific security concern (optional).
-
-A partial path may be defined (e.g., `TTPs` or `TTPs/Defense Evasion` are valid).
-
-### Selection Guidelines
-
-1. **Be Specific**: Use the most specific classifier that accurately describes the check.
-2. **Standard Compliance**: Consider if the check relates to specific compliance standards.
-3. **Multiple Types**: You can specify multiple types if the check addresses multiple concerns.
-
-## Description Guidelines
-
-### Writing Guidelines
-
-1. **Focus on the Finding**: All fields should address how the finding affects the security posture, rather than the control itself.
-2. **Use Natural Language**: Write in simple, clear paragraphs with complete, grammatically correct sentences.
-3. **Use Markdown Formatting**: Enhance readability with:
-   - Use **bold** for emphasis on key security concepts.
-   - Use *italic* for a secondary emphasis. Use it for clarifications, conditions, or optional notes. But don't abuse it.
-   - Use `code` formatting for specific configuration values, or technical details. Don't use it for service names or common technical terms.
-   - Use one or two line breaks (`\n` or `\n\n`) to separate distinct ideas.
-   - Use bullet points (`-`) for listing multiple concepts or actions.
-   - Use numbers for listing steps or sequential actions.
-4. **Be Concise**: Maximum 400 characters (spaces count). Every word should add value.
-5. **Explain What the Finding Means**: Focus on what the security control evaluates and what it means when it passes or fails, but without explicitly stating the pass or fail state.
-6. **Be Technical but Clear**: Use appropriate technical terminology while remaining understandable.
-7. **Avoid Risk Descriptions**: Do not describe potential risks, threats, or consequences.
-8. **CheckTitle and Description can be the same**: If the check is very simple and the title is already clear, you can use the same text for the description.
-
-### Common Mistakes to Avoid
-
-- **Technical Implementation Details**: "The control loops through all instances and calls the describe_instances API...".
-- **Vague Descriptions**: "This control verifies proper configuration of resources". What does it mean? "proper configuration" is not a clear description of the compliant state.
-- **Risk Descriptions**: "This could lead to data breaches" or "This poses a security threat".
-- **Starting with Verbs**: "Check if...", "Verify...", "Ensure...". Always start with the affected resource instead.
-- **References to Pass/Fail States**: Avoid using words like "pass" or "fail".
-
-## Risk Guidelines
-
-### Writing Guidelines
-
-1. **Explain the Cybersecurity Impact**: Focus on how the finding affects confidentiality, integrity, or availability (CIA triad). If the CIA triad does not apply, explain the risk in terms of the organization's business objectives.
-2. **Be Specific About Threats**: Clearly state what could happen if this security control is not in place. What attacks or incidents become possible?
-3. **Focus on Risk Context**: Explain the specific security implications of the finding, not just generic security risks.
-4. **Use Markdown Formatting**: Enhance readability with markdown formatting:
-   - Use **bold** for emphasis on key security concepts.
-   - Use *italic* for a secondary emphasis. Use it for clarifications, conditions, or optional notes. But don't abuse it.
-   - Use `code` formatting for specific configuration values, or technical details. Don't use it for service names or common technical terms.
-   - Use one or two line breaks (`\n` or `\n\n`) to separate distinct ideas.
-   - Use bullet points (`-`) for listing multiple concepts or actions.
-   - Use numbers for listing steps or sequential actions.
-5. **Be Concise**: Maximum 400 characters. Make every word count.
-
-### Common Mistakes to Avoid
-
-- **Generic Risks**: "This could lead to security issues" or "Regulatory compliance violations".
-- **Technical Implementation Focus**: "The API call might fail and return incorrect results...".
-- **Overly Broad Statements**: "This is a serious security risk that could impact everything".
-- **Vague Threats**: "This could be exploited by threat actors" without explaining how.
-
-## Recommendation Guidelines
-
-### Writing Guidelines
-
-1. **Provide Actionable Best Practice Guidance**: Explain what should be done to maintain security posture. Focus on preventive measures and proactive security practices.
-2. **Be Principle-Based**: Reference established security principles (least privilege, defense in depth, zero trust, separation of duties) where applicable.
-3. **Focus on Prevention**: Explain best practices that prevent the security issue from occurring, not just detection or remediation.
-4. **Use Markdown Formatting**: Enhance readability with markdown formatting:
-   - Use **bold** for emphasis on key security concepts.
-   - Use *italic* for a secondary emphasis. Use it for clarifications, conditions, or optional notes. But don't abuse it.
-   - Use `code` formatting for specific configuration values, or technical details. Don't use it for service names or common technical terms.
-   - Use one or two line breaks (`\n` or `\n\n`) to separate distinct ideas.
-   - Use bullet points (`-`) for listing multiple concepts or actions.
-   - Use numbers for listing steps or sequential actions.
-5. **Be Concise**: Maximum 400 characters.
-
-### Common Mistakes to Avoid
-
-- **Specific Remediation Steps**: "1. Go to the console\n2. Click on settings..." - Focus on principles, not click-by-click instructions.
-- **Implementation Details**: "Configure the JSON policy with the following IAM actions..." - Explain what to achieve, not how.
-- **Vague Guidance**: "Follow security best practices..." without explaining what those practices are.
-- **Resource-Specific Recommendations**: "Enable MFA on user john.doe@example.com" - Keep it general.
-- **Missing Context**: Not explaining why the best practice is important for security.
-
-### Good Examples
-
-- *"Avoid exposing sensitive resources directly to the Internet; configure access controls to limit exposure."*
-- *"Apply the principle of least privilege when assigning permissions to users and services."*
-- *"Regularly review and update your security configurations to align with current best practices."*
-
-## Remediation Code Guidelines
-
-### Critical Requirement
-
-The **fundamental principle** is to focus on the **specific change** that converts the finding from non-compliant to compliant.
-
-Also is important to keep all code examples as short as possible, including the essential code to fix the issue. Remove any extra configuration, optional parameters, or nice-to-have settings and add comments to explain the code when possible.
-
-### Common Guidelines for All Code Fields
-
-1. **Be Minimal**: Keep code blocks as short as possible - only include what is absolutely necessary.
-2. **Focus on the Fix**: Remove any extra configuration, optional parameters, or nice-to-have settings.
-3. **Be Accurate**: Ensure all commands and code are syntactically correct.
-4. **Use Markdown Formatting**: Format code properly using code blocks and appropriate syntax highlighting.
-5. **Follow Best Practices**: Use the most secure and recommended approaches for each platform.
-
-### CLI Guidelines
-
-- Only provide a single command that directly changes the finding from fail to pass.
-- The command must be executable as-is and resolve the security issue completely.
-- Use proper command syntax for the provider (AWS CLI, Azure CLI, gcloud, kubectl, etc.).
-- Do not use markdown formatting or code blocks - just the raw command.
-- Do not include multiple commands, comments, or explanations.
-- If the issue cannot be resolved with a single command, leave this field empty.
-
-### Native IaC Guidelines
-
-- **Keep It Minimal**: Only include the specific resource/configuration that fixes the security issue.
-- Format as markdown code blocks with proper syntax highlighting.
-- Include only the required properties to fix the issue.
-- Add comments indicating the critical line(s) that remediate the check.
-- Use `example_resource` as the generic name for all resources and IDs.
-
-### Terraform Guidelines
-
-- **Keep It Minimal**: Only include the specific resource/configuration that fixes the security issue.
-- Provide valid HCL (HashiCorp Configuration Language) code with an example of a compliant configuration.
-- Use the latest Terraform syntax and provider versions.
-- Include only the required arguments to fix the issue - skip optional parameters.
-- Format as markdown code blocks with `hcl` syntax highlighting.
-- Add comments indicating the critical line(s) that remediate the check.
-- Use `example_resource` as the generic name for all resources and IDs.
-- Skip provider requirements unless critical for the fix.
-
-### Other (Manual Steps) Guidelines
-
-- **Keep It Minimal**: Only include the exact steps needed to fix the security issue.
-- Provide step-by-step instructions for manual remediation through web interfaces.
-- Use numbered lists for sequential steps.
-- Be specific about menu locations, button names, and settings.
-- Skip optional configurations or nice-to-have settings.
-- Format using markdown for better readability.
-
-## Categories Guidelines
-
-### Selection Guidelines
-
-1. **Be Specific**: Only select categories that directly relate to what the automated control evaluates.
-2. **Primary Focus**: Consider the primary security concern the automated control addresses.
-3. **Avoid Over-Categorization**: Do not select categories just because they are tangentially related.
-
-### Available Categories
-
-| Category                | Definition                                                                                                                                                                                                                                 |
-|-------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| encryption              | Ensures data is encrypted in transit and/or at rest, including key management practices                                                                                                   |
-| internet-exposed        | Checks that limit or flag public access to services, APIs, or assets from the Internet                                                                                                              |
-| logging                 | Ensures appropriate logging of events, activities, and system interactions for traceability                                                                                                       |
-| secrets                 | Manages and protects credentials, API keys, tokens, and other sensitive information                                                                                                               |
-| resilience              | Ensures systems can maintain availability and recover from disruptions, failures, or degradation. Includes redundancy, fault-tolerance, auto-scaling, backup, disaster recovery, and failover strategies |
-| threat-detection        | Identifies suspicious activity or behaviors using IDS, malware scanning, or anomaly detection                                                                                                      |
-| trust-boundaries        | Enforces isolation or segmentation between different trust levels (e.g., VPCs, tenants, network zones)                                                                                            |
-| vulnerabilities         | Detects or remediates known software, infrastructure, or config vulnerabilities (e.g., CVEs)                                                                                                      |
-| cluster-security        | Secures Kubernetes cluster components such as API server, etcd, and role-based access                                                                                                             |
-| container-security      | Ensures container images and runtimes follow security best practices                                                                                        |
-| node-security           | Secures nodes running containers or services                                                                                                        |
-| gen-ai                  | Checks related to safe and secure use of generative AI services or models                                                                                                                        |
-| ci-cd                   | Ensures secure configurations in CI/CD pipelines                                                                                                         |
-| identity-access         | Governs user and service identities, including least privilege, MFA, and permission boundaries                                                                                                    |
-| email-security          | Ensures detection and protection against phishing, spam, spoofing, etc.                                                                                                                            |
-| forensics-ready         | Ensures systems are instrumented to support post-incident investigations. Any digital trace or evidence (logs, volume snapshots, memory dumps, network captures, etc.) preserved immutably and accompanied by integrity guarantees, which can be used in a forensic analysis |
-| software-supply-chain   | Detects or prevents tampering, unauthorized packages, or third-party risks in software supply chain                                                                                               |
-| e3                      | M365-specific controls enabled by or dependent on an E3 license (e.g., baseline security policies, conditional access)                                                                            |
-| e5                      | M365-specific controls enabled by or dependent on an E5 license (e.g., advanced threat protection, audit, DLP, and eDiscovery)                                                                    |

docs/developer-guide/checks.md

@@ -8,20 +8,15 @@ Checks are the core component of Prowler. A check is a piece of code designed to
 
 ### Creating a Check
 
-The most common high level steps to create a new check are:
+To create a new check:
 
-1. Prerequisites:
-    - Verify the check does not already exist by searching [Prowler Hub](https://hub.prowler.com) or checking `prowler/providers/<provider>/services/<service>/<check_name_want_to_implement>/`.
-    - Ensure required provider and service exist. If not, follow the [Provider](./provider.md) and [Service](./services.md) documentation to create them.
-    - Confirm the service has implemented all required methods and attributes for the check (in most cases, you will need to add or modify some methods in the service to get the data you need for the check).
-2. Navigate to the service directory. The path should be as follows: `prowler/providers/<provider>/services/<service>`.
-3. Create a check-specific folder. The path should follow this pattern: `prowler/providers/<provider>/services/<service>/<check_name_want_to_implement>`. Adhere to the [Naming Format for Checks](#naming-format-for-checks).
-4. Populate the folder with files as specified in [File Creation](#file-creation).
-5. Run the check locally to ensure it works as expected. For checking you can use the CLI in the next way:
-    - To ensure the check has been detected by Prowler: `poetry run python prowler-cli.py <provider> --list-checks | grep <check_name>`.
-    - To run the check, to find possible issues: `poetry run python prowler-cli.py <provider> --log-level ERROR --verbose --check <check_name>`.
-6. Create comprehensive tests for the check that cover multiple scenarios including both PASS (compliant) and FAIL (non-compliant) cases. For detailed information about test structure and implementation guidelines, refer to the [Testing](./unit-testing.md) documentation.
-7. If the check and its corresponding tests are working as expected, you can submit a PR to Prowler.
+- Prerequisites: A Prowler provider and service must exist. Verify support and check for pre-existing checks via [Prowler Hub](https://hub.prowler.com). If the provider or service is not present, please refer to the [Provider](./provider.md) and [Service](./services.md) documentation for creation instructions.
+
+- Navigate to the service directory. The path should be as follows: `prowler/providers/<provider>/services/<service>`.
+
+- Create a check-specific folder. The path should follow this pattern: `prowler/providers/<provider>/services/<service>/<check_name>`. Adhere to the [Naming Format for Checks](#naming-format-for-checks).
+
+- Populate the folder with files as specified in [File Creation](#file-creation).
 
 ### Naming Format for Checks
 
@@ -40,7 +35,7 @@ Each check in Prowler follows a straightforward structure. Within the newly crea
 
 - `__init__.py` (empty file) – Ensures Python treats the check folder as a package.
 - `<check_name>.py` (code file) – Contains the check logic, following the prescribed format. Please refer to the [prowler's check code structure](./checks.md#prowlers-check-code-structure) for more information.
-- `<check_name>.metadata.json` (metadata file) – Defines the check's metadata for contextual information. Please refer to the [check metadata](./checks.md#metadata-structure-for-prowler-checks) for more information.
+- `<check_name>.metadata.json` (metadata file) – Defines the check's metadata for contextual information. Please refer to the [check metadata](./checks.md#) for more information.
 
 ## Prowler's Check Code Structure
 
@@ -64,19 +59,13 @@ from prowler.providers.<provider>.services.<service>.<service>_client import <se
 # Each check must be implemented as a Python class with the same name as its corresponding file.
 # The class must inherit from the Check base class.
 class <check_name>(Check):
-    """
-    Ensure that <resource> meets <security_requirement>.
-
-    This check evaluates whether <specific_condition> to ensure <security_benefit>.
-    - PASS: <description_of_compliant_state(s)>.
-    - FAIL: <description_of_non_compliant_state(s)>.
-    """
+    """Short description of what is being checked"""
 
     def execute(self):
-        """Execute the check logic.
+        """Execute <check short description>
 
         Returns:
-            A list of reports containing the result of the check.
+            List[CheckReport<Provider>]: A list of reports containing the result of the check.
         """
         findings = []
         # Iterate over the target resources using the provider service client
@@ -158,10 +147,12 @@ else:
 Each check **must** populate the report with an unique identifier for the audited resource. This identifier or identifiers are going to depend on the provider and the resource that is being audited. Here are the criteria for each provider:
 
 - AWS
+
     - Amazon Resource ID — `report.resource_id`.
         - The resource identifier. This is the name of the resource, the ID of the resource, or a resource path. Some resource identifiers include a parent resource (sub-resource-type/parent-resource/sub-resource) or a qualifier such as a version (resource-type:resource-name:qualifier).
         - If the resource ID cannot be retrieved directly from the audited resource, it can be extracted from the ARN. It is the last part of the ARN after the last slash (`/`) or colon (`:`).
         - If no actual resource to audit exists, this format can be used: `<resource_type>/unknown`
+
     - Amazon Resource Name — `report.resource_arn`.
         - The [Amazon Resource Name (ARN)](https://docs.aws.amazon.com/IAM/latest/UserGuide/reference-arns.html) of the audited entity.
         - If the ARN cannot be retrieved directly from the audited resource, construct a valid ARN using the `resource_id` component as the audited entity. Examples:
@@ -172,24 +163,32 @@ Each check **must** populate the report with an unique identifier for the audite
                 - AWS Security Hub — `arn:<partition>:security-hub:<region>:<account-id>:hub/unknown`.
                 - Access Analyzer — `arn:<partition>:access-analyzer:<region>:<account-id>:analyzer/unknown`.
                 - GuardDuty — `arn:<partition>:guardduty:<region>:<account-id>:detector/unknown`.
+
 - GCP
+
     - Resource ID — `report.resource_id`.
         - Resource ID represents the full, [unambiguous path to a resource](https://google.aip.dev/122#full-resource-names), known as the full resource name. Typically, it follows the format: `//{api_service/resource_path}`.
         - If the resource ID cannot be retrieved directly from the audited resource, by default the resource name is used.
     - Resource Name — `report.resource_name`.
         - Resource Name usually refers to the name of a resource within its service.
+
 - Azure
+
     - Resource ID — `report.resource_id`.
         - Resource ID represents the full Azure Resource Manager path to a resource, which follows the format: `/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}`.
     - Resource Name — `report.resource_name`.
         - Resource Name usually refers to the name of a resource within its service.
         - If the [resource name](https://learn.microsoft.com/en-us/azure/azure-resource-manager/management/resource-name-rules) cannot be retrieved directly from the audited resource, the last part of the resource ID can be used.
+
 - Kubernetes
+
     - Resource ID — `report.resource_id`.
         - The UID of the Kubernetes object. This is a system-generated string that uniquely identifies the object within the cluster for its entire lifetime. See [Kubernetes Object Names and IDs - UIDs](https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids).
     - Resource Name — `report.resource_name`.
         - The name of the Kubernetes object. This is a client-provided string that must be unique for the resource type within a namespace (for namespaced resources) or cluster (for cluster-scoped resources). Names typically follow DNS subdomain or label conventions. See [Kubernetes Object Names and IDs - Names](https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names).
+
 - M365
+
     - Resource ID — `report.resource_id`.
         - If the audited resource has a globally unique identifier such as a `guid`, use it as the `resource_id`.
         - If no `guid` exists, use another unique and relevant identifier for the resource, such as the tenant domain, the internal policy ID, or a representative string following the format `<resource_type>/<name_or_id>`.
@@ -205,7 +204,9 @@ Each check **must** populate the report with an unique identifier for the audite
         - For global configurations:
             - `resource_id`: Tenant domain or representative string (e.g., "userSettings")
             - `resource_name`: Description of the configuration (e.g., "SharePoint Settings")
+
 - GitHub
+
     - Resource ID — `report.resource_id`.
         - The ID of the Github resource. This is a system-generated integer that uniquely identifies the resource within the Github platform.
     - Resource Name — `report.resource_name`.
@@ -226,174 +227,88 @@ Below is a generic example of a check metadata file. **Do not include comments i
 ```json
 {
   "Provider": "aws",
-  "CheckID": "service_resource_security_setting",
-  "CheckTitle": "Service resource has security setting enabled",
-  "CheckType": [],
-  "ServiceName": "service",
-  "SubServiceName": "",
-  "ResourceIdTemplate": "",
-  "Severity": "medium",
+  "CheckID": "example_check_id",
+  "CheckTitle": "Example Check Title",
+  "CheckType": ["Infrastructure Security"],
+  "ServiceName": "ec2",
+  "SubServiceName": "ami",
+  "ResourceIdTemplate": "arn:partition:service:region:account-id:resource-id",
+  "Severity": "critical",
   "ResourceType": "Other",
-  "Description": "This check verifies that the service resource has the required **security setting** enabled to protect against potential vulnerabilities.\n\nIt ensures that the resource follows security best practices and maintains proper access controls. The check evaluates whether the security configuration is properly implemented and active.",
-  "Risk": "Without proper security settings, the resource may be vulnerable to:\n\n- **Unauthorized access** - Malicious actors could gain entry\n- **Data breaches** - Sensitive information could be compromised\n- **Security threats** - Various attack vectors could be exploited\n\nThis could result in compliance violations and potential financial or reputational damage.",
-  "RelatedUrl": "",
-  "AdditionalURLs": ["https://example.com/security-documentation", "https://example.com/best-practices"],
+  "Description": "Example description of the check.",
+  "Risk": "Example risk if the check fails.",
+  "RelatedUrl": "https://example.com",
   "Remediation": {
     "Code": {
-      "CLI": "provider-cli service enable-security-setting --resource-id resource-123",
-      "NativeIaC": "```yaml\nType: Provider::Service::Resource\nProperties:\n  SecuritySetting: enabled\n  ResourceId: resource-123\n```",
-      "Other": "1. Open the provider management console\n2. Navigate to the service section\n3. Select the resource\n4. Enable the security setting\n5. Save the configuration",
-      "Terraform": "```hcl\nresource \"provider_service_resource\" \"example\" {\n  resource_id      = \"resource-123\"\n  security_setting = true\n}\n```"
+      "CLI": "example CLI command",
+      "NativeIaC": "",
+      "Other": "",
+      "Terraform": ""
     },
     "Recommendation": {
-      "Text": "Enable security settings on all service resources to ensure proper protection. Regularly review and update security configurations to align with current best practices.",
-      "Url": "https://hub.prowler.com/check/service_resource_security_setting"
+      "Text": "Example recommendation text.",
+      "Url": "https://example.com/remediation"
     }
   },
-  "Categories": ["internet-exposed", "secrets"],
+  "Categories": ["example-category"],
   "DependsOn": [],
-  "RelatedTo": ["service_resource_security_setting", "service_resource_security_setting_2"],
-  "Notes": "This is a generic example check that should be customized for specific provider and service requirements."
+  "RelatedTo": [],
+  "Notes": ""
 }
 ```
 
 ### Metadata Fields and Their Purpose
 
-#### Provider
+- **Provider** — The Prowler provider related to the check. The name **must** be lowercase and match the provider folder name. For supported providers refer to [Prowler Hub](https://hub.prowler.com/check) or directly to [Prowler Code](https://github.com/prowler-cloud/prowler/tree/master/prowler/providers).
 
-The Prowler provider related to the check. The name **must** be lowercase and match the provider folder name. For supported providers refer to [Prowler Hub](https://hub.prowler.com/check) or directly to [Prowler Code](https://github.com/prowler-cloud/prowler/tree/master/prowler/providers).
+- **CheckID** — The unique identifier for the check inside the provider, this field **must** match the check's folder and python file and json metadata file name. For more information about the naming refer to the [Naming Format for Checks](#naming-format-for-checks) section.
 
-#### CheckID
+- **CheckTitle** — A concise, descriptive title for the check.
 
-The unique identifier for the check inside the provider. This field **must** match the check's folder, Python file, and JSON metadata file name. For more information about naming, refer to the [Naming Format for Checks](#naming-format-for-checks) section.
+- **CheckType** — *For now this field is only standardized for the AWS provider*.
+    - For AWS this field must follow the [AWS Security Hub Types](https://docs.aws.amazon.com/securityhub/latest/userguide/asff-required-attributes.html#Types) format. So the common pattern to follow is `namespace/category/classifier`, refer to the attached documentation for the valid values for this fields.
 
-#### CheckTitle
+- **ServiceName** — The name of the provider service being audited. This field **must** be in lowercase and match with the service folder name. For supported services refer to [Prowler Hub](https://hub.prowler.com/check) or directly to [Prowler Code](https://github.com/prowler-cloud/prowler/tree/master/prowler/providers).
 
-The `CheckTitle` field must be plain text, clearly and succinctly define **the best practice being evaluated and which resource(s) each finding applies to**. The title should be specific, concise (no more than 150 characters), and reference the relevant resource(s) involved.
+- **SubServiceName** — The subservice or resource within the service, if applicable. For more information refer to the [Naming Format for Checks](#naming-format-for-checks) section.
 
-**Always write the `CheckTitle` to describe the *PASS* case**, the desired secure or compliant state of the resource(s). This helps ensure that findings are easy to interpret and that the title always reflects the best practice being met.
+- **ResourceIdTemplate** — A template for the unique resource identifier. For more information refer to the [Prowler's Resource Identification](#prowlers-resource-identification) section.
 
-For detailed guidelines on writing effective check titles, including how to determine singular vs. plural scope and common mistakes to avoid, see [CheckTitle Guidelines](./check-metadata-guidelines.md#checktitle-guidelines).
+- **Severity** — The severity of the finding if the check fails. Must be one of: `critical`, `high`, `medium`, `low`, or `informational`, this field **must** be in lowercase. To get more information about the severity levels refer to the [Prowler's Check Severity Levels](#prowlers-check-severity-levels) section.
 
-#### CheckType
+- **ResourceType** — The type of resource being audited. *For now this field is only standardized for the AWS provider*.
 
-???+ warning
-    This field is only applicable to the AWS provider.
+    - For AWS use the [Security Hub resource types](https://docs.aws.amazon.com/securityhub/latest/userguide/asff-resources.html) or, if not available, the PascalCase version of the [CloudFormation type](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-template-resource-type-ref.html) (e.g., `AwsEc2Instance`). Use "Other" if no match exists.
 
-It follows the [AWS Security Hub Types](https://docs.aws.amazon.com/securityhub/latest/userguide/asff-required-attributes.html#Types) format using the pattern `namespace/category/classifier`.
+- **Description** — A short description of what the check does.
 
-For the complete AWS Security Hub selection guidelines, see [CheckType Guidelines](./check-metadata-guidelines.md#checktype-guidelines-aws-only).
+- **Risk** — The risk or impact if the check fails, explaining why the finding matters.
 
-#### ServiceName
+- **RelatedUrl** — A URL to official documentation or further reading about the check's purpose. If no official documentation is available, use the risk and recommendation text from trusted third-party sources.
 
-The name of the provider service being audited. Must be lowercase and match the service folder name. For supported services refer to [Prowler Hub](https://hub.prowler.com/check) or the [Prowler Code](https://github.com/prowler-cloud/prowler/tree/master/prowler/providers).
+- **Remediation** — Guidance for fixing a failed check, including:
 
-#### SubServiceName
+    - **Code** — Remediation commands or code snippets for CLI, Terraform, native IaC, or other tools like the Web Console.
 
-This field is in the process of being deprecated and should be **left empty**.
+    - **Recommendation** — A textual human readable recommendation. Here it is not necessary to include actual steps, but rather a general recommendation about what to do to fix the check.
 
-#### ResourceIdTemplate
+- **Categories** — One or more categories for grouping checks in execution (e.g., `internet-exposed`). For the current list of categories, refer to the [Prowler Hub](https://hub.prowler.com/check).
 
-This field is in the process of being deprecated and should be **left empty**.
+- **DependsOn** — Currently not used.
 
-#### Severity
+- **RelatedTo** — Currently not used.
 
-Severity level if the check fails. Must be one of: `critical`, `high`, `medium`, `low`, or `informational`, and written in lowercase. See [Prowler's Check Severity Levels](#prowlers-check-severity-levels) for details.
+- **Notes** — Any additional information not covered by other fields.
 
-#### ResourceType
+### Remediation Code Guidelines
 
-The type of resource being audited. This field helps categorize and organize findings by resource type for better analysis and reporting. For each provider:
+When providing remediation steps, reference the following sources:
 
-- **AWS**: Use [Security Hub resource types](https://docs.aws.amazon.com/securityhub/latest/userguide/asff-resources.html) or PascalCase CloudFormation types removing the `::` separator used in CloudFormation templates (e.g., in CloudFormation template the type of an EC2 instance is `AWS::EC2::Instance` but in the check it should be `AwsEc2Instance`). Use `Other` if none apply.
-- **Azure**: Use types from [Azure Resource Graph](https://learn.microsoft.com/en-us/azure/governance/resource-graph/reference/supported-tables-resources), for example: `Microsoft.Storage/storageAccounts`.
-- **Google Cloud**: Use [Cloud Asset Inventory asset types](https://cloud.google.com/asset-inventory/docs/asset-types), for example: `compute.googleapis.com/Instance`.
-- **Kubernetes**: Use types shown under `KIND` from `kubectl api-resources`.
-- **M365 / GitHub**: Leave empty due to lack of standardized types.
-
-#### Description
-
-A concise, natural language explanation that **clearly describes what the finding means**, focusing on clarity and context rather than technical implementation details. Use simple paragraphs with line breaks if needed, but avoid sections, code blocks, or complex formatting. This field is limited to maximum 400 characters.
-
-For detailed writing guidelines and common mistakes to avoid, see [Description Guidelines](./check-metadata-guidelines.md#description-guidelines).
-
-#### Risk
-
-A clear, natural language explanation of **why this finding poses a cybersecurity risk**. Focus on how it may impact confidentiality, integrity, or availability. If those do not apply, describe any relevant operational or financial risks. Use simple paragraphs with line breaks if needed, but avoid sections, code blocks, or complex formatting. Limit your explanation to 400 characters.
-
-For detailed writing guidelines and common mistakes to avoid, see [Risk Guidelines](./check-metadata-guidelines.md#risk-guidelines).
-
-#### RelatedUrl
-
-*Deprecated*. Use `AdditionalURLs` for adding your URLs references.
-
-#### AdditionalURLs
-
-???+ warning
-    URLs must be valid and not repeated.
-
-A list of official documentation URLs for further reading. These should be authoritative sources that provide additional context, best practices, or detailed information about the security control being checked. Prefer official provider documentation, security standards, or well-established security resources. Avoid third-party blogs or unofficial sources unless they are highly reputable and directly relevant.
-
-#### Remediation
-
-Provides both code examples and best practice recommendations for addressing the security issue.
-
-- **Code**: Contains remediation examples in different formats:
-    - **CLI**: Command-line interface commands to make the finding compliant in runtime.
-    - **NativeIaC**: Native Infrastructure as Code templates with an example of a compliant configuration. For now it applies to:
-        - **AWS**: CloudFormation YAML formatted code (do not use JSON format).
-        - **Azure**: Bicep formatted code (do not use ARM templates).
-    - **Terraform**: HashiCorp Configuration Language (HCL) code with an example of a compliant configuration.
-    - **Other**: Manual steps through web interfaces or other tools to make the finding compliant.
-
-    For detailed guidelines on writing remediation code, see [Remediation Code Guidelines](./check-metadata-guidelines.md#remediation-code-guidelines).
-
-- **Recommendation**
-    - **Text**: Generic best practice guidance in natural language using Markdown format (maximum 400 characters). For writing guidelines, see [Recommendation Guidelines](./check-metadata-guidelines.md#recommendation-guidelines).
-    - **Url**: [Prowler Hub URL](https://hub.prowler.com/) of the check. This URL is always composed by `https://hub.prowler.com/check/<check_id>`.
-
-#### Categories
-
-One or more functional groupings used for execution filtering (e.g., `internet-exposed`). You can define new categories just by adding to this field.
-
-For the complete list of available categories, see [Categories Guidelines](./check-metadata-guidelines.md#categories-guidelines).
-
-#### DependsOn
-
-List of check IDs of checks that if are compliant, this check will be a compliant too or it is not going to give any finding.
-
-#### RelatedTo
-
-List of check IDs of checks that are conceptually related, even if they do not share a technical dependency.
-
-#### Notes
-
-Any additional information not covered in the above fields.
+- Official provider documentation.
+- [Prowler Checks Remediation Index](https://docs.prowler.com/checks/checks-index)
+- [TrendMicro Cloud One Conformity](https://www.trendmicro.com/cloudoneconformity)
+- [CloudMatos Remediation Repository](https://github.com/cloudmatos/matos/tree/master/remediations)
 
 ### Python Model Reference
 
 The metadata structure is enforced in code using a Pydantic model. For reference, see the [`CheckMetadata`](https://github.com/prowler-cloud/prowler/blob/master/prowler/lib/check/models.py).
-
-## Generic Check Patterns and Best Practices
-
-### Common Patterns
-
-- Every check is implemented as a class inheriting from `Check` (from `prowler.lib.check.models`).
-- The main logic is implemented in the `execute()` method (**only method that must be implemented**), which always returns a list of provider-specific report objects (e.g., `CheckReport<Provider>`)—one per finding/resource. If there are no findings/resources, return an empty list.
-- **Never** use the provider's client directly; instead, use the service client (e.g., `<service>_client`) and iterate over its resources.
-- For each resource, create a provider-specific report object, populate it with metadata, resource details, status (`PASS`, `FAIL`, etc.), and a human-readable `status_extended` message.
-- Use the `metadata()` method to attach check metadata to each report.
-- Checks are designed to be idempotent and stateless: they do not modify resources, only report on their state.
-
-### Best Practices
-
-- Use clear, actionable, and user-friendly language in `status_extended` to explain the result. Always provide information to identify the resource.
-- Use helper functions/utilities for repeated logic to avoid code duplication. Save them in the `lib` folder of the service.
-- Handle exceptions gracefully: catch errors per resource, log them, and continue processing other resources.
-- Document the check with a class and function level docstring explaining what it does, what it checks, and any caveats or provider-specific behaviors.
-- Use type hints for the `execute()` method (e.g., `-> list[CheckReport<Provider>]`) for clarity and static analysis.
-- Ensure checks are efficient; avoid excessive nested loops. If the complexity is high, consider refactoring the check.
-- Keep the check logic focused: one check = one control/requirement. Avoid combining unrelated logic in a single check.
-
-## Specific Check Patterns
-
-Details for specific providers can be found in documentation pages named using the pattern `<provider_name>-details`.

docs/developer-guide/gcp-details.md

@@ -2,7 +2,7 @@
 
 This page details the [Google Cloud Platform (GCP)](https://cloud.google.com/) provider implementation in Prowler.
 
-By default, Prowler will audit all the GCP projects that the authenticated identity can access. To configure it, follow the [GCP getting started guide](../tutorials/gcp/getting-started-gcp.md).
+By default, Prowler will audit all the GCP projects that the authenticated identity can access. To configure it, follow the [getting started](../index.md#google-cloud) page.
 
 ## GCP Provider Classes Architecture
 
@@ -50,49 +50,6 @@ The GCP provider implementation follows the general [Provider structure](./provi
 - **Location:** [`prowler/providers/gcp/lib/`](https://github.com/prowler-cloud/prowler/blob/master/prowler/providers/gcp/lib/)
 - **Purpose:** Helpers for argument parsing, mutelist management, and other cross-cutting concerns.
 
-## Retry Configuration
-
-GCP services implement automatic retry functionality for rate limiting errors (HTTP 429). This is configured centrally and must be included in all API calls:
-
-### Required Implementation
-
-```python
-from prowler.providers.gcp.config import DEFAULT_RETRY_ATTEMPTS
-
-# In discovery.build()
-client = discovery.build(
-    service, version, credentials=credentials,
-    num_retries=DEFAULT_RETRY_ATTEMPTS
-)
-
-# In request.execute()
-response = request.execute(num_retries=DEFAULT_RETRY_ATTEMPTS)
-```
-
-### Configuration
-
-- **Default Value**: 3 attempts (configurable in `prowler/providers/gcp/config.py`)
-- **Command Line Flag**: `--gcp-retries-max-attempts` for runtime configuration
-- **Error Types**: HTTP 429 and quota exceeded errors
-- **Backoff Strategy**: Exponential backoff with randomization
-
-### Example Service Implementation
-
-```python
-def _get_instances(self):
-    for project_id in self.project_ids:
-        try:
-            client = discovery.build(
-                "compute", "v1", credentials=self.credentials,
-                num_retries=DEFAULT_RETRY_ATTEMPTS
-            )
-            request = client.instances().list(project=project_id)
-            response = request.execute(num_retries=DEFAULT_RETRY_ATTEMPTS)
-            # Process response...
-        except Exception as error:
-            logger.error(f"{error.__class__.__name__}: {error}")
-```
-
 ## Specific Patterns in GCP Services
 
 The generic service pattern is described in [service page](./services.md#service-structure-and-initialisation). You can find all the currently implemented services in the following locations:
@@ -112,7 +69,6 @@ The best reference to understand how to implement a new service is following the
 - Resource discovery and attribute collection can be parallelized using `self.__threading_call__`, typically by region/zone or resource.
 - All GCP resources are represented as Pydantic `BaseModel` classes, providing type safety and structured access to resource attributes.
 - Each GCP API calls are wrapped in try/except blocks, always logging errors.
-- **Retry Configuration**: All `request.execute()` calls must include `num_retries=DEFAULT_RETRY_ATTEMPTS` for automatic retry on rate limiting errors (HTTP 429).
 - Tags and additional attributes that cannot be retrieved from the default call should be collected and stored for each resource using dedicated methods and threading.
 
 ## Specific Patterns in GCP Checks

docs/developer-guide/github-details.md

@@ -2,7 +2,7 @@
 
 This page details the [GitHub](https://github.com/) provider implementation in Prowler.
 
-By default, Prowler will audit the GitHub account - scanning all repositories, organizations, and applications that your configured credentials can access. To configure it, follow the [GitHub getting started guide](../tutorials/github/getting-started-github.md).
+By default, Prowler will audit the GitHub account - scanning all repositories, organizations, and applications that your configured credentials can access. To configure it, follow the [getting started](../index.md#github) page.
 
 ## GitHub Provider Classes Architecture
 

docs/developer-guide/kubernetes-details.md

@@ -2,7 +2,7 @@
 
 This page details the [Kubernetes](https://kubernetes.io/) provider implementation in Prowler.
 
-By default, Prowler will audit all namespaces in the Kubernetes cluster accessible by the configured context. To configure it, see the [In-Cluster Execution](../tutorials/kubernetes/in-cluster.md) or [Non In-Cluster Execution](../tutorials/kubernetes/outside-cluster.md) guides.
+By default, Prowler will audit all namespaces in the Kubernetes cluster accessible by the configured context. To configure it, follow the [getting started](../index.md#kubernetes) page.
 
 ## Kubernetes Provider Classes Architecture
 

docs/developer-guide/lighthouse.md

@@ -1,6 +1,6 @@
-# Extending Prowler Lighthouse AI
+# Extending Prowler Lighthouse
 
-This guide helps developers customize and extend Prowler Lighthouse AI by adding or modifying AI agents.
+This guide helps developers customize and extend Prowler Lighthouse by adding or modifying AI agents.
 
 ## Understanding AI Agents
 
@@ -13,7 +13,7 @@ AI agents fall into two main categories:
 - **Autonomous Agents**: Freely chooses from available tools to complete tasks, adapting their approach based on context. They decide which tools to use and when.
 - **Workflow Agents**: Follows structured paths with predefined logic. They execute specific tool sequences and can include conditional logic.
 
-Prowler Lighthouse AI is an autonomous agent - selecting the right tool(s) based on the users query.
+Prowler Lighthouse is an autonomous agent - selecting the right tool(s) based on the users query.
 
 ???+ note
     To learn more about AI agents, read [Anthropic's blog post on building effective agents](https://www.anthropic.com/engineering/building-effective-agents).
@@ -24,15 +24,15 @@ The autonomous nature of agents depends on the underlying LLM. Autonomous agents
 
 After evaluating multiple LLM providers (OpenAI, Gemini, Claude, LLama) based on tool calling features and response accuracy, we recommend using the `gpt-4o` model.
 
-## Prowler Lighthouse AI Architecture
+## Prowler Lighthouse Architecture
 
-Prowler Lighthouse AI uses a multi-agent architecture orchestrated by the [Langgraph-Supervisor](https://www.npmjs.com/package/@langchain/langgraph-supervisor) library.
+Prowler Lighthouse uses a multi-agent architecture orchestrated by the [Langgraph-Supervisor](https://www.npmjs.com/package/@langchain/langgraph-supervisor) library.
 
 ### Architecture Components
 
 <img src="../../tutorials/img/lighthouse-architecture.png" alt="Prowler Lighthouse architecture">
 
-Prowler Lighthouse AI integrates with the NextJS application:
+Prowler Lighthouse integrates with the NextJS application:
 
 - The [Langgraph-Supervisor](https://www.npmjs.com/package/@langchain/langgraph-supervisor) library integrates directly with NextJS
 - The system uses the authenticated user session to interact with the Prowler API server
@@ -74,7 +74,7 @@ Modifying the supervisor prompt allows you to:
 
 The supervisor agent and all specialized agents are defined in the `route.ts` file. The supervisor agent uses [langgraph-supervisor](https://www.npmjs.com/package/@langchain/langgraph-supervisor), while other agents use the prebuilt [create-react-agent](https://langchain-ai.github.io/langgraphjs/how-tos/create-react-agent/).
 
-To add new capabilities or all Lighthouse AI to interact with other APIs, create additional specialized agents:
+To add new capabilities or all Lighthouse to interact with other APIs, create additional specialized agents:
 
 1. First determine what the new agent would do. Create a detailed prompt defining the agent's purpose and capabilities. You can see an example from [here](https://github.com/prowler-cloud/prowler/blob/master/ui/lib/lighthouse/prompts.ts#L359-L385).
 ???+ note

docs/developer-guide/m365-details.md

@@ -2,7 +2,7 @@
 
 This page details the [Microsoft 365 (M365)](https://www.microsoft.com/en-us/microsoft-365) provider implementation in Prowler.
 
-By default, Prowler will audit the Microsoft Entra ID tenant and its supported services. To configure it, follow the [M365 getting started guide](../tutorials/microsoft365/getting-started-m365.md).
+By default, Prowler will audit the Microsoft Entra ID tenant and its supported services. To configure it, follow the [getting started](../index.md#microsoft-365) page.
 
 ---
 
@@ -15,7 +15,7 @@ By default, Prowler will audit the Microsoft Entra ID tenant and its supported s
 - **Required modules:**
     - [ExchangeOnlineManagement](https://www.powershellgallery.com/packages/ExchangeOnlineManagement/3.6.0) (≥ 3.6.0)
     - [MicrosoftTeams](https://www.powershellgallery.com/packages/MicrosoftTeams/6.6.0) (≥ 6.6.0)
-- If you use Prowler Cloud or the official containers, PowerShell is pre-installed. For local or pip installations, you must install PowerShell and the modules yourself. See [Authentication: Supported PowerShell Versions](../tutorials/microsoft365/authentication.md#supported-powershell-versions) and [Needed PowerShell Modules](../tutorials/microsoft365/authentication.md#required-powershell-modules).
+- If you use Prowler Cloud or the official containers, PowerShell is pre-installed. For local or pip installations, you must install PowerShell and the modules yourself. See [Requirements: Supported PowerShell Versions](../getting-started/requirements.md#supported-powershell-versions) and [Needed PowerShell Modules](../getting-started/requirements.md#needed-powershell-modules).
 - For more details and troubleshooting, see [Use of PowerShell in M365](../tutorials/microsoft365/use-of-powershell.md).
 
 ---

docs/developer-guide/outputs.md

@@ -101,7 +101,6 @@ Prowler supports multiple output formats, allowing users to tailor findings pres
                     finding_dict["DESCRIPTION"] = finding.metadata.Description
                     finding_dict["RISK"] = finding.metadata.Risk
                     finding_dict["RELATED_URL"] = finding.metadata.RelatedUrl
-                    finding_dict["ADDITIONAL_URLS"] = unroll_list(finding.metadata.AdditionalURLs)
                     finding_dict["REMEDIATION_RECOMMENDATION_TEXT"] = (
                         finding.metadata.Remediation.Recommendation.Text
                     )

docs/developer-guide/provider.md

@@ -10,7 +10,6 @@ A provider is any platform or service that offers resources, data, or functional
 - Software as a Service (SaaS) Platforms (like Microsoft 365)
 - Development Platforms (like GitHub)
 - Container Orchestration Platforms (like Kubernetes)
-- Database-as-a-Service Platforms (like MongoDB Atlas)
 
 For providers supported by Prowler, refer to [Prowler Hub](https://hub.prowler.com/).
 
@@ -64,7 +63,6 @@ Given the complexity and variability of providers, use existing provider impleme
 - [Kubernetes](https://github.com/prowler-cloud/prowler/blob/master/prowler/providers/kubernetes/kubernetes_provider.py)
 - [Microsoft365](https://github.com/prowler-cloud/prowler/blob/master/prowler/providers/microsoft365/microsoft365_provider.py)
 - [GitHub](https://github.com/prowler-cloud/prowler/blob/master/prowler/providers/github/github_provider.py)
-- [MongoDB Atlas](https://github.com/prowler-cloud/prowler/blob/master/prowler/providers/mongodbatlas/mongodbatlas_provider.py)
 
 ### Basic Provider Implementation: Pseudocode Example
 

docs/developer-guide/services.md

@@ -21,8 +21,6 @@ Within this folder the following files are also to be created:
 - `<new_service_name>_service.py` – Contains all the logic and API calls of the service.
 - `<new_service_name>_client_.py` – Contains the initialization of the freshly created service's class so that the checks can use it.
 
-Once the files are create, you can check that the service has been created by running the following command: `poetry run python prowler-cli.py <provider> --list-services | grep <new_service_name>`.
-
 ## Service Structure and Initialisation
 
 The Prowler's service structure is as outlined below. To initialise it, just import the service client in a check.
@@ -77,7 +75,7 @@ class <Service>(ServiceParentClass):
         # String in case the provider's API service name is different.
         super().__init__(__class__.__name__, provider)
 
-        # Create an empty dictionary of items to be gathered, using the unique ID as the dictionary's key, e.g., instances.
+        # Create an empty dictionary of items to be gathered, using the unique ID as the dictionary’s key, e.g., instances.
         self.<items> = {}
 
         # If parallelization can be carried out by regions or locations, the function __threading_call__ to be used must be implemented in the Service Parent Class.
@@ -162,9 +160,11 @@ class <Service>(ServiceParentClass):
 ???+note
     To prevent false findings, when Prowler fails to retrieve items due to Access Denied or similar errors, the affected item's value is set to `None`.
 
-#### Resource Models
+#### Service Models
 
-Resource models define structured classes used within services to store and process data extracted from API calls. They are defined in the same file as the service class, but outside of the class, usually at the bottom of the file.
+Service models define structured classes used within services to store and process data extracted from API calls.
+
+Using Pydantic for Data Validation
 
 Prowler leverages Pydantic's [BaseModel](https://docs.pydantic.dev/latest/api/base_model/#pydantic.BaseModel) to enforce data validation.
 
@@ -227,24 +227,11 @@ from prowler.providers.<provider>.services.<new_service_name>.<new_service_name>
 
 ## Provider Permissions in Prowler
 
-Before implementing a new service, verify that Prowler's existing permissions for each provider are sufficient. If additional permissions are required, refer to the relevant documentation and update accordingly.
+Before implementing a new service, verify that Prowler’s existing permissions for each provider are sufficient. If additional permissions are required, refer to the relevant documentation and update accordingly.
 
 Provider-Specific Permissions Documentation:
 
-- [AWS](../tutorials/aws/authentication.md#required-permissions)
-- [Azure](../tutorials/azure/authentication.md#required-permissions)
-- [GCP](../tutorials/gcp/authentication.md#required-permissions)
-- [M365](../tutorials/microsoft365/authentication.md#required-permissions)
-- [GitHub](../tutorials/github/authentication.md)
-
-## Best Practices
-
-- When available in the provider, use threading or parallelization utilities for all methods that can be parallelized by to maximize performance and reduce scan time.
-- Define a Pydantic `BaseModel` for every resource you manage, and use these models for all resource data handling.
-- Log every major step (start, success, error) in resource discovery and attribute collection for traceability and debugging; include as much context as possible.
-- Catch and log all exceptions, providing detailed context (region, subscription, resource, error type, line number) to aid troubleshooting.
-- Use consistent naming for resource containers, unique identifiers, and model attributes to improve code readability and maintainability.
-- Add docstrings to every method and comments to explain any service-specific logic, especially where provider APIs behave differently or have quirks.
-- Collect and store resource tags and additional attributes to support richer checks and reporting.
-- Leverage shared utility helpers for session setup, identifier parsing, and other cross-cutting concerns to avoid code duplication. This kind of code is typically stored in a `lib` folder in the service folder.
-- Keep code modular, maintainable, and well-documented for ease of extension and troubleshooting.
+- [AWS](../getting-started/requirements.md#authentication)
+- [Azure](../getting-started/requirements.md#needed-permissions)
+- [GCP](../getting-started/requirements.md#needed-permissions_1)
+- [M365](../getting-started/requirements.md#needed-permissions_2)

docs/developer-guide/unit-testing.md

@@ -39,7 +39,7 @@ To execute the Prowler test suite, install the necessary dependencies listed in
 
 ### Prerequisites
 
-If you have not installed Prowler yet, refer to the [developer guide introduction](./introduction.md#getting-the-code-and-installing-all-dependencies).
+If you have not installed Prowler yet, refer to the [developer guide introduction](./introduction.md#get-the-code-and-install-all-dependencies).
 
 ### Executing Tests
 
@@ -520,7 +520,7 @@ Execute tests on the service `__init__` to ensure correct information retrieval.
 
 While service tests resemble *Integration Tests*, as they assess how the service interacts with the provider, they ultimately fall under *Unit Tests*, due to the use of Moto or custom mock objects.
 
-For detailed guidance on test creation and existing service tests, check the current [AWS checks implementation](https://github.com/prowler-cloud/prowler/tree/master/tests/providers/aws/services).
+For detailed guidance on test creation and existing service tests, refer to the [AWS checks test](./unit-testing.md#checks) [documentation](https://github.com/prowler-cloud/prowler/tree/master/tests/providers/aws/services).
 
 ## GCP