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.

Sign up for GitHub

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

Jump to bottom

Fix for issue #144 #473

Merged
merged 7 commits into from
Oct 25, 2023
Merged

Fix for issue #144 #473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ce84d0a
Fix for issue #144
Aug 22, 2023
ac1ca0f
Merge pull request #497 from aws/master
NihalM99 Oct 20, 2023
d71f554
Fix for tests
NihalM99 Oct 20, 2023
79f575e
Test
NihalM99 Oct 20, 2023
9a8cdf6
Fix tests
NihalM99 Oct 20, 2023
5ab3b6f
Merge pull request #498 from aws/master
NihalM99 Oct 24, 2023
27af63a
Update test_sshops.py
NihalM99 Oct 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ebcli/operations/sshops.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ def ssh_into_instance(instance_id, keep_open=False, force_open=False, custom_ssh
custom_ssh = custom_ssh.split()
else:
ident_file = _get_ssh_file(keypair_name)
custom_ssh = ['ssh', '-i', ident_file]
custom_ssh = ['ssh', '-i', ident_file, '-o', 'IdentitiesOnly yes']

custom_ssh.extend([user + '@' + ip])

Expand Down
8 changes: 4 additions & 4 deletions tests/unit/operations/test_sshops.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def test_generate_and_upload_keypair__exit_code_0(
'-f',
os.path.expanduser('~') + '{0}.ssh{0}aws-eb-us-west-2'.format(os.path.sep),
'-C',
'aws-eb-us-west-2'
'aws-eb-us-west-2'
]
)

Expand Down Expand Up @@ -320,7 +320,7 @@ def test_ssh_into_instance__uses_private_address(
call_mock.return_value = 0

sshops.ssh_into_instance('instance-id')
call_mock.assert_called_once_with(['ssh', '-i', 'aws-eb-us-west-2', 'ec2-user@172.31.35.210'])
call_mock.assert_called_once_with(['ssh', '-i', 'aws-eb-us-west-2', '-o', 'IdentitiesOnly yes', 'ec2-user@172.31.35.210'])

@mock.patch('ebcli.operations.sshops.ec2.describe_instance')
@mock.patch('ebcli.operations.sshops.ec2.describe_security_group')
Expand All @@ -346,7 +346,7 @@ def test_ssh_into_instance__ssh_rule_exists(
sshops.ssh_into_instance('instance-id')
authorize_ssh_mock.assert_not_called()
revoke_ssh_mock.assert_not_called()
call_mock.assert_called_once_with(['ssh', '-i', 'aws-eb-us-west-2', 'ec2-user@54.218.96.238'])
call_mock.assert_called_once_with(['ssh', '-i', 'aws-eb-us-west-2', '-o', 'IdentitiesOnly yes', 'ec2-user@54.218.96.238'])

@mock.patch('ebcli.operations.sshops.ec2.describe_instance')
@mock.patch('ebcli.operations.sshops.ec2.describe_security_group')
Expand All @@ -372,7 +372,7 @@ def test_ssh_into_instance__no_ssh_rule_exists(
sshops.ssh_into_instance('instance-id')
authorize_ssh_mock.assert_called_once_with('sg-12312313')
revoke_ssh_mock.assert_called_once_with('sg-12312313')
call_mock.assert_called_once_with(['ssh', '-i', 'aws-eb-us-west-2', 'ec2-user@54.218.96.238'])
call_mock.assert_called_once_with(['ssh', '-i', 'aws-eb-us-west-2', '-o', 'IdentitiesOnly yes', 'ec2-user@54.218.96.238'])

@mock.patch('ebcli.operations.sshops.prompt_for_ec2_keyname')
@mock.patch('ebcli.operations.sshops.commonops.update_environment')
Expand Down
Loading