Skip to content

fix breaking change from core library refactor#1090

Merged
eirsep merged 1 commit intoopensearch-project:mainfrom
eirsep:core
Aug 16, 2023
Merged

fix breaking change from core library refactor#1090
eirsep merged 1 commit intoopensearch-project:mainfrom
eirsep:core

Conversation

@eirsep
Copy link
Copy Markdown
Member

@eirsep eirsep commented Aug 16, 2023

fix breaking change from core library refactor

Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>
@codecov
Copy link
Copy Markdown

codecov bot commented Aug 16, 2023

Codecov Report

Merging #1090 (656c80f) into main (b1f4bed) will increase coverage by 0.15%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##               main    #1090      +/-   ##
============================================
+ Coverage     67.60%   67.75%   +0.15%     
  Complexity      105      105              
============================================
  Files           160      160              
  Lines         10343    10343              
  Branches       1522     1522              
============================================
+ Hits           6992     7008      +16     
+ Misses         2686     2668      -18     
- Partials        665      667       +2     
Files Changed Coverage Δ
...pensearch/percolator/PercolateQueryBuilderExt.java 30.42% <ø> (ø)
...ain/kotlin/org/opensearch/alerting/AlertService.kt 81.58% <ø> (ø)
...n/kotlin/org/opensearch/alerting/AlertingPlugin.kt 94.53% <ø> (ø)
.../opensearch/alerting/DocumentLevelMonitorRunner.kt 84.10% <ø> (ø)
...in/org/opensearch/alerting/MonitorRunnerService.kt 78.03% <ø> (+4.54%) ⬆️
...ensearch/alerting/action/ExecuteMonitorResponse.kt 100.00% <ø> (ø)
...nsearch/alerting/action/ExecuteWorkflowResponse.kt 50.00% <ø> (ø)
...nsearch/alerting/action/GetDestinationsResponse.kt 100.00% <ø> (ø)
...nsearch/alerting/action/GetEmailAccountResponse.kt 92.50% <ø> (ø)
...pensearch/alerting/action/GetEmailGroupResponse.kt 92.50% <ø> (ø)
... and 29 more

... and 5 files with indirect coverage changes

@eirsep eirsep merged commit 6e7a16b into opensearch-project:main Aug 16, 2023
@opensearch-trigger-bot
Copy link
Copy Markdown
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-1090-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 6e7a16b79d664bfa533ca87ba587d107c49f0bcc
# Push it to GitHub
git push --set-upstream origin backport-1090-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-1090-to-2.x.

lezzago pushed a commit to lezzago/alerting-opensearch that referenced this pull request Aug 21, 2023
Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>
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 <ashisagr@amazon.com>

* Resolve core Xcontent and CircuitBreaker refactor (#1062)

* Resolve core Xcontent refactor

Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>

* Resolve core CircuitBreaker refactor

Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>

* Resolve integ test issues with adding test dependency

Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>

---------

Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>

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

Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>

* Resolve additional compile issues

Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>

* fix bwc issues

Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>

* Update BWC version to deal with ktlint issues

Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>

* Update BWC version

Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>

* Disable BWC for non-bwc CIs

Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>

* Fix integ tests and update CI flows

Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>

---------

Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>
Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>
Co-authored-by: Surya Sashank Nistala <snistala@amazon.com>
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