Skip to content

[Backport to 2.x] Backport to 2.x #803, #918, and #914#930

Merged
jowg-amazon merged 3 commits intoopensearch-project:2.xfrom
jowg-amazon:bpto2.x_findings
Mar 15, 2024
Merged

[Backport to 2.x] Backport to 2.x #803, #918, and #914#930
jowg-amazon merged 3 commits intoopensearch-project:2.xfrom
jowg-amazon:bpto2.x_findings

Conversation

@jowg-amazon
Copy link
Copy Markdown
Collaborator

Description

Manual backport to 2.x

Issues Resolved

[List any issues this PR will resolve]

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

riysaxen-amzn and others added 3 commits March 14, 2024 16:30
…ect#803)

* get all findings as part of findings API enhancement

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* findingsAPI feature enhancements (address comments to prev PR)

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* findingsAPI feature enhancements (address comments to prev PR)

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* added support for  param in Finding API

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* added detectionType as param for Findings API enhancements

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* added few tests to validate findings by params

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* added test for searchString param in FindingsAPI

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* adding addiional params findingIds, startTime and endTime as findings API enhancement

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* added params in getFindingsByDetectorId func

* changed the startTime and endTime req input format

* fix merge conflixt

* fix integ test failures in findings API

* fix integ tests

* fix integ tests for findings

Signed-off-by: Subhobrata Dey <sbcd90@gmail.com>

---------

Signed-off-by: Riya Saxena <riysaxen@amazon.com>
Signed-off-by: Riya <69919272+riysaxen-amzn@users.noreply.github.com>
Signed-off-by: Subhobrata Dey <sbcd90@gmail.com>
Co-authored-by: Subhobrata Dey <sbcd90@gmail.com>
Signed-off-by: Joanne Wang <jowg@amazon.com>
* get all findings as part of findings API enhancement

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* findingsAPI feature enhancements (address comments to prev PR)

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* findingsAPI feature enhancements (address comments to prev PR)

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* added support for  param in Finding API

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* added detectionType as param for Findings API enhancements

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* added few tests to validate findings by params

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* added test for searchString param in FindingsAPI

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* adding addiional params findingIds, startTime and endTime as findings API enhancement

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* added params in getFindingsByDetectorId func

* changed the startTime and endTime req input format

* fix merge conflixt

* fix integ test failures in findings API

* fix integ tests

* refactored the logic

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* remove unused imports

* address the pr comments

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* address pr comments

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* SA integ tests fix

* SA integ tests fix

* fix integ tests for findings

Signed-off-by: Subhobrata Dey <sbcd90@gmail.com>

* fix conflixt errors

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* fix conflixt errors

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* fix conflixt errors

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* fix conflixt errors

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* fix integ tests

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* fix integ tests

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* fix integ tests

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* fix flaky integ tests

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* address pr comments

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

---------

Signed-off-by: Riya Saxena <riysaxen@amazon.com>
Signed-off-by: Riya <69919272+riysaxen-amzn@users.noreply.github.com>
Signed-off-by: Subhobrata Dey <sbcd90@gmail.com>
Co-authored-by: Subhobrata Dey <sbcd90@gmail.com>
@codecov
Copy link
Copy Markdown

codecov bot commented Mar 15, 2024

Codecov Report

Attention: Patch coverage is 0% with 113 lines in your changes are missing coverage. Please review.

Project coverage is 24.67%. Comparing base (03e95eb) to head (0106cb5).
Report is 3 commits behind head on 2.x.

Files Patch % Lines
...nalytics/transport/TransportGetFindingsAction.java 0.00% 47 Missing ⚠️
...h/securityanalytics/action/GetFindingsRequest.java 0.00% 25 Missing ⚠️
...ch/securityanalytics/findings/FindingsService.java 0.00% 22 Missing ⚠️
...tyanalytics/resthandler/RestGetFindingsAction.java 0.00% 19 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##                2.x     #930      +/-   ##
============================================
- Coverage     25.02%   24.67%   -0.36%     
+ Complexity     1041     1038       -3     
============================================
  Files           277      277              
  Lines         12755    12861     +106     
  Branches       1391     1405      +14     
============================================
- Hits           3192     3173      -19     
- Misses         9289     9414     +125     
  Partials        274      274              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@jowg-amazon
Copy link
Copy Markdown
Collaborator Author

Multi node failing tests are flakey. @riysaxen-amzn will take it up as a future AI.

@jowg-amazon jowg-amazon merged commit f63c351 into opensearch-project:2.x Mar 15, 2024
riysaxen-amzn pushed a commit to riysaxen-amzn/security-analytics that referenced this pull request Mar 25, 2024
* bump version to 2.8.0

Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>

* fix import string entity

Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>

* revert commenting out jackson dependencies

Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>

* revert to deleting monitor metadata after deleting doc level queries to fix regression

Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>

* upgrade gradle wrapper for 7.6.1

Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>

* revert delete monitor action order change

Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>

---------

Signed-off-by: Surya Sashank Nistala <snistala@amazon.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