From 23a1cd26f757eb5bdf523884dfa9dd9e78669047 Mon Sep 17 00:00:00 2001 From: evelyn-ys Date: Thu, 20 Oct 2022 17:15:59 +0800 Subject: [PATCH 1/2] Log allow_broker configuration in telemetry --- src/azure-cli-core/azure/cli/core/_profile.py | 2 ++ src/azure-cli-core/azure/cli/core/telemetry.py | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/src/azure-cli-core/azure/cli/core/_profile.py b/src/azure-cli-core/azure/cli/core/_profile.py index df497e7af59..4ce7132818a 100644 --- a/src/azure-cli-core/azure/cli/core/_profile.py +++ b/src/azure-cli-core/azure/cli/core/_profile.py @@ -858,6 +858,8 @@ def _create_identity_instance(cli_ctx, *args, **kwargs): # PREVIEW: On Windows, use core.allow_broker=true to use broker (WAM) for authentication. allow_broker = cli_ctx.config.getboolean('core', 'allow_broker', fallback=False) + from .telemetry import set_wam_info + set_wam_info(allow_broker=allow_broker) return Identity(*args, encrypt=encrypt, use_msal_http_cache=use_msal_http_cache, allow_broker=allow_broker, **kwargs) diff --git a/src/azure-cli-core/azure/cli/core/telemetry.py b/src/azure-cli-core/azure/cli/core/telemetry.py index 1416a7d5ffd..ac0b6b0bddc 100644 --- a/src/azure-cli-core/azure/cli/core/telemetry.py +++ b/src/azure-cli-core/azure/cli/core/telemetry.py @@ -67,6 +67,7 @@ def __init__(self, correlation_id=None, application=None): self.suppress_new_event = False self.poll_start_time = None self.poll_end_time = None + self.allow_broker = None def add_event(self, name, properties): for key in self.instrumentation_key: @@ -206,6 +207,7 @@ def _get_azure_cli_properties(self): set_custom_properties(result, 'PollEndTime', str(self.poll_end_time)) set_custom_properties(result, 'CloudName', _get_cloud_name()) set_custom_properties(result, 'ShowSurveyMessage', str(self.show_survey_message)) + set_custom_properties(result, 'AllowBroker', str(self.allow_broker)) return result @@ -425,6 +427,12 @@ def set_survey_info(show_survey_message): _session.show_survey_message = show_survey_message +@decorators.suppress_all_exceptions() +def set_wam_info(allow_broker): + # whether customer has configured `allow_broker` to enable WAM(Web Account Manager) login for authentication + _session.allow_broker = allow_broker + + @decorators.suppress_all_exceptions() def add_dedicated_instrumentation_key(dedicated_instrumentation_key): if not dedicated_instrumentation_key: From 43f9382e74976f20ce8707b537aa2dd998063a17 Mon Sep 17 00:00:00 2001 From: "yishiwang@microsoft.com" Date: Mon, 24 Oct 2022 15:26:07 +0800 Subject: [PATCH 2/2] rename --- src/azure-cli-core/azure/cli/core/_profile.py | 4 ++-- src/azure-cli-core/azure/cli/core/telemetry.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/azure-cli-core/azure/cli/core/_profile.py b/src/azure-cli-core/azure/cli/core/_profile.py index 4ce7132818a..58aa33340b4 100644 --- a/src/azure-cli-core/azure/cli/core/_profile.py +++ b/src/azure-cli-core/azure/cli/core/_profile.py @@ -858,8 +858,8 @@ def _create_identity_instance(cli_ctx, *args, **kwargs): # PREVIEW: On Windows, use core.allow_broker=true to use broker (WAM) for authentication. allow_broker = cli_ctx.config.getboolean('core', 'allow_broker', fallback=False) - from .telemetry import set_wam_info - set_wam_info(allow_broker=allow_broker) + from .telemetry import set_broker_info + set_broker_info(allow_broker=allow_broker) return Identity(*args, encrypt=encrypt, use_msal_http_cache=use_msal_http_cache, allow_broker=allow_broker, **kwargs) diff --git a/src/azure-cli-core/azure/cli/core/telemetry.py b/src/azure-cli-core/azure/cli/core/telemetry.py index ac0b6b0bddc..b6359f04f91 100644 --- a/src/azure-cli-core/azure/cli/core/telemetry.py +++ b/src/azure-cli-core/azure/cli/core/telemetry.py @@ -428,7 +428,7 @@ def set_survey_info(show_survey_message): @decorators.suppress_all_exceptions() -def set_wam_info(allow_broker): +def set_broker_info(allow_broker): # whether customer has configured `allow_broker` to enable WAM(Web Account Manager) login for authentication _session.allow_broker = allow_broker