Skip to content

[Interactive] Remove dependency of ENV_ADDITIONAL_USER_AGENT #1479

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jiasli merged 3 commits into from
Apr 2, 2020
Merged

[Interactive] Remove dependency of ENV_ADDITIONAL_USER_AGENT #1479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dd1593e
Remove dependency of ENV_ADDITIONAL_USER_AGENT
jiasli Apr 1, 2020
047ebd7
Append UA
jiasli Apr 2, 2020
33af61c
Merge branch 'master' into interactive
jiasli Apr 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/interactive/HISTORY.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/interactive/azext_interactive/azclishell/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
7 changes: 5 additions & 2 deletions src/interactive/azext_interactive/azclishell/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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__)

Expand Down Expand Up @@ -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
Expand Down