Skip to content
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 detector writeTo() method missing fields #695

Merged
merged 2 commits into from
Oct 26, 2023

Conversation

eirsep
Copy link
Member

@eirsep eirsep commented Oct 26, 2023

Description

fix detector writeTo() method missing fields.

Fixes flaky test org.opensearch.securityanalytics.model.WriteableTests.testDetectorAsAStream()

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.

Signed-off-by: Surya Sashank Nistala <[email protected]>
@codecov
Copy link

codecov bot commented Oct 26, 2023

Codecov Report

Merging #695 (a1bbde1) into main (92a620d) will increase coverage by 0.02%.
The diff coverage is 100.00%.

@@             Coverage Diff              @@
##               main     #695      +/-   ##
============================================
+ Coverage     26.91%   26.94%   +0.02%     
  Complexity     1064     1064              
============================================
  Files           274      274              
  Lines         12346    12351       +5     
  Branches       1343     1343              
============================================
+ Hits           3323     3328       +5     
  Misses         8748     8748              
  Partials        275      275              
Files Coverage Δ
...g/opensearch/securityanalytics/model/Detector.java 65.11% <100.00%> (+0.58%) ⬆️

@eirsep eirsep merged commit 7a45203 into opensearch-project:main Oct 26, 2023
11 of 15 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Oct 26, 2023
* fix detector writeTo() method missing fields

Signed-off-by: Surya Sashank Nistala <[email protected]>

* fix test

Signed-off-by: Surya Sashank Nistala <[email protected]>

---------

Signed-off-by: Surya Sashank Nistala <[email protected]>
(cherry picked from commit 7a45203)
opensearch-trigger-bot bot pushed a commit that referenced this pull request Oct 26, 2023
* fix detector writeTo() method missing fields

Signed-off-by: Surya Sashank Nistala <[email protected]>

* fix test

Signed-off-by: Surya Sashank Nistala <[email protected]>

---------

Signed-off-by: Surya Sashank Nistala <[email protected]>
(cherry picked from commit 7a45203)
eirsep added a commit that referenced this pull request Oct 26, 2023
* fix detector writeTo() method missing fields

Signed-off-by: Surya Sashank Nistala <[email protected]>

* fix test

Signed-off-by: Surya Sashank Nistala <[email protected]>

---------

Signed-off-by: Surya Sashank Nistala <[email protected]>
(cherry picked from commit 7a45203)

Co-authored-by: Surya Sashank Nistala <[email protected]>
eirsep added a commit that referenced this pull request Oct 26, 2023
* fix detector writeTo() method missing fields

Signed-off-by: Surya Sashank Nistala <[email protected]>

* fix test

Signed-off-by: Surya Sashank Nistala <[email protected]>

---------

Signed-off-by: Surya Sashank Nistala <[email protected]>
(cherry picked from commit 7a45203)

Co-authored-by: Surya Sashank Nistala <[email protected]>
riysaxen-amzn pushed a commit to riysaxen-amzn/security-analytics that referenced this pull request Feb 20, 2024
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.9 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.9 2.9
# Navigate to the new working tree
cd .worktrees/backport-2.9
# Create a new branch
git switch --create backport/backport-695-to-2.9
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 7a452039e4bb7c6010cebffb1a455b84a23514f3
# Push it to GitHub
git push --set-upstream origin backport/backport-695-to-2.9
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.9

Then, create a pull request where the base branch is 2.9 and the compare/head branch is backport/backport-695-to-2.9.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.5 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.5 2.5
# Navigate to the new working tree
cd .worktrees/backport-2.5
# Create a new branch
git switch --create backport/backport-695-to-2.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 7a452039e4bb7c6010cebffb1a455b84a23514f3
# Push it to GitHub
git push --set-upstream origin backport/backport-695-to-2.5
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.5

Then, create a pull request where the base branch is 2.5 and the compare/head branch is backport/backport-695-to-2.5.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.7 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.7 2.7
# Navigate to the new working tree
cd .worktrees/backport-2.7
# Create a new branch
git switch --create backport/backport-695-to-2.7
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 7a452039e4bb7c6010cebffb1a455b84a23514f3
# Push it to GitHub
git push --set-upstream origin backport/backport-695-to-2.7
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.7

Then, create a pull request where the base branch is 2.7 and the compare/head branch is backport/backport-695-to-2.7.

engechas pushed a commit to engechas/security-analytics that referenced this pull request Mar 14, 2024
* fix detector writeTo() method missing fields

Signed-off-by: Surya Sashank Nistala <[email protected]>

* fix test

Signed-off-by: Surya Sashank Nistala <[email protected]>

---------

Signed-off-by: Surya Sashank Nistala <[email protected]>
@engechas engechas mentioned this pull request Mar 15, 2024
5 tasks
goyamegh pushed a commit to goyamegh/security-analytics that referenced this pull request Mar 15, 2024
* fix detector writeTo() method missing fields

Signed-off-by: Surya Sashank Nistala <[email protected]>

* fix test

Signed-off-by: Surya Sashank Nistala <[email protected]>

---------

Signed-off-by: Surya Sashank Nistala <[email protected]>
engechas added a commit that referenced this pull request Mar 15, 2024
* query_field_names bugfix (#335)

Signed-off-by: Petar Dzepina <[email protected]>

* Reduce log level for informative message (#203)

Signed-off-by: Enrico Tröger <[email protected]>

* fix detector writeTo() method missing fields (#695)

* fix detector writeTo() method missing fields

Signed-off-by: Surya Sashank Nistala <[email protected]>

* fix test

Signed-off-by: Surya Sashank Nistala <[email protected]>

---------

Signed-off-by: Surya Sashank Nistala <[email protected]>

* fix null query filter conversion from sigma to query string query (#722)

* fix null query filter conversion from sigma to query string query

Signed-off-by: Surya Sashank Nistala <[email protected]>

* fix rule to query conversion tests for null filter

Signed-off-by: Surya Sashank Nistala <[email protected]>

* enhance test to verify non null doc doesnt match null query

Signed-off-by: Surya Sashank Nistala <[email protected]>

---------

Signed-off-by: Surya Sashank Nistala <[email protected]>

* Bump version 2.5.1, fix build

Signed-off-by: Chase Engelbrecht <[email protected]>

* Manual cherry-pick of #873

Signed-off-by: Chase Engelbrecht <[email protected]>

* Fix miss from manual cherry-pick

Signed-off-by: Chase Engelbrecht <[email protected]>

* Undo exceptional case not originally present

Signed-off-by: Chase Engelbrecht <[email protected]>

* Revert test from previous commit reversion

Signed-off-by: Chase Engelbrecht <[email protected]>

* Fix another miss from manual cherry-pick

Signed-off-by: Chase Engelbrecht <[email protected]>

* Revert behavior for no rules in detector

Signed-off-by: Chase Engelbrecht <[email protected]>

---------

Signed-off-by: Petar Dzepina <[email protected]>
Signed-off-by: Enrico Tröger <[email protected]>
Signed-off-by: Surya Sashank Nistala <[email protected]>
Signed-off-by: Chase Engelbrecht <[email protected]>
Co-authored-by: Petar Dzepina <[email protected]>
Co-authored-by: Enrico Tröger <[email protected]>
Co-authored-by: Surya Sashank Nistala <[email protected]>
riysaxen-amzn pushed a commit that referenced this pull request Mar 18, 2024
* fix detector writeTo() method missing fields

Signed-off-by: Surya Sashank Nistala <[email protected]>

* fix test

Signed-off-by: Surya Sashank Nistala <[email protected]>

---------

Signed-off-by: Surya Sashank Nistala <[email protected]>
# Conflicts:
#	src/main/java/org/opensearch/securityanalytics/model/Detector.java
riysaxen-amzn pushed a commit that referenced this pull request Mar 18, 2024
* fix detector writeTo() method missing fields

Signed-off-by: Surya Sashank Nistala <[email protected]>

* fix test

Signed-off-by: Surya Sashank Nistala <[email protected]>

---------

Signed-off-by: Surya Sashank Nistala <[email protected]>
@riysaxen-amzn riysaxen-amzn mentioned this pull request Mar 18, 2024
5 tasks
riysaxen-amzn added a commit that referenced this pull request Mar 18, 2024
* Fix duplicate ecs mappings which returns incorrect log index field in mapping view API (#786) (#788)

* field mapping changes

Signed-off-by: Joanne Wang <[email protected]>

* add integ test

Signed-off-by: Joanne Wang <[email protected]>

* turn unmappedfieldaliases as set and add integ test

Signed-off-by: Joanne Wang <[email protected]>

* add comments

Signed-off-by: Joanne Wang <[email protected]>

* fix integ tests

Signed-off-by: Joanne Wang <[email protected]>

* moved logic to method for better readability

Signed-off-by: Joanne Wang <[email protected]>

---------

Signed-off-by: Joanne Wang <[email protected]>

* Fix get mappings view API incorrectly returning ecs path (#867)

* add logic and integ tests to not add duplicate to log-types-config index

Signed-off-by: Joanne Wang <[email protected]>

* change naming for existingFieldMapping and change contains to equals

Signed-off-by: Joanne Wang <[email protected]>

---------

Signed-off-by: Joanne Wang <[email protected]>

* fix integ test (#918)

Signed-off-by: Joanne Wang <[email protected]>

* fix detector writeTo() method missing fields (#695)

* fix detector writeTo() method missing fields

Signed-off-by: Surya Sashank Nistala <[email protected]>

* fix test

Signed-off-by: Surya Sashank Nistala <[email protected]>

---------

Signed-off-by: Surya Sashank Nistala <[email protected]>

* removing threatIntel related code

Signed-off-by: Riya Saxena <[email protected]>

* removing threatIntel related code

Signed-off-by: Riya Saxena <[email protected]>

* ignore flaky tests

Signed-off-by: Riya Saxena <[email protected]>

---------

Signed-off-by: Joanne Wang <[email protected]>
Signed-off-by: Surya Sashank Nistala <[email protected]>
Signed-off-by: Riya Saxena <[email protected]>
Co-authored-by: Joanne Wang <[email protected]>
Co-authored-by: Surya Sashank Nistala <[email protected]>
@toepkerd toepkerd mentioned this pull request Mar 19, 2024
5 tasks
engechas pushed a commit that referenced this pull request Mar 19, 2024
* Version bump to 2.7.1

Signed-off-by: Megha Goyal <[email protected]>

* fix detector writeTo() method missing fields (#695)

* fix detector writeTo() method missing fields

Signed-off-by: Surya Sashank Nistala <[email protected]>

* fix test

Signed-off-by: Surya Sashank Nistala <[email protected]>

---------

Signed-off-by: Surya Sashank Nistala <[email protected]>

* fix null query filter conversion from sigma to query string query (#722)

* fix null query filter conversion from sigma to query string query

Signed-off-by: Surya Sashank Nistala <[email protected]>

* fix rule to query conversion tests for null filter

Signed-off-by: Surya Sashank Nistala <[email protected]>

* enhance test to verify non null doc doesnt match null query

Signed-off-by: Surya Sashank Nistala <[email protected]>

---------

Signed-off-by: Surya Sashank Nistala <[email protected]>

* * #709 Return empty response for empty mappings and no applied aliases

Signed-off-by: Megha Goyal <[email protected]>

* Adding integ tests for empty mappings/aliases use-cases

Signed-off-by: Megha Goyal <[email protected]>

* Fix unit tests for MappingsTraverser

Signed-off-by: Megha Goyal <[email protected]>

---------

Signed-off-by: Megha Goyal <[email protected]>

* fixing build failures for previous cherry-pick PR for SAP2.7 (to be squashed)

Signed-off-by: Dennis Toepker <[email protected]>

* Pass rule field names in doc level queries during monitor/creation. Remove blocking actionGet() calls  (#873)

* pass query field names in doc level queries during monitor creation/updation

Signed-off-by: Surya Sashank Nistala <[email protected]>

* remove actionGet() and change get index mapping call to event driven flow

Signed-off-by: Surya Sashank Nistala <[email protected]>

* fix chained findings monitor

Signed-off-by: Surya Sashank Nistala <[email protected]>

* add finding mappings

Signed-off-by: Surya Sashank Nistala <[email protected]>

* remove test messages from logs

Signed-off-by: Surya Sashank Nistala <[email protected]>

* revert build.gradle change

Signed-off-by: Surya Sashank Nistala <[email protected]>

---------

Signed-off-by: Surya Sashank Nistala <[email protected]>

* fixing an import

Signed-off-by: Dennis Toepker <[email protected]>

---------

Signed-off-by: Megha Goyal <[email protected]>
Signed-off-by: Surya Sashank Nistala <[email protected]>
Signed-off-by: Dennis Toepker <[email protected]>
Co-authored-by: Megha Goyal <[email protected]>
Co-authored-by: Surya Sashank Nistala <[email protected]>
Co-authored-by: Megha Goyal <[email protected]>
Co-authored-by: Dennis Toepker <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants