Skip to content

Delete detector successfully if workflow is missing (#790)#809

Merged
jowg-amazon merged 1 commit intoopensearch-project:2.xfrom
engechas:backport-790-to-2.x
Feb 5, 2024
Merged

Delete detector successfully if workflow is missing (#790)#809
jowg-amazon merged 1 commit intoopensearch-project:2.xfrom
engechas:backport-790-to-2.x

Conversation

@engechas
Copy link
Copy Markdown
Collaborator

@engechas engechas commented Jan 16, 2024

  • Delete detector successfully if workflow is missing

Signed-off-by: Chase Engelbrecht engechas@amazon.com

  • Refactor to use existing NotFound exception checker

Signed-off-by: Chase Engelbrecht engechas@amazon.com

Signed-off-by: Chase Engelbrecht engechas@amazon.com
(cherry picked from commit 0ad91cc)

Description

Manual conflict resolution + backport

Check List

  • New functionality includes testing.
    • All tests pass
  • [N/A] New functionality has been documented.
    • [N/A] 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.

@jowg-amazon
Copy link
Copy Markdown
Collaborator

jowg-amazon commented Jan 17, 2024

Can you rebase from 2.x? Checks are failing because of the gradle update.

@engechas
Delete detector successfully if workflow is missing (opensearch-proje…
ac2255b 
…ct#790)

* Delete detector successfully if workflow is missing

Signed-off-by: Chase Engelbrecht <engechas@amazon.com>

* Refactor to use existing NotFound exception checker

Signed-off-by: Chase Engelbrecht <engechas@amazon.com>

---------

Signed-off-by: Chase Engelbrecht <engechas@amazon.com>
(cherry picked from commit 0ad91cc)
@engechas engechas force-pushed the backport-790-to-2.x branch from 2932d25 to ac2255b Compare January 17, 2024 21:59
@engechas
Copy link
Copy Markdown
Collaborator Author

engechas commented Jan 17, 2024

Can you rebase from 2.x? Checks are failing because of the gradle update.

Done

@codecov
Copy link
Copy Markdown

codecov bot commented Jan 17, 2024

Codecov Report

Attention: 13 lines in your changes are missing coverage. Please review.

Comparison is base (8990aed) 24.83% compared to head (ac2255b) 24.82%.

Files Patch % Lines
...ytics/transport/TransportDeleteDetectorAction.java 0.00% 13 Missing ⚠️
Additional details and impacted files 
@@             Coverage Diff              @@
##                2.x     #809      +/-   ##
============================================
- Coverage     24.83%   24.82%   -0.02%     
  Complexity     1024     1024              
============================================
  Files           277      277              
  Lines         12683    12689       +6     
  Branches       1389     1389              
============================================
  Hits           3150     3150              
- Misses         9267     9273       +6     
  Partials        266      266

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

@engechas
Copy link
Copy Markdown
Collaborator Author

engechas commented Jan 17, 2024

Can you rebase from 2.x? Checks are failing because of the gradle update.

Done

Nvm, still failing. It doesn't look related to this PR but will investigate soon

@engechas
Copy link
Copy Markdown
Collaborator Author

engechas commented Jan 17, 2024

This is the failure:

org.opensearch.securityanalytics.findings.FindingIT > testGetFindings_rolloverByMaxAge_success FAILED
    java.lang.IndexOutOfBoundsException: Index 0 out of bounds for length 0
        at __randomizedtesting.SeedInfo.seed([C511499764CAA34E:81FC4FA1CAEA296F]:0)
        at java.base/jdk.internal.util.Preconditions.outOfBounds(Preconditions.java:64)
        at java.base/jdk.internal.util.Preconditions.outOfBoundsCheckIndex(Preconditions.java:70)
        at java.base/jdk.internal.util.Preconditions.checkIndex(Preconditions.java:248)
        at java.base/java.util.Objects.checkIndex(Objects.java:374)
        at java.base/java.util.ArrayList.get(ArrayList.java:459)
        at org.opensearch.securityanalytics.findings.FindingIT.testGetFindings_rolloverByMaxAge_success(FindingIT.java:325)

I confirmed it still occurs with my backported commit removed.

@jowg-amazon
Copy link
Copy Markdown
Collaborator

jowg-amazon commented Jan 18, 2024

Yeah this is a known flakey test in SA. I'm taking a look into it now.

@jowg-amazon jowg-amazon merged commit 30edec0 into opensearch-project:2.x Feb 5, 2024
riysaxen-amzn pushed a commit to riysaxen-amzn/security-analytics that referenced this pull request Mar 25, 2024
@opensearch-trigger-bot @lezzago
Added 2.6 release notes. (opensearch-project#809) (opensearch-project…
9875176 
…#810)

Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>
(cherry picked from commit db83a812606655cab076c6c9001adab30d380327)

Co-authored-by: Ashish Agrawal <ashisagr@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@praveensameneni praveensameneni praveensameneni approved these changes

@jowg-amazon jowg-amazon jowg-amazon approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@engechas @jowg-amazon @praveensameneni