From 7d11c4960fe7e5e97a3ffaa07c0f5e0c814ffcbc Mon Sep 17 00:00:00 2001 From: Matthew Booe Date: Mon, 27 Jan 2020 14:11:41 -0800 Subject: [PATCH 1/2] Remove EUII information from az find telemetry --- .../azure/cli/command_modules/find/custom.py | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/azure-cli/azure/cli/command_modules/find/custom.py b/src/azure-cli/azure/cli/command_modules/find/custom.py index b9ef45fd55d..74b06280aaf 100644 --- a/src/azure-cli/azure/cli/command_modules/find/custom.py +++ b/src/azure-cli/azure/cli/command_modules/find/custom.py @@ -93,21 +93,9 @@ def should_enable_styling(): def call_aladdin_service(query): - client_request_id = '' - if telemetry_core._session.application: # pylint: disable=protected-access - client_request_id = telemetry_core._session.application.data['headers']['x-ms-client-request-id'] # pylint: disable=protected-access - - session_id = telemetry_core._session._get_base_properties()['Reserved.SessionId'] # pylint: disable=protected-access - subscription_id = telemetry_core._get_azure_subscription_id() # pylint: disable=protected-access - client_request_id = client_request_id # pylint: disable=protected-access - installation_id = telemetry_core._get_installation_id() # pylint: disable=protected-access version = str(parse_version(core_version)) context = { - "sessionId": session_id, - "subscriptionId": subscription_id, - "clientRequestId": client_request_id, - "installationId": installation_id, "versionNumber": version } From 938f8d1198ddff0c43a6c2b47fc850faa09b7dd8 Mon Sep 17 00:00:00 2001 From: Matthew Booe Date: Tue, 3 Mar 2020 10:22:44 -0800 Subject: [PATCH 2/2] Suppress the old find extension --- src/azure-cli/azure/cli/command_modules/find/__init__.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/azure-cli/azure/cli/command_modules/find/__init__.py b/src/azure-cli/azure/cli/command_modules/find/__init__.py index db37efb1fa2..b650dfe2c3e 100644 --- a/src/azure-cli/azure/cli/command_modules/find/__init__.py +++ b/src/azure-cli/azure/cli/command_modules/find/__init__.py @@ -11,8 +11,14 @@ class FindCommandsLoader(AzCommandsLoader): def __init__(self, cli_ctx=None): from azure.cli.core.commands import CliCommandType + from azure.cli.core import ModExtensionSuppress find_custom = CliCommandType(operations_tmpl='azure.cli.command_modules.find.custom#{}') - super(FindCommandsLoader, self).__init__(cli_ctx=cli_ctx, custom_command_type=find_custom) + super(FindCommandsLoader, self).__init__(cli_ctx=cli_ctx, + custom_command_type=find_custom, + suppress_extension=ModExtensionSuppress( + __name__, 'find', '0.3.0', + reason='The find command is now in CLI.', + recommend_remove=True)) self.module_name = __name__ def load_command_table(self, args):