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

Fix build break from cluster manager changes #1911

Merged
merged 1 commit into from
Jun 24, 2022

Conversation

peternied
Copy link
Member

Description

Fix build break from cluster manager changes

Check List

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

Signed-off-by: Peter Nied <petern@amazon.com>
@peternied peternied added the bug Something isn't working label Jun 24, 2022
@peternied peternied requested a review from a team June 24, 2022 17:33
@peternied peternied self-assigned this Jun 24, 2022
@cliu123
Copy link
Member

cliu123 commented Jun 24, 2022

Thanks for making this fix! But this fix is actually not necessary until 3.0.0, so I've included the fix in the version bump to 3.0.0 PR.

@codecov-commenter
Copy link

codecov-commenter commented Jun 24, 2022

Codecov Report

Merging #1911 (3e21b3b) into main (8393c71) will decrease coverage by 0.02%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##               main    #1911      +/-   ##
============================================
- Coverage     61.04%   61.01%   -0.03%     
  Complexity     3234     3234              
============================================
  Files           256      256              
  Lines         18088    18088              
  Branches       3224     3224              
============================================
- Hits          11041    11037       -4     
  Misses         5467     5467              
- Partials       1580     1584       +4     
Impacted Files Coverage Δ
...rch/security/dlic/rest/api/WhitelistApiAction.java 100.00% <ø> (ø)
...ch/security/securityconf/DynamicConfigFactory.java 56.05% <ø> (ø)
...rg/opensearch/security/ssl/util/CertFileProps.java 100.00% <ø> (ø)
...org/opensearch/security/ssl/util/CertFromFile.java 100.00% <ø> (ø)
...opensearch/security/ssl/util/CertFromKeystore.java 73.91% <ø> (ø)
...ensearch/security/ssl/util/CertFromTruststore.java 87.87% <ø> (ø)
...search/security/ssl/util/CertificateValidator.java 69.41% <ø> (ø)
...rg/opensearch/security/ssl/util/KeystoreProps.java 72.72% <ø> (ø)
...urity/ssl/transport/SecuritySSLNettyTransport.java 62.36% <0.00%> (-4.31%) ⬇️
...security/auditlog/sink/ExternalOpenSearchSink.java 59.25% <0.00%> (-2.47%) ⬇️
... and 4 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 03a224d...3e21b3b. Read the comment docs.

@peternied peternied merged commit 1a63f22 into opensearch-project:main Jun 24, 2022
@peternied peternied deleted the fix-bb-clustermanager branch June 24, 2022 18:05
@DarshitChanpura DarshitChanpura added the backport 2.x backport to 2.x branch label Jun 27, 2022
@opensearch-trigger-bot
Copy link
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-1911-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 1a63f228932d90011f2519759143de6cf08c7714
# Push it to GitHub
git push --set-upstream origin backport/backport-1911-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-1911-to-2.x.

@peternied
Copy link
Member Author

@DarshitChanpura We don't need to backport this change, I fixed main and 2.x with seperate pull requests, 2.x was resolved with the backport for the build changes, see #1903, commit 4102f3a.

@peternied peternied removed the backport 2.x backport to 2.x branch label Jun 27, 2022
@DarshitChanpura
Copy link
Member

okay..thank you @peternied !

stephen-crawford pushed a commit to stephen-crawford/security that referenced this pull request Nov 10, 2022
Signed-off-by: Peter Nied <petern@amazon.com>
Signed-off-by: Stephen Crawford <steecraw@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants