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

[SSH] Remove dependency to msrestazure #8183

Merged
merged 3 commits into from
Oct 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions src/ssh/HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
Release History
===============
2.0.6
-----
* Remove msrestazure dependency

2.0.5
-----
* Remove ctypes dependency from RDP feature
Expand Down
6 changes: 3 additions & 3 deletions src/ssh/azext_ssh/ip_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

from azure.cli.core.commands import client_factory
from azure.cli.core import profiles
from msrestazure import tools
from azure.mgmt.core.tools import parse_resource_id

from knack import log

Expand All @@ -23,7 +23,7 @@ def get_ssh_ip(cmd, resource_group, vm_name, use_private_ip):
private_ips = []

for nic_ref in vm.network_profile.network_interfaces:
parsed_id = tools.parse_resource_id(nic_ref.id)
parsed_id = parse_resource_id(nic_ref.id)
get_args = {
'name': parsed_id['name'],
'resource_group': parsed_id['resource_group']
Expand All @@ -34,7 +34,7 @@ def get_ssh_ip(cmd, resource_group, vm_name, use_private_ip):
return ip_config["privateIPAddress"]
public_ip_ref = ip_config.get("publicIPAddress", None)
if public_ip_ref and public_ip_ref.get("id", None):
parsed_ip_id = tools.parse_resource_id(public_ip_ref["id"])
parsed_ip_id = parse_resource_id(public_ip_ref["id"])
api_args = {
'name': parsed_ip_id['name'],
'resource_group': parsed_ip_id['resource_group']
Expand Down
1 change: 1 addition & 0 deletions src/ssh/azext_ssh/target_os_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@


# Send target OS type telemetry and check if authentication options are valid for that OS.
# pylint: disable=useless-return
def handle_target_os_type(cmd, op_info):
os_type = None
agent_version = None
Expand Down
2 changes: 1 addition & 1 deletion src/ssh/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

from setuptools import setup, find_packages

VERSION = "2.0.5"
VERSION = "2.0.6"

CLASSIFIERS = [
'Development Status :: 4 - Beta',
Expand Down
Loading