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

init master key automatically #1075

Merged
merged 10 commits into from
Jul 12, 2023

Conversation

ylwu-amzn
Copy link
Collaborator

Description

[Describe what this change achieves]

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.

@codecov
Copy link

codecov bot commented Jul 11, 2023

Codecov Report

Merging #1075 (d6fb41c) into 2.x (e3cb2e3) will increase coverage by 0.95%.
The diff coverage is 92.20%.

@@             Coverage Diff              @@
##                2.x    #1075      +/-   ##
============================================
+ Coverage     77.95%   78.90%   +0.95%     
- Complexity     2071     2116      +45     
============================================
  Files           167      167              
  Lines          8558     8618      +60     
  Branches        857      866       +9     
============================================
+ Hits           6671     6800     +129     
+ Misses         1503     1426      -77     
- Partials        384      392       +8     
Flag Coverage Δ
ml-commons 78.90% <92.20%> (+0.95%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
...ch/ml/engine/algorithms/remote/ConnectorUtils.java 68.75% <ø> (-2.27%) ⬇️
...n/java/org/opensearch/ml/model/MLModelManager.java 62.81% <ø> (+0.17%) ⬆️
.../org/opensearch/ml/settings/MLCommonsSettings.java 100.00% <ø> (ø)
.../opensearch/ml/engine/encryptor/EncryptorImpl.java 89.65% <83.33%> (+5.03%) ⬆️
...c/main/java/org/opensearch/ml/engine/MLEngine.java 66.25% <100.00%> (+2.50%) ⬆️
.../cluster/MLCommonsClusterManagerEventListener.java 80.00% <100.00%> (+0.58%) ⬆️
...n/java/org/opensearch/ml/cluster/MLSyncUpCron.java 78.74% <100.00%> (+3.05%) ⬆️
...c/main/java/org/opensearch/ml/indices/MLIndex.java 93.75% <100.00%> (+0.41%) ⬆️
...va/org/opensearch/ml/indices/MLIndicesHandler.java 69.73% <100.00%> (+0.81%) ⬆️
...rg/opensearch/ml/plugin/MachineLearningPlugin.java 99.00% <100.00%> (+<0.01%) ⬆️

... and 6 files with indirect coverage changes

Signed-off-by: Yaliang Wu <[email protected]>
Signed-off-by: Yaliang Wu <[email protected]>
Signed-off-by: Yaliang Wu <[email protected]>
rbhavna
rbhavna previously approved these changes Jul 12, 2023
Zhangxunmt
Zhangxunmt previously approved these changes Jul 12, 2023
rbhavna
rbhavna previously approved these changes Jul 12, 2023
Signed-off-by: Yaliang Wu <[email protected]>
@ylwu-amzn ylwu-amzn dismissed stale reviews from rbhavna and Zhangxunmt via 5d7a898 July 12, 2023 04:02
b4sjoo
b4sjoo previously approved these changes Jul 12, 2023
Signed-off-by: Yaliang Wu <[email protected]>
@ylwu-amzn ylwu-amzn merged commit 66672d9 into opensearch-project:2.x Jul 12, 2023
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jul 12, 2023
* init master key automatically

Signed-off-by: Yaliang Wu <[email protected]>

* remove unnecessary escape

Signed-off-by: Yaliang Wu <[email protected]>

* fix failed ut

Signed-off-by: Yaliang Wu <[email protected]>

* tune syncup jot interval

Signed-off-by: Yaliang Wu <[email protected]>

* tune syncup jot interval

Signed-off-by: Yaliang Wu <[email protected]>

* remove local config file code

Signed-off-by: Yaliang Wu <[email protected]>

* set master key when init remote model

Signed-off-by: Yaliang Wu <[email protected]>

* move init master key to encryptor

Signed-off-by: Yaliang Wu <[email protected]>

* fine tune code

Signed-off-by: Yaliang Wu <[email protected]>

* fine tune code

Signed-off-by: Yaliang Wu <[email protected]>

---------

Signed-off-by: Yaliang Wu <[email protected]>
(cherry picked from commit 66672d9)
ylwu-amzn added a commit that referenced this pull request Jul 12, 2023
* init master key automatically

Signed-off-by: Yaliang Wu <[email protected]>

* remove unnecessary escape

Signed-off-by: Yaliang Wu <[email protected]>

* fix failed ut

Signed-off-by: Yaliang Wu <[email protected]>

* tune syncup jot interval

Signed-off-by: Yaliang Wu <[email protected]>

* tune syncup jot interval

Signed-off-by: Yaliang Wu <[email protected]>

* remove local config file code

Signed-off-by: Yaliang Wu <[email protected]>

* set master key when init remote model

Signed-off-by: Yaliang Wu <[email protected]>

* move init master key to encryptor

Signed-off-by: Yaliang Wu <[email protected]>

* fine tune code

Signed-off-by: Yaliang Wu <[email protected]>

* fine tune code

Signed-off-by: Yaliang Wu <[email protected]>

---------

Signed-off-by: Yaliang Wu <[email protected]>
(cherry picked from commit 66672d9)

Co-authored-by: Yaliang Wu <[email protected]>
zane-neo pushed a commit to zane-neo/ml-commons that referenced this pull request Sep 1, 2023
* init master key automatically

Signed-off-by: Yaliang Wu <[email protected]>

* remove unnecessary escape

Signed-off-by: Yaliang Wu <[email protected]>

* fix failed ut

Signed-off-by: Yaliang Wu <[email protected]>

* tune syncup jot interval

Signed-off-by: Yaliang Wu <[email protected]>

* tune syncup jot interval

Signed-off-by: Yaliang Wu <[email protected]>

* remove local config file code

Signed-off-by: Yaliang Wu <[email protected]>

* set master key when init remote model

Signed-off-by: Yaliang Wu <[email protected]>

* move init master key to encryptor

Signed-off-by: Yaliang Wu <[email protected]>

* fine tune code

Signed-off-by: Yaliang Wu <[email protected]>

* fine tune code

Signed-off-by: Yaliang Wu <[email protected]>

---------

Signed-off-by: Yaliang Wu <[email protected]>
zane-neo pushed a commit that referenced this pull request Sep 1, 2023
* init master key automatically

Signed-off-by: Yaliang Wu <[email protected]>

* remove unnecessary escape

Signed-off-by: Yaliang Wu <[email protected]>

* fix failed ut

Signed-off-by: Yaliang Wu <[email protected]>

* tune syncup jot interval

Signed-off-by: Yaliang Wu <[email protected]>

* tune syncup jot interval

Signed-off-by: Yaliang Wu <[email protected]>

* remove local config file code

Signed-off-by: Yaliang Wu <[email protected]>

* set master key when init remote model

Signed-off-by: Yaliang Wu <[email protected]>

* move init master key to encryptor

Signed-off-by: Yaliang Wu <[email protected]>

* fine tune code

Signed-off-by: Yaliang Wu <[email protected]>

* fine tune code

Signed-off-by: Yaliang Wu <[email protected]>

---------

Signed-off-by: Yaliang Wu <[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.

5 participants