Skip to content

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

Merged
jowg-amazon merged 1 commit intoopensearch-project:2.11from
engechas:backport-790-to-2.11
Feb 5, 2024
Merged

Delete detector successfully if workflow is missing (#790)#807
jowg-amazon merged 1 commit intoopensearch-project:2.11from
engechas:backport-790-to-2.11

Conversation

@engechas
Copy link
Copy Markdown
Collaborator

  • 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.

…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)
@codecov
Copy link
Copy Markdown

codecov bot commented Jan 16, 2024

Codecov Report

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

Comparison is base (48c2cfa) 24.67% compared to head (d3366fe) 24.68%.
Report is 1 commits behind head on 2.11.

Files Patch % Lines
...s/transport/TransportIndexCustomLogTypeAction.java 0.00% 54 Missing ⚠️
.../transport/TransportDeleteCustomLogTypeAction.java 0.00% 34 Missing ⚠️
...ytics/transport/TransportDeleteDetectorAction.java 0.00% 13 Missing ⚠️
...opensearch/securityanalytics/util/RuleIndices.java 0.00% 12 Missing ⚠️
...analytics/transport/TransportDeleteRuleAction.java 0.00% 1 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##               2.11     #807      +/-   ##
============================================
+ Coverage     24.67%   24.68%   +0.01%     
+ Complexity      947      944       -3     
============================================
  Files           255      255              
  Lines         11374    11353      -21     
  Branches       1279     1280       +1     
============================================
- Hits           2806     2803       -3     
+ Misses         8319     8300      -19     
- Partials        249      250       +1     

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

@jowg-amazon jowg-amazon merged commit aa1a3c9 into opensearch-project:2.11 Feb 5, 2024
riysaxen-amzn pushed a commit to riysaxen-amzn/security-analytics that referenced this pull request Mar 25, 2024
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