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

[2.x] Extracts demo configuration setup into a java tool, adds support for Bundled JDK for this tool and updates DEVELOPER_GUIDE.md #3845

Merged

Conversation

DarshitChanpura
Copy link
Member

@DarshitChanpura DarshitChanpura commented Dec 13, 2023

Description

Backports following commits related to demo configuration tool from main to 2.x:

Issues Resolved

Testing

  • automated tests

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.

…#3669)

This change extracts the core demo configuration install script to java
tool to allow re-usability while leveraging that OpenSearch itself is
JAVA process. All other tools shipped by security are java tools, and
now with this PR, demo configuration setup will also be a java tool.

---------

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



Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
### Description
This PR adds tests associated with the demo-configuration tool.

## Issues Resolved:
 - Resolves opensearch-project#3636

### Testing
- Unit Testing
- Integration Testing

### Check List
- [x] New functionality includes testing
~- [ ] New functionality has been documented~
- [x] 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](https://github.com/opensearch-project/OpenSearch/blob/main/CONTRIBUTING.md#developer-certificate-of-origin).

---------

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
…be compliant with opensearch naming convention (opensearch-project#3843)

### Issues Resolved
- Resolves opensearch-project#3842



### Testing

- automated tests

### Check List
- [x] New functionality includes testing
~- [ ] New functionality has been documented~
- [x] 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](https://github.com/opensearch-project/OpenSearch/blob/main/CONTRIBUTING.md#developer-certificate-of-origin).

---------

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
@DarshitChanpura DarshitChanpura added the v2.12.0 Items targeting 2.12.0 label Dec 13, 2023
@DarshitChanpura DarshitChanpura self-assigned this Dec 13, 2023
@DarshitChanpura DarshitChanpura changed the title Backport demo config changes [2.x] Backports changes related to demo configuration tool Dec 13, 2023
Copy link

codecov bot commented Dec 13, 2023

Codecov Report

Merging #3845 (66e100e) into 2.x (7e5d02a) will increase coverage by 0.11%.
Report is 3 commits behind head on 2.x.
The diff coverage is 75.28%.

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff              @@
##                2.x    #3845      +/-   ##
============================================
+ Coverage     64.88%   65.00%   +0.11%     
- Complexity     3661     3729      +68     
============================================
  Files           292      297       +5     
  Lines         20648    21000     +352     
  Branches       3402     3440      +38     
============================================
+ Hits          13398    13651     +253     
- Misses         5567     5641      +74     
- Partials       1683     1708      +25     
Files Coverage Δ
...g/opensearch/security/support/ConfigConstants.java 95.23% <ø> (ø)
...search/security/tools/democonfig/Certificates.java 100.00% <100.00%> (ø)
...ecurity/tools/democonfig/ExecutionEnvironment.java 100.00% <100.00%> (ø)
...ecurity/tools/democonfig/CertificateGenerator.java 93.33% <93.33%> (ø)
...y/tools/democonfig/SecuritySettingsConfigurer.java 73.18% <73.18%> (ø)
...pensearch/security/tools/democonfig/Installer.java 71.67% <71.67%> (ø)

... and 4 files with indirect coverage changes

@DarshitChanpura
Copy link
Member Author

DarshitChanpura commented Dec 14, 2023

Plugin install failures due to mismatch in github workflows between main and 2.x. This is the source PR that was not backported. https://github.com/opensearch-project/security/pull/2290/files

I'll refactor current PR to match the plugin install workflow on 2.x

DarshitChanpura and others added 3 commits December 14, 2023 17:09
Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
…d prevents password from being printed in the logs (opensearch-project#3850)

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

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
Signed-off-by: Darshit Chanpura <35282393+DarshitChanpura@users.noreply.github.com>
@DarshitChanpura
Copy link
Member Author

DarshitChanpura commented Dec 15, 2023

There was mismatch in documentation in DEVELOPER_GUIDE.md between main and 2x. I've refactored that file to be in line with main.

@DarshitChanpura DarshitChanpura changed the title [2.x] Backports changes related to demo configuration tool [2.x] Extracts demo configuration setup into a java tool, adds support for Bundled JDK for this tool and updates DEVELOPER_GUIDE.md Dec 15, 2023
Copy link
Collaborator

@derek-ho derek-ho left a comment

Choose a reason for hiding this comment

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

LGTM

@cwperks cwperks merged commit ea9546e into opensearch-project:2.x Dec 18, 2023
77 checks passed
derek-ho added a commit to derek-ho/security that referenced this pull request Dec 19, 2023
…s support for Bundled JDK for this tool and updates DEVELOPER_GUIDE.md (opensearch-project#3845)"

This reverts commit ea9546e.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
v2.12.0 Items targeting 2.12.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants