Skip to content

webapp: Updating AppService to use the new Python SDK version #8886

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yugangw-msft merged 6 commits into from
Apr 3, 2019
Merged

webapp: Updating AppService to use the new Python SDK version #8886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0140cf3
Updating AppService to use the new Python SDK version
panchagnula Mar 26, 2019
25485f9
Fixing errors
panchagnula Mar 28, 2019
428a7bc
Handling the deprecated command the CLI recommended way
panchagnula Apr 2, 2019
fe2ae0d
Updates for test & static check
panchagnula Apr 2, 2019
78c72c0
Removing the ssh test that's timing out on test but works locally. Ad…
panchagnula Apr 3, 2019
3e6d77d
Adding the test with recording on mac
panchagnula Apr 3, 2019
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
5 changes: 5 additions & 0 deletions src/command_modules/azure-cli-appservice/HISTORY.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,15 @@

Release History
===============

0.2.17
++++++
* functionapp: fix `az functionapp devops-build create` command azure-pipelines.yml generation issues
* functionapp: improve `az functionapp devops-build create` error handlings and error indications
* functionapp: remove `--local_git` flag in devops-build command, local git detection and handling are compulsory for creating Azure DevOps pipelines
* functionapp: add support for linux functions plan creation
* webapp, functionapp: Updating to use the new Python SDK version
* appservice: adminSiteName property of SKU object is deprecated

0.2.16
++++++
Expand Down
2 changes: 1 addition & 1 deletion src/command_modules/azure-cli-appservice/azure/cli/command_modules/appservice/_params.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def load_arguments(self, _):
completer=get_resource_name_completion_list('Microsoft.Web/serverFarms'),
configured_default='appserviceplan', id_part='name')
c.argument('number_of_workers', help='Number of workers to be allocated.', type=int, default=1)
c.argument('admin_site_name', help='The name of the admin web app.')
c.argument('admin_site_name', help='The name of the admin web app.', deprecate_info=c.deprecate(expiration='0.2.17'))

with self.argument_context('appservice plan create') as c:
c.argument('name', options_list=['--name', '-n'], help="Name of the new app service plan", completer=None)
Expand Down
7 changes: 1 addition & 6 deletions src/command_modules/azure-cli-appservice/azure/cli/command_modules/appservice/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1149,8 +1149,7 @@ def create_app_service_plan(cmd, resource_group_name, name, is_linux, hyper_v, s
return client.app_service_plans.create_or_update(resource_group_name, name, plan_def)


def update_app_service_plan(instance, sku=None, number_of_workers=None,
admin_site_name=None):
def update_app_service_plan(instance, sku=None, number_of_workers=None):
sku_def = instance.sku
if sku is not None:
sku = _normalize_sku(sku)
Expand All @@ -1159,11 +1158,7 @@ def update_app_service_plan(instance, sku=None, number_of_workers=None,

if number_of_workers is not None:
sku_def.capacity = number_of_workers

instance.sku = sku_def
instance.sku = sku_def
if admin_site_name is not None:
instance.admin_site_name = admin_site_name
return instance


Expand Down
Loading