Fix 4.89.2 Docker publish: add missing GetSoftwareInstallerMetadataByTeamTitleAndInstallerID - #49760
Merged
georgekarrv merged 2 commits intoJul 22, 2026
Conversation
…leAndInstallerID The FMA patch-policy fix (#49519) was cherry-picked into this RC branch, bringing a caller of ds.GetSoftwareInstallerMetadataByTeamTitleAndInstallerID without the method itself (which lives in the larger #48607 feature PR that is not part of this release). This broke compilation and failed the Docker publish: software_installers.go:748: ds.GetSoftwareInstallerMetadataByTeamTitleAndInstallerID undefined (type *Datastore has no field or method ...) Add the method as a self-contained addition using the RC branch's existing metadata query, refactored to share a helper that takes an optional installer ID. The nil case preserves the existing GetSoftwareInstallerMetadataByTeamAndTitleID behavior exactly; a non-nil installer ID selects that specific package.
…n RC branch The FMA patch-policy test cherry-picked in with #49519 calls RecordPolicyQueryExecutions expecting ([]uint, error) (its signature on main), but on this RC branch it returns just error. The non-compiling test package failed both the mysql test suite and the Go linters' typecheck pass. Drop the unused first return value to match the RC signature.
nulmete
approved these changes
Jul 22, 2026
georgekarrv
deleted the
fix-docker-publish-4.89.2-missing-installer-method
branch
July 22, 2026 18:17
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## rc-patch-fleet-v4.89.2 #49760 +/- ##
=========================================================
Coverage ? 69.09%
=========================================================
Files ? 1702
Lines ? 197057
Branches ? 0
=========================================================
Hits ? 136161
Misses ? 46807
Partials ? 14089
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:
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Related issue: N/A — RC branch build/CI fix
What & why
The Docker publish for 4.89.2 on
rc-patch-fleet-v4.89.2was failing to compile, and themysqltest suite + Go linters were red — all from the same root cause: a broken cherry-pick.1. Missing datastore method (broke Docker publish + all binary builds):
The FMA patch-policy fix (#49519, commit
9603e84cc4) was cherry-picked in, bringing a caller ofGetSoftwareInstallerMetadataByTeamTitleAndInstallerID, but the method itself was introduced onmainby the large "Multiple packages API changes" feature PR (#48607), which is not part of this release.2. Stale test assertion (broke
mysqltest suite +lint/lint-incrementaltypecheck):The same cherry-pick brought a test that calls
RecordPolicyQueryExecutionsexpecting([]uint, error)(its signature onmain), but on this RC branch it returns justerror. A non-compiling test package fails both the mysql suite and the linter's typecheck pass.Fix
GetSoftwareInstallerMetadataByTeamTitleAndInstallerIDas a self-contained, minimal addition (interface + datastore impl + regenerated mock), refactoringGetSoftwareInstallerMetadataByTeamAndTitleIDto share a private helper that takes an optional installer ID. Thenilpath preserves existing behavior exactly; a non-nil ID selects that specific package bysi.id.No production behavior change for existing callers.
Checklist for submitter
SELECT *is avoided, SQL injection is prevented (using placeholders for values in statements), JS inline code is prevented especially for url redirects, and untrusted data interpolated into shell scripts/commands is validated against shell metacharacters.Testing
For unreleased bug fixes in a release candidate, one of: