refactor(cli): fixup + test aws-install SSH user
#1009
Merged
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
This commit refactors and adds unit tests for the SSH username assignment logic in the `aws-install` CLI subcommand. Specifically, this commit: * Breaks down the AMI image name fetch and the lookup table code into helper functions * Adds unit tests for these helper functions * Enforces using the username passed as the `--ssh_username` CLI arg Fixes RAIN-42812 Signed-off-by: nschmeller <[email protected]>
cirego
approved these changes
Nov 9, 2022
| // `LW_SSH_USER` in the shell environment. | ||
| func getSSHUsernameLookupTable() []func(string) (bool, string) { | ||
| return []func(string) (bool, string){ | ||
| func(_ string) (bool, string) { return os.Getenv("LW_SSH_USER") != "", os.Getenv("LW_SSH_USER") }, // THIS ROW MUST BE FIRST IN THE TABLE |
There was a problem hiding this comment.
I would be tempted to move the LW_SSH_USER check between lines 153 and 154. Otherwise it could be really easy to introduce a regression by reordering the elements in this array and/or adding a new AMI type before the LW_SSH_USER check.
There was a problem hiding this comment.
I'd agree, but we test those cases in a unit test. So I'd like to keep everything all neatly packaged up if possible
Merged
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 commit refactors and adds unit tests for the SSH username
assignment logic in the
aws-installCLI subcommand.Specifically, this commit:
helper functions
--ssh_usernameCLI argFixes RAIN-42812
Signed-off-by: nschmeller [email protected]
How did you test this change?
Added unit tests, ran integration tests from the agent repo
Issue
https://lacework.atlassian.net/browse/RAIN-42812