Skip to content

Add Amazon Corretto 25 as a Windows FMA#46220

Merged
allenhouchins merged 3 commits into
mainfrom
allenhouchins-amazon-corretto-windows-fma
May 27, 2026
Merged

Add Amazon Corretto 25 as a Windows FMA#46220
allenhouchins merged 3 commits into
mainfrom
allenhouchins-amazon-corretto-windows-fma

Conversation

@allenhouchins

@allenhouchins allenhouchins commented May 26, 2026

Copy link
Copy Markdown
Member

Add support for Amazon Corretto 25 across the repo: new winget input definition, Windows output metadata (version 25.0.3.9) including installer/uninstaller PowerShell scripts, SHA256 and upgrade_code, and register the app in ee/maintained-apps/outputs/apps.json. Also add a frontend SVG icon component, map it in the icons index, and include the 2x PNG asset so the app is displayed in the UI. This enables Fleet to install and uninstall Amazon Corretto 25 on Windows.

Summary by CodeRabbit

Release Notes

  • New Features
    • Added complete Amazon Corretto 25 support for Windows including detection, installation, and lifecycle management capabilities
    • Enhanced Windows application detection to support matching by multiple registry identifiers, improving detection accuracy for installed programs

Review Change Stack

Add support for Amazon Corretto 25 across the repo: new winget input definition, Windows output metadata (version 25.0.3.9) including installer/uninstaller PowerShell scripts, SHA256 and upgrade_code, and register the app in ee/maintained-apps/outputs/apps.json. Also add a frontend SVG icon component, map it in the icons index, and include the 2x PNG asset so the app is displayed in the UI. This enables Fleet to install and uninstall Amazon Corretto 25 on Windows.
fleet-release
fleet-release previously approved these changes May 26, 2026
@codecov

codecov Bot commented May 26, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 50.00000% with 1 line in your changes missing coverage. Please review.
✅ Project coverage is 66.85%. Comparing base (48ace11) to head (c491b9b).
⚠️ Report is 2 commits behind head on main.

Files with missing lines Patch % Lines
...SoftwarePage/components/icons/AmazonCorretto25.tsx 50.00% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main   #46220      +/-   ##
==========================================
+ Coverage   66.83%   66.85%   +0.01%     
==========================================
  Files        2757     2759       +2     
  Lines      220189   220757     +568     
  Branches    11006    10879     -127     
==========================================
+ Hits       147161   147583     +422     
- Misses      59735    59830      +95     
- Partials    13293    13344      +51     
Flag Coverage Δ
backend 68.66% <ø> (+0.01%) ⬆️
frontend 55.79% <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 Sentry.
📢 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.

Allow searching programs by the app's unique_identifier when it differs from the catalog name and validate the input to avoid unsafe SQL. Updates cmd/maintained-apps/validate/windows.go to append an OR condition for uniqueIdentifier (with validateSqlInput guard) and keep existing install_location checks. Adjusts Amazon Corretto 25 metadata and queries: change unique_identifier to "Amazon Corretto (x64)", update the exists and patched queries to search the DisplayName and use version LIKE '25.%', and update apps.json accordingly. This addresses mismatches between catalog names and registry DisplayName entries so the presence/patch checks work reliably.
@allenhouchins allenhouchins marked this pull request as ready for review May 26, 2026 21:00
Copilot AI review requested due to automatic review settings May 26, 2026 21:00
@allenhouchins allenhouchins requested review from a team as code owners May 26, 2026 21:00
@fleet-release fleet-release requested a review from eashaw May 26, 2026 21: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

Adds Amazon Corretto 25 as a Fleet-maintained app (Windows) and wires it through both the maintained-apps pipeline and the frontend UI icon set so it can be displayed and managed in Fleet.

Changes:

  • Added a Winget input definition and generated Windows maintained-app output metadata for Amazon Corretto 25 (including installer/uninstaller scripts, SHA256, and upgrade code).
  • Registered the app in the maintained-apps catalog (apps.json).
  • Added a new frontend icon component and mapped the software name to the icon.

Reviewed changes

Copilot reviewed 6 out of 7 changed files in this pull request and generated no comments.

Show a summary per file
File Description
frontend/pages/SoftwarePage/components/icons/index.ts Adds import + name→icon mapping for “Amazon Corretto 25”.
frontend/pages/SoftwarePage/components/icons/AmazonCorretto25.tsx Adds the Amazon Corretto 25 icon component (embedded PNG in SVG).
ee/maintained-apps/outputs/apps.json Registers Amazon Corretto 25 in the maintained apps list.
ee/maintained-apps/outputs/amazon-corretto-25/windows.json Adds Windows maintained-app output: version metadata, queries, scripts, SHA256, and upgrade_code.
ee/maintained-apps/inputs/winget/amazon-corretto-25.json Adds the Winget input definition used to generate/track this maintained app.
cmd/maintained-apps/validate/windows.go Updates Windows validator existence-check logic to also search by unique_identifier when it differs from the catalog name.

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

@coderabbitai

coderabbitai Bot commented May 26, 2026

Copy link
Copy Markdown
Contributor

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Run ID: 34930429-1aa7-4575-9c9f-06a1ab333c93

📥 Commits

Reviewing files that changed from the base of the PR and between 48ace11 and c491b9b.

⛔ Files ignored due to path filters (1)
  • website/assets/images/app-icon-amazon-corretto-25-60x60@2x.png is excluded by !**/*.png
📒 Files selected for processing (6)
  • cmd/maintained-apps/validate/windows.go
  • ee/maintained-apps/inputs/winget/amazon-corretto-25.json
  • ee/maintained-apps/outputs/amazon-corretto-25/windows.json
  • ee/maintained-apps/outputs/apps.json
  • frontend/pages/SoftwarePage/components/icons/AmazonCorretto25.tsx
  • frontend/pages/SoftwarePage/components/icons/index.ts

Walkthrough

This PR adds Amazon Corretto 25 (Java distribution) as a maintained Windows application in Fleet. The changes enhance Windows app detection by extending the appExists logic to search registry entries by uniqueIdentifier when present. The PR then defines the complete application package: input metadata for Winget integration, output configuration with version info and MSI installer details, PowerShell scripts for installation and uninstallation with timeout/error handling, catalog entry, and a frontend SVG icon component with icon-map registration.

Possibly related PRs

  • fleetdm/fleet#42397: Both PRs enhance Windows app detection in cmd/maintained-apps/validate/windows.go by extending uniqueIdentifier-based matching logic.
  • fleetdm/fleet#46217: Both PRs modify Windows osquery detection in cmd/maintained-apps/validate/windows.go to enrich the programs-based lookup with additional registry fields.
🚥 Pre-merge checks | ✅ 3 | ❌ 2

❌ Failed checks (2 warnings)

Check name Status Explanation Resolution
Description check ⚠️ Warning The PR description is largely incomplete relative to the provided template. Critical checklist items for input validation, testing, and compatibility verification are not addressed. Complete the description template by checking applicable checklist items and confirming input validation (SQL injection prevention), testing (automated and manual QA), and Windows compatibility have been verified.
Docstring Coverage ⚠️ Warning Docstring coverage is 0.00% which is insufficient. The required threshold is 80.00%. Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (3 passed)
Check name Status Explanation
Title check ✅ Passed The title 'Add Amazon Corretto 25 as a Windows FMA' clearly and concisely summarizes the main change—adding support for a new Windows application package.
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.

✏️ 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 allenhouchins-amazon-corretto-windows-fma

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 merged commit 1651b6e into main May 27, 2026
49 checks passed
@allenhouchins allenhouchins deleted the allenhouchins-amazon-corretto-windows-fma branch May 27, 2026 02:10
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.

4 participants