Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
f4a41d6
Initial changes for managed instances using aaz
joslinmicrosoft Oct 16, 2025
7e8dc6c
Implement new create properties with AAZ as well as registry adapter …
joslinmicrosoft Oct 17, 2025
b66dcea
Revert accidental api-version change
joslinmicrosoft Oct 17, 2025
1c962a1
Add missing zone_redundant property
joslinmicrosoft Oct 20, 2025
43b76d5
Add install script commands
joslinmicrosoft Oct 20, 2025
37e8e3b
Add storage mount commands
joslinmicrosoft Oct 20, 2025
6f82c44
Fix MI assignment
joslinmicrosoft Oct 20, 2025
12ad38b
Show secrets for RDP password
joslinmicrosoft Oct 21, 2025
b1981ca
Add RDP command
joslinmicrosoft Oct 21, 2025
6bb7d2e
is_custom_mode -> is_managed_instance
joslinmicrosoft Oct 21, 2025
6410948
Fix is_managed_instance being pass into call
joslinmicrosoft Oct 21, 2025
ce1ab3b
Remove vnet_route_all_enabled
joslinmicrosoft Oct 21, 2025
624544c
Implement identities commands
joslinmicrosoft Oct 21, 2025
e4eef1c
Revert create to use SDK and use additionalProperties, as a safer alt…
joslinmicrosoft Oct 23, 2025
18ff472
Update unit tests
joslinmicrosoft Oct 23, 2025
09106de
Revert back to using AppServicePlanCreate
joslinmicrosoft Oct 27, 2025
ec3d599
Fix RDP command and remove _enable_managed_instance_properties
joslinmicrosoft Oct 27, 2025
1a56780
Remove extraneous comments
joslinmicrosoft Oct 27, 2025
98abd15
Add help text
joslinmicrosoft Oct 27, 2025
050714f
Implement networking and plan default identity, and use Create instea…
joslinmicrosoft Oct 27, 2025
1572f2a
lint fix for actions.py
joslinmicrosoft Oct 28, 2025
7f0140c
Fix style
joslinmicrosoft Oct 28, 2025
6c761b8
More linter / style updates
joslinmicrosoft Oct 28, 2025
7e34d55
Add plan default tests
joslinmicrosoft Oct 28, 2025
f1af2e6
Test test_appservice_plan_managed_instance_basic_create
joslinmicrosoft Oct 28, 2025
81442c9
Fix a test, unregister show rdp password
joslinmicrosoft Oct 28, 2025
c1c2fa4
RDP -> connect
joslinmicrosoft Oct 28, 2025
e7689b5
Remove connect command for now
joslinmicrosoft Oct 28, 2025
ed62bad
test_appservice_plan_managed_instance_with_identities
joslinmicrosoft Oct 28, 2025
4809f34
test_appservice_plan_managed_instance_with_rdp
joslinmicrosoft Oct 28, 2025
c9daa14
Update src/azure-cli/azure/cli/command_modules/appservice/_help.py
joslinmicrosoft Oct 29, 2025
62349b7
Fix management endpoint used
joslinmicrosoft Oct 28, 2025
affd3d6
Add some more tests
joslinmicrosoft Oct 28, 2025
c09ab47
Temporarily remove failing tests
joslinmicrosoft Oct 28, 2025
d7e09d1
Add help examples
joslinmicrosoft Oct 29, 2025
c50ce65
Some more test fixes
joslinmicrosoft Oct 29, 2025
528bab8
Fix style check
joslinmicrosoft Oct 29, 2025
25535d2
Fix linter
joslinmicrosoft Oct 29, 2025
c3a2d9d
Try to fix custom polling to return immediately on 200
joslinmicrosoft Oct 29, 2025
d5897e2
Add update, and fix another test
joslinmicrosoft Oct 29, 2025
777b13c
Finish fixing tests
joslinmicrosoft Oct 29, 2025
379cdf3
Fix rdp_enabled arg_type and implement update test
joslinmicrosoft Oct 29, 2025
23967e6
All tests pass
joslinmicrosoft Oct 29, 2025
5463d0f
Fix style issues
joslinmicrosoft Oct 30, 2025
12816f1
Add az appservice plan managed-instance instance connect and also upd…
joslinmicrosoft Oct 30, 2025
4b486fc
Fix style violations
joslinmicrosoft Oct 30, 2025
ad5db7e
Small update to help text
joslinmicrosoft Oct 30, 2025
ff53c67
Re-record appservice tests
joslinmicrosoft Oct 31, 2025
23238b2
Manually fix up a couple tests
joslinmicrosoft Oct 31, 2025
d77760d
A couple manual fixes to other RP tests
joslinmicrosoft Oct 31, 2025
60ea28c
Fix vnet/subnet log; fix identity remove; fix remove missing reg key …
joslinmicrosoft Oct 31, 2025
e415e76
Make source optional for local storage mount
joslinmicrosoft Oct 31, 2025
a362907
worker-name -> instance-name for instance connect
joslinmicrosoft Oct 31, 2025
d7ee9cc
Fix identity update for local storage mounts
joslinmicrosoft Oct 31, 2025
43c015b
Custom recycle command
joslinmicrosoft Oct 31, 2025
2021cde
Fix linter and _recycle AAZ
joslinmicrosoft Oct 31, 2025
04686e8
Revert "Manually fix up a couple tests"
joslinmicrosoft Nov 3, 2025
d2ca7c2
Storage api-version 2025-01-01 -> 2025-06-01
joslinmicrosoft Nov 3, 2025
fccd2be
Manually fix up Microsoft.Web/serverFarms 2024-11-01 -> 2025-03-01 on…
joslinmicrosoft Nov 3, 2025
0d3a041
Remove unnecessary params and params options_list per PR comments
joslinmicrosoft Nov 4, 2025
b8459e3
Update identity args and commands per standard
joslinmicrosoft Nov 4, 2025
b65624c
Update help text per PR comments
joslinmicrosoft Nov 4, 2025
34b28a4
Some create fixes and fixes to help text
joslinmicrosoft Nov 4, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
198 changes: 198 additions & 0 deletions src/azure-cli/azure/cli/command_modules/appservice/_help.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,204 @@
crafted: true
"""

helps['appservice plan managed-instance'] = """
type: group
short-summary: Manage configurations for managed instance App Service plans.
"""

helps['appservice plan managed-instance install-script'] = """
type: group
short-summary: Manage install scripts for managed instance App Service plans.
"""

helps['appservice plan managed-instance install-script list'] = """
type: command
short-summary: List install scripts for a managed instance App Service plan.
examples:
- name: List all install scripts for a managed instance App Service plan.
text: az appservice plan managed-instance install-script list --name MyAppServicePlan --resource-group MyResourceGroup
"""

helps['appservice plan managed-instance install-script add'] = """
type: command
short-summary: Add an install script to a managed instance App Service plan.
examples:
- name: Add an install script to a managed instance App Service plan.
text: az appservice plan managed-instance install-script add --name MyAppServicePlan --resource-group MyResourceGroup --install-script-name MyScript --source-uri https://example.com/script.ps1 --type RemoteAzureBlob
"""

helps['appservice plan managed-instance install-script remove'] = """
type: command
short-summary: Remove an install script from a managed instance App Service plan.
examples:
- name: Remove an install script from a managed instance App Service plan.
text: az appservice plan managed-instance install-script remove --name MyAppServicePlan --resource-group MyResourceGroup --install-script-name MyScript
"""

helps['appservice plan managed-instance storage-mount'] = """
type: group
short-summary: Manage storage mounts for managed instance App Service plans.
"""

helps['appservice plan managed-instance storage-mount list'] = """
type: command
short-summary: List storage mounts for a managed instance App Service plan.
examples:
- name: List all storage mounts for a managed instance App Service plan.
text: az appservice plan managed-instance storage-mount list --name MyAppServicePlan --resource-group MyResourceGroup
"""

helps['appservice plan managed-instance storage-mount add'] = """
type: command
short-summary: Add a storage mount to a managed instance App Service plan.
examples:
- name: Add a storage mount to a managed instance App Service plan.
text: az appservice plan managed-instance storage-mount add --name MyAppServicePlan --resource-group MyResourceGroup --mount-name MyMount --type AzureFiles --source //myaccount.file.core.windows.net/myshare --destination-path F:\\ --credentials-secret-uri https://myvault.vault.azure.net/secrets/storage-credentials/myversion
"""

helps['appservice plan managed-instance storage-mount remove'] = """
type: command
short-summary: Remove a storage mount from a managed instance App Service plan.
examples:
- name: Remove a storage mount from a managed instance App Service plan.
text: az appservice plan managed-instance storage-mount remove --name MyAppServicePlan --resource-group MyResourceGroup --mount-name MyMount
"""

helps['appservice plan managed-instance registry-adapter'] = """
type: group
short-summary: Manage registry adapters for managed instance App Service plans.
"""

helps['appservice plan managed-instance registry-adapter list'] = """
type: command
short-summary: List registry adapters for a managed instance App Service plan.
examples:
- name: List all registry adapters for a managed instance App Service plan.
text: az appservice plan managed-instance registry-adapter list --name MyAppServicePlan --resource-group MyResourceGroup
"""

helps['appservice plan managed-instance registry-adapter add'] = """
type: command
short-summary: Add a registry adapter to a managed instance App Service plan.
examples:
- name: Add a registry adapter to a managed instance App Service plan.
text: az appservice plan managed-instance registry-adapter add --name MyAppServicePlan --resource-group MyResourceGroup --registry-key myregistry --type String --secret-uri https://myvault.vault.azure.net/secrets/registryKeyValue/myversion
"""

helps['appservice plan managed-instance registry-adapter remove'] = """
type: command
short-summary: Remove a registry adapter from a managed instance App Service plan.
examples:
- name: Remove a registry adapter from a managed instance App Service plan.
text: az appservice plan managed-instance registry-adapter remove --name MyAppServicePlan --resource-group MyResourceGroup --registry-key myregistry
"""

helps['appservice plan managed-instance network'] = """
type: group
short-summary: Manage network integration for managed instance App Service plans.
"""

helps['appservice plan managed-instance network show'] = """
type: command
short-summary: Show the network configuration for a managed instance App Service plan.
examples:
- name: Show the network configuration for a managed instance App Service plan.
text: az appservice plan managed-instance network show --name MyAppServicePlan --resource-group MyResourceGroup
"""

helps['appservice plan managed-instance network add'] = """
type: command
short-summary: Add VNet integration to a managed instance App Service plan.
examples:
- name: Add VNet integration to a managed instance App Service plan using subnet name and VNet name.
text: az appservice plan managed-instance network add --name MyAppServicePlan --resource-group MyResourceGroup --vnet MyVNet --subnet MySubnet
- name: Add VNet integration to a managed instance App Service plan using vnet resource id
text: az appservice plan managed-instance network add --name MyAppServicePlan --resource-group MyResourceGroup --vnet '/subscriptions/[sub id]/resourceGroups/[MyResourceGroup]/providers/Microsoft.Network/virtualNetworks/[MyVnetName]' --subnet MySubnet
- name: Add VNet integration to a managed instance App Service plan using subnet resource ID.
text: az appservice plan managed-instance network add --name MyAppServicePlan --resource-group MyResourceGroup --subnet '/subscriptions/[sub id]/resourceGroups/[MyResourceGroup]/providers/Microsoft.Network/virtualNetworks/[MyVnetName]/subnets/[MySubnetName]'
"""

helps['appservice plan managed-instance network remove'] = """
type: command
short-summary: Remove VNet integration from a managed instance App Service plan.
examples:
- name: Remove VNet integration from a managed instance App Service plan.
text: az appservice plan managed-instance network remove --name MyAppServicePlan --resource-group MyResourceGroup
"""

helps['appservice plan identity'] = """
type: group
short-summary: Manage managed identity for App Service plans.
"""

helps['appservice plan identity show'] = """
type: command
short-summary: Show the managed identity for an App Service plan.
examples:
- name: Show the managed identity for an App Service plan.
text: az appservice plan identity show --name MyAppServicePlan --resource-group MyResourceGroup
"""

helps['appservice plan identity assign'] = """
type: command
short-summary: Assign a managed identity to an App Service plan.
examples:
- name: Assign a system-assigned managed identity to an App Service plan.
text: az appservice plan identity assign --name MyAppServicePlan --resource-group MyResourceGroup --system-assigned
- name: Assign a user-assigned managed identity to an App Service plan.
text: az appservice plan identity assign --name MyAppServicePlan --resource-group MyResourceGroup --user-assigned /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MyResourceGroup/providers/Microsoft.ManagedIdentity/userAssignedIdentities/MyIdentity
- name: Assign both system-assigned and user-assigned managed identities to an App Service plan.
text: az appservice plan identity assign --name MyAppServicePlan --resource-group MyResourceGroup --system-assigned --user-assigned /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MyResourceGroup/providers/Microsoft.ManagedIdentity/userAssignedIdentities/MyIdentity
"""

helps['appservice plan identity remove'] = """
type: command
short-summary: Remove managed identities from an App Service plan.
examples:
- name: Remove a system-assigned managed identity from an App Service plan.
text: az appservice plan identity remove --name MyAppServicePlan --resource-group MyResourceGroup --system-assigned
- name: Remove a user-assigned managed identity from an App Service plan.
text: az appservice plan identity remove --name MyAppServicePlan --resource-group MyResourceGroup --user-assigned /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MyResourceGroup/providers/Microsoft.ManagedIdentity/userAssignedIdentities/MyIdentity
- name: Remove both system-assigned and user-assigned managed identities from an App Service plan.
text: az appservice plan identity remove --name MyAppServicePlan --resource-group MyResourceGroup --system-assigned --user-assigned /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MyResourceGroup/providers/Microsoft.ManagedIdentity/userAssignedIdentities/MyIdentity
"""

helps['appservice plan identity set-default'] = """
type: command
short-summary: Set the default managed identity for an App Service plan.
examples:
- name: Set system-assigned identity as the default for an App Service plan.
text: az appservice plan identity set-default --name MyAppServicePlan --resource-group MyResourceGroup --identity [system]
- name: Set a user-assigned identity as the default for an App Service plan.
text: az appservice plan identity set-default --name MyAppServicePlan --resource-group MyResourceGroup --identity /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MyResourceGroup/providers/Microsoft.ManagedIdentity/userAssignedIdentities/MyIdentity
"""

helps['appservice plan managed-instance instance'] = """
type: group
short-summary: Manage instances for managed instance App Service plans.
"""

helps['appservice plan managed-instance instance connect'] = """
type: command
short-summary: Connect to a managed instance App Service plan worker instance via RDP using Azure Bastion.
long-summary: |
This command establishes an RDP connection to a specific worker instance in a managed instance App Service plan using Azure Bastion.
You must have appropriate permissions to access the App Service plan and the Bastion resource.
examples:
- name: Connect to a worker instance via RDP using Azure Bastion.
text: az appservice plan managed-instance instance connect --name MyAppServicePlan --resource-group MyResourceGroup --instance-name MyInstance --bastion-name MyBastion --bastion-resource-group MyBastionRG
- name: Connect to a worker instance via RDP with Bastion in the same resource group as the App Service plan.
text: az appservice plan managed-instance instance connect --name MyAppServicePlan --resource-group MyResourceGroup --instance-name MyInstance --bastion-name MyBastion
"""

helps['appservice plan managed-instance instance recycle'] = """
type: command
short-summary: Recycle a specific instance in a managed instance App Service plan.
examples:
- name: Recycle a specific worker instance in a managed instance App Service plan.
text: az appservice plan managed-instance instance recycle --name MyAppServicePlan --resource-group MyResourceGroup --instance-name MyWorkerInstance
"""

helps['appservice vnet-integration'] = """
type: group
short-summary: a method that lists the virtual network integrations used in an appservice plan
Expand Down
Loading