Skip to content

[backport 2.x] Rollup Interceptor sourceIndex NPE fix (#773) #781

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

Merged
merged 2 commits into from
May 16, 2023

Conversation

petardz
Copy link
Contributor

@petardz petardz commented May 16, 2023

Issue #, if available: #773

Description of changes: manual backport

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.

* initial commit

Signed-off-by: Petar Dzepina <[email protected]>

* detekt fix

Signed-off-by: Petar Dzepina <[email protected]>

* few fixes

Signed-off-by: Petar Dzepina <[email protected]>

* detekt override

Signed-off-by: Petar Dzepina <[email protected]>

* Added test

Signed-off-by: Petar Dzepina <[email protected]>

---------

Signed-off-by: Petar Dzepina <[email protected]>
(cherry picked from commit 4c60abd)
@petardz petardz changed the title Rollup Interceptor sourceIndex NPE fix (#773) [backport 2.x] Rollup Interceptor sourceIndex NPE fix (#773) May 16, 2023
Signed-off-by: Petar Dzepina <[email protected]>
@codecov
Copy link

codecov bot commented May 16, 2023

Codecov Report

Merging #781 (c7d632a) into 2.x (86339f9) will increase coverage by 0.07%.
The diff coverage is 65.00%.

@@             Coverage Diff              @@
##                2.x     #781      +/-   ##
============================================
+ Coverage     75.68%   75.75%   +0.07%     
- Complexity     2643     2655      +12     
============================================
  Files           337      337              
  Lines         15552    15560       +8     
  Branches       2252     2254       +2     
============================================
+ Hits          11771    11788      +17     
+ Misses         2472     2462      -10     
- Partials       1309     1310       +1     
Impacted Files Coverage Δ
.../org/opensearch/indexmanagement/util/IndexUtils.kt 67.01% <ø> (-9.41%) ⬇️
...management/rollup/interceptor/RollupInterceptor.kt 77.77% <65.00%> (-2.37%) ⬇️

... and 11 files with indirect coverage changes

@bowenlan-amzn bowenlan-amzn merged commit fa00e92 into opensearch-project:2.x May 16, 2023
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.5 failed:

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

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.5 2.5
# Navigate to the new working tree
cd .worktrees/backport-2.5
# Create a new branch
git switch --create backport/backport-781-to-2.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 fa00e92727786301b3d82431f56d34ff93ed7624
# Push it to GitHub
git push --set-upstream origin backport/backport-781-to-2.5
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.5

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

opensearch-trigger-bot bot pushed a commit that referenced this pull request Jun 16, 2023
* Rollup Interceptor sourceIndex NPE fix (#773)

* initial commit

Signed-off-by: Petar Dzepina <[email protected]>

* detekt fix

Signed-off-by: Petar Dzepina <[email protected]>

* few fixes

Signed-off-by: Petar Dzepina <[email protected]>

* detekt override

Signed-off-by: Petar Dzepina <[email protected]>

* Added test

Signed-off-by: Petar Dzepina <[email protected]>

---------

Signed-off-by: Petar Dzepina <[email protected]>
(cherry picked from commit 4c60abd)

* compile fix

Signed-off-by: Petar Dzepina <[email protected]>

---------

Signed-off-by: Petar Dzepina <[email protected]>
(cherry picked from commit fa00e92)
lezzago pushed a commit that referenced this pull request Jun 16, 2023
…815)

* Rollup Interceptor sourceIndex NPE fix (#773)

* initial commit

Signed-off-by: Petar Dzepina <[email protected]>

* detekt fix

Signed-off-by: Petar Dzepina <[email protected]>

* few fixes

Signed-off-by: Petar Dzepina <[email protected]>

* detekt override

Signed-off-by: Petar Dzepina <[email protected]>

* Added test

Signed-off-by: Petar Dzepina <[email protected]>

---------

Signed-off-by: Petar Dzepina <[email protected]>
(cherry picked from commit 4c60abd)

* compile fix

Signed-off-by: Petar Dzepina <[email protected]>

---------

Signed-off-by: Petar Dzepina <[email protected]>
(cherry picked from commit fa00e92)

Co-authored-by: Petar Dzepina <[email protected]>
lezzago pushed a commit to lezzago/index-management-opensearch that referenced this pull request Jun 16, 2023
…ject#773) (opensearch-project#781)

* Rollup Interceptor sourceIndex NPE fix (opensearch-project#773)

* initial commit

Signed-off-by: Petar Dzepina <[email protected]>

* detekt fix

Signed-off-by: Petar Dzepina <[email protected]>

* few fixes

Signed-off-by: Petar Dzepina <[email protected]>

* detekt override

Signed-off-by: Petar Dzepina <[email protected]>

* Added test

Signed-off-by: Petar Dzepina <[email protected]>

---------

Signed-off-by: Petar Dzepina <[email protected]>
(cherry picked from commit 4c60abd)

* compile fix

Signed-off-by: Petar Dzepina <[email protected]>

---------

Signed-off-by: Petar Dzepina <[email protected]>
lezzago added a commit that referenced this pull request Jul 13, 2023
…816)

* Rollup Interceptor sourceIndex NPE fix (#773)

* initial commit



* detekt fix



* few fixes



* detekt override



* Added test



---------


(cherry picked from commit 4c60abd)

* compile fix



---------

Signed-off-by: Petar Dzepina <[email protected]>
Co-authored-by: Petar Dzepina <[email protected]>
ronnaksaxena pushed a commit to ronnaksaxena/index-management that referenced this pull request Jul 19, 2023
…ject#773) (opensearch-project#781)

* Rollup Interceptor sourceIndex NPE fix (opensearch-project#773)

* initial commit

Signed-off-by: Petar Dzepina <[email protected]>

* detekt fix

Signed-off-by: Petar Dzepina <[email protected]>

* few fixes

Signed-off-by: Petar Dzepina <[email protected]>

* detekt override

Signed-off-by: Petar Dzepina <[email protected]>

* Added test

Signed-off-by: Petar Dzepina <[email protected]>

---------

Signed-off-by: Petar Dzepina <[email protected]>
(cherry picked from commit 4c60abd)

* compile fix

Signed-off-by: Petar Dzepina <[email protected]>

---------

Signed-off-by: Petar Dzepina <[email protected]>
Signed-off-by: Ronnak Saxena <[email protected]>
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