azure-cli-core 2.90.0__tar.gz → 2.92.0__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/HISTORY.rst +12 -0
- {azure_cli_core-2.90.0/azure_cli_core.egg-info → azure_cli_core-2.92.0}/PKG-INFO +7 -17
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/__init__.py +1 -1
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/_environment.py +1 -0
- azure_cli_core-2.92.0/azure/cli/core/_output.py +82 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/_profile.py +4 -1
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/aaz/_arg_fmt.py +0 -3
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/aaz/_poller.py +4 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/auth/identity.py +4 -2
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/breaking_change.py +1 -1
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/cloud.py +33 -1
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/commandIndex.latest.json +1 -1
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/commands/arm.py +3 -4
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/extension/dynamic_install.py +10 -6
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/helpIndex.latest.json +2 -2
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/telemetry.py +5 -2
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/util.py +32 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0/azure_cli_core.egg-info}/PKG-INFO +7 -17
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure_cli_core.egg-info/SOURCES.txt +1 -1
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure_cli_core.egg-info/requires.txt +4 -4
- azure_cli_core-2.92.0/pyproject.toml +66 -0
- azure_cli_core-2.90.0/azure/cli/core/_output.py +0 -21
- azure_cli_core-2.90.0/setup.py +0 -92
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/LICENSE.txt +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/MANIFEST.in +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/README.rst +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/__init__.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/__init__.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/_breaking_change.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/_completers.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/_config.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/_debug.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/_help.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/_help_loaders.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/_session.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/aaz/__init__.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/aaz/_arg.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/aaz/_arg_action.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/aaz/_arg_browser.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/aaz/_base.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/aaz/_client.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/aaz/_command.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/aaz/_command_ctx.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/aaz/_content_builder.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/aaz/_error_format.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/aaz/_field_type.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/aaz/_field_value.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/aaz/_help.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/aaz/_http_policy.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/aaz/_operation.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/aaz/_paging.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/aaz/_prompt.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/aaz/_selector.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/aaz/_utils.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/aaz/exceptions.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/aaz/utils.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/api.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/auth/__init__.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/auth/agentic_session.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/auth/binary_cache.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/auth/constants.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/auth/credential_adaptor.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/auth/landing_pages/error.html +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/auth/landing_pages/success.html +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/auth/msal_credentials.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/auth/persistence.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/auth/util.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/azclierror.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/azlogging.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/command_recommender.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/commands/__init__.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/commands/client_factory.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/commands/command_operation.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/commands/constants.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/commands/events.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/commands/parameters.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/commands/progress.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/commands/sensitive.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/commands/template_create.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/commands/transform.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/commands/validators.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/credential_helper.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/decorators.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/extension/__init__.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/extension/_homebrew_patch.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/extension/_index.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/extension/_resolve.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/extension/operations.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/file_util.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/intercept_survey.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/keys.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/local_context.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/mock.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/parser.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/profiles/__init__.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/profiles/_shared.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/sdk/__init__.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/sdk/policies.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/style.py +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure_cli_core.egg-info/dependency_links.txt +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure_cli_core.egg-info/not-zip-safe +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure_cli_core.egg-info/top_level.txt +0 -0
- {azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/setup.cfg +0 -0
|
@@ -3,6 +3,18 @@
|
|
|
3
3
|
Release History
|
|
4
4
|
===============
|
|
5
5
|
|
|
6
|
+
2.92.0
|
|
7
|
+
++++++
|
|
8
|
+
* Add `get_safe_executable_path` to prevent binary planting when spawning subprocess (#34212)
|
|
9
|
+
* Resolve GHSA-6q48-6c7w-9gw2 (#34250)
|
|
10
|
+
* Add `core.output_newline` config (native|lf) and default to LF line endings on stdout when run from WSL or Git Bash on Windows (#34236)
|
|
11
|
+
* Resolve OpenSSL and Certifi related vulnerabilities (#34275)
|
|
12
|
+
|
|
13
|
+
2.91.0
|
|
14
|
+
++++++
|
|
15
|
+
* Remove AzureGermanCloud from hard-coded cloud list (#34042)
|
|
16
|
+
* PREVIEW: Enable broker-based authentication on macOS (opt-in via `az config set core.enable_broker_on_mac=true`) (#33376)
|
|
17
|
+
|
|
6
18
|
2.90.0
|
|
7
19
|
++++++
|
|
8
20
|
* Minor fixes
|
|
@@ -1,11 +1,10 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: azure-cli-core
|
|
3
|
-
Version: 2.
|
|
3
|
+
Version: 2.92.0
|
|
4
4
|
Summary: Microsoft Azure Command-Line Tools Core Module
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
License: MIT
|
|
5
|
+
Author-email: Microsoft Corporation <azpycli@microsoft.com>
|
|
6
|
+
License-Expression: MIT
|
|
7
|
+
Project-URL: Homepage, https://github.com/Azure/azure-cli
|
|
9
8
|
Classifier: Development Status :: 5 - Production/Stable
|
|
10
9
|
Classifier: Intended Audience :: Developers
|
|
11
10
|
Classifier: Intended Audience :: System Administrators
|
|
@@ -16,8 +15,8 @@ Classifier: Programming Language :: Python :: 3.11
|
|
|
16
15
|
Classifier: Programming Language :: Python :: 3.12
|
|
17
16
|
Classifier: Programming Language :: Python :: 3.13
|
|
18
17
|
Classifier: Programming Language :: Python :: 3.14
|
|
19
|
-
Classifier: License :: OSI Approved :: MIT License
|
|
20
18
|
Requires-Python: >=3.10.0
|
|
19
|
+
Description-Content-Type: text/x-rst
|
|
21
20
|
License-File: LICENSE.txt
|
|
22
21
|
Requires-Dist: argcomplete~=3.5.2
|
|
23
22
|
Requires-Dist: azure-cli-telemetry==1.1.0.*
|
|
@@ -30,8 +29,8 @@ Requires-Dist: jmespath
|
|
|
30
29
|
Requires-Dist: knack~=0.14.0
|
|
31
30
|
Requires-Dist: microsoft-security-utilities-secret-masker~=1.0.0b4
|
|
32
31
|
Requires-Dist: msal-extensions==1.3.1
|
|
33
|
-
Requires-Dist: msal[broker]==1.
|
|
34
|
-
Requires-Dist: msal==1.
|
|
32
|
+
Requires-Dist: msal[broker]==1.39.0; sys_platform == "win32" or sys_platform == "darwin"
|
|
33
|
+
Requires-Dist: msal==1.39.0; sys_platform != "win32" and sys_platform != "darwin"
|
|
35
34
|
Requires-Dist: packaging>=20.9
|
|
36
35
|
Requires-Dist: pkginfo>=1.12.0
|
|
37
36
|
Requires-Dist: psutil>=5.9; sys_platform != "cygwin"
|
|
@@ -39,16 +38,7 @@ Requires-Dist: PyJWT>=2.1.0
|
|
|
39
38
|
Requires-Dist: pyopenssl>=17.1.0
|
|
40
39
|
Requires-Dist: py-deviceid
|
|
41
40
|
Requires-Dist: requests[socks]
|
|
42
|
-
Dynamic: author
|
|
43
|
-
Dynamic: author-email
|
|
44
|
-
Dynamic: classifier
|
|
45
|
-
Dynamic: description
|
|
46
|
-
Dynamic: home-page
|
|
47
|
-
Dynamic: license
|
|
48
41
|
Dynamic: license-file
|
|
49
|
-
Dynamic: requires-dist
|
|
50
|
-
Dynamic: requires-python
|
|
51
|
-
Dynamic: summary
|
|
52
42
|
|
|
53
43
|
Microsoft Azure CLI Core Module
|
|
54
44
|
==================================
|
|
@@ -0,0 +1,82 @@
|
|
|
1
|
+
# --------------------------------------------------------------------------------------------
|
|
2
|
+
# Copyright (c) Microsoft Corporation. All rights reserved.
|
|
3
|
+
# Licensed under the MIT License. See License.txt in the project root for license information.
|
|
4
|
+
# --------------------------------------------------------------------------------------------
|
|
5
|
+
|
|
6
|
+
import configparser
|
|
7
|
+
import os
|
|
8
|
+
import sys
|
|
9
|
+
|
|
10
|
+
import knack.output
|
|
11
|
+
from knack.log import get_logger
|
|
12
|
+
|
|
13
|
+
from azure.cli.core._environment import _ENV_AZ_LAUNCHER
|
|
14
|
+
|
|
15
|
+
logger = get_logger(__name__)
|
|
16
|
+
|
|
17
|
+
_OUTPUT_NEWLINE_NATIVE = 'native'
|
|
18
|
+
_OUTPUT_NEWLINE_LF = 'lf'
|
|
19
|
+
# core.output_newline value -> newline for stdout.reconfigure(); None leaves stdout untouched.
|
|
20
|
+
_OUTPUT_NEWLINES = {
|
|
21
|
+
_OUTPUT_NEWLINE_NATIVE: None,
|
|
22
|
+
_OUTPUT_NEWLINE_LF: '\n',
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
|
|
26
|
+
class AzOutputProducer(knack.output.OutputProducer):
|
|
27
|
+
|
|
28
|
+
def check_valid_format_type(self, format_type):
|
|
29
|
+
return format_type in self._FORMAT_DICT
|
|
30
|
+
|
|
31
|
+
|
|
32
|
+
def get_output_format(cli_ctx):
|
|
33
|
+
return cli_ctx.invocation.data.get("output", None)
|
|
34
|
+
|
|
35
|
+
|
|
36
|
+
def set_output_format(cli_ctx, desired_format):
|
|
37
|
+
if cli_ctx.output.check_valid_format_type(desired_format):
|
|
38
|
+
cli_ctx.invocation.data["output"] = desired_format
|
|
39
|
+
|
|
40
|
+
|
|
41
|
+
def get_output_newline(cli_ctx):
|
|
42
|
+
"""Resolve `core.output_newline`: AZURE_CORE_OUTPUT_NEWLINE, then global config, then launcher default.
|
|
43
|
+
|
|
44
|
+
An empty value selects the default rather than falling back to the next source. The bash launcher shipped
|
|
45
|
+
with the Windows MSI (used by WSL and Git Bash) sets AZ_LAUNCHER=bash, which defaults to LF so
|
|
46
|
+
`$(az ... -o tsv)` does not capture a trailing carriage return.
|
|
47
|
+
"""
|
|
48
|
+
value = (cli_ctx.config.get('core', 'output_newline', fallback=None) or '').strip().lower()
|
|
49
|
+
if not value:
|
|
50
|
+
return _OUTPUT_NEWLINE_LF if os.environ.get(_ENV_AZ_LAUNCHER) == 'bash' else _OUTPUT_NEWLINE_NATIVE
|
|
51
|
+
return value
|
|
52
|
+
|
|
53
|
+
|
|
54
|
+
def apply_output_newline(cli_ctx, **_):
|
|
55
|
+
"""Stop Windows from translating '\\n' to '\\r\\n' in all text written to stdout (not just `-o` results)
|
|
56
|
+
when `core.output_newline` is `lf`.
|
|
57
|
+
|
|
58
|
+
Registered for EVENT_CLI_PRE_EXECUTE: logging is configured by then and no command output has been
|
|
59
|
+
written yet. Streams are reconfigured in place because knack keeps a reference to sys.stdout as `out_file`.
|
|
60
|
+
"""
|
|
61
|
+
try:
|
|
62
|
+
value = get_output_newline(cli_ctx)
|
|
63
|
+
except configparser.Error as ex:
|
|
64
|
+
logger.warning("Ignoring unreadable core.output_newline value: %s", ex)
|
|
65
|
+
return
|
|
66
|
+
if value not in _OUTPUT_NEWLINES:
|
|
67
|
+
logger.warning("Ignoring invalid core.output_newline value '%s'. Allowed values: %s",
|
|
68
|
+
value, ', '.join(_OUTPUT_NEWLINES))
|
|
69
|
+
return
|
|
70
|
+
newline = _OUTPUT_NEWLINES[value]
|
|
71
|
+
if newline is None:
|
|
72
|
+
return
|
|
73
|
+
streams = []
|
|
74
|
+
for stream in (getattr(cli_ctx, 'out_file', None), sys.stdout):
|
|
75
|
+
if stream is not None and hasattr(stream, 'reconfigure') and all(stream is not s for s in streams):
|
|
76
|
+
streams.append(stream)
|
|
77
|
+
for stream in streams:
|
|
78
|
+
try:
|
|
79
|
+
stream.reconfigure(newline=newline)
|
|
80
|
+
except (OSError, ValueError) as ex:
|
|
81
|
+
# Line endings are cosmetic, so never fail the command (e.g. stdout closed or detached).
|
|
82
|
+
logger.debug("Unable to set stdout newline to %r: %s", newline, ex)
|
|
@@ -975,8 +975,10 @@ def _create_identity_instance(cli_ctx, authority, tenant_id=None, client_id=None
|
|
|
975
975
|
|
|
976
976
|
# On Windows, use core.enable_broker_on_windows=false to disable broker (WAM) for authentication.
|
|
977
977
|
enable_broker_on_windows = cli_ctx.config.getboolean('core', 'enable_broker_on_windows', fallback=True)
|
|
978
|
+
# On macOS, broker authentication is opt-in. Use core.enable_broker_on_mac=true to enable it.
|
|
979
|
+
enable_broker_on_mac = cli_ctx.config.getboolean('core', 'enable_broker_on_mac', fallback=False)
|
|
978
980
|
from .telemetry import set_broker_info
|
|
979
|
-
set_broker_info(enable_broker_on_windows)
|
|
981
|
+
set_broker_info(enable_broker_on_windows, enable_broker_on_mac)
|
|
980
982
|
|
|
981
983
|
# PREVIEW: In Azure Stack environment, use core.instance_discovery=false to disable MSAL's instance discovery.
|
|
982
984
|
instance_discovery = cli_ctx.config.getboolean('core', 'instance_discovery', True)
|
|
@@ -985,4 +987,5 @@ def _create_identity_instance(cli_ctx, authority, tenant_id=None, client_id=None
|
|
|
985
987
|
encrypt=encrypt,
|
|
986
988
|
use_msal_http_cache=use_msal_http_cache,
|
|
987
989
|
enable_broker_on_windows=enable_broker_on_windows,
|
|
990
|
+
enable_broker_on_mac=enable_broker_on_mac,
|
|
988
991
|
instance_discovery=instance_discovery)
|
|
@@ -52,9 +52,6 @@ class AAZStrArgFormat(AAZBaseArgFormat):
|
|
|
52
52
|
if self._max_length is not None and len(data) > self._max_length:
|
|
53
53
|
raise AAZInvalidArgValueError(
|
|
54
54
|
f"Invalid format: '{data}' length is greater than {self._max_length}")
|
|
55
|
-
if self._pattern is not None and not self._compiled_pattern.fullmatch(data):
|
|
56
|
-
raise AAZInvalidArgValueError(
|
|
57
|
-
f"Invalid format: '{data}' does not fully match regular expression pattern '{self._pattern}'")
|
|
58
55
|
|
|
59
56
|
return value
|
|
60
57
|
|
|
@@ -62,6 +62,10 @@ class AAZLROPoller:
|
|
|
62
62
|
self._done = None
|
|
63
63
|
self._exception = None
|
|
64
64
|
|
|
65
|
+
# MSAL lazily imports requests when the credential is created on the polling thread,
|
|
66
|
+
# which can raise _DeadlockError (seen on Python 3.14). Import it here on the main thread first.
|
|
67
|
+
import requests # pylint: disable=unused-import
|
|
68
|
+
|
|
65
69
|
self._done = threading.Event()
|
|
66
70
|
self._thread = threading.Thread(
|
|
67
71
|
target=with_current_context(self._start),
|
|
@@ -58,7 +58,7 @@ class Identity: # pylint: disable=too-many-instance-attributes
|
|
|
58
58
|
_service_principal_store_instance = None
|
|
59
59
|
|
|
60
60
|
def __init__(self, authority, tenant_id=None, client_id=None, encrypt=False, use_msal_http_cache=True,
|
|
61
|
-
enable_broker_on_windows=None, instance_discovery=None):
|
|
61
|
+
enable_broker_on_windows=None, enable_broker_on_mac=None, instance_discovery=None):
|
|
62
62
|
"""
|
|
63
63
|
:param authority: Authentication authority endpoint. For example,
|
|
64
64
|
- AAD: https://login.microsoftonline.com
|
|
@@ -74,6 +74,7 @@ class Identity: # pylint: disable=too-many-instance-attributes
|
|
|
74
74
|
self._encrypt = encrypt
|
|
75
75
|
self._use_msal_http_cache = use_msal_http_cache
|
|
76
76
|
self._enable_broker_on_windows = enable_broker_on_windows
|
|
77
|
+
self._enable_broker_on_mac = enable_broker_on_mac
|
|
77
78
|
self._instance_discovery = instance_discovery
|
|
78
79
|
|
|
79
80
|
# Build the authority in MSAL style
|
|
@@ -111,9 +112,10 @@ class Identity: # pylint: disable=too-many-instance-attributes
|
|
|
111
112
|
@property
|
|
112
113
|
def _msal_public_app_kwargs(self):
|
|
113
114
|
"""kwargs for creating PublicClientApplication."""
|
|
114
|
-
# enable_broker_on_windows can only be used on PublicClientApplication.
|
|
115
|
+
# enable_broker_on_windows and enable_broker_on_mac can only be used on PublicClientApplication.
|
|
115
116
|
return {**self._msal_app_kwargs,
|
|
116
117
|
"enable_broker_on_windows": self._enable_broker_on_windows,
|
|
118
|
+
"enable_broker_on_mac": self._enable_broker_on_mac,
|
|
117
119
|
"enable_pii_log": True}
|
|
118
120
|
|
|
119
121
|
@property
|
|
@@ -356,6 +356,7 @@ class CloudNameEnum: # pylint: disable=too-few-public-methods
|
|
|
356
356
|
AzureUSGovernment = 'AzureUSGovernment'
|
|
357
357
|
AzureGermanCloud = 'AzureGermanCloud'
|
|
358
358
|
AzureBleuCloud = 'AzureBleuCloud'
|
|
359
|
+
AzureDelosCloud = 'AzureDelosCloud'
|
|
359
360
|
|
|
360
361
|
|
|
361
362
|
AZURE_PUBLIC_CLOUD = Cloud(
|
|
@@ -505,6 +506,7 @@ AZURE_BLEU_CLOUD = Cloud(
|
|
|
505
506
|
vm_image_alias_doc='https://azcliprod.blob.core.windows.net/cli/vm/aliases_master.json',
|
|
506
507
|
media_resource_id='https://rest.media.sovcloud-api.fr',
|
|
507
508
|
ossrdbms_resource_id='https://ossrdbms-aad.database.sovcloud-api.fr',
|
|
509
|
+
synapse_analytics_resource_id='https://dev.azuresynapse.sovcloud-api.fr',
|
|
508
510
|
portal='https://portal.sovcloud-azure.fr'),
|
|
509
511
|
suffixes=CloudSuffixes(
|
|
510
512
|
acr_login_server_endpoint='.azurecr.sovcloud-azure.fr',
|
|
@@ -519,7 +521,37 @@ AZURE_BLEU_CLOUD = Cloud(
|
|
|
519
521
|
mariadb_server_endpoint='.mariadb.database.sovcloud-api.fr',
|
|
520
522
|
synapse_analytics_endpoint='.dev.azuresynapse.sovcloud-api.fr'))
|
|
521
523
|
|
|
522
|
-
|
|
524
|
+
AZURE_DELOS_CLOUD = Cloud(
|
|
525
|
+
CloudNameEnum.AzureDelosCloud,
|
|
526
|
+
endpoints=CloudEndpoints(
|
|
527
|
+
management='https://management.sovcloud-api.de/',
|
|
528
|
+
resource_manager='https://management.sovcloud-api.de',
|
|
529
|
+
sql_management='https://management.database.sovcloud-api.de:8443/',
|
|
530
|
+
batch_resource_id='https://batch.sovcloud-api.de/',
|
|
531
|
+
gallery='https://gallery.sovcloud-api.de/',
|
|
532
|
+
active_directory='https://login.sovcloud-identity.de',
|
|
533
|
+
active_directory_resource_id='https://management.sovcloud-api.de/',
|
|
534
|
+
active_directory_graph_resource_id='https://graph.svc.sovcloud.de/',
|
|
535
|
+
microsoft_graph_resource_id='https://graph.svc.sovcloud.de',
|
|
536
|
+
vm_image_alias_doc='https://azcliprod.blob.core.windows.net/cli/vm/aliases_master.json',
|
|
537
|
+
media_resource_id='https://rest.media.sovcloud-api.de',
|
|
538
|
+
ossrdbms_resource_id='https://ossrdbms-aad.database.sovcloud-api.de',
|
|
539
|
+
synapse_analytics_resource_id='https://dev.azuresynapse.sovcloud-api.de',
|
|
540
|
+
portal='https://portal.sovcloud.de'),
|
|
541
|
+
suffixes=CloudSuffixes(
|
|
542
|
+
acr_login_server_endpoint='.azurecr.sovcloud-azure.de',
|
|
543
|
+
attestation_endpoint='attest.sovcloud-api.de',
|
|
544
|
+
storage_endpoint='core.sovcloud-api.de',
|
|
545
|
+
storage_sync_endpoint='afs.sovcloud-api.de',
|
|
546
|
+
keyvault_dns='.vault.sovcloud-api.de',
|
|
547
|
+
mhsm_dns='.managedhsm.sovcloud-api.de',
|
|
548
|
+
sql_server_hostname='.database.sovcloud-api.de',
|
|
549
|
+
mysql_server_endpoint='.mysql.database.sovcloud-api.de',
|
|
550
|
+
postgresql_server_endpoint='.postgres.database.sovcloud-api.de',
|
|
551
|
+
mariadb_server_endpoint='.mariadb.database.sovcloud-api.de',
|
|
552
|
+
synapse_analytics_endpoint='.dev.azuresynapse.sovcloud-api.de'))
|
|
553
|
+
|
|
554
|
+
HARD_CODED_CLOUD_LIST = [AZURE_PUBLIC_CLOUD, AZURE_CHINA_CLOUD, AZURE_US_GOV_CLOUD, AZURE_BLEU_CLOUD, AZURE_DELOS_CLOUD]
|
|
523
555
|
|
|
524
556
|
|
|
525
557
|
def retrieve_arm_cloud_metadata():
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
# Copyright (c) Microsoft Corporation. All rights reserved.
|
|
3
3
|
# Licensed under the MIT License. See License.txt in the project root for license information.
|
|
4
4
|
# --------------------------------------------------------------------------------------------
|
|
5
|
-
|
|
5
|
+
# pylint: disable=line-too-long
|
|
6
6
|
# pylint: disable=too-many-lines
|
|
7
7
|
|
|
8
8
|
import argparse
|
|
@@ -75,7 +75,7 @@ class ArmTemplateBuilder:
|
|
|
75
75
|
output_type='string', path=None):
|
|
76
76
|
|
|
77
77
|
if provider and property_type:
|
|
78
|
-
value = "[reference(resourceId('{provider}/{type}', '{property}'),providers('{provider}', '{type}').apiVersions[0])".format(
|
|
78
|
+
value = "[reference(resourceId('{provider}/{type}', '{property}'),providers('{provider}', '{type}').apiVersions[0])".format(
|
|
79
79
|
provider=provider, type=property_type, property=property_name)
|
|
80
80
|
else:
|
|
81
81
|
value = "[reference('{}')".format(property_name)
|
|
@@ -175,8 +175,7 @@ class ResourceId(str):
|
|
|
175
175
|
return str.__new__(cls, val)
|
|
176
176
|
|
|
177
177
|
|
|
178
|
-
def resource_exists(cli_ctx, subscription, resource_group, name, namespace, type,
|
|
179
|
-
**_): # pylint: disable=redefined-builtin
|
|
178
|
+
def resource_exists(cli_ctx, subscription, resource_group, name, namespace, type, **_): # pylint: disable=redefined-builtin
|
|
180
179
|
''' Checks if the given resource exists. '''
|
|
181
180
|
odata_filter = "resourceGroup eq '{}' and name eq '{}'" \
|
|
182
181
|
" and resourceType eq '{}/{}'".format(resource_group, name, namespace, type)
|
|
@@ -241,13 +241,17 @@ def _check_value_in_extensions(cli_ctx, parser, args, no_prompt): # pylint: dis
|
|
|
241
241
|
from azure.cli.core.extension.operations import add_extension
|
|
242
242
|
add_extension(cli_ctx=cli_ctx, extension_name=ext_name, upgrade=True, allow_preview=extension_allow_preview)
|
|
243
243
|
if run_after_extension_installed:
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
244
|
+
# Rerun the command with the CLI's own entry point instead of handing the raw argv back to a
|
|
245
|
+
# shell. The previous implementation used `subprocess.call(args, shell=True)` on Windows, which
|
|
246
|
+
# let cmd.exe reinterpret user-controlled arguments (e.g. `&`, `|`, `^`) and allowed command
|
|
247
|
+
# injection. `run_az_cmd` executes the command in-process with the args kept as a list, so no
|
|
248
|
+
# shell is involved.
|
|
249
|
+
from azure.cli.core.util import run_az_cmd
|
|
250
|
+
result = run_az_cmd(args[1:])
|
|
251
|
+
exit_code = getattr(result, 'exit_code', 0)
|
|
247
252
|
# In this case, error msg is for telemetry recording purpose only.
|
|
248
|
-
# From UX perspective, the command
|
|
249
|
-
#
|
|
250
|
-
# interrupt that.
|
|
253
|
+
# From UX perspective, the command is rerun and its messages are already shown,
|
|
254
|
+
# so this process should not print more message to interrupt that.
|
|
251
255
|
print_error = False
|
|
252
256
|
error_msg = ("Extension {} dynamically installed{} and commands will be "
|
|
253
257
|
"rerun automatically.").format(ext_name, prompt_info)
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "2.
|
|
2
|
+
"version": "2.92.0",
|
|
3
3
|
"cloudProfile": "latest",
|
|
4
4
|
"helpIndex": {
|
|
5
5
|
"groups": {
|
|
@@ -89,7 +89,7 @@
|
|
|
89
89
|
},
|
|
90
90
|
"config": {
|
|
91
91
|
"summary": "Manage Azure CLI configuration.",
|
|
92
|
-
"tags": "
|
|
92
|
+
"tags": ""
|
|
93
93
|
},
|
|
94
94
|
"connection": {
|
|
95
95
|
"summary": "Commands to manage Service Connector local connections which allow local environment to connect Azure Resource. If you want to manage connection for compute service, please run 'az webapp/containerapp/spring connection'.",
|
|
@@ -77,6 +77,7 @@ class TelemetrySession: # pylint: disable=too-many-instance-attributes
|
|
|
77
77
|
self.user_agent = None
|
|
78
78
|
# authentication-related
|
|
79
79
|
self.enable_broker_on_windows = None
|
|
80
|
+
self.enable_broker_on_mac = None
|
|
80
81
|
self.msal_telemetry = None
|
|
81
82
|
self.login_experience_v2 = None
|
|
82
83
|
self.agentic_session = False
|
|
@@ -238,6 +239,7 @@ class TelemetrySession: # pylint: disable=too-many-instance-attributes
|
|
|
238
239
|
set_custom_properties(result, 'SecretNames', ','.join(self.secret_names or []))
|
|
239
240
|
# authentication-related
|
|
240
241
|
set_custom_properties(result, 'EnableBrokerOnWindows', str(self.enable_broker_on_windows))
|
|
242
|
+
set_custom_properties(result, 'EnableBrokerOnMac', str(self.enable_broker_on_mac))
|
|
241
243
|
set_custom_properties(result, 'MsalTelemetry', self.msal_telemetry)
|
|
242
244
|
set_custom_properties(result, 'LoginExperienceV2', str(self.login_experience_v2))
|
|
243
245
|
set_custom_properties(result, 'AgenticSession', str(self.agentic_session))
|
|
@@ -485,9 +487,10 @@ def set_region_identified(region_input, region_identified):
|
|
|
485
487
|
|
|
486
488
|
# region authentication-related
|
|
487
489
|
@decorators.suppress_all_exceptions()
|
|
488
|
-
def set_broker_info(enable_broker_on_windows):
|
|
489
|
-
# Log the value of `enable_broker_on_windows`
|
|
490
|
+
def set_broker_info(enable_broker_on_windows, enable_broker_on_mac=None):
|
|
491
|
+
# Log the value of `enable_broker_on_windows` and `enable_broker_on_mac`
|
|
490
492
|
_session.enable_broker_on_windows = enable_broker_on_windows
|
|
493
|
+
_session.enable_broker_on_mac = enable_broker_on_mac
|
|
491
494
|
|
|
492
495
|
|
|
493
496
|
@decorators.suppress_all_exceptions()
|
|
@@ -1634,6 +1634,38 @@ def should_encrypt_token_cache(cli_ctx):
|
|
|
1634
1634
|
return encrypt
|
|
1635
1635
|
|
|
1636
1636
|
|
|
1637
|
+
def get_safe_executable_path(executable):
|
|
1638
|
+
"""Resolve an executable name to an absolute path like ``shutil.which``, but never from the current working
|
|
1639
|
+
directory, which Windows searches first for bare names (binary planting, CWE-427).
|
|
1640
|
+
Return ``None`` if nothing trusted is found; never fall back to the bare name.
|
|
1641
|
+
"""
|
|
1642
|
+
if os.path.dirname(executable):
|
|
1643
|
+
return executable
|
|
1644
|
+
try:
|
|
1645
|
+
cwd = os.getcwd()
|
|
1646
|
+
except OSError:
|
|
1647
|
+
return None # Fail closed: the directory to exclude is unknown.
|
|
1648
|
+
|
|
1649
|
+
search_dirs = os.environ.get('PATH', os.defpath).split(os.pathsep)
|
|
1650
|
+
names = [executable]
|
|
1651
|
+
if sys.platform.startswith('win'):
|
|
1652
|
+
system_root = os.environ.get('SystemRoot', r'C:\Windows')
|
|
1653
|
+
search_dirs = [os.path.join(system_root, 'System32'), system_root] + search_dirs
|
|
1654
|
+
exts = [ext for ext in os.environ.get('PATHEXT', '.COM;.EXE;.BAT;.CMD').split(os.pathsep) if ext]
|
|
1655
|
+
if os.path.splitext(executable)[1].upper() not in (ext.upper() for ext in exts):
|
|
1656
|
+
names = [executable + ext for ext in exts]
|
|
1657
|
+
|
|
1658
|
+
for directory in (d.strip('"') for d in search_dirs):
|
|
1659
|
+
# Relative entries ('', '.') resolve against the CWD as well.
|
|
1660
|
+
if not os.path.isabs(directory) or not os.path.isdir(directory) or os.path.samefile(directory, cwd):
|
|
1661
|
+
continue
|
|
1662
|
+
for name in names:
|
|
1663
|
+
path = os.path.join(directory, name)
|
|
1664
|
+
if os.path.isfile(path) and os.access(path, os.X_OK):
|
|
1665
|
+
return path
|
|
1666
|
+
return None
|
|
1667
|
+
|
|
1668
|
+
|
|
1637
1669
|
def run_cmd(args, *, capture_output=False, timeout=None, check=False, encoding=None, env=None):
|
|
1638
1670
|
"""Run command in a subprocess. It reduces (not eliminates) shell injection by forcing args to be a list
|
|
1639
1671
|
and shell=False. Other arguments are keyword-only. For their documentation, see
|
|
@@ -1,11 +1,10 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: azure-cli-core
|
|
3
|
-
Version: 2.
|
|
3
|
+
Version: 2.92.0
|
|
4
4
|
Summary: Microsoft Azure Command-Line Tools Core Module
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
License: MIT
|
|
5
|
+
Author-email: Microsoft Corporation <azpycli@microsoft.com>
|
|
6
|
+
License-Expression: MIT
|
|
7
|
+
Project-URL: Homepage, https://github.com/Azure/azure-cli
|
|
9
8
|
Classifier: Development Status :: 5 - Production/Stable
|
|
10
9
|
Classifier: Intended Audience :: Developers
|
|
11
10
|
Classifier: Intended Audience :: System Administrators
|
|
@@ -16,8 +15,8 @@ Classifier: Programming Language :: Python :: 3.11
|
|
|
16
15
|
Classifier: Programming Language :: Python :: 3.12
|
|
17
16
|
Classifier: Programming Language :: Python :: 3.13
|
|
18
17
|
Classifier: Programming Language :: Python :: 3.14
|
|
19
|
-
Classifier: License :: OSI Approved :: MIT License
|
|
20
18
|
Requires-Python: >=3.10.0
|
|
19
|
+
Description-Content-Type: text/x-rst
|
|
21
20
|
License-File: LICENSE.txt
|
|
22
21
|
Requires-Dist: argcomplete~=3.5.2
|
|
23
22
|
Requires-Dist: azure-cli-telemetry==1.1.0.*
|
|
@@ -30,8 +29,8 @@ Requires-Dist: jmespath
|
|
|
30
29
|
Requires-Dist: knack~=0.14.0
|
|
31
30
|
Requires-Dist: microsoft-security-utilities-secret-masker~=1.0.0b4
|
|
32
31
|
Requires-Dist: msal-extensions==1.3.1
|
|
33
|
-
Requires-Dist: msal[broker]==1.
|
|
34
|
-
Requires-Dist: msal==1.
|
|
32
|
+
Requires-Dist: msal[broker]==1.39.0; sys_platform == "win32" or sys_platform == "darwin"
|
|
33
|
+
Requires-Dist: msal==1.39.0; sys_platform != "win32" and sys_platform != "darwin"
|
|
35
34
|
Requires-Dist: packaging>=20.9
|
|
36
35
|
Requires-Dist: pkginfo>=1.12.0
|
|
37
36
|
Requires-Dist: psutil>=5.9; sys_platform != "cygwin"
|
|
@@ -39,16 +38,7 @@ Requires-Dist: PyJWT>=2.1.0
|
|
|
39
38
|
Requires-Dist: pyopenssl>=17.1.0
|
|
40
39
|
Requires-Dist: py-deviceid
|
|
41
40
|
Requires-Dist: requests[socks]
|
|
42
|
-
Dynamic: author
|
|
43
|
-
Dynamic: author-email
|
|
44
|
-
Dynamic: classifier
|
|
45
|
-
Dynamic: description
|
|
46
|
-
Dynamic: home-page
|
|
47
|
-
Dynamic: license
|
|
48
41
|
Dynamic: license-file
|
|
49
|
-
Dynamic: requires-dist
|
|
50
|
-
Dynamic: requires-python
|
|
51
|
-
Dynamic: summary
|
|
52
42
|
|
|
53
43
|
Microsoft Azure CLI Core Module
|
|
54
44
|
==================================
|
|
@@ -18,11 +18,11 @@ requests[socks]
|
|
|
18
18
|
[:sys_platform != "cygwin"]
|
|
19
19
|
psutil>=5.9
|
|
20
20
|
|
|
21
|
-
[:sys_platform != "win32"]
|
|
22
|
-
msal==1.
|
|
21
|
+
[:sys_platform != "win32" and sys_platform != "darwin"]
|
|
22
|
+
msal==1.39.0
|
|
23
23
|
|
|
24
24
|
[:sys_platform == "linux"]
|
|
25
25
|
distro
|
|
26
26
|
|
|
27
|
-
[:sys_platform == "win32"]
|
|
28
|
-
msal[broker]==1.
|
|
27
|
+
[:sys_platform == "win32" or sys_platform == "darwin"]
|
|
28
|
+
msal[broker]==1.39.0
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
[build-system]
|
|
2
|
+
requires = ["setuptools>=78.1.1"]
|
|
3
|
+
build-backend = "setuptools.build_meta"
|
|
4
|
+
|
|
5
|
+
[project]
|
|
6
|
+
name = "azure-cli-core"
|
|
7
|
+
version = "2.92.0"
|
|
8
|
+
description = "Microsoft Azure Command-Line Tools Core Module"
|
|
9
|
+
readme = { file = "README.rst", content-type = "text/x-rst" }
|
|
10
|
+
requires-python = ">=3.10.0"
|
|
11
|
+
license = "MIT"
|
|
12
|
+
license-files = ["LICENSE.txt"]
|
|
13
|
+
authors = [{ name = "Microsoft Corporation", email = "azpycli@microsoft.com" }]
|
|
14
|
+
classifiers = [
|
|
15
|
+
"Development Status :: 5 - Production/Stable",
|
|
16
|
+
"Intended Audience :: Developers",
|
|
17
|
+
"Intended Audience :: System Administrators",
|
|
18
|
+
"Programming Language :: Python",
|
|
19
|
+
"Programming Language :: Python :: 3",
|
|
20
|
+
"Programming Language :: Python :: 3.10",
|
|
21
|
+
"Programming Language :: Python :: 3.11",
|
|
22
|
+
"Programming Language :: Python :: 3.12",
|
|
23
|
+
"Programming Language :: Python :: 3.13",
|
|
24
|
+
"Programming Language :: Python :: 3.14",
|
|
25
|
+
]
|
|
26
|
+
dependencies = [
|
|
27
|
+
'argcomplete~=3.5.2',
|
|
28
|
+
'azure-cli-telemetry==1.1.0.*',
|
|
29
|
+
'azure-core~=1.39.0',
|
|
30
|
+
'azure-mgmt-core>=1.2.0,<2',
|
|
31
|
+
'cryptography',
|
|
32
|
+
# On Linux, the distribution (Ubuntu, Debian, etc) and version are logged in telemetry
|
|
33
|
+
'distro; sys_platform == "linux"',
|
|
34
|
+
'humanfriendly~=10.0',
|
|
35
|
+
'jmespath',
|
|
36
|
+
'knack~=0.14.0',
|
|
37
|
+
'microsoft-security-utilities-secret-masker~=1.0.0b4',
|
|
38
|
+
'msal-extensions==1.3.1',
|
|
39
|
+
'msal[broker]==1.39.0; sys_platform == "win32" or sys_platform == "darwin"',
|
|
40
|
+
'msal==1.39.0; sys_platform != "win32" and sys_platform != "darwin"',
|
|
41
|
+
'packaging>=20.9',
|
|
42
|
+
# pkginfo>=1.12.0 reads the spec-defined wheel METADATA / unpacked .dist-info
|
|
43
|
+
# layout produced by modern wheel/setuptools (no metadata.json). Required so
|
|
44
|
+
# WheelExtension.get_metadata works without the legacy wheel==0.30.0 artifact.
|
|
45
|
+
'pkginfo>=1.12.0',
|
|
46
|
+
# psutil can't install on cygwin: https://github.com/Azure/azure-cli/issues/9399
|
|
47
|
+
'psutil>=5.9; sys_platform != "cygwin"',
|
|
48
|
+
'PyJWT>=2.1.0',
|
|
49
|
+
'pyopenssl>=17.1.0', # https://github.com/pyca/pyopenssl/pull/612
|
|
50
|
+
'py-deviceid',
|
|
51
|
+
'requests[socks]',
|
|
52
|
+
]
|
|
53
|
+
|
|
54
|
+
[project.urls]
|
|
55
|
+
Homepage = "https://github.com/Azure/azure-cli"
|
|
56
|
+
|
|
57
|
+
[tool.setuptools]
|
|
58
|
+
include-package-data = false
|
|
59
|
+
zip-safe = false
|
|
60
|
+
|
|
61
|
+
[tool.setuptools.packages.find]
|
|
62
|
+
namespaces = false
|
|
63
|
+
exclude = ["*.tests", "*.tests.*", "tests.*", "tests", "azure", "azure.cli"]
|
|
64
|
+
|
|
65
|
+
[tool.setuptools.package-data]
|
|
66
|
+
"azure.cli.core" = ["auth/landing_pages/*.html", "commandIndex.latest.json", "helpIndex.latest.json"]
|
|
@@ -1,21 +0,0 @@
|
|
|
1
|
-
# --------------------------------------------------------------------------------------------
|
|
2
|
-
# Copyright (c) Microsoft Corporation. All rights reserved.
|
|
3
|
-
# Licensed under the MIT License. See License.txt in the project root for license information.
|
|
4
|
-
# --------------------------------------------------------------------------------------------
|
|
5
|
-
|
|
6
|
-
import knack.output
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
class AzOutputProducer(knack.output.OutputProducer):
|
|
10
|
-
|
|
11
|
-
def check_valid_format_type(self, format_type):
|
|
12
|
-
return format_type in self._FORMAT_DICT
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
def get_output_format(cli_ctx):
|
|
16
|
-
return cli_ctx.invocation.data.get("output", None)
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
def set_output_format(cli_ctx, desired_format):
|
|
20
|
-
if cli_ctx.output.check_valid_format_type(desired_format):
|
|
21
|
-
cli_ctx.invocation.data["output"] = desired_format
|
azure_cli_core-2.90.0/setup.py
DELETED
|
@@ -1,92 +0,0 @@
|
|
|
1
|
-
#!/usr/bin/env python
|
|
2
|
-
|
|
3
|
-
# --------------------------------------------------------------------------------------------
|
|
4
|
-
# Copyright (c) Microsoft Corporation. All rights reserved.
|
|
5
|
-
# Licensed under the MIT License. See License.txt in the project root for license information.
|
|
6
|
-
# --------------------------------------------------------------------------------------------
|
|
7
|
-
|
|
8
|
-
from codecs import open
|
|
9
|
-
from setuptools import setup, find_packages
|
|
10
|
-
|
|
11
|
-
VERSION = "2.90.0"
|
|
12
|
-
|
|
13
|
-
# If we have source, validate that our version numbers match
|
|
14
|
-
# This should prevent uploading releases with mismatched versions.
|
|
15
|
-
try:
|
|
16
|
-
with open('azure/cli/core/__init__.py', 'r', encoding='utf-8') as f:
|
|
17
|
-
content = f.read()
|
|
18
|
-
except OSError:
|
|
19
|
-
pass
|
|
20
|
-
else:
|
|
21
|
-
import re
|
|
22
|
-
import sys
|
|
23
|
-
|
|
24
|
-
m = re.search(r'__version__\s*=\s*[\'"](.+?)[\'"]', content)
|
|
25
|
-
if not m:
|
|
26
|
-
print('Could not find __version__ in azure/cli/core/__init__.py')
|
|
27
|
-
sys.exit(1)
|
|
28
|
-
if m.group(1) != VERSION:
|
|
29
|
-
print('Expected __version__ = "{}"; found "{}"'.format(VERSION, m.group(1)))
|
|
30
|
-
sys.exit(1)
|
|
31
|
-
|
|
32
|
-
CLASSIFIERS = [
|
|
33
|
-
'Development Status :: 5 - Production/Stable',
|
|
34
|
-
'Intended Audience :: Developers',
|
|
35
|
-
'Intended Audience :: System Administrators',
|
|
36
|
-
'Programming Language :: Python',
|
|
37
|
-
'Programming Language :: Python :: 3',
|
|
38
|
-
'Programming Language :: Python :: 3.10',
|
|
39
|
-
'Programming Language :: Python :: 3.11',
|
|
40
|
-
'Programming Language :: Python :: 3.12',
|
|
41
|
-
'Programming Language :: Python :: 3.13',
|
|
42
|
-
'Programming Language :: Python :: 3.14',
|
|
43
|
-
'License :: OSI Approved :: MIT License',
|
|
44
|
-
]
|
|
45
|
-
|
|
46
|
-
DEPENDENCIES = [
|
|
47
|
-
'argcomplete~=3.5.2',
|
|
48
|
-
'azure-cli-telemetry==1.1.0.*',
|
|
49
|
-
'azure-core~=1.39.0',
|
|
50
|
-
'azure-mgmt-core>=1.2.0,<2',
|
|
51
|
-
'cryptography',
|
|
52
|
-
# On Linux, the distribution (Ubuntu, Debian, etc) and version are logged in telemetry
|
|
53
|
-
'distro; sys_platform == "linux"',
|
|
54
|
-
'humanfriendly~=10.0',
|
|
55
|
-
'jmespath',
|
|
56
|
-
'knack~=0.14.0',
|
|
57
|
-
'microsoft-security-utilities-secret-masker~=1.0.0b4',
|
|
58
|
-
'msal-extensions==1.3.1',
|
|
59
|
-
'msal[broker]==1.36.0; sys_platform == "win32"',
|
|
60
|
-
'msal==1.36.0; sys_platform != "win32"',
|
|
61
|
-
'packaging>=20.9',
|
|
62
|
-
# pkginfo>=1.12.0 reads the spec-defined wheel METADATA / unpacked .dist-info
|
|
63
|
-
# layout produced by modern wheel/setuptools (no metadata.json). Required so
|
|
64
|
-
# WheelExtension.get_metadata works without the legacy wheel==0.30.0 artifact.
|
|
65
|
-
'pkginfo>=1.12.0',
|
|
66
|
-
# psutil can't install on cygwin: https://github.com/Azure/azure-cli/issues/9399
|
|
67
|
-
'psutil>=5.9; sys_platform != "cygwin"',
|
|
68
|
-
'PyJWT>=2.1.0',
|
|
69
|
-
'pyopenssl>=17.1.0', # https://github.com/pyca/pyopenssl/pull/612
|
|
70
|
-
'py-deviceid',
|
|
71
|
-
'requests[socks]',
|
|
72
|
-
]
|
|
73
|
-
|
|
74
|
-
with open('README.rst', 'r', encoding='utf-8') as f:
|
|
75
|
-
README = f.read()
|
|
76
|
-
|
|
77
|
-
setup(
|
|
78
|
-
name='azure-cli-core',
|
|
79
|
-
version=VERSION,
|
|
80
|
-
description='Microsoft Azure Command-Line Tools Core Module',
|
|
81
|
-
long_description=README,
|
|
82
|
-
license='MIT',
|
|
83
|
-
author='Microsoft Corporation',
|
|
84
|
-
author_email='azpycli@microsoft.com',
|
|
85
|
-
url='https://github.com/Azure/azure-cli',
|
|
86
|
-
zip_safe=False,
|
|
87
|
-
classifiers=CLASSIFIERS,
|
|
88
|
-
packages=find_packages(exclude=["*.tests", "*.tests.*", "tests.*", "tests", "azure", "azure.cli"]),
|
|
89
|
-
install_requires=DEPENDENCIES,
|
|
90
|
-
python_requires='>=3.10.0',
|
|
91
|
-
package_data={'azure.cli.core': ['auth/landing_pages/*.html', 'commandIndex.latest.json', 'helpIndex.latest.json']}
|
|
92
|
-
)
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/auth/landing_pages/error.html
RENAMED
|
File without changes
|
{azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/auth/landing_pages/success.html
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure/cli/core/commands/command_operation.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{azure_cli_core-2.90.0 → azure_cli_core-2.92.0}/azure_cli_core.egg-info/dependency_links.txt
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|