More informative exception message for malformed connection string (A…

…zure#5983)

* More informative exception message for connection string

* clierror import on lower scope

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

@@ -3,6 +3,10 @@
 Release History
 ===============
 
+2.0.31
+++++++
+* Better error message for malformed connection strings.
+
 2.0.30
 ++++++
 * Fix issue of upload file with size between 195GB and 200GB

src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/_validators.py

@@ -75,8 +75,12 @@ def get_config_value(section, key, default):
     # if connection string supplied or in environment variables, extract account key and name
     if n.connection_string:
         conn_dict = validate_key_value_pairs(n.connection_string)
-        n.account_name = conn_dict['AccountName']
-        n.account_key = conn_dict['AccountKey']
+        n.account_name = conn_dict.get('AccountName')
+        n.account_key = conn_dict.get('AccountKey')
+        if not n.account_name or not n.account_key:
+            from knack.util import CLIError
+            raise CLIError('Connection-string: %s, is malformed. Some shell environments require the '
+                           'connection string to be surrounded by quotes.' % n.connection_string)
 
     # otherwise, simply try to retrieve the remaining variables from environment variables
     if not n.account_name:

src/command_modules/azure-cli-storage/setup.py

@@ -14,7 +14,7 @@
     logger.warn("Wheel is not available, disabling bdist_wheel hook")
     cmdclass = {}
 
-VERSION = "2.0.30"
+VERSION = "2.0.31"
 CLASSIFIERS = [
     'Development Status :: 5 - Production/Stable',
     'Intended Audience :: Developers',