Fix limit parameter in GET sca check endpoint and Fix odd offset issue when paginating wdb queries#6464
Merged
davidjiglesias merged 14 commits into4.0from Oct 30, 2020
Merged
Conversation
davidjiglesias
approved these changes
Oct 30, 2020
13 tasks
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
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.
Hi team,
The next changes were also posted in the PR #6064, but it needed to be closed due to a change on the base branch. Due to the odd offset issue when paginating, these changes are going to be merged into 4.0.
This PR is related to the issue #5878 . This PR is solving the limit parameter problem as well as the odd offset issue when paginating wdb queries (last commit).
For the first problem, I have changed the
limitparameter behavior inGET /sca/{agent_id}/checks/{policy_id}endpoint.Before the changes, the
limitparameter was not working as expected, when you set thelimitto 3 (as an instance), therulesandcompliancesof every check were counted to reach to that limit.New behavior, different than the one proposed in the issue, when you set the
limitto 3, you will get 3 different checks and all therulesandcompliancescorresponding to these 3 checks.CHANGES:
API integration test cases added/updated.
Filefield in the json response forsca checktest had to be removed because it is not always returned. After the changes to the endpoint, for agent001, policy_idcis_debian9_L1and limit1,Fileis not returned, as an instance.Function descriptions adapted to
numpydocformat.In
wdb.py, I have used wildcards in order to know where are the limit and offset parameter. This change will make future queries easier to do aswdb.pyused to addlimitandoffsetparameters at the end of the query, which could be wrong sometimes (in this case, for instance).Limitandoffsetparameters were deleted when removingwherekeyword in query -> updated regex inwdb.pyin order to make it more appropriate.Test results:
test_sca.py:Example of the new behavior:
Request:
curl -X GET "https://localhost:55000/sca/000/checks/cis_debian9_L2?limit=3" -H "accept: application/json" -H "Authorization: Bearer $TOKEN" -kResponse:
Regards,
Manuel.