From 92f5b395300545671f8d0a3e558f218806c93ba6 Mon Sep 17 00:00:00 2001 From: Sisira Panchagnula Date: Thu, 22 Mar 2018 14:44:53 -0700 Subject: [PATCH] webapp new to up & chaging version to 0.2.0 (skipping versions in between as per PM request) adding isPreview metadata --- src/index.json | 8 ++++---- src/webapp/azext_webapp/__init__.py | 6 +++--- src/webapp/azext_webapp/_help.py | 8 ++++---- src/webapp/azext_webapp/azext_metadata.json | 3 ++- src/webapp/azext_webapp/custom.py | 4 ++-- src/webapp/setup.py | 2 +- 6 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/index.json b/src/index.json index ee936f88efb..ffd1defbfcd 100644 --- a/src/index.json +++ b/src/index.json @@ -280,9 +280,9 @@ ], "webapp": [ { - "filename": "webapp-0.1.2-py2.py3-none-any.whl", - "sha256Digest": "6fb8a59aa38dff6b0d3a878742290cacac0eb0e50dc0fae2e6fbf7bd5c38f37b", - "downloadUrl": "https://github.com/panchagnula/azure-cli-extensions/raw/sisirap-extensions-whl/dist/webapp-0.1.2-py2.py3-none-any.whl", + "filename": "webapp-0.2.0-py2.py3-none-any.whl", + "sha256Digest": "a13151c899eabb66c3d853e9e46bcd5752f78e5a75c35eb09590f4673ac49279", + "downloadUrl": "https://github.com/panchagnula/azure-cli-extensions/raw/sisirap-extensions-whl/dist/webapp-0.2.0-py2.py3-none-any.whl", "metadata": { "classifiers": [ "Development Status :: 4 - Beta", @@ -319,7 +319,7 @@ "metadata_version": "2.0", "name": "webapp", "summary": "An Azure CLI Extension to manage appservice resources", - "version": "0.1.2" + "version": "0.2.0" } } ], diff --git a/src/webapp/azext_webapp/__init__.py b/src/webapp/azext_webapp/__init__.py index 581e1590978..5acbe9846b3 100644 --- a/src/webapp/azext_webapp/__init__.py +++ b/src/webapp/azext_webapp/__init__.py @@ -22,12 +22,12 @@ def __init__(self, cli_ctx=None): def load_command_table(self, _): with self.command_group('webapp') as g: - g.custom_command('new', 'create_deploy_webapp') + g.custom_command('up', 'create_deploy_webapp') return self.command_table def load_arguments(self, _): - with self.argument_context('webapp new') as c: - c.argument('name', options_list=['--name', '-n'], help='name of the new webapp') + with self.argument_context('webapp up') as c: + c.argument('name', options_list=['--name', '-n'], help='name of the webapp to be created') c.argument('dryrun', help="shows summary of the create and deploy operation instead of executing it", default=False, action='store_true') diff --git a/src/webapp/azext_webapp/_help.py b/src/webapp/azext_webapp/_help.py index 84c920896c1..2aa436e7cd7 100644 --- a/src/webapp/azext_webapp/_help.py +++ b/src/webapp/azext_webapp/_help.py @@ -6,13 +6,13 @@ from knack.help_files import helps -helps['webapp new'] = """ +helps['webapp up'] = """ type: command short-summary: Experimental command to create and deploy a web app. - Current supports Node on Linux & .NET Core on Windows. + Current supports includes Node on Linux & .NET Core on Windows. examples: - name: Create a web app with the default configuration. text: > - az webapp new -n MyUniqueAppName --dryrun \n - az webapp new -n MyUniqueAppName -l locationName + az webapp up -n MyUniqueAppName --dryrun \n + az webapp up -n MyUniqueAppName -l locationName """ diff --git a/src/webapp/azext_webapp/azext_metadata.json b/src/webapp/azext_webapp/azext_metadata.json index bbe67260f34..eebc88db508 100644 --- a/src/webapp/azext_webapp/azext_metadata.json +++ b/src/webapp/azext_webapp/azext_metadata.json @@ -1,3 +1,4 @@ { - "azext.minCliCoreVersion": "2.0.24" + "azext.minCliCoreVersion": "2.0.24", + "azext.isPreview" :true } \ No newline at end of file diff --git a/src/webapp/azext_webapp/custom.py b/src/webapp/azext_webapp/custom.py index 2d338535d9e..34be7f65cfd 100644 --- a/src/webapp/azext_webapp/custom.py +++ b/src/webapp/azext_webapp/custom.py @@ -14,7 +14,7 @@ update_app_settings, _get_site_credential, _get_scm_url, - _get_sku_name) + get_sku_name) from .create_util import ( zip_contents_from_dir, @@ -74,7 +74,7 @@ def create_deploy_webapp(cmd, name, location=None, dryrun=False): location = available_locs[0] # Remove spaces from the location string, incase the GeoRegion string is used loc_name = location.replace(" ", "") - full_sku = _get_sku_name(sku) + full_sku = get_sku_name(sku) is_linux = True if os_val == 'Linux' else False diff --git a/src/webapp/setup.py b/src/webapp/setup.py index d8f5bca8d17..73f51c75ad6 100644 --- a/src/webapp/setup.py +++ b/src/webapp/setup.py @@ -8,7 +8,7 @@ from codecs import open from setuptools import setup, find_packages -VERSION = "0.1.2" +VERSION = "0.2.0" CLASSIFIERS = [ 'Development Status :: 4 - Beta',