From 55f9aca93ee4a7ee4c1dd8fddc34deabb028e470 Mon Sep 17 00:00:00 2001
From: Yugang Wang <yugangw@microsoft.com>
Date: Tue, 27 Mar 2018 10:49:24 -0700
Subject: [PATCH] webapp/functionapp: capture the error when plan can be None
 (#5919)

---
 src/command_modules/azure-cli-appservice/HISTORY.rst        | 6 +++++-
 .../azure/cli/command_modules/appservice/custom.py          | 5 +++++
 src/command_modules/azure-cli-appservice/setup.py           | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/command_modules/azure-cli-appservice/HISTORY.rst b/src/command_modules/azure-cli-appservice/HISTORY.rst
index 494f7838c3c..076ca112168 100644
--- a/src/command_modules/azure-cli-appservice/HISTORY.rst
+++ b/src/command_modules/azure-cli-appservice/HISTORY.rst
@@ -2,10 +2,14 @@
 
 Release History
 ===============
+0.1.31
+++++++
+* webapp: capture the unhandled exception if the appservice plan doesn't exist
+
 0.1.30
 ++++++
 * webapp: az webapp update supports httpsOnly
-* webapp/functionapp:  slot support for identity assign & identity show=======
+* webapp/functionapp:  slot support for identity assign & identity show
 
 0.1.29
 ++++++
diff --git a/src/command_modules/azure-cli-appservice/azure/cli/command_modules/appservice/custom.py b/src/command_modules/azure-cli-appservice/azure/cli/command_modules/appservice/custom.py
index 4f1374bd538..0ab811e6285 100644
--- a/src/command_modules/azure-cli-appservice/azure/cli/command_modules/appservice/custom.py
+++ b/src/command_modules/azure-cli-appservice/azure/cli/command_modules/appservice/custom.py
@@ -56,6 +56,8 @@ def create_webapp(cmd, resource_group_name, name, plan, runtime=None, startup_fi
         plan_info = client.app_service_plans.get(parse_result['resource_group'], parse_result['name'])
     else:
         plan_info = client.app_service_plans.get(resource_group_name, plan)
+    if not plan_info:
+        raise CLIError("The plan '{}' doesn't exist".format(plan))
     is_linux = plan_info.reserved
     node_default_version = "6.9.1"
     location = plan_info.location
@@ -1520,6 +1522,7 @@ def create_function(cmd, resource_group_name, name, storage_account, plan=None,
                     consumption_plan_location=None, deployment_source_url=None,
                     deployment_source_branch='master', deployment_local_git=None,
                     deployment_container_image_name=None):
+    # pylint: disable=too-many-statements
     if deployment_source_url and deployment_local_git:
         raise CLIError('usage error: --deployment-source-url <url> | --deployment-local-git')
     if bool(plan) == bool(consumption_plan_location):
@@ -1540,6 +1543,8 @@ def create_function(cmd, resource_group_name, name, storage_account, plan=None,
         if is_valid_resource_id(plan):
             plan = parse_resource_id(plan)['name']
         plan_info = client.app_service_plans.get(resource_group_name, plan)
+        if not plan_info:
+            raise CLIError("The plan '{}' doesn't exist".format(plan))
         location = plan_info.location
         is_linux = plan_info.reserved
         if is_linux:
diff --git a/src/command_modules/azure-cli-appservice/setup.py b/src/command_modules/azure-cli-appservice/setup.py
index a950885cfbe..a7d01a53b10 100644
--- a/src/command_modules/azure-cli-appservice/setup.py
+++ b/src/command_modules/azure-cli-appservice/setup.py
@@ -14,7 +14,7 @@
     logger.warn("Wheel is not available, disabling bdist_wheel hook")
     cmdclass = {}
 
-VERSION = "0.1.30"
+VERSION = "0.1.31"
 CLASSIFIERS = [
     'Development Status :: 4 - Beta',
     'Intended Audience :: Developers',