Skip to content

Fixed compile issues related to latest OS core repo changes#412

Merged
sbcd90 merged 1 commit intoopensearch-project:mainfrom
petardz:compile-fixes
May 1, 2023
Merged

Fixed compile issues related to latest OS core repo changes#412
sbcd90 merged 1 commit intoopensearch-project:mainfrom
petardz:compile-fixes

Conversation

@petardz
Copy link
Copy Markdown
Contributor

@petardz petardz commented Apr 28, 2023

Description

Fixed compile issues related to latest OS core repo changes

Issues Resolved

[List any issues this PR will resolve]

Check List

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

…util.Map

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>
@petardz petardz requested a review from a team April 28, 2023 23:09
@codecov-commenter
Copy link
Copy Markdown

codecov-commenter commented Apr 28, 2023

Codecov Report

❌ Patch coverage is 25.00000% with 18 lines in your changes missing coverage. Please review.
✅ Project coverage is 28.34%. Comparing base (acfef46) to head (7498228).
⚠️ Report is 228 commits behind head on main.

Files with missing lines Patch % Lines
...rityanalytics/action/GetIndexMappingsResponse.java 46.15% 7 Missing ⚠️
...search/securityanalytics/mapper/MapperService.java 0.00% 7 Missing ⚠️
...indexmanagment/DetectorIndexManagementService.java 0.00% 4 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##               main     #412      +/-   ##
============================================
+ Coverage     28.33%   28.34%   +0.01%     
  Complexity      897      897              
============================================
  Files           231      231              
  Lines          9282     9281       -1     
  Branches       1072     1071       -1     
============================================
+ Hits           2630     2631       +1     
+ Misses         6415     6414       -1     
+ Partials        237      236       -1     

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

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@sbcd90 sbcd90 merged commit f92e232 into opensearch-project:main May 1, 2023
petardz added a commit to petardz/security-analytics that referenced this pull request May 2, 2023
…util.Map (opensearch-project#412)

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>
petardz added a commit to petardz/security-analytics that referenced this pull request May 4, 2023
…util.Map (opensearch-project#412)

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>
petardz added a commit to petardz/security-analytics that referenced this pull request May 4, 2023
…util.Map (opensearch-project#412)

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>
@opensearch-trigger-bot
Copy link
Copy Markdown
Contributor

The backport to 2.x 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.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-412-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 f92e232303ec0a23c069aae8ae82c16e94b33d6c
# Push it to GitHub
git push --set-upstream origin backport/backport-412-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.x

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

@nknize
Copy link
Copy Markdown
Contributor

nknize commented Jun 30, 2023

The ImmutableOpenMap removal backport landed so this PR needs to be backported.

riysaxen-amzn pushed a commit to riysaxen-amzn/security-analytics that referenced this pull request Feb 20, 2024
…oject#412)

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.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.

6 participants