From 464a79cb0f9c474da1f9d426b9aaf56afcffc47a Mon Sep 17 00:00:00 2001 From: "Danni X." Date: Wed, 4 Dec 2024 10:47:31 +0800 Subject: [PATCH] update (#30159) --- .github/ISSUE_TEMPLATE/docs_feedback.yml | 2 +- .github/azure-client-tools-bot/config.yml | 2 +- Dockerfile.nanoserver | 4 +- README.md | 26 ++--- build_scripts/windows/Product.wxs | 6 +- doc/authoring_command_modules/README.md | 2 +- scripts/live_test/sendemail.py | 2 +- .../homebrew/docker/formula_template.txt | 2 +- scripts/release/rpm/azure-cli.spec | 2 +- .../azure/cli/core/auth/credential_adaptor.py | 2 +- .../cli/core/auth/landing_pages/success.html | 4 +- .../azure/cli/core/auth/util.py | 4 +- .../azure/cli/core/commands/client_factory.py | 2 +- .../azure/cli/core/intercept_survey.py | 4 +- src/azure-cli-core/azure/cli/core/parser.py | 2 +- src/azure-cli-core/azure/cli/core/style.py | 2 +- .../azure/cli/core/tests/test_help.py | 16 +-- .../azure/cli/core/tests/test_util.py | 8 +- src/azure-cli-core/azure/cli/core/util.py | 8 +- .../azure/cli/testsdk/preparers.py | 2 +- src/azure-cli/HISTORY.rst | 8 +- src/azure-cli/README.rst | 2 +- .../azure/cli/command_modules/acr/_errors.py | 2 +- .../azure/cli/command_modules/acr/helm.py | 2 +- .../azure/cli/command_modules/acs/_help.py | 8 +- .../cli/command_modules/acs/_validators.py | 2 +- .../acs/tests/latest/test_validators.py | 6 +- .../azure/cli/command_modules/ams/_params.py | 24 ++--- .../cli/command_modules/ams/operations/sp.py | 2 +- .../ams/operations/streaming_policy.py | 2 +- .../cli/command_modules/appconfig/_params.py | 4 +- .../command_modules/appservice/_validators.py | 4 +- .../aaz/latest/network/_list_service_tags.py | 2 +- .../aaz/latest/network/vnet/__cmd_group.py | 2 +- .../latest/network/vnet/subnet/__cmd_group.py | 2 +- .../network/vnet/__cmd_group.py | 2 +- .../network/vnet/subnet/__cmd_group.py | 2 +- .../network/nsg/__cmd_group.py | 2 +- .../network/vnet/__cmd_group.py | 2 +- .../network/vnet/subnet/__cmd_group.py | 2 +- .../command_modules/appservice/commands.py | 2 +- .../cli/command_modules/appservice/custom.py | 2 +- .../tests/latest/test_webapp_commands.py | 8 +- .../aaz/latest/network/vnet/__cmd_group.py | 2 +- .../latest/network/vnet/subnet/__cmd_group.py | 2 +- .../azure/cli/command_modules/backup/_help.py | 2 +- .../azure/cli/command_modules/batch/_help.py | 2 +- .../cli/command_modules/batch/_params.py | 2 +- .../batch/tests/latest/README.md | 2 +- .../latest/recordings/cli-3.2.0.help.txt | 20 ++-- .../latest/recordings/cli-3.4.0.help.txt | 34 +++--- .../cli/command_modules/botservice/custom.py | 2 +- .../tests/latest/test_bot_commands.py | 2 +- .../azure/cli/command_modules/cdn/_help.py | 2 +- .../azure/cli/command_modules/cdn/_params.py | 8 +- .../command_modules/cdn/custom/custom_afdx.py | 8 +- .../command_modules/cdn/custom/custom_cdn.py | 8 +- .../cognitiveservices/_help.py | 56 +++++----- .../aaz/latest/compute_fleet/_create.py | 28 ++--- .../aaz/latest/compute_fleet/_update.py | 28 ++--- .../azure/cli/command_modules/config/_help.py | 2 +- .../command_modules/container/_vt_helper.py | 4 +- .../aaz/latest/network/vnet/__cmd_group.py | 2 +- .../aaz/latest/network/vnet/_create.py | 2 +- .../latest/network/vnet/subnet/__cmd_group.py | 2 +- .../tests/latest/test_container_commands.py | 2 +- .../containerapp/_compose_utils.py | 2 +- .../command_modules/containerapp/_params.py | 2 +- .../command_modules/containerapp/_utils.py | 2 +- .../aaz/latest/network/vnet/__cmd_group.py | 2 +- .../Pages/Index.cshtml | 2 +- .../Pages/Shared/_Layout.cshtml.css | 2 +- .../wwwroot/js/site.js | 2 +- .../Pages/Index.cshtml | 2 +- .../Pages/Shared/_Layout.cshtml.css | 2 +- .../wwwroot/js/site.js | 2 +- .../feedback/tests/latest/test_feedback.py | 2 +- .../cli/command_modules/hdinsight/_help.py | 2 +- .../cli/command_modules/hdinsight/_params.py | 14 +-- .../aaz/latest/network/vnet/__cmd_group.py | 2 +- .../latest/network/vnet/subnet/__cmd_group.py | 2 +- .../cli/command_modules/iot/_constants.py | 2 +- .../azure/cli/command_modules/iot/_help.py | 18 ++-- .../cli/command_modules/keyvault/_help.py | 2 +- .../cli/command_modules/keyvault/_params.py | 4 +- .../command_modules/keyvault/_validators.py | 4 +- .../cli/command_modules/keyvault/commands.py | 4 +- .../cli/command_modules/monitor/_help.py | 14 +-- .../cli/command_modules/monitor/_params.py | 2 +- .../aaz/latest/monitor/autoscale/_create.py | 2 +- .../aaz/latest/monitor/autoscale/_update.py | 2 +- .../monitor/diagnostic_settings/_create.py | 4 +- .../log_analytics/workspace/_get_schema.py | 2 +- .../workspace/data_export/_create.py | 2 +- .../workspace/data_export/_update.py | 2 +- .../workspace/saved_search/_create.py | 2 +- .../workspace/saved_search/_update.py | 2 +- .../azure/cli/command_modules/mysql/_help.py | 8 +- .../aaz/latest/network/vnet/__cmd_group.py | 2 +- .../mysql/aaz/latest/network/vnet/_create.py | 2 +- .../latest/network/vnet/subnet/__cmd_group.py | 2 +- .../cli/command_modules/network/_help.py | 58 +++++----- .../aaz/latest/network/_list_service_tags.py | 2 +- .../network/application_gateway/_create.py | 30 +++--- .../network/application_gateway/_update.py | 2 +- .../aaz/latest/network/asg/__cmd_group.py | 2 +- .../network/express_route/__cmd_group.py | 2 +- .../network/express_route/auth/__cmd_group.py | 2 +- .../gateway/connection/_create.py | 2 +- .../gateway/connection/_update.py | 2 +- .../network/local_gateway/__cmd_group.py | 2 +- .../latest/network/local_gateway/_delete.py | 2 +- .../aaz/latest/network/nsg/__cmd_group.py | 2 +- .../latest/network/public_ip/__cmd_group.py | 2 +- .../aaz/latest/network/vnet/__cmd_group.py | 2 +- .../aaz/latest/network/vnet/_create.py | 2 +- .../network/vnet/_list_endpoint_services.py | 2 +- .../latest/network/vnet/subnet/__cmd_group.py | 2 +- .../network/vnet_gateway/__cmd_group.py | 2 +- .../latest/network/vnet_gateway/_delete.py | 2 +- .../network/vpn_connection/__cmd_group.py | 2 +- .../aaz/latest/network/watcher/__cmd_group.py | 2 +- .../network/watcher/flow_log/__cmd_group.py | 2 +- .../watcher/troubleshooting/__cmd_group.py | 2 +- .../network/local_gateway/__cmd_group.py | 2 +- .../network/local_gateway/_delete.py | 2 +- .../network/nsg/__cmd_group.py | 2 +- .../network/public_ip/__cmd_group.py | 2 +- .../network/vnet/__cmd_group.py | 2 +- .../network/vnet/_create.py | 2 +- .../network/vnet/subnet/__cmd_group.py | 2 +- .../network/vnet_gateway/__cmd_group.py | 2 +- .../network/vnet_gateway/_delete.py | 2 +- .../network/vpn_connection/__cmd_group.py | 2 +- .../network/local_gateway/__cmd_group.py | 2 +- .../network/local_gateway/_delete.py | 2 +- .../network/nsg/__cmd_group.py | 2 +- .../network/public_ip/__cmd_group.py | 2 +- .../network/vnet/__cmd_group.py | 2 +- .../network/vnet/_create.py | 2 +- .../network/vnet/_list_endpoint_services.py | 2 +- .../network/vnet/subnet/__cmd_group.py | 2 +- .../network/vnet_gateway/__cmd_group.py | 2 +- .../network/vnet_gateway/_delete.py | 2 +- .../network/vpn_connection/__cmd_group.py | 2 +- .../network/local_gateway/__cmd_group.py | 2 +- .../network/local_gateway/_delete.py | 2 +- .../network/nsg/__cmd_group.py | 2 +- .../network/public_ip/__cmd_group.py | 2 +- .../network/vnet/__cmd_group.py | 2 +- .../network/vnet/_create.py | 2 +- .../network/vnet/_list_endpoint_services.py | 2 +- .../network/vnet/subnet/__cmd_group.py | 2 +- .../network/vnet_gateway/__cmd_group.py | 2 +- .../network/vnet_gateway/_delete.py | 2 +- .../network/vpn_connection/__cmd_group.py | 2 +- .../network/azure_stack/_params.py | 2 +- .../cli/command_modules/network/custom.py | 2 +- .../latest/test_policyinsights_scenario.py | 2 +- .../profile/tests/latest/test_auth_e2e.py | 2 +- .../cli/command_modules/rdbms/_helptext_pg.py | 4 +- .../cli/command_modules/rdbms/_params.py | 2 +- .../aaz/latest/network/vnet/__cmd_group.py | 2 +- .../rdbms/aaz/latest/network/vnet/_create.py | 2 +- .../latest/network/vnet/subnet/__cmd_group.py | 2 +- .../cli/command_modules/resource/_bicep.py | 2 +- .../cli/command_modules/resource/_help.py | 4 +- .../cli/command_modules/resource/_params.py | 2 +- .../azure/cli/command_modules/role/_help.py | 4 +- .../role/_msgrpah/_graph_client.py | 100 +++++++++--------- .../role/_msgrpah/_graph_objects.py | 6 +- .../azure/cli/command_modules/role/_params.py | 6 +- .../azure/cli/command_modules/role/custom.py | 34 +++--- .../role/tests/latest/test_graph.py | 10 +- .../latest/test_role_commands_thru_mock.py | 4 +- .../serviceconnector/_utils.py | 2 +- .../command_modules/servicefabric/_params.py | 4 +- .../latest/network/public_ip/__cmd_group.py | 2 +- .../aaz/latest/network/vnet/__cmd_group.py | 2 +- .../latest/network/vnet/subnet/__cmd_group.py | 2 +- .../azure/cli/command_modules/sql/_help.py | 2 +- .../cli/command_modules/sqlvm/_params.py | 2 +- .../cli/command_modules/storage/_help.py | 10 +- .../cli/command_modules/storage/_params.py | 14 +-- .../storage/_params_azure_stack.py | 8 +- .../command_modules/storage/_validators.py | 6 +- .../storage/_validators_azure_stack.py | 4 +- .../command_modules/storage/azcopy/util.py | 2 +- .../command_modules/storage/docs/ADLS Gen2.md | 4 +- .../storage/docs/Storage Encryption.md | 4 +- .../cli/command_modules/storage/readme.md | 12 +-- .../azure/cli/command_modules/util/custom.py | 6 +- .../util/tests/latest/test_rest.py | 54 +++++----- .../cli/command_modules/vm/_arg_client.py | 2 +- .../azure/cli/command_modules/vm/_help.py | 44 ++++---- .../azure/cli/command_modules/vm/_params.py | 12 +-- .../vm/aaz/latest/vm/_deallocate.py | 2 +- .../vm/aaz/latest/vm/_generalize.py | 2 +- .../vm/aaz/latest/vm/host/_redeploy.py | 2 +- .../vm/aaz/latest/vm/host/_restart.py | 2 +- .../aaz/latest/vmss/_perform_maintenance.py | 2 +- .../vm/_deallocate.py | 2 +- .../vm/_generalize.py | 2 +- .../vm/_deallocate.py | 2 +- .../vm/_generalize.py | 2 +- .../vmss/_perform_maintenance.py | 2 +- .../vm/_deallocate.py | 2 +- .../vm/_generalize.py | 2 +- .../vmss/_perform_maintenance.py | 2 +- .../command_modules/vm/azure_stack/_params.py | 12 +-- .../command_modules/vm/azure_stack/custom.py | 2 +- .../azure/cli/command_modules/vm/custom.py | 2 +- src/azure-cli/service_name.json | 8 +- 213 files changed, 588 insertions(+), 588 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/docs_feedback.yml b/.github/ISSUE_TEMPLATE/docs_feedback.yml index ca47e49310d..e1bcb7ecfdd 100644 --- a/.github/ISSUE_TEMPLATE/docs_feedback.yml +++ b/.github/ISSUE_TEMPLATE/docs_feedback.yml @@ -9,7 +9,7 @@ body: value: > Azure CLI documentation includes 3 categories: - - Conceptual doc about Azure CLI: https://docs.microsoft.com/en-us/CLI/azure + - Conceptual doc about Azure CLI: https://learn.microsoft.com/en-us/CLI/azure - Engineering doc on Github repo (Core): https://github.com/Azure/azure-CLI diff --git a/.github/azure-client-tools-bot/config.yml b/.github/azure-client-tools-bot/config.yml index 4d7561afac6..f5846b6c3fd 100644 --- a/.github/azure-client-tools-bot/config.yml +++ b/.github/azure-client-tools-bot/config.yml @@ -50,7 +50,7 @@ cli_common_issues: - https://github.com/Azure/azure-cli/issues/19640#issuecomment-1133875268 - https://github.com/Azure/azure-cli/issues/19640#issuecomment-1148202854 - Please follow https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux to install Microsoft official Azure CLI. + Please follow https://learn.microsoft.com/en-us/cli/azure/install-azure-cli-linux to install Microsoft official Azure CLI. If you feel that further discussion is needed, please add a comment with the text `/clibot unresolve` to reopen the issue. - tag: latest_api_version_not_available diff --git a/Dockerfile.nanoserver b/Dockerfile.nanoserver index 442ac8ed942..b7ac434ebf4 100644 --- a/Dockerfile.nanoserver +++ b/Dockerfile.nanoserver @@ -11,8 +11,8 @@ LABEL maintainer="Microsoft" \ org.label-schema.version=$CLI_VERSION \ org.label-schema.license="MIT" \ org.label-schema.description="The Azure CLI 2.0 is the new Azure CLI and is applicable when you use the Resource Manager deployment model." \ - org.label-schema.url="https://docs.microsoft.com/cli/azure/overview" \ - org.label-schema.usage="https://docs.microsoft.com/cli/azure/install-az-cli2#docker" \ + org.label-schema.url="https://learn.microsoft.com/cli/azure/overview" \ + org.label-schema.usage="https://learn.microsoft.com/cli/azure/install-az-cli2#docker" \ org.label-schema.build-date=$BUILD_DATE \ org.label-schema.vcs-url="https://github.com/Azure/azure-cli.git" \ org.label-schema.docker.cmd="docker run -v $HOME\.azure:C:\Users\ContainerUser\.azure -it mcr.microsoft.com/azure-cli:$CLI_VERSION" diff --git a/README.md b/README.md index 76242adbc6a..6c6c143f90c 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Take a test run now from [Azure Cloud Shell](https://portal.azure.com/#cloudshel ## Installation -Please refer to the [install guide](https://docs.microsoft.com/cli/azure/install-azure-cli) for detailed install instructions. +Please refer to the [install guide](https://learn.microsoft.com/cli/azure/install-azure-cli) for detailed install instructions. A list of common install issues and their resolutions are available at [install troubleshooting](https://github.com/Azure/azure-cli/blob/dev/doc/install_troubleshooting.md). @@ -28,7 +28,7 @@ $ az [ group ] [ subgroup ] [ command ] {parameters} ### Get Started -Please refer to the ["get started" guide](https://docs.microsoft.com/cli/azure/get-started-with-az-cli2) for in-depth instructions. +Please refer to the ["get started" guide](https://learn.microsoft.com/cli/azure/get-started-with-az-cli2) for in-depth instructions. For usage and help content, pass in the `-h` parameter, for example: @@ -87,21 +87,21 @@ For scripting purposes, we output certain exit codes for differing scenarios. ### Common scenarios and use Azure CLI effectively -Please check [Tips for using Azure CLI effectively](https://docs.microsoft.com/en-us/cli/azure/use-cli-effectively). It describes some common scenarios: +Please check [Tips for using Azure CLI effectively](https://learn.microsoft.com/en-us/cli/azure/use-cli-effectively). It describes some common scenarios: -- [Output formatting (json, table, or tsv)](https://docs.microsoft.com/en-us/cli/azure/use-cli-effectively#output-formatting-json-table-or-tsv) -- [Pass values from one command to another](https://docs.microsoft.com/en-us/cli/azure/use-cli-effectively#pass-values-from-one-command-to-another) -- [Async operations](https://docs.microsoft.com/en-us/cli/azure/use-cli-effectively#async-operations) -- [Generic update arguments](https://docs.microsoft.com/en-us/cli/azure/use-cli-effectively#generic-update-arguments) -- [Generic resource commands - `az resource`](https://docs.microsoft.com/en-us/cli/azure/use-cli-effectively#generic-resource-commands---az-resource) -- [REST API command - `az rest`](https://docs.microsoft.com/en-us/cli/azure/use-cli-effectively#rest-api-command---az-rest) -- [Quoting issues](https://docs.microsoft.com/en-us/cli/azure/use-cli-effectively#quoting-issues) -- [Work behind a proxy](https://docs.microsoft.com/en-us/cli/azure/use-cli-effectively#work-behind-a-proxy) -- [Concurrent builds](https://docs.microsoft.com/en-us/cli/azure/use-cli-effectively#concurrent-builds) +- [Output formatting (json, table, or tsv)](https://learn.microsoft.com/en-us/cli/azure/use-cli-effectively#output-formatting-json-table-or-tsv) +- [Pass values from one command to another](https://learn.microsoft.com/en-us/cli/azure/use-cli-effectively#pass-values-from-one-command-to-another) +- [Async operations](https://learn.microsoft.com/en-us/cli/azure/use-cli-effectively#async-operations) +- [Generic update arguments](https://learn.microsoft.com/en-us/cli/azure/use-cli-effectively#generic-update-arguments) +- [Generic resource commands - `az resource`](https://learn.microsoft.com/en-us/cli/azure/use-cli-effectively#generic-resource-commands---az-resource) +- [REST API command - `az rest`](https://learn.microsoft.com/en-us/cli/azure/use-cli-effectively#rest-api-command---az-rest) +- [Quoting issues](https://learn.microsoft.com/en-us/cli/azure/use-cli-effectively#quoting-issues) +- [Work behind a proxy](https://learn.microsoft.com/en-us/cli/azure/use-cli-effectively#work-behind-a-proxy) +- [Concurrent builds](https://learn.microsoft.com/en-us/cli/azure/use-cli-effectively#concurrent-builds) ### More samples and snippets -For more usage examples, take a look at our [GitHub samples repo](http://github.com/Azure/azure-cli-samples) or [https://docs.microsoft.com/cli/azure/overview](https://docs.microsoft.com/cli/azure/overview). +For more usage examples, take a look at our [GitHub samples repo](http://github.com/Azure/azure-cli-samples) or [https://learn.microsoft.com/cli/azure/overview](https://learn.microsoft.com/cli/azure/overview). ### Write and run commands in Visual Studio Code diff --git a/build_scripts/windows/Product.wxs b/build_scripts/windows/Product.wxs index 2db951f4a06..1d14b411d78 100644 --- a/build_scripts/windows/Product.wxs +++ b/build_scripts/windows/Product.wxs @@ -68,9 +68,9 @@ - - - + + + diff --git a/doc/authoring_command_modules/README.md b/doc/authoring_command_modules/README.md index d26365fc47a..aace2141b84 100644 --- a/doc/authoring_command_modules/README.md +++ b/doc/authoring_command_modules/README.md @@ -15,7 +15,7 @@ The document provides instructions and guidelines on how to author command modul **Test Authoring**:
https://github.com/Azure/azure-cli/blob/dev/doc/authoring_tests.md -**Generating Documentation**:
https://review.docs.microsoft.com/help/onboard/admin/reference/cli/azure-cli-ci?branch=master#documenting-a-new-azure-cli-module +**Generating Documentation**:
https://review.learn.microsoft.com/help/onboard/admin/reference/cli/azure-cli-ci?branch=master#documenting-a-new-azure-cli-module Set Up ------ diff --git a/scripts/live_test/sendemail.py b/scripts/live_test/sendemail.py index 8a811cba491..1fbf06b9df6 100644 --- a/scripts/live_test/sendemail.py +++ b/scripts/live_test/sendemail.py @@ -42,7 +42,7 @@ KUSTO_CLUSTER = os.environ.get('KUSTO_CLUSTER') KUSTO_DATABASE = os.environ.get('KUSTO_DATABASE') KUSTO_TABLE = os.environ.get('KUSTO_TABLE') -# get tenant id from https://docs.microsoft.com/en-us/onedrive/find-your-office-365-tenant-id +# get tenant id from https://learn.microsoft.com/en-us/onedrive/find-your-office-365-tenant-id KUSTO_TENANT_ID = os.environ.get('KUSTO_TENANT_ID') PYTHON_VERSION = os.environ.get('PYTHON_VERSION') USER_BRANCH = os.environ.get('USER_BRANCH') diff --git a/scripts/release/homebrew/docker/formula_template.txt b/scripts/release/homebrew/docker/formula_template.txt index 79de7b969c2..c8bbff14aeb 100644 --- a/scripts/release/homebrew/docker/formula_template.txt +++ b/scripts/release/homebrew/docker/formula_template.txt @@ -2,7 +2,7 @@ class AzureCli < Formula include Language::Python::Virtualenv desc "Microsoft Azure CLI 2.0" - homepage "https://docs.microsoft.com/cli/azure/overview" + homepage "https://learn.microsoft.com/cli/azure/overview" url "{{ upstream_url }}" version "{{ cli_version }}" sha256 "{{ upstream_sha }}" diff --git a/scripts/release/rpm/azure-cli.spec b/scripts/release/rpm/azure-cli.spec index e63f58f7be6..d8e6b610884 100644 --- a/scripts/release/rpm/azure-cli.spec +++ b/scripts/release/rpm/azure-cli.spec @@ -21,7 +21,7 @@ License: MIT Name: %{name} Version: %{version} Release: %{release} -Url: https://docs.microsoft.com/cli/azure/install-azure-cli +Url: https://learn.microsoft.com/cli/azure/install-azure-cli Requires: %{python_package} Prefix: /usr Prefix: /etc diff --git a/src/azure-cli-core/azure/cli/core/auth/credential_adaptor.py b/src/azure-cli-core/azure/cli/core/auth/credential_adaptor.py index 3635963cb78..3b685fbac97 100644 --- a/src/azure-cli-core/azure/cli/core/auth/credential_adaptor.py +++ b/src/azure-cli-core/azure/cli/core/auth/credential_adaptor.py @@ -23,7 +23,7 @@ def __init__(self, credential, resource=None, auxiliary_credentials=None): :param resource: AAD resource for Track 1 only :param auxiliary_credentials: Credentials from .msal_authentication for cross tenant authentication. Details about cross tenant authentication: - https://docs.microsoft.com/en-us/azure/azure-resource-manager/management/authenticate-multi-tenant + https://learn.microsoft.com/en-us/azure/azure-resource-manager/management/authenticate-multi-tenant """ self._credential = credential diff --git a/src/azure-cli-core/azure/cli/core/auth/landing_pages/success.html b/src/azure-cli-core/azure/cli/core/auth/landing_pages/success.html index d24f2fea071..a4eb5069a79 100644 --- a/src/azure-cli-core/azure/cli/core/auth/landing_pages/success.html +++ b/src/azure-cli-core/azure/cli/core/auth/landing_pages/success.html @@ -2,7 +2,7 @@ - + Login successfully