IHA: add support for in-house apps to list host software by mna · Pull Request #34588 · fleetdm/fleet

mna · 2025-10-21T15:21:32Z

Related issue: (partially) Resolves #34001

Checklist for submitter

Input data is properly validated, SELECT * is avoided, SQL injection is prevented (using placeholders for values in statements)

Testing

Added/updated automated tests
Where appropriate, automated tests simulate multiple hosts and test for host isolation (updates to one hosts's records do not affect another)

codecov · 2025-10-21T15:39:47Z

Codecov Report

❌ Patch coverage is 89.46629% with 75 lines in your changes missing coverage. Please review.
⚠️ Please upload report for BASE (feat-in-house-apps@e403c74). Learn more about missing BASE report.

Files with missing lines	Patch %	Lines
server/datastore/mysql/software.go	89.40%	51 Missing and 24 partials ⚠️

Additional details and impacted files

@@                  Coverage Diff                  @@
##             feat-in-house-apps   #34588   +/-   ##
=====================================================
  Coverage                      ?   64.37%           
=====================================================
  Files                         ?     2065           
  Lines                         ?   209506           
  Branches                      ?     7032           
=====================================================
  Hits                          ?   134878           
  Misses                        ?    64078           
  Partials                      ?    10550

Flag	Coverage Δ
backend	`65.51% <89.46%> (?)`

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.

mna · 2025-10-21T17:11:17Z

+	// TODO: should an in-house app fill the InstallUUID instead? For frontend?
+	require.Equal(t, sw[2].SoftwarePackage.LastInstall.CommandUUID, inhouse1InstallCmd)


Thinking especially of when clicking on details in the software library for the last install status? Won't that try to open an installer's script outputs vs an MDM command results? ~~rachaelshaw~~ (meant @RachelElysia )

Actually, it currently reports the in-house app UUID in the command_uuid field, not the install_uuid, just wondering if that's ok for the frontend - i.e. it should open an MDM command result modal when clicking on details in list host software library, not the installer's results.

Sorry, meant to ping @RachelElysia ^

@mna I think this is right. VPP & in-house apps want command_uuid for the MDM command results modal.

mna · 2025-10-21T19:32:42Z

+
+	// create some in-house apps for no-team (this creates both iOS and iPadOS,
+	// but returns the iOS ids)
+	inHouseID1, inHouseTitleID1, err := ds.MatchOrCreateSoftwareInstaller(ctx, &fleet.UploadSoftwareInstallerPayload{


This turned out ok for this test, but it's a bit awkward/error-prone API to create 2 entries for the installer payload but return (~arbitrarily) the iOS in-house and title ids.

mna · 2025-10-21T19:33:24Z

+	require.Len(t, sw, 4)
+	require.Equal(t, []string{"inhouse1", "inhouse2", "inhouse3", "inhouseincl"}, pluckSoftwareNames(sw))
+
+	// Useful for debugging:


I'm thinking of leaving it there to help future us adding cases or debugging issues, unless y'all hate it.

that's fine by me!

mna · 2025-10-21T20:32:39Z

+		DumpTable(t, tx, "nano_commands")
+		DumpTable(t, tx, "nano_command_results")
+		return nil
+	})


It has passed the last few times, and locally too, but I'd leave this here so if we do see it failing before we merge the feature branch, it might help with debugging. If not, we can always remove it before merging to main (or leave it there a while longer).

jahzielv · 2025-10-22T15:53:49Z

+			for _, s := range installedInHouseAppIDs {
+				if s.InHouseAppID != nil {
+					if tmpByInHouseID[*s.InHouseAppID] == nil {
+						// inventoried by osquery, but not installed by fleet


nit: in-house apps can't be inventoried by osquery rn, because they're mobile device only

ah, true, I was caught up in duplicating the most accurately possible the VPP logic. Are we confident enough in the comment so that I remove this part?

actually it may just be the comment that need adjusted, and the code needs to stay there (i.e. inventoried by MDM command, but not installed by Fleet)...

I'll update it this PM.

@mna yeah that sounds right to me 👍

jahzielv · 2025-10-22T16:35:14Z

this lgtm overall!

cdcme · 2025-10-22T18:13:04Z

+	// TODO: should an in-house app fill the InstallUUID instead? For frontend?
+	require.Equal(t, sw[2].SoftwarePackage.LastInstall.CommandUUID, inhouse1InstallCmd)


@mna I think this is right. VPP & in-house apps want command_uuid for the MDM command results modal.

mna added 7 commits October 20, 2025 10:05

Start work on list host software

ecb1466

Implement inhouse apps get latest install

8c46b54

Some progress on in-house apps in list host software

bf0a2f7

More progress on in-house list host software

41da4a8

Work on in house apps support

509672e

Finish up adding inhouse support, test works so far

3d84362

Add more test cases

ac25863

mna had a problem deploying to Docker Hub October 21, 2025 15:21 — with GitHub Actions Error

Remove unused var

c74f5c9

mna temporarily deployed to Docker Hub October 21, 2025 15:24 — with GitHub Actions Inactive

Add more test cases

d09fec3

mna had a problem deploying to Docker Hub October 21, 2025 16:03 — with GitHub Actions Error

Add comment

addcff9

mna temporarily deployed to Docker Hub October 21, 2025 16:05 — with GitHub Actions Inactive

mna commented Oct 21, 2025

View reviewed changes

Merge branch 'feat-in-house-apps' into mna-34001-list-filter-ipa-2

445c570

mna temporarily deployed to Docker Hub October 21, 2025 18:29 — with GitHub Actions Inactive

Fix test list software titles tests

eb3eedd

mna had a problem deploying to Docker Hub October 21, 2025 19:24 — with GitHub Actions Error

Remove dump table debugging

e81506f

mna had a problem deploying to Docker Hub October 21, 2025 19:25 — with GitHub Actions Error

Fix list host software test

7efd2a0

mna temporarily deployed to Docker Hub October 21, 2025 19:31 — with GitHub Actions Inactive

mna commented Oct 21, 2025

View reviewed changes

Add debugging for flaky test failure

69985d1

mna temporarily deployed to Docker Hub October 21, 2025 20:01 — with GitHub Actions Inactive

Add debug info

83ed915

mna temporarily deployed to Docker Hub October 21, 2025 20:15 — with GitHub Actions Inactive

mna marked this pull request as ready for review October 21, 2025 20:31

mna requested a review from a team as a code owner October 21, 2025 20:31

mna commented Oct 21, 2025

View reviewed changes

jahzielv reviewed Oct 22, 2025

View reviewed changes

Adjust incorrect comment

cee15a8

mna temporarily deployed to Docker Hub October 22, 2025 17:30 — with GitHub Actions Inactive

mna mentioned this pull request Oct 22, 2025

IPA: finalize unified queue work #34625

Merged

2 tasks

cdcme approved these changes Oct 22, 2025

View reviewed changes

jahzielv approved these changes Oct 22, 2025

View reviewed changes

mna merged commit 84cd57e into feat-in-house-apps Oct 22, 2025
36 checks passed

mna deleted the mna-34001-list-filter-ipa-2 branch October 22, 2025 18:20

mna added a commit that referenced this pull request Oct 27, 2025

IHA: add support for in-house apps to list host software (#34588)

606204f

		// TODO: should an in-house app fill the InstallUUID instead? For frontend?
		require.Equal(t, sw[2].SoftwarePackage.LastInstall.CommandUUID, inhouse1InstallCmd)

Uh oh!

Conversation

mna commented Oct 21, 2025

Checklist for submitter

Testing

Uh oh!

codecov Bot commented Oct 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

mna Oct 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jahzielv commented Oct 22, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

codecov Bot commented Oct 21, 2025 •

edited

Loading

mna Oct 21, 2025 •

edited

Loading