Add more Windows FMAs (A) - #47659
Conversation
… Aptakube, Audiveris, AWS SAM CLI, Amazon Corretto JRE 8
There was a problem hiding this comment.
Pull request overview
This PR expands Fleet’s Windows Fleet-maintained app (FMA) catalog (PatchMyPC parity “Letter A”) by adding new winget-backed Windows app manifests plus corresponding Software page icons so the catalog can display the correct branding.
Changes:
- Added Windows FMAs (inputs + generated outputs) for Alacritty, Autopsy, Aptakube, Audiveris, AWS SAM CLI, and Amazon Corretto JRE 8.
- Added new Software page icon components and wired them into the name→icon map.
- Updated the generated
apps.jsoncatalog list to include the new Windows FMAs.
Reviewed changes
Copilot reviewed 19 out of 24 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| frontend/pages/SoftwarePage/components/icons/index.ts | Registers new icon components and maps software names to icons (including new Windows FMAs). |
| frontend/pages/SoftwarePage/components/icons/Alacritty.tsx | Adds Alacritty icon (embedded PNG-in-SVG). |
| frontend/pages/SoftwarePage/components/icons/Aptakube.tsx | Adds Aptakube icon (embedded PNG-in-SVG). |
| frontend/pages/SoftwarePage/components/icons/Audiveris.tsx | Adds Audiveris icon (embedded PNG-in-SVG). |
| frontend/pages/SoftwarePage/components/icons/Autopsy.tsx | Adds Autopsy icon (embedded PNG-in-SVG). |
| frontend/pages/SoftwarePage/components/icons/AwsSamCli.tsx | Adds AWS SAM CLI icon (embedded PNG-in-SVG). |
| ee/maintained-apps/outputs/alacritty/windows.json | Generated Windows FMA output (queries, installer URL, hashes, scripts/refs). |
| ee/maintained-apps/outputs/aptakube/windows.json | Generated Windows FMA output (queries, installer URL, hashes, scripts/refs). |
| ee/maintained-apps/outputs/audiveris/windows.json | Generated Windows FMA output (queries, installer URL, hashes, scripts/refs). |
| ee/maintained-apps/outputs/autopsy/windows.json | Generated Windows FMA output (queries, installer URL, hashes, scripts/refs). |
| ee/maintained-apps/outputs/aws-sam-cli/windows.json | Generated Windows FMA output (queries, installer URL, hashes, scripts/refs). |
| ee/maintained-apps/outputs/amazon-corretto-jre-8/windows.json | Generated Windows FMA output (queries, installer URL, hashes, scripts/refs). |
| ee/maintained-apps/outputs/apps.json | Adds new app entries to the generated catalog list. |
| ee/maintained-apps/inputs/winget/alacritty.json | Adds winget input definition for Alacritty Windows FMA generation. |
| ee/maintained-apps/inputs/winget/aptakube.json | Adds winget input definition for Aptakube Windows FMA generation (incl. publisher override). |
| ee/maintained-apps/inputs/winget/audiveris.json | Adds winget input definition for Audiveris Windows FMA generation. |
| ee/maintained-apps/inputs/winget/autopsy.json | Adds winget input definition for Autopsy Windows FMA generation. |
| ee/maintained-apps/inputs/winget/aws-sam-cli.json | Adds winget input definition for AWS SAM CLI Windows FMA generation. |
| ee/maintained-apps/inputs/winget/amazon-corretto-jre-8.json | Adds winget input definition for Amazon Corretto JRE 8 Windows FMA generation. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Codecov Report❌ Patch coverage is Additional details and impacted files@@ Coverage Diff @@
## main #47659 +/- ##
=======================================
Coverage 67.19% 67.19%
=======================================
Files 3618 3627 +9
Lines 229110 229151 +41
Branches 11899 11908 +9
=======================================
+ Hits 153944 153978 +34
- Misses 61324 61331 +7
Partials 13842 13842
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
WalkthroughEight new Windows maintained apps are added: Alacritty, Amazon Corretto JRE 8, Aptakube, Audiveris, Autopsy, AWS SAM Command Line Interface, Filebeat, and Winlogbeat. Each app receives a Winget input JSON manifest defining package identifiers and installer metadata, a Possibly related PRs
🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches📝 Generate docstrings
🧪 Generate unit tests (beta)
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. Comment |
allenhouchins
changed the title
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
🧹 Nitpick comments (1)
ee/maintained-apps/outputs/filebeat/windows.json (1)
16-20: ⚡ Quick winConsider using
$UPGRADE_CODEplaceholder instead of hardcoding.The uninstall script hardcodes the upgrade code
'{84CD8645-4DB1-5D89-81E3-071F628CFEAE}'while the same value exists in theupgrade_codefield. The backend supports$UPGRADE_CODEplaceholder substitution (persoftware_installers.go:330-338), which would ensure the script and JSON field stay synchronized automatically.If these values ever diverge, the uninstall would target the wrong products.
♻️ Suggested change to use placeholder
In the uninstall script, replace the hardcoded value:
-foreach ($product_code in $inst.RelatedProducts('{84CD8645-4DB1-5D89-81E3-071F628CFEAE}')) { +foreach ($product_code in $inst.RelatedProducts($UPGRADE_CODE)) {🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@ee/maintained-apps/outputs/filebeat/windows.json` around lines 16 - 20, The uninstall PowerShell script in the refs field hardcodes the upgrade code value '{84CD8645-4DB1-5D89-81E3-071F628CFEAE}' in the call to $inst.RelatedProducts(), but this value is already defined in the upgrade_code field above. Replace the hardcoded upgrade code in the script with the $UPGRADE_CODE placeholder, which the backend will automatically substitute during execution. This ensures the script and JSON configuration stay synchronized and prevents the uninstall from targeting incorrect products if the values ever diverge.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Nitpick comments:
In `@ee/maintained-apps/outputs/filebeat/windows.json`:
- Around line 16-20: The uninstall PowerShell script in the refs field hardcodes
the upgrade code value '{84CD8645-4DB1-5D89-81E3-071F628CFEAE}' in the call to
$inst.RelatedProducts(), but this value is already defined in the upgrade_code
field above. Replace the hardcoded upgrade code in the script with the
$UPGRADE_CODE placeholder, which the backend will automatically substitute
during execution. This ensures the script and JSON configuration stay
synchronized and prevents the uninstall from targeting incorrect products if the
values ever diverge.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Path: .coderabbit.yaml
Review profile: CHILL
Plan: Pro
Run ID: 1abb21ff-d0fa-4f02-86ea-5f9c79b1db9a
⛔ Files ignored due to path filters (2)
website/assets/images/app-icon-filebeat-60x60@2x.pngis excluded by!**/*.pngwebsite/assets/images/app-icon-winlogbeat-60x60@2x.pngis excluded by!**/*.png
📒 Files selected for processing (8)
ee/maintained-apps/inputs/winget/filebeat.jsonee/maintained-apps/inputs/winget/winlogbeat.jsonee/maintained-apps/outputs/apps.jsonee/maintained-apps/outputs/filebeat/windows.jsonee/maintained-apps/outputs/winlogbeat/windows.jsonfrontend/pages/SoftwarePage/components/icons/Filebeat.tsxfrontend/pages/SoftwarePage/components/icons/Winlogbeat.tsxfrontend/pages/SoftwarePage/components/icons/index.ts
✅ Files skipped from review due to trivial changes (4)
- ee/maintained-apps/inputs/winget/filebeat.json
- frontend/pages/SoftwarePage/components/icons/Filebeat.tsx
- frontend/pages/SoftwarePage/components/icons/Winlogbeat.tsx
- ee/maintained-apps/outputs/winlogbeat/windows.json
🚧 Files skipped from review as they are similar to previous changes (2)
- ee/maintained-apps/outputs/apps.json
- frontend/pages/SoftwarePage/components/icons/index.ts
This pull request adds support for several new Windows applications to the maintained apps catalog, including their installation and uninstallation scripts, metadata, and detection queries. It also updates the main
apps.jsonindex to include these new apps with descriptions. Additionally, there are minor improvements to existing app descriptions.New Windows app support:
alacritty.json,alacritty/windows.json) [1] [2]amazon-corretto-jre-8.json,amazon-corretto-jre-8/windows.json) [1] [2]aptakube.json,aptakube/windows.json) [1] [2]audiveris.json,audiveris/windows.json) [1] [2]autopsy.json,autopsy/windows.json) [1] [2]aws-sam-cli.json,aws-sam-cli/windows.json)filebeat.json,filebeat/windows.json)winlogbeat.json,winlogbeat/windows.json)Catalog and metadata updates:
apps.jsonto include the new Windows apps with their descriptions and unique identifiers. [1] [2] [3] [4] [5] [6] [7]Minor improvements:
apps.jsonfor better typographic consistency. [1] [2]