From 330d2c8158aaf6d2c4c27b57a73b274a592514ca Mon Sep 17 00:00:00 2001 From: Silas Strawn Date: Wed, 15 Jun 2022 11:25:45 -0700 Subject: [PATCH] Remove mentions of powershell and pipe delimiter --- .../azure/cli/command_modules/appservice/_help.py | 12 +++--------- .../azure/cli/command_modules/appservice/_params.py | 4 ++-- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/azure-cli/azure/cli/command_modules/appservice/_help.py b/src/azure-cli/azure/cli/command_modules/appservice/_help.py index ad0aca195ec..4cfe0c91d52 100644 --- a/src/azure-cli/azure/cli/command_modules/appservice/_help.py +++ b/src/azure-cli/azure/cli/command_modules/appservice/_help.py @@ -1441,15 +1441,12 @@ - name: Create a web app with the default configuration. text: > az webapp create -g MyResourceGroup -p MyPlan -n MyUniqueAppName - - name: Create a web app with a Java 11 runtime using '|' delimiter. (not recommended for powershell; use the ":" delimiter instead) - text: > - az webapp create -g MyResourceGroup -p MyPlan -n MyUniqueAppName --runtime "java|11|Java SE|11" - - name: Create a web app with a Java 11 runtime using ':' delimiter. + - name: Create a web app with a Java 11 runtime. text: > az webapp create -g MyResourceGroup -p MyPlan -n MyUniqueAppName --runtime "java:11:Java SE:11" - name: Create a web app with a NodeJS 10.14 runtime and deployed from a local git repository. text: > - az webapp create -g MyResourceGroup -p MyPlan -n MyUniqueAppName --runtime "node|12LTS" --deployment-local-git + az webapp create -g MyResourceGroup -p MyPlan -n MyUniqueAppName --runtime "node:12LTS" --deployment-local-git - name: Create a web app with an image from DockerHub. text: > az webapp create -g MyResourceGroup -p MyPlan -n MyUniqueAppName -i nginx @@ -2015,10 +2012,7 @@ - name: Create a web app with a specified name text: > az webapp up -n MyUniqueAppName - - name: Create a web app with a specified name and a Java 11 runtime using '|' delimiter (not recommended for powershell; use the ":" delimiter instead) - text: > - az webapp up -n MyUniqueAppName --runtime "java|11|Java SE|11" - - name: Create a web app with a specified name and a Java 11 runtime using ':' delimiter + - name: Create a web app with a specified name and a Java 11 runtime text: > az webapp up -n MyUniqueAppName --runtime "java:11:Java SE:11" - name: Create a web app in a specific region, by running the command from the folder where the code to be deployed exists. diff --git a/src/azure-cli/azure/cli/command_modules/appservice/_params.py b/src/azure-cli/azure/cli/command_modules/appservice/_params.py index 2409a138564..8aa321f0735 100644 --- a/src/azure-cli/azure/cli/command_modules/appservice/_params.py +++ b/src/azure-cli/azure/cli/command_modules/appservice/_params.py @@ -146,7 +146,7 @@ def load_arguments(self, _): c.argument('docker_registry_server_password', options_list=['--docker-registry-server-password', '-w'], help='The container registry server password. Required for private registries.') c.argument('multicontainer_config_type', options_list=['--multicontainer-config-type'], help="Linux only.", arg_type=get_enum_type(MULTI_CONTAINER_TYPES)) c.argument('multicontainer_config_file', options_list=['--multicontainer-config-file'], help="Linux only. Config file for multicontainer apps. (local or remote)") - c.argument('runtime', options_list=['--runtime', '-r'], help="canonicalized web runtime in the format of Framework:Version, e.g. \"PHP:7.2\". Allowed delimiters: \"|\" or \":\". If using powershell, please use the \":\" delimiter or be sure to properly escape the \"|\" character. " + c.argument('runtime', options_list=['--runtime', '-r'], help="canonicalized web runtime in the format of Framework:Version, e.g. \"PHP:7.2\"." "Use `az webapp list-runtimes` for available list") # TODO ADD completer c.argument('plan', options_list=['--plan', '-p'], configured_default='appserviceplan', completer=get_resource_name_completion_list('Microsoft.Web/serverFarms'), @@ -632,7 +632,7 @@ def load_arguments(self, _): configured_default='appserviceplan') c.argument('sku', arg_type=sku_arg_type) c.argument('os_type', options_list=['--os-type'], arg_type=get_enum_type(OS_TYPES), help="Set the OS type for the app to be created.") - c.argument('runtime', options_list=['--runtime', '-r'], help="canonicalized web runtime in the format of Framework:Version, e.g. \"PHP:7.2\". Allowed delimiters: \"|\" or \":\". If using powershell, please use the \":\" delimiter or be sure to properly escape the \"|\" character. " + c.argument('runtime', options_list=['--runtime', '-r'], help="canonicalized web runtime in the format of Framework:Version, e.g. \"PHP:7.2\"." "Use `az webapp list-runtimes` for available list.") c.argument('dryrun', help="show summary of the create and deploy operation instead of executing it", default=False, action='store_true')