Feature: 15605 merge inherited queries and policies#18801
Merged
RachelElysia merged 10 commits intomainfrom May 7, 2024
Merged
Feature: 15605 merge inherited queries and policies#18801RachelElysia merged 10 commits intomainfrom
RachelElysia merged 10 commits intomainfrom
Conversation
#17745 implement `merge_inherited` on the list queries endpoint to combine team and inherited queries. - [ ] Changes file added for user-visible changes in `changes/`, `orbit/changes/` or `ee/fleetd-chrome/changes`. See [Changes files](https://fleetdm.com/docs/contributing/committing-changes#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] Added/updated tests - [X] Manual QA for all new/changed functionality --------- Co-authored-by: RachelElysia <rachel@fleetdm.com>
#17744 This change implements a new query parameter on `/teams/%d/policies` to merge inherited policies into the policies array instead of listing them separately. The frontend will key off the existing `team_id` field to mark policies as "inherited" in theUI. I opted for an additive approach in adding a datastore method rather than modifying the existing ListTeamPolicies to avoid a large test refactor. - [ ] Changes file added for user-visible changes in `changes/`, `orbit/changes/` or `ee/fleetd-chrome/changes`. See [Changes files](https://fleetdm.com/docs/contributing/committing-changes#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] Added/updated tests - [X] Manual QA for all new/changed functionality --------- Co-authored-by: RachelElysia <rachel@fleetdm.com>
#17744 This adds the `merged_inherited` query param to `/teams/:id/policies/count` related to #18564 - [ ] Changes file added for user-visible changes in `changes/`, `orbit/changes/` or `ee/fleetd-chrome/changes`. See [Changes files](https://fleetdm.com/docs/contributing/committing-changes#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] Added/updated tests - [X] Manual QA for all new/changed functionality --------- Co-authored-by: RachelElysia <rachel@fleetdm.com>
Co-authored-by: Jacob Shandling <jacob@fleetdm.com>
…m Policies APIs (#18795)
ghernandez345
approved these changes
May 7, 2024
mostlikelee
approved these changes
May 7, 2024
RachelElysia
added a commit
that referenced
this pull request
May 7, 2024
mostlikelee
added a commit
that referenced
this pull request
May 8, 2024
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
4 participants
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.
Squash and merged Feature: 15605 merge inherited queries and policies #18771
Reverted with #18800
Note
This is the Unsquashed merge
Issue
Feature branch including all frontend and backend of #15605
Description
Merging this feature branch (15605-merge-inherited-queries-and-policies) into main includes the following commits that are all went through review and approval cycles:
Commits, authors, and approvers