-
Notifications
You must be signed in to change notification settings - Fork 1.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix limit parameter in GET sca check endpoint and Fix odd offset issue when paginating wdb queries #6464
Merged
Conversation
This file contains 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
limit
parameter behavior inGET /sca/{agent_id}/checks/{policy_id}
endpoint.Before the changes, the
limit
parameter was not working as expected, when you set thelimit
to 3 (as an instance), therules
andcompliances
of every check were counted to reach to that limit.New behavior, different than the one proposed in the issue, when you set the
limit
to 3, you will get 3 different checks and all therules
andcompliances
corresponding to these 3 checks.CHANGES:
API integration test cases added/updated.
File
field in the json response forsca check
test had to be removed because it is not always returned. After the changes to the endpoint, for agent001
, policy_idcis_debian9_L1
and limit1
,File
is not returned, as an instance.Function descriptions adapted to
numpydoc
format.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.py
used to addlimit
andoffset
parameters at the end of the query, which could be wrong sometimes (in this case, for instance).Limit
andoffset
parameters were deleted when removingwhere
keyword in query -> updated regex inwdb.py
in 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" -k
Response:
Regards,
Manuel.