Skip to content

17745 queries backend#18582

Merged
mostlikelee merged 6 commits into15605-merge-inherited-queries-and-policiesfrom
17745-queries-backend
Apr 29, 2024
Merged

17745 queries backend#18582
mostlikelee merged 6 commits into15605-merge-inherited-queries-and-policiesfrom
17745-queries-backend

Conversation

@mostlikelee
Copy link
Copy Markdown
Contributor

#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 for more information.
  • Input data is properly validated, SELECT * is avoided, SQL injection is prevented (using placeholders for values in statements)
  • Added/updated tests
  • Manual QA for all new/changed functionality

@mostlikelee mostlikelee requested a review from a team as a code owner April 26, 2024 19:16
Copy link
Copy Markdown
Member

@getvictor getvictor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@mostlikelee mostlikelee changed the base branch from main to 15605-merge-inherited-queries-and-policies April 29, 2024 18:36
@mostlikelee mostlikelee merged commit 1306ede into 15605-merge-inherited-queries-and-policies Apr 29, 2024
@mostlikelee mostlikelee deleted the 17745-queries-backend branch April 29, 2024 18:37
RachelElysia added a commit that referenced this pull request May 6, 2024
#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>
RachelElysia added a commit that referenced this pull request May 7, 2024
#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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants