Skip to content

fix: rebase onto current prowler-cloud/prowler master - #54

Open
Arunktr123 wants to merge 498 commits into
ethanolivertroy:feature/fedramp-20x-ksi-2026from
Arunktr123:fix/rebase-fedramp-20x-ksi-2026
Open

Arunktr123 wants to merge 498 commits into
ethanolivertroy:feature/fedramp-20x-ksi-2026from
Arunktr123:fix/rebase-fedramp-20x-ksi-2026

Conversation

@Arunktr123

Copy link
Copy Markdown

Summary

Rebased feature/fedramp-20x-ksi-2026 onto current prowler-cloud/prowler:master (497 commits divergence since branch point) and resolved merge conflicts.

Conflicts resolved:

  1. prowler/compliance/aws/fedramp_20x_ksi_low_aws.json — accepted deletion (superseded by fedramp_20x_ksi_aws.json)
  2. prowler/compliance/azure/fedramp_20x_ksi_low_azure.json — accepted deletion (superseded by fedramp_20x_ksi_azure.json)
  3. ui/CHANGELOG.md — kept both entries under [1.32.0] Changed section (FedRAMP framework update + scan configuration wording)

Validation:

  • ✅ All 5 provider FedRAMP 20x KSI 2026 framework files validated (0 missing checks):
    • AWS: 136 unique checks
    • Azure: 122 unique checks
    • GCP: 79 unique checks
    • Kubernetes: 83 unique checks
    • M365: 87 unique checks
  • ✅ Compliance catalog integrity test suite: 345/345 passed
  • ✅ Pre-commit checks: all passed (except environment-specific Docker/TruffleHog utilities unavailable in sandbox, which is expected)

All framework files retain correct, current check names—no rework needed inside the new frameworks. Ready to merge into your feature branch and then upstream into prowler-cloud/prowler:master.

This fix unblocks PR #11701.

alejandrobailo and others added 30 commits July 29, 2026 11:55
…oud#12232)

Signed-off-by: StepSecurity Bot <bot@stepsecurity.io>
Co-authored-by: stepsecurity-app[bot] <188008098+stepsecurity-app[bot]@users.noreply.github.com>
Co-authored-by: jbchief-dev <285331266+jbchief-dev@users.noreply.github.com>
Co-authored-by: Daniel Barranquero <danielbo2001@gmail.com>
… check (prowler-cloud#12118)

Co-authored-by: Daniel Barranquero <danielbo2001@gmail.com>
Co-authored-by: Alex Chen <l46983284@gmail.com>
…_secrets check (prowler-cloud#11846)

Co-authored-by: Daniel Barranquero <danielbo2001@gmail.com>
…d#11963)

Signed-off-by: Alex Chen <l46983284@gmail.com>
Co-authored-by: Daniel Barranquero <danielbo2001@gmail.com>
Co-authored-by: Rishi943 <84287593+Rishi943@users.noreply.github.com>
Co-authored-by: Utkarsh <udaydeepak1928@gmail.com>
…-cloud#12094)

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Co-authored-by: CodeRabbit <noreply@coderabbit.ai>
…oud#12254)

Signed-off-by: StepSecurity Bot <bot@stepsecurity.io>
Co-authored-by: stepsecurity-app[bot] <188008098+stepsecurity-app[bot]@users.noreply.github.com>
…d#12219)

Co-authored-by: alejandrobailo <alejandrobailo94@gmail.com>
…rowler-cloud#11460)

Co-authored-by: Daniel Barranquero <danielbo2001@gmail.com>
Co-authored-by: Josema Camacho <josema@prowler.com>
tamg-aws and others added 23 commits September 1, 2026 14:00
Co-authored-by: prowler-bot <179230569+prowler-bot@users.noreply.github.com>
Co-authored-by: Daniel Barranquero <danielbo2001@gmail.com>
Co-authored-by: Pepe Fagoaga <pepe@prowler.com>
Co-authored-by: prowler-bot <179230569+prowler-bot@users.noreply.github.com>
Co-authored-by: Pepe Fagoaga <pepe@prowler.com>
Co-authored-by: pedrooot <pedromarting3@gmail.com>
Co-authored-by: alejandrobailo <alejandrobailo94@gmail.com>
Resolves merge conflicts introduced since the fedramp-20x-ksi-2026 branch
was created (497 commits divergence from master). Three conflicts resolved:

1. prowler/compliance/aws/fedramp_20x_ksi_low_aws.json — deleted by PR prowler-cloud#11701
   (superseded by fedramp_20x_ksi_aws.json), but master had patched renamed
   check IDs. Accept deletion.

2. prowler/compliance/azure/fedramp_20x_ksi_low_azure.json — same pattern.
   Accept deletion.

3. ui/CHANGELOG.md — both prowler-cloud#11701 and master added changelog entries under
   [1.32.0] Changed section. Keep both lines (FedRAMP framework display
   update + scan configuration wording).

All 5 provider FedRAMP 20x KSI 2026 framework files (aws, azure, gcp,
kubernetes, m365) retain correct current check names and still validate
cleanly against the latest check catalog.

Co-Authored-By: Ethan Troy <ethanolivertroy@users.noreply.github.com>
Copilot AI lite review requested due to automatic review settings September 7, 2026 12:26
@coderabbitai

coderabbitai Bot commented Sep 7, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Team

Run ID: e15099b5-97c2-4870-bc4c-c7425e15dff3

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🔵 Needs a closer look

The PR is a very large rebase touching many subsystems, and at least one confirmed type-contract change (SectionScores allowing strings) can cause incorrect UI rendering unless all consumers normalize those values.

Pull request overview

This PR rebases feature/fedramp-20x-ksi-2026 onto the current prowler-cloud/prowler:master, resolving conflicts and bringing in a large set of upstream changes across SDK, API, UI, MCP server, docs, and CI configuration.

Changes:

  • Rebase conflict resolutions + formatting/consistency tweaks (e.g., JSON newline normalization, updated runtime config keys/tests).
  • UI refactors toward @/components/shadcn/* paths, plus new/updated Lighthouse v1/v2-related types/utilities and various supporting components/tests.
  • SDK/API/MCP updates spanning compliance catalogs, provider checks/clients, MCP server hardening/config, and additional docs/CI maintenance.
File summaries
File Description
ui/actions/overview/threat-score/types/threat-score.types.ts Broadens SectionScores typing to support aggregated API payloads (but requires consumer normalization).
ui/lib/compliance/threatscore-pillars.ts (Context) Pillar helpers currently treat only numeric scores as valid data.
ui/app/(prowler)/_overview/threat-score/_components/threat-score.tsx Already coerces SectionScores values with Number(...) for tooltip rendering.
ui/components/compliance/compliance-charts/threatscore-breakdown-card.tsx Uses getOrderedPillars() and will mis-render if section scores arrive as strings.
ui/components/compliance/threatscore-badge.tsx Uses getOrderedPillars() and will mis-render if section scores arrive as strings.
Review details
  • Files reviewed: 163/3576 changed files
  • Comments generated: 1
  • Review effort level: Lite

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

Comment on lines +11 to +12
// The multi-provider aggregation branch serializes values as decimal strings.
export type SectionScores = Record<string, number | string>;
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.