diff --git a/src/interactive/HISTORY.rst b/src/interactive/HISTORY.rst index 8a34885c417..73bcfeaf3e6 100644 --- a/src/interactive/HISTORY.rst +++ b/src/interactive/HISTORY.rst @@ -3,6 +3,10 @@ Release History =============== +0.4.4 ++++++ +* Remove dependency of azure-cli-core's ENV_ADDITIONAL_USER_AGENT + 0.4.3 +++++ * Fix config problem in interactive diff --git a/src/interactive/azext_interactive/azclishell/__init__.py b/src/interactive/azext_interactive/azclishell/__init__.py index d8ac255f4d5..433a3fca693 100644 --- a/src/interactive/azext_interactive/azclishell/__init__.py +++ b/src/interactive/azext_interactive/azclishell/__init__.py @@ -3,4 +3,4 @@ # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -VERSION = '0.4.3' +VERSION = '0.4.4' diff --git a/src/interactive/azext_interactive/azclishell/app.py b/src/interactive/azext_interactive/azclishell/app.py index e0f92a5aa15..e0c7c9519c2 100644 --- a/src/interactive/azext_interactive/azclishell/app.py +++ b/src/interactive/azext_interactive/azclishell/app.py @@ -17,7 +17,6 @@ from six.moves import configparser from knack.log import get_logger from knack.util import CLIError -from azure.cli.core.commands.client_factory import ENV_ADDITIONAL_USER_AGENT from azure.cli.core._profile import _SUBSCRIPTION_NAME, Profile from azure.cli.core._session import ACCOUNT, CONFIG, SESSION from azure.cli.core.api import get_config_dir @@ -53,6 +52,7 @@ PART_SCREEN_EXAMPLE = .3 START_TIME = datetime.datetime.utcnow() CLEAR_WORD = get_os_clear_screen_word() +_ENV_ADDITIONAL_USER_AGENT = 'AZURE_HTTP_USER_AGENT' logger = get_logger(__name__) @@ -98,7 +98,10 @@ def __init__(self, cli_ctx, style=None, completer=None, self.completer = AzCompleter(self, None) self.lexer = None self.history = history or FileHistory(os.path.join(self.config.get_config_dir(), self.config.get_history())) - os.environ[ENV_ADDITIONAL_USER_AGENT] = 'AZURECLISHELL/' + VERSION + if os.environ.get(_ENV_ADDITIONAL_USER_AGENT): + os.environ[_ENV_ADDITIONAL_USER_AGENT] += ' AZURECLISHELL/' + VERSION + else: + os.environ[_ENV_ADDITIONAL_USER_AGENT] = 'AZURECLISHELL/' + VERSION # OH WHAT FUN TO FIGURE OUT WHAT THESE ARE! self._cli = None