mirror of
https://github.com/fleetdm/fleet
synced 2026-05-19 23:18:51 +00:00
26e4395926
for #28118 # Checklist for submitter - [X] Manual QA for all new/changed functionality ## Details This PR adds an `overwrite` option to the "modify app config" API which, if set, causes the code to replace certain keys in the existing config with keys from the incoming config, without attempting any merge. This is then used by GitOps to allow it to easily clear settings that were otherwise being merged together or ignored entirely due to the PATCH semantics expected for the `fleetctl apply` use case. The new setting is utilized in this first pass for the following settings: * `sso_settings` * `smtp_settings` * `features` * `mdm.end_user_authentication` It could be expanded to several more keys that we currently handle piecemeal in the GitOps code by attempting to send empty values to the server (with varying success). Targeting `mdm.end_user_authentication` vs. all of `mdm` is based on [this bug](https://github.com/fleetdm/fleet/issues/26175) being opened. The concern with doing all of `mdm` would be that anyone who had e.g. VPP set up in their app and hadn't set it up in GitOps would have it wiped out. If we're comfortable with that risk I can update that here and update the warning accordingly. ### More detail **The way this code works _without_ Overwrite mode on** 1. We unmarshall the incoming JSON from GitOps into a fresh AppConfig struct `newAppConfig`. Anything keys not present in the incoming JSON will result in default values being set in `newAppConfig` 2. We unmarshall the incoming JSON from GitOps into the current `appConfig`. This uses an internal merge algorithm where keys not present in the JSON will generally leave the matching keys in `appConfig` untouched. We've been dealing with this by having GitOps find missing keys and explicitly set them to non-nil empty states. When arrays are encountered, they are _merged_, not replaced, which is problematic for the `features.additional_queries` use case and probably others. 3. We piecemeal replace certain data in `appConfig` with data from `newAppConfig`, and save it to the db. **The way this works _with_ Overwrite mode on** Between steps 1 and 2 above, we _copy_ certain keys from `newAppConfig` to `appConfig`. If the incoming JSON didn't have a key, the effect will be that `appConfig` now has default values for that key. For nested arrays like `features.additionalQueries`, the value in `appConfig` will be precisely what the user put in GitOps. ## Testing I tested adding/removing these settings with GitOps manually via `fleetctl gitops`. On the main branch I could reproduce the issue where omitting out these keys in my YAML did not lead to the settings being reset on my instance. With the Features settings, the issue was more granular, with inconsistent behavior when trying to remove individual nested settings. On this branch, the settings are cleared as expected at all levels of granularity. I also added some new automated tests to verify the expected behavior for these keys. All existing tests pass. If accepted this PR would supercede https://github.com/fleetdm/fleet/pull/29180 which approaches the issue from the GitOps side for sso, smtp and mdm. Adapting that approach for `features` would require custom logic to declare nested properties as "cleared". |
||
|---|---|---|
| .. | ||
| .keep | ||
| 10098-org-logo | ||
| 17710-apple-host-mdm-timestamps | ||
| 19235-microsoft-compliance-conditional-access | ||
| 23497-gitops-sha | ||
| 24083-app-metadata | ||
| 24087-app-names | ||
| 24087-migration-perf-improvement | ||
| 24209-windows-mdm-error-msg | ||
| 24394-wlan-xml-profile-verification | ||
| 24469-fleetctl-fma-apps | ||
| 24469-FMA-gitops | ||
| 24475-manual_agent_install | ||
| 24878-renew-ndes | ||
| 25700-luks-escrow-longtime | ||
| 26114-new-team-with-vpp-apps | ||
| 26366-update-sql-parser | ||
| 26553-renew-digicert | ||
| 26674-update-disk-info-docs | ||
| 26692-upload-install-tarballs | ||
| 27003-list-host-software | ||
| 27007-host-certificate-serial-display | ||
| 27052-round-live-policy-percentages | ||
| 27255-hide-script-content-for-saved-scripts | ||
| 27436-query-automation-query-ids | ||
| 27445-webhook-automation-backend | ||
| 27458-update-calendar-events | ||
| 27463-add-script-syntax-highlighting | ||
| 27475-fix-query-page-selection-clear | ||
| 27476-add-generate-gitops-cmd | ||
| 27477-do-not-interpolate-gitops-text-sections | ||
| 27501-clear-windows-mdm-info-on-linux-enroll | ||
| 27522-installer-encoding | ||
| 27609-user-menu-style | ||
| 27700-validate-bootstrap-is-distribution-pkg | ||
| 27822-dep-host-cleanup | ||
| 27854-force-profile-assign-on-abm-add | ||
| 27867-fix-chrome-profiles-not-reset-after-reenroll | ||
| 27909-hover-checkbox-radio | ||
| 27941-GOM-shouldn't-apply-to-VPP-token | ||
| 27979-ddm-profile-verification | ||
| 28032-email-to-header | ||
| 28033-support-end-user-idp-fleet-vars | ||
| 28038-uninstall | ||
| 28049-conditional-access-fe-updates | ||
| 28054-surface-policy-count-triggering-install | ||
| 28099-sha-hash | ||
| 28118-clear-gitops-settings | ||
| 28137-my-device-page-layout-changes | ||
| 28138-categories-be | ||
| 28154-fix-gitops-dry-run-labels | ||
| 28158-batch-script-backend | ||
| 28159-batch-scripts | ||
| 28166-webhook-logging | ||
| 28196-SCIM-for-Entra-ID | ||
| 28197-SCIM-for-authentik | ||
| 28205-skip-policies-during-setup-experience | ||
| 28240-log-invalid-soap-msg | ||
| 28266-clean-up-settings | ||
| 28343-reverting-some-mcx-validation | ||
| 28379-vpp-app-install-status | ||
| 28411-self-service-install-status | ||
| 28440-deleting-non-managed-gitops-labels | ||
| 28443-add-hash-to-software-title-response | ||
| 28543-exe-edits | ||
| 28560-add-neon-to-linux-platforms | ||
| 28616-renew-custom-scep | ||
| 28652-copy-button-consistency | ||
| 28743-gom-premium-only | ||
| 28747-allow-advanced-save-in-GOM | ||
| 28762-batch-resend-profile-to-hosts | ||
| 28857-vuln-checks | ||
| 28929-fleet-desktop-errors | ||
| 48642-add-retry-to-apply-queries | ||
| C10298-additional-stats | ||
| issue-23784-turn-off-mdm-iphone-ipad | ||
| issue-26070-add-ui-for-manual-agent-install | ||
| issue-26148-remove-config-settings-when-no-team-removed | ||
| issue-26505-keyboard-accssibility-to-activites | ||
| issue-27198-long-host-name | ||
| issue-27775-fix-activity-date-tooltip | ||
| issue-28215-allow-fleet-secrets-for-macos-setup-script | ||
| issue-28757-ui-for-profiles-status-and-batch-resend | ||
| issue-28759-ui-for-filter-hosts-by-config-profile-status | ||
| update-go-1.24.2 | ||
| warn-on-save-script | ||