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

added correlationAlert integ tests #1099

Conversation

riysaxen-amzn
Copy link
Collaborator

Description

  • Added Correlation Alert Integration Tests
  • Did refactoring

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.

Signed-off-by: Riya Saxena <[email protected]>
Signed-off-by: Riya Saxena <[email protected]>
@jowg-amazon
Copy link
Collaborator

It seems like these multinode tests are failing
"org.opensearch.securityanalytics.correlation.alerts.SecureCorrelationAlertsRestApiIT.testGetCorrelationAlertsAPI"
"org.opensearch.securityanalytics.findings.FindingIT.testGetFindings_bySeverity_success"

@riysaxen-amzn
Copy link
Collaborator Author

It seems like these multinode tests are failing "org.opensearch.securityanalytics.correlation.alerts.SecureCorrelationAlertsRestApiIT.testGetCorrelationAlertsAPI" "org.opensearch.securityanalytics.findings.FindingIT.testGetFindings_bySeverity_success"

removed SecureCorrelationAlertsRestApiIT.testGetCorrelationAlertsAPI till i fix it

@sbcd90
Copy link
Collaborator

sbcd90 commented Jul 2, 2024

It seems like these multinode tests are failing "org.opensearch.securityanalytics.correlation.alerts.SecureCorrelationAlertsRestApiIT.testGetCorrelationAlertsAPI" "org.opensearch.securityanalytics.findings.FindingIT.testGetFindings_bySeverity_success"

removed SecureCorrelationAlertsRestApiIT.testGetCorrelationAlertsAPI till i fix it

you can mark it as ignored so that we do not lose the test.

@riysaxen-amzn riysaxen-amzn merged commit e8d7879 into opensearch-project:main Jul 2, 2024
12 of 16 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

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

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/security-analytics/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/security-analytics/backport-2.x
# Create a new branch
git switch --create backport-1099-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 e8d78790ffbf344a68efd05417c8af2469948f57
# Push it to GitHub
git push --set-upstream origin backport-1099-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/security-analytics/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport-1099-to-2.x.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.15 failed:

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

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/security-analytics/backport-2.15 2.15
# Navigate to the new working tree
pushd ../.worktrees/security-analytics/backport-2.15
# Create a new branch
git switch --create backport-1099-to-2.15
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 e8d78790ffbf344a68efd05417c8af2469948f57
# Push it to GitHub
git push --set-upstream origin backport-1099-to-2.15
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/security-analytics/backport-2.15

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

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

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

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/security-analytics/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/security-analytics/backport-2.x
# Create a new branch
git switch --create backport-1099-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 e8d78790ffbf344a68efd05417c8af2469948f57
# Push it to GitHub
git push --set-upstream origin backport-1099-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/security-analytics/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport-1099-to-2.x.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.15 failed:

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

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/security-analytics/backport-2.15 2.15
# Navigate to the new working tree
pushd ../.worktrees/security-analytics/backport-2.15
# Create a new branch
git switch --create backport-1099-to-2.15
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 e8d78790ffbf344a68efd05417c8af2469948f57
# Push it to GitHub
git push --set-upstream origin backport-1099-to-2.15
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/security-analytics/backport-2.15

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

riysaxen-amzn added a commit to riysaxen-amzn/security-analytics that referenced this pull request Jul 6, 2024
* added correlationAlert integ tests

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

* added licences

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

* fixed imports

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

* deleted SecureCorrelationAlerts Tests, will add later

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

---------

Signed-off-by: Riya Saxena <[email protected]>
(cherry picked from commit e8d7879)
riysaxen-amzn added a commit to riysaxen-amzn/security-analytics that referenced this pull request Jul 6, 2024
* added correlationAlert integ tests

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

* added licences

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

* fixed imports

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

* deleted SecureCorrelationAlerts Tests, will add later

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

---------

Signed-off-by: Riya Saxena <[email protected]>
(cherry picked from commit e8d7879)
riysaxen-amzn added a commit that referenced this pull request Jul 7, 2024
* added correlationAlert integ tests

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

* added licences

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

* fixed imports

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

* deleted SecureCorrelationAlerts Tests, will add later

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

---------

Signed-off-by: Riya Saxena <[email protected]>
(cherry picked from commit e8d7879)
riysaxen-amzn added a commit that referenced this pull request Jul 7, 2024
* added correlationAlert integ tests

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

* added licences

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

* fixed imports

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

* deleted SecureCorrelationAlerts Tests, will add later

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

---------

Signed-off-by: Riya Saxena <[email protected]>
(cherry picked from commit e8d7879)
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.

3 participants