Fix the Fleet-maintained apps list being cut off by adding server-side pagination and applying platform / "hide added apps" filters across the full library. Introduces MaintainedAppListOptions (with Platform and AvailableOnly) and changes the ListAvailableFleetMaintainedApps / ListFleetMaintainedApps signatures. Datastore now paginates and counts by distinct app name, fetches all platform rows for apps on a page, and returns a count and pagination metadata; default client page size set to 500. Frontend no longer performs client-side filtering or local status/platform state; it relies on the API and uses data.count for totals. Docs, tests, mocks, and various call sites updated (including a new test that verifies pagination, platform and availability filters). <!-- Add the related story/sub-task/bug number, like Resolves #123, or remove if NA --> **Related issue:** Resolves # # Checklist for submitter If some of the following don't apply, delete the relevant line. - [x] Changes file added for user-visible changes in `changes/`, `orbit/changes/` or `ee/fleetd-chrome/changes`. See [Changes files](https://github.com/fleetdm/fleet/blob/main/docs/Contributing/guides/committing-changes.md#changes-files) for more information. - [ ] Input data is properly validated, `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. - [ ] Timeouts are implemented and retries are limited to avoid infinite loops - [ ] If paths of existing endpoints are modified without backwards compatibility, checked the frontend/CLI for any necessary changes ## Testing - [x] Added/updated automated tests - [ ] Where appropriate, [automated tests simulate multiple hosts and test for host isolation](https://github.com/fleetdm/fleet/blob/main/docs/Contributing/reference/patterns-backend.md#unit-testing) (updates to one hosts's records do not affect another) - [x] QA'd all new/changed functionality manually For unreleased bug fixes in a release candidate, one of: - [ ] Confirmed that the fix is not expected to adversely impact load test results - [ ] Alerted the release DRI if additional load testing is needed ## Database migrations - [ ] Checked schema for all modified table for columns that will auto-update timestamps during migration. - [ ] Confirmed that updating the timestamps is acceptable, and will not cause unwanted side effects. - [ ] Ensured the correct collation is explicitly set for character columns (`COLLATE utf8mb4_unicode_ci`). ## New Fleet configuration settings - [ ] Setting(s) is/are explicitly excluded from GitOps If you didn't check the box above, follow this checklist for GitOps-enabled settings: - [ ] Verified that the setting is exported via `fleetctl generate-gitops` - [ ] Verified the setting is documented in a separate PR to [the GitOps documentation](https://github.com/fleetdm/fleet/blob/main/docs/Configuration/yaml-files.md#L485) - [ ] Verified that the setting is cleared on the server if it is not supplied in a YAML file (or that it is documented as being optional) - [ ] Verified that any relevant UI is disabled when GitOps mode is enabled ## fleetd/orbit/Fleet Desktop - [ ] Verified compatibility with the latest released version of Fleet (see [Must rule](https://github.com/fleetdm/fleet/blob/main/docs/Contributing/workflows/fleetd-development-and-release-strategy.md)) - [ ] If the change applies to only one platform, confirmed that `runtime.GOOS` is used as needed to isolate changes - [ ] Verified that fleetd runs on macOS, Linux and Windows - [ ] Verified auto-update works from the released version of component to the new version (see [tools/tuf/test](../tools/tuf/test/README.md)) <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **Bug Fixes** * Fleet-maintained apps listing now paginates server-side (100 per page) so entries near the end of the alphabet are reachable. * Platform and “Hide added apps” filters are applied across the entire library, not just the currently loaded subset. * The displayed count now matches results by counting macOS and Windows versions separately. * **New Features** * Listing now supports URL-driven platform and “available” filtering, and the UI consistently reflects the active filter state. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
141 lines
4.7 KiB
Go
141 lines
4.7 KiB
Go
package maintained_apps
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"os"
|
|
"path/filepath"
|
|
"runtime"
|
|
"testing"
|
|
|
|
"github.com/fleetdm/fleet/v4/server/dev_mode"
|
|
"github.com/fleetdm/fleet/v4/server/fleet"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
// SyncApps ingests the maintained apps from the apps list manifest
|
|
// to fill the library of maintained apps with valid data for tests.
|
|
// It returns the results of the ingestion as a slice of
|
|
// fleet.MaintainedApps.
|
|
func SyncApps(t *testing.T, ds fleet.Datastore) []fleet.MaintainedApp {
|
|
_, filename, _, _ := runtime.Caller(0)
|
|
base := filepath.Dir(filepath.Dir(filepath.Dir(filepath.Dir(filename))))
|
|
outputsDir := filepath.Join(base, "ee/maintained-apps/outputs")
|
|
|
|
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
b, err := os.ReadFile(filepath.Join(outputsDir, r.URL.Path))
|
|
if err != nil {
|
|
if os.IsNotExist(err) {
|
|
w.WriteHeader(http.StatusNotFound)
|
|
return
|
|
}
|
|
w.WriteHeader(http.StatusInternalServerError)
|
|
_, _ = w.Write([]byte(err.Error()))
|
|
return
|
|
}
|
|
_, _ = w.Write(b)
|
|
}))
|
|
defer srv.Close()
|
|
|
|
// not using t.Setenv because we want the env var to be unset on return of
|
|
// this call
|
|
dev_mode.SetOverride("FLEET_DEV_MAINTAINED_APPS_BASE_URL", srv.URL)
|
|
defer dev_mode.ClearOverride("FLEET_DEV_MAINTAINED_APPS_BASE_URL")
|
|
dev_mode.SetOverride("FLEET_DEV_MAINTAINED_APPS_FALLBACK_BASE_URL", srv.URL)
|
|
defer dev_mode.ClearOverride("FLEET_DEV_MAINTAINED_APPS_FALLBACK_BASE_URL")
|
|
|
|
err := SyncAppsList(context.Background(), ds)
|
|
require.NoError(t, err)
|
|
|
|
// The list endpoint paginates and orders by app name. With default options
|
|
// GetPerPage returns DefaultPerPage (effectively unbounded), so this helper
|
|
// gets the full set in a single page for tests, which should not depend on
|
|
// the order.
|
|
apps, _, err := ds.ListAvailableFleetMaintainedApps(context.Background(), nil, fleet.MaintainedAppListOptions{})
|
|
require.NoError(t, err)
|
|
return apps
|
|
}
|
|
|
|
// ExpectedAppSlugs returns the list of app slugs (unique identifier) that are
|
|
// expected to be in the maintained apps library after ingestion. The slugs are
|
|
// taken from the apps.json list.
|
|
func ExpectedAppSlugs(t *testing.T) []string {
|
|
_, filename, _, _ := runtime.Caller(0)
|
|
base := filepath.Dir(filepath.Dir(filepath.Dir(filepath.Dir(filename))))
|
|
outputsDir := filepath.Join(base, "ee/maintained-apps/outputs")
|
|
b, err := os.ReadFile(filepath.Join(outputsDir, "apps.json"))
|
|
require.NoError(t, err)
|
|
|
|
var appsList AppsList
|
|
err = json.Unmarshal(b, &appsList)
|
|
require.NoError(t, err)
|
|
|
|
slugs := make([]string, len(appsList.Apps))
|
|
for i, app := range appsList.Apps {
|
|
slugs[i] = app.Slug
|
|
}
|
|
return slugs
|
|
}
|
|
|
|
func SyncAndRemoveApps(t *testing.T, ds fleet.Datastore) {
|
|
_, filename, _, _ := runtime.Caller(0)
|
|
base := filepath.Dir(filepath.Dir(filepath.Dir(filepath.Dir(filename))))
|
|
outputsDir := filepath.Join(base, "ee/maintained-apps/outputs")
|
|
|
|
b, err := os.ReadFile(filepath.Join(outputsDir, "apps.json"))
|
|
require.NoError(t, err)
|
|
var appsFile AppsList
|
|
require.NoError(t, json.Unmarshal(b, &appsFile))
|
|
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
data, err := json.Marshal(&appsFile)
|
|
if err != nil {
|
|
w.WriteHeader(http.StatusInternalServerError)
|
|
_, _ = w.Write([]byte(err.Error()))
|
|
return
|
|
}
|
|
_, _ = w.Write(data)
|
|
}))
|
|
defer srv.Close()
|
|
|
|
// not using t.Setenv because we want the env var to be unset on return of
|
|
// this call
|
|
dev_mode.SetOverride("FLEET_DEV_MAINTAINED_APPS_BASE_URL", srv.URL)
|
|
defer dev_mode.ClearOverride("FLEET_DEV_MAINTAINED_APPS_BASE_URL")
|
|
|
|
err = SyncAppsList(context.Background(), ds)
|
|
require.NoError(t, err)
|
|
|
|
originalApps, _, err := ds.ListAvailableFleetMaintainedApps(context.Background(), nil, fleet.MaintainedAppListOptions{})
|
|
require.NoError(t, err)
|
|
|
|
require.Equal(t, len(appsFile.Apps), len(originalApps))
|
|
|
|
// Modify the apps list to simulate removing an app from upstream
|
|
removedApp := appsFile.Apps[0]
|
|
appsFile.Apps = appsFile.Apps[1:]
|
|
|
|
err = SyncAppsList(context.Background(), ds)
|
|
require.NoError(t, err)
|
|
|
|
modifiedApps, _, err := ds.ListAvailableFleetMaintainedApps(context.Background(), nil, fleet.MaintainedAppListOptions{})
|
|
require.NoError(t, err)
|
|
|
|
require.Equal(t, len(appsFile.Apps), len(modifiedApps))
|
|
require.Equal(t, len(originalApps)-1, len(modifiedApps))
|
|
for _, a := range modifiedApps {
|
|
require.NotEqual(t, removedApp.Slug, a.Slug)
|
|
}
|
|
|
|
// remove all apps from upstream.
|
|
appsFile.Apps = []appListing{}
|
|
|
|
err = SyncAppsList(context.Background(), ds)
|
|
require.NoError(t, err)
|
|
|
|
modifiedApps, _, err = ds.ListAvailableFleetMaintainedApps(context.Background(), nil, fleet.MaintainedAppListOptions{})
|
|
require.ErrorIs(t, err, &fleet.NoMaintainedAppsInDatabaseError{})
|
|
require.Empty(t, modifiedApps)
|
|
}
|