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

[Bundle] include default files #758

Closed
wants to merge 1 commit into from

Conversation

kavilla
Copy link
Member

@kavilla kavilla commented Oct 16, 2021

Description

Create the bundles with default files for OpenSearch and OpenSearch
Dashboards.

These files include:

  • opensearch-tar-install.sh
  • config/opensearch_dashboards.yml

However, we do not want to include opensearch-tar-install.sh into
the OpenSearch Dashboards bundle because the script will just fail
to run.

Signed-off-by: Kawika Avilla [email protected]

Issues Resolved

#610

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.

Create the bundles with default files for OpenSearch and OpenSearch
Dashboards.

These files include:
* opensearch-tar-install.sh
* config/opensearch_dashboards.yml

Issue resolved:
opensearch-project#610

Signed-off-by: Kawika Avilla <[email protected]>
@codecov-commenter
Copy link

codecov-commenter commented Oct 16, 2021

Codecov Report

Merging #758 (d85e76f) into main (326d59f) will increase coverage by 0.07%.
The diff coverage is 91.30%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main     #758      +/-   ##
==========================================
+ Coverage   91.21%   91.28%   +0.07%     
==========================================
  Files          75       75              
  Lines        1992     2009      +17     
==========================================
+ Hits         1817     1834      +17     
  Misses        175      175              
Impacted Files Coverage Δ
src/assemble_workflow/bundle.py 94.66% <75.00%> (-2.35%) ⬇️
src/assemble_workflow/bundle_opensearch.py 100.00% <100.00%> (ø)
.../assemble_workflow/bundle_opensearch_dashboards.py 100.00% <100.00%> (ø)
src/run_assemble.py 97.05% <100.00%> (+4.75%) ⬆️

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 43b7675...d85e76f. Read the comment docs.

@kavilla kavilla marked this pull request as ready for review October 16, 2021 22:38
@kavilla kavilla linked an issue Oct 16, 2021 that may be closed by this pull request
Copy link
Member

@dblock dblock left a comment

Choose a reason for hiding this comment

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

This seems to replace a hard-coded copy by another hard-coded copy, so I think we're on the wrong track.

During the assemble phase we iterate through all plugins and install them. Part of that we run a post-install script which can do things like copying additional files, e.g. k-nn/install.sh. Add an install step for the min artifact, and copy the custom .sh script for OpenSearch and the custom dashboards_config.yml in install.sh that will live under scripts/.../OpenSearch and scripts/.../OpenSearch-Dashboards. Then this entire code can be deleted.

source,
)
)
if not os.path.isfile(file):
Copy link
Member

Choose a reason for hiding this comment

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

You can't exit in the middle of code. The next call to shutil.copy2 will fail with an exception as needed.

@kavilla kavilla closed this Oct 18, 2021
@kavilla kavilla deleted the avillk/config branch October 22, 2021 02:56
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.

OpenSearch Dashboards default config
3 participants