Skip to content

Add Windows FMAs (Letter C)#47732

Merged
allenhouchins merged 1 commit into
mainfrom
windows-fma-pmpc-parity
Jun 19, 2026
Merged

Add Windows FMAs (Letter C)#47732
allenhouchins merged 1 commit into
mainfrom
windows-fma-pmpc-parity

Conversation

@allenhouchins

@allenhouchins allenhouchins commented Jun 17, 2026

Copy link
Copy Markdown
Member

This pull request adds support for three new Windows applications—Chef Workstation, Cherry Keys, and Colour Contrast Analyser—along with Cribl Edge, to the maintained apps system. It introduces their metadata, installation/uninstallation scripts, and icon assets, ensuring these apps can be managed and displayed within the platform.

New Windows Application Support:

  • Added metadata input files for:
    • Chef Workstation (chef-workstation.json), including detection queries and categorization as a Developer tool.
    • Cherry Keys (cherry-keys.json), with fuzzy name matching and categorized as a Utility.
    • Colour Contrast Analyser (colour-contrast-analyser.json), specifying publisher and categorized as a Utility.
    • Cribl Edge (cribl-edge.json), with detection queries and categorized as a Developer tool.

Application Output and Versioning:

  • Added output JSON files for each new app with:
    • Latest version info, detection and patch queries, installer URLs, SHA256 hashes, install/uninstall script references, and upgrade codes:
      • chef-workstation/windows.json
      • cherry-keys/windows.json
      • colour-contrast-analyser/windows.json
      • cribl-edge/windows.json

App Catalog Updates:

  • Updated apps.json to include the new Windows apps, each with a description and unique identifier for catalog display. [1] [2] [3]

UI/Icon Assets:

  • Added a new SVG icon component for Chef Workstation in the frontend (ChefWorkstation.tsx).

…herry Keys, Colour Contrast Analyser, Cribl Edge
@allenhouchins allenhouchins requested a review from a team as a code owner June 17, 2026 03:00
Copilot AI review requested due to automatic review settings June 17, 2026 03:00
@fleet-release fleet-release requested a review from eashaw June 17, 2026 03:00

@claude claude Bot 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.

Claude Code Review

This repository is configured for manual code reviews. Comment @claude review to trigger a review and subscribe this PR to future pushes, or @claude review once for a one-time review.

Tip: disable this comment in your organization's Code Review settings.

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

This PR expands Fleet’s Windows Fleet-maintained app (FMA) catalog as part of the PatchMyPC parity sweep (Letter C), adding new winget-backed MSI apps and wiring up corresponding Software page icons.

Changes:

  • Added 4 new Windows winget FMA input definitions (Chef Workstation, Cherry Keys, Colour Contrast Analyser, Cribl Edge).
  • Added generated Windows output manifests for those apps (installer URLs, hashes, detection queries, install/uninstall script refs) and updated the apps.json catalog index.
  • Added new Software page icon components and mapped them for Chef Workstation, Cherry Keys, and Cribl Edge (Colour Contrast Analyser icon mapping already exists).

Reviewed changes

Copilot reviewed 13 out of 16 changed files in this pull request and generated no comments.

Show a summary per file
File Description
frontend/pages/SoftwarePage/components/icons/index.ts Imports new icon components and maps software-name keys to icons.
frontend/pages/SoftwarePage/components/icons/ChefWorkstation.tsx Adds Chef Workstation icon component (embedded PNG-in-SVG).
frontend/pages/SoftwarePage/components/icons/CherryKeys.tsx Adds Cherry Keys icon component (embedded PNG-in-SVG).
frontend/pages/SoftwarePage/components/icons/CriblEdge.tsx Adds Cribl Edge icon component (embedded PNG-in-SVG).
ee/maintained-apps/inputs/winget/chef-workstation.json Adds winget input definition for Chef Workstation (custom exists_query).
ee/maintained-apps/inputs/winget/cherry-keys.json Adds winget input definition for Cherry Keys (fuzzy_match_name pattern).
ee/maintained-apps/inputs/winget/colour-contrast-analyser.json Adds winget input definition for Colour Contrast Analyser (explicit program_publisher).
ee/maintained-apps/inputs/winget/cribl-edge.json Adds winget input definition for Cribl Edge.
ee/maintained-apps/outputs/chef-workstation/windows.json Adds generated Windows manifest (queries, scripts, hash, upgrade code).
ee/maintained-apps/outputs/cherry-keys/windows.json Adds generated Windows manifest (queries, scripts, hash, upgrade code).
ee/maintained-apps/outputs/colour-contrast-analyser/windows.json Adds generated Windows manifest (queries, scripts, hash, upgrade code).
ee/maintained-apps/outputs/cribl-edge/windows.json Adds generated Windows manifest (queries, scripts, hash, upgrade code).
ee/maintained-apps/outputs/apps.json Registers the new Windows FMAs in the catalog index.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@codecov

codecov Bot commented Jun 17, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 50.00000% with 3 lines in your changes missing coverage. Please review.
✅ Project coverage is 67.21%. Comparing base (ef0aed3) to head (e73edf8).
⚠️ Report is 83 commits behind head on main.

Files with missing lines Patch % Lines
.../SoftwarePage/components/icons/ChefWorkstation.tsx 50.00% 1 Missing ⚠️
...pages/SoftwarePage/components/icons/CherryKeys.tsx 50.00% 1 Missing ⚠️
.../pages/SoftwarePage/components/icons/CriblEdge.tsx 50.00% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main   #47732      +/-   ##
==========================================
- Coverage   67.21%   67.21%   -0.01%     
==========================================
  Files        3630     3633       +3     
  Lines      229526   229532       +6     
  Branches    11957    11810     -147     
==========================================
- Hits       154273   154270       -3     
- Misses      61389    61396       +7     
- Partials    13864    13866       +2     
Flag Coverage Δ
frontend 58.09% <50.00%> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@coderabbitai

coderabbitai Bot commented Jun 17, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

Walkthrough

Four new Windows applications—Chef Workstation, Cherry Keys, Colour Contrast Analyser, and Cribl Edge—are added to the maintained-apps catalog. Each app receives a Winget input JSON manifest (slug, package identifier, installer metadata, default category), a versioned output windows.json with SQL detection queries, MSI installer URL, SHA-256 checksum, upgrade code, and embedded PowerShell install/uninstall script references. The apps.json catalog is updated with four new Windows app entries. Three new React SVG icon components are added to the frontend and registered in SOFTWARE_NAME_TO_ICON_MAP.

Possibly related PRs

  • fleetdm/fleet#46381: Extends the same SOFTWARE_NAME_TO_ICON_MAP in frontend/pages/SoftwarePage/components/icons/index.ts and adds new entries to ee/maintained-apps/outputs/apps.json for different products.
  • fleetdm/fleet#47659: Extends the same Windows maintained-app catalog pipeline by adding new Winget input/output entries and updating SOFTWARE_NAME_TO_ICON_MAP with new app-name→icon mappings.
  • fleetdm/fleet#47000: Adds new Windows app entries and a corresponding React SVG icon registered in SOFTWARE_NAME_TO_ICON_MAP, using the identical structural pattern applied in this PR.
🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Title check ✅ Passed The title clearly and concisely summarizes the main change: adding Windows FMAs for applications starting with 'Letter C', which is exactly what the changeset does.
Description check ✅ Passed The PR description comprehensively covers all major changes including metadata files, output JSON configs with installation scripts, app catalog updates, and UI icon assets for four Windows applications.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
📝 Generate docstrings
  • Create stacked PR
  • Commit on current branch
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch windows-fma-pmpc-parity

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 and usage tips.

@allenhouchins allenhouchins changed the title Add Windows FMAs for PatchMyPC parity (Letter C) Add Windows FMAs (Letter C) Jun 17, 2026
@allenhouchins allenhouchins marked this pull request as draft June 17, 2026 03:07
@allenhouchins allenhouchins marked this pull request as ready for review June 19, 2026 15:04

@claude claude Bot 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.

Claude Code Review

This repository is configured for manual code reviews. Comment @claude review to trigger a review and subscribe this PR to future pushes, or @claude review once for a one-time review.

Tip: disable this comment in your organization's Code Review settings.

@allenhouchins allenhouchins merged commit 334d83a into main Jun 19, 2026
32 of 33 checks passed
@allenhouchins allenhouchins deleted the windows-fma-pmpc-parity branch June 19, 2026 15:04
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.

3 participants