Skip to content

Commit cd72191

Browse files
william051200william051200
committed
Merge remote-tracking branch 'origin/dev' into 32814-sig-identity
2 parents f6d3c05 + 8fbf679 commit cd72191

42 files changed

Lines changed: 7607 additions & 6804 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitattributes‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ build_scripts/windows/scripts/az eol=lf
1616
# sh scripts should be LF
1717
*.sh eol=lf
1818

19+
# Git hook scripts (no extension) should be LF to work on macOS/Linux
20+
.githooks/pre-commit eol=lf
21+
.githooks/pre-push eol=lf
22+
1923
# Generated latest index assets should always use LF to avoid cross-platform churn
2024
src/azure-cli-core/azure/cli/core/commandIndex.latest.json text eol=lf
2125
src/azure-cli-core/azure/cli/core/helpIndex.latest.json text eol=lf

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
/src/azure-cli-core/ @necusjz @DanielMicrosoft @ReaNAiveD @yonzhan @bebound @jiasli
1717
/src/azure-cli-core/azure/cli/core/_profile.py @isra-fel @notyashhh @xuming-ms @teresaritorto
1818
/src/azure-cli-core/azure/cli/core/auth/ @isra-fel @notyashhh @xuming-ms @teresaritorto
19+
/src/azure-cli-core/azure/cli/core/cloud.py @isra-fel @notyashhh @xuming-ms @teresaritorto
1920
/src/azure-cli-core/azure/cli/core/extension/ @VeryEarly @Pan-Qi @jsntcy @necusjz
2021
/src/azure-cli-core/azure/cli/core/style.py @NoriZC @yanzhudd @teresaritorto
2122
/src/azure-cli-core/azure/cli/core/aaz/ @VeryEarly @Pan-Qi @jsntcy @necusjz

‎azure-pipelines.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1094,7 +1094,7 @@ jobs:
10941094
- bash: |
10951095
set -ev
10961096
. env/bin/activate
1097-
python scripts/generate_latest_indices.py verify
1097+
azdev latest-index verify --repo .
10981098
displayName: 'Verify generated latest indices'
10991099
11001100
- job: CheckStyle

‎doc/authoring_command_modules/README.md‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,27 @@ Style Checks
163163
azdev style <module> [--pylint] [--pep8]
164164
```
165165

166+
Latest Packaged Indices
167+
-----------------------
168+
169+
Use azdev wrappers around Azure CLI's latest index generation script:
170+
171+
```
172+
azdev latest-index generate
173+
azdev latest-index verify
174+
```
175+
176+
You can pass an explicit Azure CLI checkout path when needed:
177+
178+
```
179+
azdev latest-index generate --cli /path/to/azure-cli
180+
azdev latest-index verify --cli /path/to/azure-cli
181+
```
182+
183+
`azdev latest-index verify` exits non-zero when generated output differs from
184+
the checked-in `commandIndex.latest.json` or `helpIndex.latest.json`, making it
185+
CI-friendly.
186+
166187
Submitting Pull Requests
167188
------------------------
168189

‎scripts/generate_latest_indices.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,9 @@ def _run_verify(command_text, help_text):
278278
print('Generated latest index files are out of date:')
279279
for path in mismatched:
280280
print(f' - {path.relative_to(REPO_ROOT)}')
281-
print('Run:')
281+
print('Run either:')
282+
print(' azdev latest-index generate --cli .')
283+
print('or:')
282284
print(' python scripts/generate_latest_indices.py generate')
283285
return 1
284286

‎src/azure-cli-core/HISTORY.rst‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@
33
Release History
44
===============
55

6+
2.85.0
7+
++++++
8+
* Resolve CVE-2026-26007 (#32879)
9+
* `az *`: Make `--acquire-policy-token` and `--change-reference` global arguments available by default, removing the need for `core.enable_policy_token` configuration (#32883)
10+
* Resolve CVE-2026-27448 (#33035)
11+
* Resolve CVE-2026-27459 (#33035)
12+
* Resolve CVE-2026-32597 (#33034)
13+
* Resolve CVE-2026-25645 (#33081)
14+
* Resolve CVE-2026-34073 (#33099)
15+
616
2.84.0
717
++++++
818
* Minor fixes

‎src/azure-cli-core/azure/cli/core/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# --------------------------------------------------------------------------------------------
55
# pylint: disable=line-too-long
66

7-
__version__ = "2.84.0"
7+
__version__ = "2.85.0"
88

99
import os
1010
import sys

‎src/azure-cli-core/azure/cli/core/cloud.py‎

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,6 +358,7 @@ class CloudNameEnum: # pylint: disable=too-few-public-methods
358358
AzureChinaCloud = 'AzureChinaCloud'
359359
AzureUSGovernment = 'AzureUSGovernment'
360360
AzureGermanCloud = 'AzureGermanCloud'
361+
AzureBleuCloud = 'AzureBleuCloud'
361362

362363

363364
AZURE_PUBLIC_CLOUD = Cloud(
@@ -492,7 +493,36 @@ class CloudNameEnum: # pylint: disable=too-few-public-methods
492493
postgresql_server_endpoint='.postgres.database.cloudapi.de',
493494
mariadb_server_endpoint='.mariadb.database.cloudapi.de'))
494495

495-
HARD_CODED_CLOUD_LIST = [AZURE_PUBLIC_CLOUD, AZURE_CHINA_CLOUD, AZURE_US_GOV_CLOUD, AZURE_GERMAN_CLOUD]
496+
AZURE_BLEU_CLOUD = Cloud(
497+
CloudNameEnum.AzureBleuCloud,
498+
endpoints=CloudEndpoints(
499+
management='https://management.sovcloud-api.fr/',
500+
resource_manager='https://management.sovcloud-api.fr',
501+
sql_management='https://management.database.sovcloud-api.fr:8443/',
502+
batch_resource_id='https://batch.sovcloud-api.fr/',
503+
gallery='https://gallery.sovcloud-api.fr/',
504+
active_directory='https://login.sovcloud-api.fr',
505+
active_directory_resource_id='https://management.sovcloud-api.fr/',
506+
active_directory_graph_resource_id='https://graph.svc.sovcloud.fr/',
507+
microsoft_graph_resource_id='https://graph.svc.sovcloud.fr',
508+
vm_image_alias_doc='https://raw.githubusercontent.com/Azure/azure-rest-api-specs/master/arm-compute/quickstart-templates/aliases.json',
509+
media_resource_id='https://rest.media.sovcloud-api.fr',
510+
ossrdbms_resource_id='https://ossrdbms-aad.database.sovcloud-api.fr',
511+
portal='https://portal.sovcloud-azure.fr'),
512+
suffixes=CloudSuffixes(
513+
acr_login_server_endpoint='.azurecr.sovcloud-azure.fr',
514+
attestation_endpoint='attest.sovcloud-api.fr',
515+
storage_endpoint='core.sovcloud-api.fr',
516+
storage_sync_endpoint='afs.sovcloud-api.fr',
517+
keyvault_dns='.vault.sovcloud-api.fr',
518+
mhsm_dns='.managedhsm.sovcloud-api.fr',
519+
sql_server_hostname='.database.sovcloud-api.fr',
520+
mysql_server_endpoint='.mysql.database.sovcloud-api.fr',
521+
postgresql_server_endpoint='.postgres.database.sovcloud-api.fr',
522+
mariadb_server_endpoint='.mariadb.database.sovcloud-api.fr',
523+
synapse_analytics_endpoint='.dev.azuresynapse.sovcloud-api.fr'))
524+
525+
HARD_CODED_CLOUD_LIST = [AZURE_PUBLIC_CLOUD, AZURE_CHINA_CLOUD, AZURE_US_GOV_CLOUD, AZURE_GERMAN_CLOUD, AZURE_BLEU_CLOUD]
496526

497527

498528
def retrieve_arm_cloud_metadata():

‎src/azure-cli-core/azure/cli/core/commandIndex.latest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "2.84.0",
2+
"version": "2.85.0",
33
"cloudProfile": "latest",
44
"commandIndex": {
55
"account": [

‎src/azure-cli-core/azure/cli/core/helpIndex.latest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "2.84.0",
2+
"version": "2.85.0",
33
"cloudProfile": "latest",
44
"helpIndex": {
55
"groups": {

0 commit comments

Comments
 (0)