Skip to content

Fix split package in keystore-cli#78047

Merged
rjernst merged 4 commits intoelastic:masterfrom
rjernst:split-packages/keystore-cli
Sep 21, 2021
Merged

Fix split package in keystore-cli#78047
rjernst merged 4 commits intoelastic:masterfrom
rjernst:split-packages/keystore-cli

Conversation

@rjernst
Copy link
Copy Markdown
Member

@rjernst rjernst commented Sep 20, 2021

The keystore-cli contains cli command classes for reading and writing
the elasticsearch-keystore. These classes need access to the save
methods of the KeyStoreWrapper, but those are package private. This
change openes those methods to make them available. Note that setString
was already public, only setFile and a couple minor methods were
necessary to open up. Additionally, some methods from bootstrap for
reading the keystore needed to be accessible to tests. This change moves
those to a public utility class, as they were already static.

The keystore-cli contains cli command classes for reading and writing
the elasticsearch-keystore. These classes need access to the save
methods of the KeyStoreWrapper, but those are package private. This
change openes those methods to make them available. Note that setString
was already public, only setFile and a couple minor methods were
necessary to open up. Additionally, some methods from bootstrap for
reading the keystore needed to be accessible to tests. This change moves
those to a public utility class, as they were already static.
@rjernst rjernst requested a review from tvernum September 20, 2021 22:30
@elasticmachine elasticmachine added the Team:Core/Infra Meta label for core/infra team label Sep 20, 2021
@elasticmachine
Copy link
Copy Markdown
Collaborator

Pinging @elastic/es-core-infra (Team:Core/Infra)

@rjernst
Copy link
Copy Markdown
Member Author

rjernst commented Sep 21, 2021

@elasticmachine run elasticsearch-ci/part-2

Copy link
Copy Markdown
Contributor

@ChrisHegarty ChrisHegarty left a comment

Choose a reason for hiding this comment

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

LGTM.

*/
public class BootstrapUtil {

/**
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Trivially, you could optionally add a private no-args constructor to BootstrapUtil, since it would appear to be a non-instantiable class exposing static utility methods.

@rjernst rjernst merged commit 8f2a9b9 into elastic:master Sep 21, 2021
@rjernst rjernst deleted the split-packages/keystore-cli branch September 21, 2021 17:39
@elasticsearchmachine
Copy link
Copy Markdown
Collaborator

💔 Backport failed

Status Branch Result
7.x Commit could not be cherrypicked due to conflicts

You can use sqren/backport to manually backport by running backport --upstream elastic/elasticsearch --pr 78047

@ChrisHegarty ChrisHegarty mentioned this pull request Sep 22, 2021
58 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

:Core/Infra/CLI CLI utilities, scripts, and infrastructure >non-issue Team:Core/Infra Meta label for core/infra team v7.16.0 v8.0.0-beta1

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants