Skip to content

Commit b4fee26

Browse files
DanielMicrosoftDanielMicrosoft
committed
fix: address merge conflicts
2 parents 26803df + 1d853bd commit b4fee26

File tree

285 files changed

+343289
-203466
lines changed

Some content is hidden

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

285 files changed

+343289
-203466
lines changed

‎.vscode/launch.json‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,9 @@
2323
"program": "${workspaceRoot}/src/azure-cli/azure/cli/__main__.py",
2424
"cwd": "${workspaceRoot}",
2525
"args": [
26-
"vm",
27-
"show"
26+
"--version"
2827
],
29-
"console": "externalTerminal"
28+
"console": "externalTerminal",
3029
},
3130
{
3231
"name": "Azdev Scripts",
@@ -38,7 +37,7 @@
3837
"args": [
3938
"--help"
4039
],
41-
"console": "integratedTerminal"
40+
"console": "integratedTerminal",
4241
}
4342
]
4443
}

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

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

6+
2.81.0
7+
++++++
8+
* Minor fixes
9+
610
2.80.0
711
++++++
812
* Minor fixes

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

Lines changed: 4 additions & 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.80.0"
7+
__version__ = "2.81.0"
88

99
import os
1010
import sys
@@ -120,6 +120,9 @@ def get_cli_version(self):
120120

121121
def show_version(self):
122122
from azure.cli.core.util import get_az_version_string, show_updates
123+
from azure.cli.core import telemetry
124+
125+
telemetry.set_command_details(command="", parameters=["--version"])
123126

124127
ver_string, updates_available_components = get_az_version_string()
125128
print(ver_string)

‎src/azure-cli-core/azure/cli/core/tests/test_telemetry.py‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
# --------------------------------------------------------------------------------------------
55

66
import unittest
7+
from unittest import mock
78

89

910
class TestCoreTelemetry(unittest.TestCase):
@@ -57,3 +58,24 @@ def test_cloud_forbid_telemetry(self):
5758
# mock to add current cloud name in CLOUDS_FORBIDDING_TELEMETRY
5859
with mock.patch('azure.cli.core.cloud.CLOUDS_FORBIDDING_TELEMETRY', [az_cli.cloud.name]):
5960
self.assertFalse(telemetry.is_telemetry_enabled())
61+
62+
@mock.patch('azure.cli.core.util.get_az_version_string')
63+
def test_show_version_sets_telemetry_params(self, mock_get_version):
64+
"""Test show_version telemetry state is same regardless of available updates."""
65+
from azure.cli.core.mock import DummyCli
66+
from azure.cli.core import telemetry
67+
from knack.completion import ARGCOMPLETE_ENV_NAME
68+
69+
mock_get_version.return_value = ("azure-cli 2.80.0", ["core", "extension1"])
70+
71+
telemetry.start()
72+
73+
cli = DummyCli()
74+
telemetry.set_application(cli, ARGCOMPLETE_ENV_NAME)
75+
76+
cli.show_version()
77+
78+
session = telemetry._session
79+
self.assertEqual(session.command, "")
80+
self.assertEqual(session.parameters, ["--version"])
81+
self.assertIsNone(session.raw_command)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from codecs import open
99
from setuptools import setup, find_packages
1010

11-
VERSION = "2.80.0"
11+
VERSION = "2.81.0"
1212

1313
# If we have source, validate that our version numbers match
1414
# This should prevent uploading releases with mismatched versions.

‎src/azure-cli/HISTORY.rst‎

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

6+
2.81.0
7+
++++++
8+
9+
**AKS**
10+
11+
* `az aks safeguards`: Add `--pss-level` parameter to support Pod Security Standards (#32432)
12+
* `az aks safeguards create`: Add validation to prevent duplicate resource creation (#32432)
13+
14+
**ARM**
15+
16+
* Fix #32098: `az bicep install`: Fix a bug where the installation was skipped when `--version` was specified unless `bicep.use_binary_from_path` was explicitly set to `false` (#32337)
17+
18+
**Compute**
19+
20+
* `az vm/vmss application set`: Add new parameter `--enable-automatic-upgrade` to support enabling application automatic upgrade (#32394)
21+
22+
**NetAppFiles**
23+
24+
* `az netappfiles volume-group create`: Add `--network-features` parameter for volume groups (#32423)
25+
* `az netappfiles volume replication list`: Add `--exclude` parameter to exclude deleted replications (#32423)
26+
627
2.80.0
728
++++++
829

‎src/azure-cli/azure/cli/__main__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
from knack.log import get_logger
1818

1919
__author__ = "Microsoft Corporation <[email protected]>"
20-
__version__ = "2.80.0"
20+
__version__ = "2.81.0"
2121

2222

2323
logger = get_logger(__name__)

‎src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_CrossZonalRestore.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1647,7 +1647,7 @@ interactions:
16471647
User-Agent:
16481648
- AZURECLI/2.78.0 azsdk-python-core/1.35.0 Python/3.11.9 (Windows-10-10.0.26200-SP0)
16491649
method: GET
1650-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000004?$expand=instanceView&api-version=2024-11-01
1650+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000004?$expand=instanceView&api-version=2025-04-01
16511651
response:
16521652
body:
16531653
string: "{\r\n \"name\": \"clitest-vm000004\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000004\",\r\n

‎src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_container.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1686,7 +1686,7 @@ interactions:
16861686
User-Agent:
16871687
- AZURECLI/2.78.0 azsdk-python-core/1.35.0 Python/3.11.9 (Windows-10-10.0.26200-SP0)
16881688
method: GET
1689-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000003?$expand=instanceView&api-version=2024-11-01
1689+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000003?$expand=instanceView&api-version=2025-04-01
16901690
response:
16911691
body:
16921692
string: "{\r\n \"name\": \"clitest-vm000003\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000003\",\r\n
@@ -3282,7 +3282,7 @@ interactions:
32823282
User-Agent:
32833283
- AZURECLI/2.78.0 azsdk-python-core/1.35.0 Python/3.11.9 (Windows-10-10.0.26200-SP0)
32843284
method: GET
3285-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000004?$expand=instanceView&api-version=2024-11-01
3285+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000004?$expand=instanceView&api-version=2025-04-01
32863286
response:
32873287
body:
32883288
string: "{\r\n \"name\": \"clitest-vm000004\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000004\",\r\n

‎src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_disk_exclusion.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1778,7 +1778,7 @@ interactions:
17781778
User-Agent:
17791779
- AZURECLI/2.78.0 azsdk-python-core/1.35.0 Python/3.11.9 (Windows-10-10.0.26200-SP0)
17801780
method: GET
1781-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000003?$expand=instanceView&api-version=2024-11-01
1781+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000003?$expand=instanceView&api-version=2025-04-01
17821782
response:
17831783
body:
17841784
string: "{\r\n \"name\": \"clitest-vm000003\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000003\",\r\n

0 commit comments

Comments
 (0)