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

Bump version to 3.0.0.0 #1890

Merged
merged 5 commits into from
Jun 27, 2022

Conversation

cliu123
Copy link
Member

@cliu123 cliu123 commented Jun 16, 2022

Description

  • Category (Enhancement, New feature, Bug fix, Test fix, Refactoring, Maintenance, Documentation) Maintenance
  • Changes:
  1. Bump plugin version so 3.0.0.0.
  2. Bump OpenSearch core engine version to 3.0.0.
  3. Fix the issues caused by the breaking changes that have already been introduced into OpenSearch 3.0.0.

Testing

ITs, BWC tests

Check List

  • 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.

@cliu123
Copy link
Member Author

cliu123 commented Jun 16, 2022

The BWC test is blocked: opensearch-project/OpenSearch#3615

@codecov-commenter
Copy link

codecov-commenter commented Jun 16, 2022

Codecov Report

Merging #1890 (9685ded) into main (746748b) will decrease coverage by 0.04%.
The diff coverage is 71.42%.

@@             Coverage Diff              @@
##               main    #1890      +/-   ##
============================================
- Coverage     61.04%   60.99%   -0.05%     
+ Complexity     3236     3233       -3     
============================================
  Files           256      256              
  Lines         18088    18088              
  Branches       3224     3224              
============================================
- Hits          11041    11033       -8     
- Misses         5467     5471       +4     
- Partials       1580     1584       +4     
Impacted Files Coverage Δ
...ic/auth/http/kerberos/HTTPSpnegoAuthenticator.java 0.00% <0.00%> (ø)
...auth/http/saml/SamlFilesystemMetadataResolver.java 0.00% <0.00%> (ø)
...earch/security/auditlog/impl/AbstractAuditLog.java 73.75% <0.00%> (ø)
...ecurity/configuration/ConfigurationRepository.java 72.13% <0.00%> (ø)
.../opensearch/security/OpenSearchSecurityPlugin.java 79.67% <100.00%> (ø)
...ensearch/security/ssl/DefaultSecurityKeyStore.java 67.63% <100.00%> (ø)
...opensearch/security/ssl/util/SSLRequestHelper.java 64.70% <100.00%> (ø)
.../org/opensearch/security/support/PemKeyReader.java 76.76% <100.00%> (ø)
...urity/ssl/transport/SecuritySSLNettyTransport.java 62.36% <0.00%> (-4.31%) ⬇️
...security/auditlog/sink/ExternalOpenSearchSink.java 59.25% <0.00%> (-2.47%) ⬇️
... and 1 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 746748b...9685ded. Read the comment docs.

@cliu123 cliu123 force-pushed the bump_version_to_3.0.0.0 branch 3 times, most recently from 4de22c4 to 1ad34e1 Compare June 21, 2022 22:05
Signed-off-by: cliu123 <lc12251109@gmail.com>
Signed-off-by: cliu123 <lc12251109@gmail.com>
Signed-off-by: cliu123 <lc12251109@gmail.com>
Signed-off-by: cliu123 <lc12251109@gmail.com>
Signed-off-by: cliu123 <lc12251109@gmail.com>
@cliu123 cliu123 marked this pull request as ready for review June 24, 2022 23:20
@cliu123 cliu123 requested a review from a team June 24, 2022 23:20
@@ -51,6 +51,6 @@ public byte[] run() throws ResolverException {

private static File getMetadataFile(String filePath, Settings settings, Path configPath) {
Environment env = new Environment(settings, configPath);
return env.configFile().resolve(filePath).toAbsolutePath().toFile();
return env.configDir().resolve(filePath).toAbsolutePath().toFile();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

out of curiosity, did this get change in core or in one of the 3rd party dependencies?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This changed in core: opensearch-project/OpenSearch#2730

@peternied peternied merged commit 00e2a5d into opensearch-project:main Jun 27, 2022
@cliu123 cliu123 deleted the bump_version_to_3.0.0.0 branch June 27, 2022 17:07
DarshitChanpura added a commit to DarshitChanpura/security that referenced this pull request Jun 27, 2022
DarshitChanpura added a commit to DarshitChanpura/security that referenced this pull request Jun 27, 2022
This reverts commit 00e2a5d.

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
peternied pushed a commit that referenced this pull request Jun 27, 2022
* Adds release notes for 2.1.0

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>

* Revert "Bump version to 3.0.0.0 (#1890)"

This reverts commit 00e2a5d.

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jun 27, 2022
* Adds release notes for 2.1.0

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>

* Revert "Bump version to 3.0.0.0 (#1890)"

This reverts commit 00e2a5d.

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
(cherry picked from commit 15f1fbd)
peternied pushed a commit that referenced this pull request Jun 27, 2022
* Adds release notes for 2.1.0

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>

* Revert "Bump version to 3.0.0.0 (#1890)"

This reverts commit 00e2a5d.

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
(cherry picked from commit 15f1fbd)

Co-authored-by: Darshit Chanpura <35282393+DarshitChanpura@users.noreply.github.com>
@cliu123 cliu123 restored the bump_version_to_3.0.0.0 branch July 20, 2022 17:48
stephen-crawford pushed a commit to stephen-crawford/security that referenced this pull request Nov 10, 2022
* Bump version to 3.0.0.0
* Fix for the breaking changes in OpenSearch 3.0

Signed-off-by: cliu123 <lc12251109@gmail.com>
Signed-off-by: Stephen Crawford <steecraw@amazon.com>
stephen-crawford pushed a commit to stephen-crawford/security that referenced this pull request Nov 10, 2022
…search-project#1901)

* Adds release notes for 2.1.0

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>

* Revert "Bump version to 3.0.0.0 (opensearch-project#1890)"

This reverts commit 00e2a5d.

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
Signed-off-by: Stephen Crawford <steecraw@amazon.com>
wuychn pushed a commit to ochprince/security that referenced this pull request Mar 16, 2023
…search-project#1901) (opensearch-project#1919)

* Adds release notes for 2.1.0

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>

* Revert "Bump version to 3.0.0.0 (opensearch-project#1890)"

This reverts commit 00e2a5d.

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
(cherry picked from commit 15f1fbd)

Co-authored-by: Darshit Chanpura <35282393+DarshitChanpura@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants