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

Update imports for files refactored in core PR #8157 #1025

Merged
merged 4 commits into from
Jul 24, 2023

Conversation

lezzago
Copy link
Member

@lezzago lezzago commented Jul 13, 2023

Issue #, if available:
N/A

Description of changes:
Update imports for files refactored in core PR opensearch-project/OpenSearch#8157
Reenable macOS CI integ tests

CheckList:

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

@lezzago
Copy link
Member Author

lezzago commented Jul 13, 2023

Currently need https://github.com/opensearch-project/notifications to fix this.

@Hailong-am

@lezzago lezzago marked this pull request as draft July 13, 2023 16:31
@Hailong-am
Copy link

Hailong-am commented Jul 14, 2023

Currently need https://github.com/opensearch-project/notifications to fix this.

@Hailong-am

will take fix in notification opensearch-project/notifications#707 and publish new jar/zip file

@Hailong-am
Copy link

Currently need https://github.com/opensearch-project/notifications to fix this.

@Hailong-am

@lezzago you should unblocked.

lezzago added 3 commits July 21, 2023 10:00
Signed-off-by: Ashish Agrawal <[email protected]>
Signed-off-by: Ashish Agrawal <[email protected]>
Signed-off-by: Ashish Agrawal <[email protected]>
@codecov
Copy link

codecov bot commented Jul 21, 2023

Codecov Report

Merging #1025 (01b3ca3) into main (2430d81) will increase coverage by 0.41%.
The diff coverage is 50.00%.

@@             Coverage Diff              @@
##               main    #1025      +/-   ##
============================================
+ Coverage     72.13%   72.55%   +0.41%     
+ Complexity      113      105       -8     
============================================
  Files           160      160              
  Lines         10301    10303       +2     
  Branches       1571     1514      -57     
============================================
+ Hits           7431     7475      +44     
+ Misses         1977     1967      -10     
+ Partials        893      861      -32     
Impacted Files Coverage Δ
...pensearch/percolator/PercolateQueryBuilderExt.java 30.81% <ø> (ø)
...pensearch/percolator/PercolatorFieldMapperExt.java 78.12% <ø> (ø)
...n/kotlin/org/opensearch/alerting/AlertingPlugin.kt 94.53% <ø> (ø)
...rg/opensearch/alerting/BucketLevelMonitorRunner.kt 79.75% <ø> (-0.41%) ⬇️
.../opensearch/alerting/DocumentLevelMonitorRunner.kt 84.10% <ø> (+0.82%) ⬆️
...ain/kotlin/org/opensearch/alerting/InputService.kt 89.88% <ø> (ø)
.../org/opensearch/alerting/MonitorMetadataService.kt 63.63% <ø> (-0.76%) ⬇️
...org/opensearch/alerting/WorkflowMetadataService.kt 63.88% <ø> (ø)
.../kotlin/org/opensearch/alerting/WorkflowService.kt 80.00% <ø> (ø)
...pensearch/alerting/action/ExecuteMonitorRequest.kt 100.00% <ø> (ø)
... and 80 more

... and 9 files with indirect coverage changes

@lezzago lezzago marked this pull request as ready for review July 21, 2023 19:56
@sbcd90 sbcd90 merged commit d879e1a into opensearch-project:main Jul 24, 2023
@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/alerting/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/alerting/backport-2.x
# Create a new branch
git switch --create backport-1025-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 d879e1af6762d8f3e4398a39d823c31effcd6ed1
# Push it to GitHub
git push --set-upstream origin backport-1025-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/alerting/backport-2.x

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

@lezzago
Copy link
Member Author

lezzago commented Aug 2, 2023

backport was no longer needed.

lezzago added a commit to lezzago/alerting-opensearch that referenced this pull request Aug 21, 2023
lezzago added a commit that referenced this pull request Aug 23, 2023
* Update imports for files refactored in core PR #8157 (#1025)

Signed-off-by: Ashish Agrawal <[email protected]>

* Resolve core Xcontent and CircuitBreaker refactor (#1062)

* Resolve core Xcontent refactor

Signed-off-by: Ashish Agrawal <[email protected]>

* Resolve core CircuitBreaker refactor

Signed-off-by: Ashish Agrawal <[email protected]>

* Resolve integ test issues with adding test dependency

Signed-off-by: Ashish Agrawal <[email protected]>

---------

Signed-off-by: Ashish Agrawal <[email protected]>

* fix breaking change from core library refactor (#1090)

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

* Resolve additional compile issues

Signed-off-by: Ashish Agrawal <[email protected]>

* fix bwc issues

Signed-off-by: Ashish Agrawal <[email protected]>

* Update BWC version to deal with ktlint issues

Signed-off-by: Ashish Agrawal <[email protected]>

* Update BWC version

Signed-off-by: Ashish Agrawal <[email protected]>

* Disable BWC for non-bwc CIs

Signed-off-by: Ashish Agrawal <[email protected]>

* Fix integ tests and update CI flows

Signed-off-by: Ashish Agrawal <[email protected]>

---------

Signed-off-by: Ashish Agrawal <[email protected]>
Signed-off-by: Surya Sashank Nistala <[email protected]>
Co-authored-by: Surya Sashank Nistala <[email protected]>
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.

4 participants