mirror of
https://github.com/fleetdm/fleet
synced 2026-04-21 21:47:20 +00:00
There are still some TODOs particularly within Gitops test code which will be worked on in a followup PR # 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. - [x] Input data is properly validated, `SELECT *` is avoided, SQL injection is prevented (using placeholders for values in statements) - [x] If paths of existing endpoints are modified without backwards compatibility, checked the frontend/CLI for any necessary changes ## Testing - [x] Added/updated automated tests - [x] 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) - [ ] QA'd all new/changed functionality manually For unreleased bug fixes in a release candidate, one of: - [x] Confirmed that the fix is not expected to adversely impact load test results - [x] Alerted the release DRI if additional load testing is needed ## Database migrations - [x] Checked table schema to confirm autoupdate - [x] Checked schema for all modified table for columns that will auto-update timestamps during migration. - [x] Confirmed that updating the timestamps is acceptable, and will not cause unwanted side effects. - [x] 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` - [x] 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) - [x] 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) - [x] Verified that any relevant UI is disabled when GitOps mode is enabled --------- Co-authored-by: Gabriel Hernandez <ghernandez345@gmail.com> Co-authored-by: Magnus Jensen <magnus@fleetdm.com> Co-authored-by: Sarah Gillespie <73313222+gillespi314@users.noreply.github.com>
35 lines
901 B
TypeScript
35 lines
901 B
TypeScript
import { differenceWith, isArray, isEqual, isObject, map } from "lodash";
|
|
|
|
/**
|
|
* Compares two objects and returns the differences.
|
|
* It returns the properties from obj1 that are different from obj2.
|
|
*/
|
|
const deepDifference = (obj1: any, obj2: any) => {
|
|
const result: any = {};
|
|
|
|
map(obj1, (value, key) => {
|
|
const obj2Value = obj2[key];
|
|
|
|
if (isEqual(value, obj2Value)) return;
|
|
|
|
if (isArray(value) && isArray(obj2Value)) {
|
|
if (!value.length && obj2Value.length) {
|
|
result[key] = value;
|
|
} else {
|
|
const arrayDiff = differenceWith(value, obj2Value, isEqual);
|
|
|
|
if (arrayDiff.length) {
|
|
result[key] = arrayDiff;
|
|
}
|
|
}
|
|
} else if (isObject(value) && isObject(obj2Value)) {
|
|
result[key] = deepDifference(value, obj2Value);
|
|
} else {
|
|
result[key] = value;
|
|
}
|
|
});
|
|
|
|
return result;
|
|
};
|
|
|
|
export default deepDifference;
|