From 03453b4b764fab3e7cc8981546fa4d54eed3ec41 Mon Sep 17 00:00:00 2001 From: Vivian Thiebaut Date: Tue, 22 Oct 2024 15:11:36 -0400 Subject: [PATCH 1/3] remove dependency to msrestazure --- src/ssh/azext_ssh/ip_utils.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ssh/azext_ssh/ip_utils.py b/src/ssh/azext_ssh/ip_utils.py index 499243eb6d9..d32042d1a7c 100644 --- a/src/ssh/azext_ssh/ip_utils.py +++ b/src/ssh/azext_ssh/ip_utils.py @@ -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 @@ -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'] @@ -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'] From 5938dcadb083b82ab9ff5dddd7329c90d831ee73 Mon Sep 17 00:00:00 2001 From: Vivian Thiebaut Date: Tue, 22 Oct 2024 15:16:06 -0400 Subject: [PATCH 2/3] ignore style check --- src/ssh/azext_ssh/target_os_utils.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ssh/azext_ssh/target_os_utils.py b/src/ssh/azext_ssh/target_os_utils.py index 02abacbd7b6..efda19eb352 100644 --- a/src/ssh/azext_ssh/target_os_utils.py +++ b/src/ssh/azext_ssh/target_os_utils.py @@ -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 From 6f52c89a1037a1511d8039ff7f3ae74384112a1e Mon Sep 17 00:00:00 2001 From: Vivian Thiebaut Date: Tue, 22 Oct 2024 15:23:08 -0400 Subject: [PATCH 3/3] update version --- src/ssh/HISTORY.md | 4 ++++ src/ssh/setup.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/ssh/HISTORY.md b/src/ssh/HISTORY.md index 2d6e3cf4234..c681d5706c2 100644 --- a/src/ssh/HISTORY.md +++ b/src/ssh/HISTORY.md @@ -1,5 +1,9 @@ Release History =============== +2.0.6 +----- +* Remove msrestazure dependency + 2.0.5 ----- * Remove ctypes dependency from RDP feature diff --git a/src/ssh/setup.py b/src/ssh/setup.py index 618fdea127b..4ad30289af0 100644 --- a/src/ssh/setup.py +++ b/src/ssh/setup.py @@ -7,7 +7,7 @@ from setuptools import setup, find_packages -VERSION = "2.0.5" +VERSION = "2.0.6" CLASSIFIERS = [ 'Development Status :: 4 - Beta',