From 6f18528d59454146c5ede194d4defcbab923b0f2 Mon Sep 17 00:00:00 2001 From: Oluwatosin Adewale Date: Wed, 21 Nov 2018 12:34:34 -0800 Subject: [PATCH 1/2] Properly handle parsing of ids from -o tsv on windows. --- src/azure-cli-core/HISTORY.rst | 2 +- src/azure-cli-core/azure/cli/core/commands/arm.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/azure-cli-core/HISTORY.rst b/src/azure-cli-core/HISTORY.rst index a97f8519aeb..7f6bb43cb32 100644 --- a/src/azure-cli-core/HISTORY.rst +++ b/src/azure-cli-core/HISTORY.rst @@ -4,7 +4,7 @@ Release History =============== 2.0.52 ++++++ -* Minor fixes +* Fix bug where ids piped from a command with tsv output is improperly parsed. 2.0.51 ++++++ diff --git a/src/azure-cli-core/azure/cli/core/commands/arm.py b/src/azure-cli-core/azure/cli/core/commands/arm.py index 70fcf64f455..d3b77cbf7a1 100644 --- a/src/azure-cli-core/azure/cli/core/commands/arm.py +++ b/src/azure-cli-core/azure/cli/core/commands/arm.py @@ -271,7 +271,7 @@ def parse_ids_arguments(_, command, args): full_id_list += [json_val['id']] except ValueError: # supports piping of --ids to the command when using TSV. Requires use of --query - full_id_list = full_id_list + val.split(os.linesep) + full_id_list = full_id_list + val.splitlines() for val in full_id_list: if not is_valid_resource_id(val): From c6ddaaed58363a918628853260d5df281a19a7b5 Mon Sep 17 00:00:00 2001 From: Oluwatosin Adewale Date: Wed, 21 Nov 2018 13:28:29 -0800 Subject: [PATCH 2/2] Removed unused import. --- src/azure-cli-core/azure/cli/core/commands/arm.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/azure-cli-core/azure/cli/core/commands/arm.py b/src/azure-cli-core/azure/cli/core/commands/arm.py index d3b77cbf7a1..344dc3aee9c 100644 --- a/src/azure-cli-core/azure/cli/core/commands/arm.py +++ b/src/azure-cli-core/azure/cli/core/commands/arm.py @@ -176,7 +176,6 @@ def register_ids_argument(cli_ctx): from knack import events from msrestazure.tools import parse_resource_id, is_valid_resource_id - import os ids_metadata = {}