fix #477 source bashrc and #476 intermittent tectia failures #478
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…used in ssh scripts; also put stronger typing (config keys) around use of ssh flags, and expose them through entity config (and brooklyn.properties) as well as through properties on the location (or explicit flags in an individual call in the entity)
- Also move SshTool to brooklyn.util.internal.ssh (from brooklyn.util.internal) - Extract super-class for SshjTool test, ready for other SshTool impls
- workaround for Tectia: if connecting to a Tectia server, the sshj doesn't work (see hierynomus/sshj#54)
…to fix/477-source-bashrc Conflicts in renamed/javafied test core/src/test/java/brooklyn/util/internal/ssh/SshjToolIntegrationTest, and mods to SshjTool to use flags. Have introduced an SshAbstractTool though still to do is: move common code from Sshj/Cli Tools, and tests that config on entities gets applied to ssh (e.g. headers)
…l. fixes problems where SshCliTool ignores some config keys e.g. scriptHeader.
…mpt to mimic exception when cannot connect. SshCli integration tests passing.
…SS). test for that, and for defining script header as a config key on the entity. both working. only thing left is, i'm not sure if ssh confg set in brooklyn.properties gets picked up.
|
|
||
| /* more flags TODO */ | ||
|
|
||
| // warnOnDeprecated(props, "privateKey", "privateKeyData"); |
There was a problem hiding this comment.
Needs tidied asap; will do that in next pull request.
|
Looking good. Lots of minor things to tidy up in a subsequent pull request, but I'm happy to merge this now so it gets built for the customer asap - in the knowledge that I'm going to work on the clean-up next. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
this pull request addresses #476 and #477, by:
supporting CLI ssh, adding a new class, and allowing you to specify in your
~/.brooklyn/brooklyn.properties:and
supporting configruable SSH script header, if you specify in your
~/.brooklyn/brooklyn.properties: