Save in-progress exec-execute changes

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: vageorge00

.github/CODEOWNERS

@@ -67,3 +67,4 @@
 /src/azure-cli/azure/cli/command_modules/util/ @jiasli @zhoxing-ms @evelyn-ys
 /src/azure-cli/azure/cli/command_modules/vm/ @zhoxing-ms @jsntcy @wangzelin007 @yanzhudd @Drewm3 @TravisCragg-MSFT @nikhilpatel909 @sandeepraichura @hilaryw29 @GabstaMSFT @ramankumarlive @ushnaarshadkhan
 /src/azure-cli/azure/cli/command_modules/containerapp/ @zhoxing-ms @yanzhudd @ruslany @sanchitmehta @ebencarek @JennyLawrance @howang-ms @vinisoto @chinadragon0515 @vturecek @torosent @pagariyaalok @Juliehzl @jijohn14 @Greedygre @ShichaoQiu
+/src/azure-cli/azure/cli/command_modules/webapp/ @vageorge00

doc/sphinx/azhelpgen/doc_source_map.json

@@ -77,5 +77,6 @@
     "term": "src/azure-cli/azure/cli/command_modules/marketplaceordering/_help.py",
     "util": "src/azure-cli/azure/cli/command_modules/util/_help.py",
     "vm": "src/azure-cli/azure/cli/command_modules/vm/_help.py",
-    "vmss": "src/azure-cli/azure/cli/command_modules/vm/_help.py"
+    "vmss": "src/azure-cli/azure/cli/command_modules/vm/_help.py",
+    "webapp": "src/azure-cli/azure/cli/command_modules/webapp/_help.py"
 }

src/azure-cli/azure/cli/command_modules/appservice/_help.py

@@ -1919,24 +1919,24 @@
 
 helps['webapp exec'] = """
 type: command
-short-summary: Execute a command in a web app container.
+short-summary: Execute a shell command in a web app container.
 long-summary: >
-    Execute commands remotely in your web app container. The command runs asynchronously 
-    and returns immediately without command output. Requires SCM Basic Auth Publishing 
-    Credentials to be enabled.
+    Execute shell commands remotely in your web app container. The command returns immediately 
+    after being accepted, without waiting for completion or output. Redirect to a file to capture results (see examples). 
+    Requires SCM Basic Auth Publishing Credentials to be enabled.
 examples:
-  - name: Execute a simple command on a web app
+  - name: Execute a simple command on a web app and redirect output to a log file
     text: >
-        az webapp exec -g MyResourceGroup -n MyWebapp --cmd "ls -la /home"
+        az webapp exec -g MyResourceGroup -n MyWebapp --command "(ls -l) > output.log 2>&1"
   - name: Execute a command in a specific working directory on a specific instance
     text: >
-        az webapp exec -g MyResourceGroup -n MyWebapp --cmd "npm install" --cwd /home/site/wwwroot --instance MyInstanceId
+        az webapp exec -g MyResourceGroup --name MyWebapp --command "npm install" --cwd /home/site/wwwroot --instance MyInstanceId
   - name: Execute a command on all instances
     text: >
-        az webapp exec -g MyResourceGroup -n MyWebapp --cmd "systemctl restart nginx" --instance all
+        az webapp exec -g MyResourceGroup -n MyWebapp --command "systemctl restart nginx" --instance all
   - name: Execute a command on a deployment slot
     text: >
-        az webapp exec -g MyResourceGroup -n MyWebapp -s staging --cmd "python manage.py migrate"
+        az webapp exec -g MyResourceGroup -n MyWebapp -s staging --command "python manage.py migrate"
 """
 
 helps['webapp delete'] = """

src/azure-cli/azure/cli/command_modules/appservice/_params.py

@@ -1504,12 +1504,12 @@ def load_arguments(self, _):
         c.argument("no_register", help="Don't try to register the Microsoft.CDN provider. Registration can be done manually with: az provider register --wait --namespace Microsoft.CDN. For more details, please review the documentation available at https://go.microsoft.com/fwlink/?linkid=2184995 .", default=False)
     with self.argument_context('webapp exec') as c:
         c.argument('name', arg_type=webapp_name_arg_type, id_part=None)
-        c.argument('command', options_list=['--command', '--cmd'], help='The command to execute in the container.')
+        c.argument('command', options_list=['--command'], help='The command to execute in the container.')
         c.argument('mode', 
                     help='Execution mode. \'execute\': Starts command execution and returns immediately without returning command output.', 
                     arg_type=get_enum_type(['execute']), default='execute')
         c.argument('working_directory', options_list=['--working-directory', '--cwd'], 
-                    help='Working directory for command execution')
+                    help='Working directory for command execution. Defaults to the container\'s working directory (typically /home/site/wwwroot for App Service images).'')
         c.argument('instance', options_list=['--instance', '-i'], 
                     help='Webapp instance(s) to target. Specify a comma-separated list of instance IDs (use "az webapp list-instances" to get IDs) or "all" for all instances. Defaults to a random instance.')
         c.argument('slot', options_list=['--slot', '-s'], 

src/azure-cli/azure/cli/command_modules/webapp/__init__.py

@@ -0,0 +1,32 @@
+# --------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# --------------------------------------------------------------------------------------------
+
+from azure.cli.core import AzCommandsLoader
+
+from azure.cli.command_modules.webapp._help import helps  # pylint: disable=unused-import
+
+
+class WebappCommandsLoader(AzCommandsLoader):
+
+    def __init__(self, cli_ctx=None):
+        from azure.cli.core.commands import CliCommandType
+        from azure.cli.command_modules.webapp._client_factory import cf_webapp
+        webapp_custom = CliCommandType(
+            operations_tmpl='azure.cli.command_modules.webapp.custom#{}',
+            client_factory=cf_webapp)
+        super(WebappCommandsLoader, self).__init__(cli_ctx=cli_ctx,
+                                                  custom_command_type=webapp_custom)
+
+    def load_command_table(self, args):
+        from azure.cli.command_modules.webapp.commands import load_command_table
+        load_command_table(self, args)
+        return self.command_table
+
+    def load_arguments(self, command):
+        from azure.cli.command_modules.webapp._params import load_arguments
+        load_arguments(self, command)
+
+
+COMMAND_LOADER_CLS = WebappCommandsLoader

src/azure-cli/azure/cli/command_modules/webapp/_client_factory.py

@@ -0,0 +1,12 @@
+# --------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# --------------------------------------------------------------------------------------------
+
+def cf_webapp(cli_ctx, *_):
+
+    from azure.cli.core.commands.client_factory import get_mgmt_service_client
+    # TODO: Replace CONTOSO with the appropriate label and uncomment
+    # from azure.mgmt.CONTOSO import CONTOSOManagementClient
+    # return get_mgmt_service_client(cli_ctx, CONTOSOManagementClient)
+    return None

src/azure-cli/azure/cli/command_modules/webapp/_help.py

@@ -0,0 +1,38 @@
+# coding=utf-8
+# --------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# --------------------------------------------------------------------------------------------
+
+from knack.help_files import helps  # pylint: disable=unused-import
+
+
+helps['webapp'] = """
+    type: group
+    short-summary: Commands to manage Webapps.
+"""
+
+helps['webapp create'] = """
+    type: command
+    short-summary: Create a Webapp.
+"""
+
+helps['webapp list'] = """
+    type: command
+    short-summary: List Webapps.
+"""
+
+# helps['webapp delete'] = """
+#     type: command
+#     short-summary: Delete a Webapp.
+# """
+
+# helps['webapp show'] = """
+#     type: command
+#     short-summary: Show details of a Webapp.
+# """
+
+# helps['webapp update'] = """
+#     type: command
+#     short-summary: Update a Webapp.
+# """

src/azure-cli/azure/cli/command_modules/webapp/_params.py

@@ -0,0 +1,23 @@
+# --------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# --------------------------------------------------------------------------------------------
+# pylint: disable=line-too-long
+
+from knack.arguments import CLIArgumentType
+
+
+def load_arguments(self, _):
+
+    from azure.cli.core.commands.parameters import tags_type
+    from azure.cli.core.commands.validators import get_default_location_from_resource_group
+
+    webapp_name_type = CLIArgumentType(options_list='--webapp-name-name', help='Name of the Webapp.', id_part='name')
+
+    with self.argument_context('webapp') as c:
+        c.argument('tags', tags_type)
+        c.argument('location', validator=get_default_location_from_resource_group)
+        c.argument('webapp_name', webapp_name_type, options_list=['--name', '-n'])
+
+    with self.argument_context('webapp list') as c:
+        c.argument('webapp_name', webapp_name_type, id_part=None)

src/azure-cli/azure/cli/command_modules/webapp/_validators.py

@@ -0,0 +1,20 @@
+# --------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# --------------------------------------------------------------------------------------------
+
+
+def example_name_or_id_validator(cmd, namespace):
+    # Example of a storage account name or ID validator.
+    # See: https://github.com/Azure/azure-cli/blob/dev/doc/authoring_command_modules/authoring_commands.md#supporting-name-or-id-parameters
+    from azure.cli.core.commands.client_factory import get_subscription_id
+    from msrestazure.tools import is_valid_resource_id, resource_id
+    if namespace.storage_account:
+        if not is_valid_resource_id(namespace.RESOURCE):
+            namespace.storage_account = resource_id(
+                subscription=get_subscription_id(cmd.cli_ctx),
+                resource_group=namespace.resource_group_name,
+                namespace='Microsoft.Storage',
+                type='storageAccounts',
+                name=namespace.storage_account
+            )

src/azure-cli/azure/cli/command_modules/webapp/commands.py

@@ -0,0 +1,29 @@
+# --------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# --------------------------------------------------------------------------------------------
+
+# pylint: disable=line-too-long
+from azure.cli.core.commands import CliCommandType
+from azure.cli.command_modules.webapp._client_factory import cf_webapp
+
+
+def load_command_table(self, _):
+
+    # TODO: Add command type here
+    # webapp_sdk = CliCommandType(
+    #    operations_tmpl='<PATH>.operations#.{}',
+    #    client_factory=cf_webapp)
+
+
+    with self.command_group('webapp') as g:
+        g.custom_command('create', 'create_webapp')
+        # g.command('delete', 'delete')
+        g.custom_command('list', 'list_webapp')
+        # g.show_command('show', 'get')
+        # g.generic_update_command('update', setter_name='update', custom_func_name='update_webapp')
+
+
+    with self.command_group('webapp', is_preview=True):
+        pass
+