webapp: Adding support for az webapp up

azure-cli2017.pyproj

@@ -256,6 +256,12 @@
     <Compile Include="command_modules\azure-cli-appservice\azure\cli\command_modules\appservice\_appservice_utils.py" />
     <Compile Include="command_modules\azure-cli-appservice\azure\cli\command_modules\appservice\_client_factory.py" />
     <Compile Include="command_modules\azure-cli-appservice\azure\cli\command_modules\appservice\_completers.py" />
+    <Compile Include="command_modules\azure-cli-appservice\azure\cli\command_modules\appservice\_constants.py">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="command_modules\azure-cli-appservice\azure\cli\command_modules\appservice\_create_util.py">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="command_modules\azure-cli-appservice\azure\cli\command_modules\appservice\_help.py" />
     <Compile Include="command_modules\azure-cli-appservice\azure\cli\command_modules\appservice\_params.py" />
     <Compile Include="command_modules\azure-cli-appservice\azure\cli\command_modules\appservice\_validators.py">

src/command_modules/azure-cli-appservice/HISTORY.rst

@@ -4,8 +4,10 @@ Release History
 ===============
 0.2.8
 +++++
+* webapp: adding support for az webapp up command (Preview) that helps in creating & deploying contents to app
 * webapp: fix a bug on container based windows app due to backend change
 
+
 0.2.7
 +++++
 * webapp, functionapp: Zip deployment default timeout to poll for the status increased to 5 mins, also adding a timeout property to customize this value

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

@@ -0,0 +1,18 @@
+# --------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# --------------------------------------------------------------------------------------------
+
+NODE_VERSION_DEFAULT = "8.11"
+NETCORE_VERSION_DEFAULT = "2.0"
+DOTNET_VERSION_DEFAULT = "4.7"
+PYTHON_VERSION_DEFAULT = "3.7"
+NETCORE_RUNTIME_NAME = "dotnetcore"
+DOTNET_RUNTIME_NAME = "aspnet"
+NODE_RUNTIME_NAME = "node"
+PYTHON_RUNTIME_NAME = "python"
+OS_DEFAULT = "Windows"
+STATIC_RUNTIME_NAME = "static"  # not an oficial supported runtime but used for CLI logic
+NODE_VERSIONS = ['4.4', '4.5', '6.2', '6.6', '6.9', '6.11', '8.0', '8.1', '8.9', '8.11']
+NETCORE_VERSIONS = ['1.0', '1.1', '2.0']
+DOTNET_VERSIONS = ['3.5', '4.7']

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

@@ -0,0 +1,268 @@
+
+# --------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# --------------------------------------------------------------------------------------------
+
+import os
+import zipfile
+from azure.cli.core.commands.client_factory import get_mgmt_service_client
+from azure.mgmt.resource.resources.models import ResourceGroup
+from ._constants import (NETCORE_VERSION_DEFAULT, NETCORE_VERSIONS, NODE_VERSION_DEFAULT,
+                         NODE_VERSIONS, NETCORE_RUNTIME_NAME, NODE_RUNTIME_NAME, DOTNET_RUNTIME_NAME,
+                         DOTNET_VERSION_DEFAULT, DOTNET_VERSIONS, STATIC_RUNTIME_NAME,
+                         PYTHON_RUNTIME_NAME, PYTHON_VERSION_DEFAULT)
+
+
+def _resource_client_factory(cli_ctx, **_):
+    from azure.cli.core.profiles import ResourceType
+    return get_mgmt_service_client(cli_ctx, ResourceType.MGMT_RESOURCE_RESOURCES)
+
+
+def web_client_factory(cli_ctx, **_):
+    from azure.mgmt.web import WebSiteManagementClient
+    return get_mgmt_service_client(cli_ctx, WebSiteManagementClient)
+
+
+def zip_contents_from_dir(dirPath, lang):
+    relroot = os.path.abspath(os.path.join(dirPath, os.pardir))
+    path_and_file = os.path.splitdrive(dirPath)[1]
+    file_val = os.path.split(path_and_file)[1]
+    zip_file_path = relroot + os.path.sep + file_val + ".zip"
+    abs_src = os.path.abspath(dirPath)
+    with zipfile.ZipFile("{}".format(zip_file_path), "w", zipfile.ZIP_DEFLATED) as zf:
+        for dirname, subdirs, files in os.walk(dirPath):
+            # skip node_modules folder for Node apps,
+            # since zip_deployment will perfom the build operation
+            if lang.lower() == NODE_RUNTIME_NAME and 'node_modules' in subdirs:
+                subdirs.remove('node_modules')
+            elif lang.lower() == NETCORE_RUNTIME_NAME:
+                if 'bin' in subdirs:
+                    subdirs.remove('bin')
+                elif 'obj' in subdirs:
+                    subdirs.remove('obj')
+            for filename in files:
+                absname = os.path.abspath(os.path.join(dirname, filename))
+                arcname = absname[len(abs_src) + 1:]
+                zf.write(absname, arcname)
+    return zip_file_path
+
+
+def get_runtime_version_details(file_path, lang_name):
+    version_detected = None
+    version_to_create = None
+    if lang_name.lower() == NETCORE_RUNTIME_NAME:
+        # method returns list in DESC, pick the first
+        version_detected = parse_netcore_version(file_path)[0]
+        version_to_create = detect_netcore_version_tocreate(version_detected)
+    elif lang_name.lower() == DOTNET_RUNTIME_NAME:
+        # method returns list in DESC, pick the first
+        version_detected = parse_dotnet_version(file_path)
+        version_to_create = detect_dotnet_version_tocreate(version_detected)
+    elif lang_name.lower() == NODE_RUNTIME_NAME:
+        version_detected = parse_node_version(file_path)[0]
+        version_to_create = detect_node_version_tocreate(version_detected)
+    elif lang_name.lower() == PYTHON_RUNTIME_NAME:
+        version_detected = "-"
+        version_to_create = PYTHON_VERSION_DEFAULT
+    elif lang_name.lower() == STATIC_RUNTIME_NAME:
+        version_detected = "-"
+        version_to_create = "-"
+    return {'detected': version_detected, 'to_create': version_to_create}
+
+
+def create_resource_group(cmd, rg_name, location):
+    rcf = _resource_client_factory(cmd.cli_ctx)
+    rg_params = ResourceGroup(location=location)
+    return rcf.resource_groups.create_or_update(rg_name, rg_params)
+
+
+def _check_resource_group_exists(cmd, rg_name):
+    rcf = _resource_client_factory(cmd.cli_ctx)
+    return rcf.resource_groups.check_existence(rg_name)
+
+
+def _check_resource_group_supports_os(cmd, rg_name, is_linux):
+    # get all appservice plans from RG
+    client = web_client_factory(cmd.cli_ctx)
+    plans = list(client.app_service_plans.list_by_resource_group(rg_name))
+    for item in plans:
+        # for Linux if an app with reserved==False exists, ASP doesn't support Linux
+        if is_linux and not item.reserved:
+            return False
+        elif not is_linux and item.reserved:
+            return False
+    return True
+
+
+def check_if_asp_exists(cmd, rg_name, asp_name, location):
+    # get all appservice plans from RG
+    client = web_client_factory(cmd.cli_ctx)
+    for item in list(client.app_service_plans.list_by_resource_group(rg_name)):
+        if (item.name.lower() == asp_name.lower() and
+                item.location.replace(" ", "").lower() == location or
+                item.location == location):
+            return True
+    return False
+
+
+def check_app_exists(cmd, rg_name, app_name):
+    client = web_client_factory(cmd.cli_ctx)
+    for item in list(client.web_apps.list_by_resource_group(rg_name)):
+        if item.name.lower() == app_name.lower():
+            return True
+    return False
+
+
+# pylint:disable=unexpected-keyword-arg
+def get_lang_from_content(src_path):
+    import glob
+    # NODE: package.json should exist in the application root dir
+    # NETCORE & DOTNET: *.csproj should exist in the application dir
+    # NETCORE: <TargetFramework>netcoreapp2.0</TargetFramework>
+    # DOTNET: <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    runtime_details_dict = dict.fromkeys(['language', 'file_loc', 'default_sku'])
+    package_json_file = os.path.join(src_path, 'package.json')
+    package_python_file = glob.glob("**/*.py", recursive=True)
+    package_netlang_glob = glob.glob("**/*.csproj", recursive=True)
+    static_html_file = glob.glob("**/*.html", recursive=True)
+    if os.path.isfile(package_json_file):
+        runtime_details_dict['language'] = NODE_RUNTIME_NAME
+        runtime_details_dict['file_loc'] = package_json_file
+        runtime_details_dict['default_sku'] = 'B1'
+    elif package_python_file:
+        runtime_details_dict['language'] = PYTHON_RUNTIME_NAME
+        runtime_details_dict['file_loc'] = os.path.join(src_path, package_json_file[0])
+        runtime_details_dict['default_sku'] = 'B1'
+    elif package_netlang_glob:
+        package_netcore_file = os.path.join(src_path, package_netlang_glob[0])
+        runtime_lang = detect_dotnet_lang(package_netcore_file)
+        runtime_details_dict['language'] = runtime_lang
+        runtime_details_dict['file_loc'] = package_netcore_file
+        runtime_details_dict['default_sku'] = 'F1'
+    elif static_html_file:
+        runtime_details_dict['language'] = STATIC_RUNTIME_NAME
+        runtime_details_dict['file_loc'] = static_html_file[0]
+        runtime_details_dict['default_sku'] = 'F1'
+    return runtime_details_dict
+
+
+def detect_dotnet_lang(csproj_path):
+    import xml.etree.ElementTree as ET
+    import re
+    parsed_file = ET.parse(csproj_path)
+    root = parsed_file.getroot()
+    version_lang = ''
+    for target_ver in root.iter('TargetFramework'):
+        version_lang = re.sub(r'([^a-zA-Z\s]+?)', '', target_ver.text)
+    if 'netcore' in version_lang.lower():
+        return NETCORE_RUNTIME_NAME
+    return DOTNET_RUNTIME_NAME
+
+
+def parse_dotnet_version(file_path):
+    version_detected = ['4.7']
+    try:
+        from xml.dom import minidom
+        import re
+        xmldoc = minidom.parse(file_path)
+        framework_ver = xmldoc.getElementsByTagName('TargetFrameworkVersion')
+        target_ver = framework_ver[0].firstChild.data
+        non_decimal = re.compile(r'[^\d.]+')
+        # reduce the version to '5.7.4' from '5.7'
+        if target_ver is not None:
+            # remove the string from the beginning of the version value
+            c = non_decimal.sub('', target_ver)
+            version_detected = c[:3]
+    except:  # pylint: disable=bare-except
+        version_detected = version_detected[0]
+    return version_detected
+
+
+def parse_netcore_version(file_path):
+    import xml.etree.ElementTree as ET
+    import re
+    version_detected = ['0.0']
+    parsed_file = ET.parse(file_path)
+    root = parsed_file.getroot()
+    for target_ver in root.iter('TargetFramework'):
+        version_detected = re.findall(r"\d+\.\d+", target_ver.text)
+    # incase of multiple versions detected, return list in descending order
+    version_detected = sorted(version_detected, key=float, reverse=True)
+    return version_detected
+
+
+def parse_node_version(file_path):
+    import json
+    import re
+    with open(file_path) as data_file:
+        data = []
+        for d in find_key_in_json(json.load(data_file), 'node'):
+            non_decimal = re.compile(r'[^\d.]+')
+            # remove the string ~ or  > that sometimes exists in version value
+            c = non_decimal.sub('', d)
+            # reduce the version to '6.0' from '6.0.0'
+            data.append(c[:3])
+        version_detected = sorted(data, key=float, reverse=True)
+    return version_detected or ['0.0']
+
+
+def detect_netcore_version_tocreate(detected_ver):
+    if detected_ver in NETCORE_VERSIONS:
+        return detected_ver
+    return NETCORE_VERSION_DEFAULT
+
+
+def detect_dotnet_version_tocreate(detected_ver):
+    min_ver = DOTNET_VERSIONS[0]
+    if detected_ver in DOTNET_VERSIONS:
+        return detected_ver
+    elif detected_ver < min_ver:
+        return min_ver
+    return DOTNET_VERSION_DEFAULT
+
+
+def detect_node_version_tocreate(detected_ver):
+    if detected_ver in NODE_VERSIONS:
+        return detected_ver
+    # get major version & get the closest version from supported list
+    major_ver = float(detected_ver.split('.')[0])
+    if major_ver < 4:
+        return NODE_VERSION_DEFAULT
+    elif major_ver >= 4 and major_ver < 6:
+        return '4.5'
+    elif major_ver >= 6 and major_ver < 8:
+        return '6.9'
+    return NODE_VERSION_DEFAULT
+
+
+def find_key_in_json(json_data, key):
+    for k, v in json_data.items():
+        if key in k:
+            yield v
+        elif isinstance(v, dict):
+            for id_val in find_key_in_json(v, key):
+                yield id_val
+
+
+def set_location(cmd, sku, location):
+    client = web_client_factory(cmd.cli_ctx)
+    if location is None:
+        locs = client.list_geo_regions(sku, True)
+        available_locs = []
+        for loc in locs:
+            available_locs.append(loc.name)
+        location = available_locs[0]
+    else:
+        location = location
+    return location.replace(" ", "").lower()
+
+
+def should_create_new_rg(cmd, default_rg, rg_name, is_linux):
+    if (default_rg and _check_resource_group_exists(cmd, default_rg) and
+            _check_resource_group_supports_os(cmd, default_rg, is_linux)):
+        return False
+    elif (_check_resource_group_exists(cmd, rg_name) and
+          _check_resource_group_supports_os(cmd, rg_name, is_linux)):
+        return False
+    return True

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

@@ -635,6 +635,27 @@
             az webapp create -g MyResourceGroup -p MyPlan -n MyUniqueAppName --runtime "node|6.2" --deployment-local-git
 """
 
+helps['webapp up'] = """
+    type: command
+    short-summary: (Preview) Create and deploy existing local code to the webapp, by running the command from the folder where the code is present.
+                   Supports running the command in preview mode using --dryrun parameter. Current supports includes Node, Python,.NET Core, ASP.NET,
+                   staticHtml. Node, Python apps are created as Linux apps. .Net Core, ASP.NET and static HTML apps are created as Windows apps.
+                   If command is run from an empty folder, an empty windows webapp is created.
+    examples:
+        - name: View the details of the app that will be created, without actually running the operation
+          text: >
+            az webapp up -n MyUniqueAppName --dryrun
+        - name: Create a web app with the default configuration, by running the command from the folder where the code to deployed exists.
+          text: >
+            az webapp up -n MyUniqueAppName
+        - name: Create a web app in a sepcific region, by running the command from the folder where the code to deployed exists.
+          text: >
+            az webapp up -n MyUniqueAppName -l locationName
+        - name: Deploy new code to an app that was originally created using the same command
+          text: >
+            az webapp up -n MyUniqueAppName -l locationName
+"""
+
 helps['webapp update'] = """
     type: command
     short-summary: Update a web app.

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

@@ -326,6 +326,11 @@ def load_arguments(self, _):
         c.argument('microsoft_account_client_secret', arg_group='Microsoft', help='AAD V2 Application client secret')
         c.argument('microsoft_account_oauth_scopes', nargs='+', help="One or more Microsoft authentification scopes (space-delimited).", arg_group='Microsoft')
 
+    with self.argument_context('webapp up') as c:
+        c.argument('name', arg_type=webapp_name_arg_type)
+        c.argument('sku', arg_type=sku_arg_type)
+        c.argument('dryrun', help="show summary of the create and deploy operation instead of executing it", default=False, action='store_true')
+
     with self.argument_context('functionapp') as c:
         c.ignore('app_instance', 'slot')
         c.argument('name', arg_type=name_arg_type, id_part='name', help='name of the function app')

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

@@ -73,6 +73,7 @@ def load_command_table(self, _):
 
     with self.command_group('webapp', webapp_sdk) as g:
         g.custom_command('create', 'create_webapp', exception_handler=ex_handler_factory())
+        g.custom_command('up', 'create_deploy_webapp', exception_handler=ex_handler_factory())
         g.custom_command('list', 'list_webapp', table_transformer=transform_web_list_output)
         g.custom_show_command('show', 'show_webapp', table_transformer=transform_web_output)
         g.custom_command('delete', 'delete_webapp')