DataLake Knack conversion (Azure#5100)

* DataLake conversion.

* Re-enable most modules for static checks.

* Fix up linter issues with RDBMS and VM modules.

* Updates for latest pylint and stuff. :/

* Updates for latest pylint and stuff. :/

* Code review feedback.

.flake8

@@ -14,11 +14,7 @@ exclude =
     scripts
     doc
     build_scripts
-    src/command_modules/azure-cli-rdbms
-    src/command_modules/azure-cli-sql
-    src/command_modules/azure-cli-vm
-    src/command_modules/azure-cli-acs
+    src/command_modules/azure-cli-backup
+    src/command_modules/azure-cli-batchai
     src/command_modules/azure-cli-cosmosdb
-    src/command_modules/azure-cli-dla
-    src/command_modules/azure-cli-dls
-    src/command_modules/azure-cli-monitor
+	src/command_modules/azure-cli-monitor

azure-cli.pyproj

@@ -89,7 +89,6 @@
     <Compile Include="azure-cli-testsdk\azure\cli\testsdk\patches.py" />
     <Compile Include="azure-cli-testsdk\azure\cli\testsdk\preparers.py" />
     <Compile Include="azure-cli-testsdk\azure\cli\testsdk\utilities.py" />
-    <Compile Include="azure-cli-testsdk\azure\cli\testsdk\vcr_test_base.py" />
     <Compile Include="azure-cli-testsdk\azure\cli\testsdk\__init__.py" />
     <Compile Include="azure-cli-testsdk\setup.py" />
     <Compile Include="azure-cli\azure\cli\__init__.py" />

scripts/ci/build.sh

@@ -109,8 +109,8 @@ for name in $(ls src/command_modules | grep azure-cli-); do
     if [ "$name" == "azure-cli-backup" ]; then continue; fi
     if [ "$name" == "azure-cli-batchai" ]; then continue; fi
     if [ "$name" == "azure-cli-cosmosdb" ]; then continue; fi
-    if [ "$name" == "azure-cli-dla" ]; then continue; fi
-    if [ "$name" == "azure-cli-dls" ]; then continue; fi
+	if [ "$name" == "azure-cli-dla" ]; then continue; fi
+	if [ "$name" == "azure-cli-dls" ]; then continue; fi
     if [ "$name" == "azure-cli-eventgrid" ]; then continue; fi
     if [ "$name" == "azure-cli-find" ]; then continue; fi
     if [ "$name" == "azure-cli-interactive" ]; then continue; fi

scripts/ci/test_static.sh

@@ -49,8 +49,8 @@ run_style azure.cli.command_modules.configure
 run_style azure.cli.command_modules.container
 run_style azure.cli.command_modules.consumption
 #run_style azure.cli.command_modules.cosmosdb
-#run_style azure.cli.command_modules.dla
-#run_style azure.cli.command_modules.dls
+run_style azure.cli.command_modules.dla
+run_style azure.cli.command_modules.dls
 run_style azure.cli.command_modules.eventgrid
 run_style azure.cli.command_modules.extension
 run_style azure.cli.command_modules.feedback
@@ -61,17 +61,16 @@ run_style azure.cli.command_modules.keyvault
 run_style azure.cli.command_modules.lab
 #run_style azure.cli.command_modules.monitor
 run_style azure.cli.command_modules.network
-#run_style azure.cli.command_modules.nspkg
-#run_style azure.cli.command_modules.profile
-#run_style azure.cli.command_modules.rdbms
+run_style azure.cli.command_modules.profile
+run_style azure.cli.command_modules.rdbms
 run_style azure.cli.command_modules.redis
 run_style azure.cli.command_modules.reservations
 run_style azure.cli.command_modules.resource
 run_style azure.cli.command_modules.role
 run_style azure.cli.command_modules.servicefabric
-#run_style azure.cli.command_modules.sql
+run_style azure.cli.command_modules.sql
 run_style azure.cli.command_modules.storage
-#run_style azure.cli.command_modules.testsdk
-#run_style azure.cli.command_modules.vm
+run_style azure.cli.testsdk
+run_style azure.cli.command_modules.vm
 
 exit $exit_code

src/azure-cli-core/azure/cli/core/_help.py

@@ -5,16 +5,15 @@
 
 from __future__ import print_function
 
-from azure.cli.core.commands import ExtensionCommandSource
-
 from knack.help import (HelpExample,
                         HelpFile as KnackHelpFile,
                         CLIHelp,
                         HelpParameter,
                         ArgumentGroupRegistry as KnackArgumentGroupRegistry)
-
 from knack.log import get_logger
 
+from azure.cli.core.commands import ExtensionCommandSource
+
 logger = get_logger(__name__)
 
 PRIVACY_STATEMENT = """

src/azure-cli-core/azure/cli/core/_profile.py

@@ -12,14 +12,14 @@
 from copy import deepcopy
 from enum import Enum
 
+from knack.log import get_logger
+from knack.util import CLIError
+
 from azure.cli.core._environment import get_config_dir
 from azure.cli.core._session import ACCOUNT
 from azure.cli.core.util import get_file_json, in_cloud_console
 from azure.cli.core.cloud import get_active_cloud, set_cloud_subscription
 
-from knack.log import get_logger
-from knack.util import CLIError
-
 logger = get_logger(__name__)
 
 # Names below are used by azure-xplat-cli to persist account information into

src/azure-cli-core/azure/cli/core/cloud.py

@@ -7,13 +7,13 @@
 from pprint import pformat
 from six.moves import configparser
 
-from azure.cli.core.profiles import API_PROFILES
-from azure.cli.core._config import GLOBAL_CONFIG_DIR
-
 from knack.log import get_logger
 from knack.util import CLIError
 from knack.config import get_config_parser
 
+from azure.cli.core.profiles import API_PROFILES
+from azure.cli.core._config import GLOBAL_CONFIG_DIR
+
 logger = get_logger(__name__)
 
 CLOUD_CONFIG_FILE = os.path.join(GLOBAL_CONFIG_DIR, 'clouds.config')

src/azure-cli-core/azure/cli/core/commands/__init__.py

@@ -11,17 +11,16 @@
 import sys
 import time
 from importlib import import_module
-
-from azure.cli.core import EXCLUDED_PARAMS
-import azure.cli.core.telemetry as telemetry
+import six
 
 from knack.arguments import CLICommandArgument, ignore_type, ArgumentsContext
 from knack.commands import CLICommand, CommandGroup
 from knack.invocation import CommandInvoker
 from knack.log import get_logger
 from knack.util import CLIError
 
-import six
+from azure.cli.core import EXCLUDED_PARAMS
+import azure.cli.core.telemetry as telemetry
 
 
 logger = get_logger(__name__)
@@ -319,7 +318,7 @@ def execute(self, args):
             except Exception as ex:  # pylint: disable=broad-except
                 if cmd.exception_handler:
                     cmd.exception_handler(ex)
-                    return
+                    return None
                 else:
                     six.reraise(*sys.exc_info())
 

src/azure-cli-core/azure/cli/core/commands/arm.py

@@ -7,18 +7,18 @@
 import re
 from six import string_types
 
+from knack.arguments import CLICommandArgument, ignore_type
+from knack.introspection import extract_args_from_signature
+from knack.log import get_logger
+from knack.util import todict, CLIError
+
 from azure.cli.core import AzCommandsLoader, EXCLUDED_PARAMS
 from azure.cli.core.commands import LongRunningOperation, _is_poller
 from azure.cli.core.commands.client_factory import get_mgmt_service_client
 from azure.cli.core.commands.validators import IterateValue
 from azure.cli.core.util import shell_safe_json_parse
 from azure.cli.core.profiles import ResourceType
 
-from knack.arguments import CLICommandArgument, ignore_type
-from knack.introspection import extract_args_from_signature
-from knack.log import get_logger
-from knack.util import todict, CLIError
-
 logger = get_logger(__name__)
 
 
@@ -472,20 +472,20 @@ def handler(args):
             try:
                 instance = getter(**args)
                 if wait_for_exists:
-                    return
+                    return None
                 provisioning_state = get_provisioning_state(instance)
                 # until we have any needs to wait for 'Failed', let us bail out on this
                 if provisioning_state == 'Failed':
                     raise CLIError('The operation failed')
                 if wait_for_created or wait_for_updated:
                     if provisioning_state == 'Succeeded':
-                        return
+                        return None
                 if custom_condition and bool(verify_property(instance, custom_condition)):
-                    return
+                    return None
             except ClientException as ex:
                 if getattr(ex, 'status_code', None) == 404:
                     if wait_for_deleted:
-                        return
+                        return None
                     if not any([wait_for_created, wait_for_exists, custom_condition]):
                         raise
                 else:

src/azure-cli-core/azure/cli/core/commands/client_factory.py

@@ -4,14 +4,15 @@
 # --------------------------------------------------------------------------------------------
 
 import os
+
+from knack.log import get_logger
+from knack.util import CLIError
+
 from azure.cli.core import __version__ as core_version
 import azure.cli.core._debug as _debug
 from azure.cli.core.profiles._shared import get_client_class
 from azure.cli.core.profiles import ResourceType, get_api_version, get_sdk
 
-from knack.log import get_logger
-from knack.util import CLIError
-
 logger = get_logger(__name__)
 UA_AGENT = "AZURECLI/{}".format(core_version)
 ENV_ADDITIONAL_USER_AGENT = 'AZURE_HTTP_USER_AGENT'

src/azure-cli-core/azure/cli/core/commands/parameters.py

@@ -7,15 +7,15 @@
 import argparse
 import platform
 
+from knack.arguments import CLIArgumentType, CaseInsensitiveList
+from knack.log import get_logger
+from knack.util import CLIError
+
 from azure.cli.core.commands.validators import validate_tag, validate_tags
 from azure.cli.core.commands.validators import generate_deployment_name
 from azure.cli.core.decorators import Completer
 from azure.cli.core.profiles import ResourceType
 
-from knack.arguments import CLIArgumentType, CaseInsensitiveList
-from knack.log import get_logger
-from knack.util import CLIError
-
 logger = get_logger(__name__)
 
 

src/azure-cli-core/azure/cli/core/commands/template_create.py

@@ -6,11 +6,11 @@
 from __future__ import print_function
 import platform
 
-from azure.cli.core.commands.arm import resource_exists
-
 from knack.log import get_logger
 from knack.util import CLIError
 
+from azure.cli.core.commands.arm import resource_exists
+
 logger = get_logger(__name__)
 
 

src/azure-cli-core/azure/cli/core/commands/validators.py

@@ -6,10 +6,11 @@
 import argparse
 import time
 import random
-from azure.cli.core.profiles import ResourceType
 
 from knack.log import get_logger
 
+from azure.cli.core.profiles import ResourceType
+
 logger = get_logger(__name__)
 
 

src/azure-cli-core/azure/cli/core/extension.py

@@ -7,10 +7,10 @@
 import traceback
 import json
 
-from azure.cli.core._config import GLOBAL_CONFIG_DIR
-
 from knack.log import get_logger
 
+from azure.cli.core._config import GLOBAL_CONFIG_DIR
+
 
 _CUSTOM_EXT_DIR = os.environ.get('AZURE_EXTENSION_DIR')
 EXTENSIONS_DIR = os.path.expanduser(_CUSTOM_EXT_DIR) if _CUSTOM_EXT_DIR else os.path.join(GLOBAL_CONFIG_DIR,

src/azure-cli-core/azure/cli/core/extensions/transform.py

@@ -5,10 +5,10 @@
 
 import re
 
-from azure.cli.core.util import b64_to_hex
-
 import knack.events as events
 
+from azure.cli.core.util import b64_to_hex
+
 
 def register(cli_ctx):
     cli_ctx.register_event(events.EVENT_INVOKER_TRANSFORM_RESULT, _resource_group_transform)

src/azure-cli-core/azure/cli/core/parser.py

@@ -8,12 +8,13 @@
 import argparse
 import argcomplete
 
-import azure.cli.core.telemetry as telemetry
-
 from knack.log import get_logger
 from knack.parser import CLICommandParser
 from knack.util import CLIError
 
+import azure.cli.core.telemetry as telemetry
+
+
 logger = get_logger(__name__)
 
 

src/azure-cli-core/azure/cli/core/telemetry.py

@@ -187,7 +187,7 @@ def _user_agrees_to_telemetry(func):
     @wraps(func)
     def _wrapper(*args, **kwargs):
         if not _get_config().getboolean('core', 'collect_telemetry', fallback=True):
-            return
+            return None
         return func(*args, **kwargs)
 
     return _wrapper

src/azure-cli-core/azure/cli/core/util.py

@@ -32,6 +32,7 @@ def handle_exception(ex):
     return 1
 
 
+# pylint: disable=inconsistent-return-statements
 def empty_on_404(ex):
     from msrestazure.azure_exceptions import CloudError
     if isinstance(ex, CloudError) and ex.status_code == 404:

src/azure-cli-testsdk/azure/cli/testsdk/__init__.py

@@ -3,10 +3,10 @@
 # Licensed under the MIT License. See License.txt in the project root for license information.
 # --------------------------------------------------------------------------------------------
 
-from azure.cli.core import AzCli
-
 from azure_devtools.scenario_tests import live_only, record_only, get_sha1_hash
 
+from azure.cli.core import AzCli
+
 from .base import ScenarioTest, LiveScenarioTest
 from .preparers import (StorageAccountPreparer, ResourceGroupPreparer, RoleBasedServicePrincipalPreparer,
                         KeyVaultPreparer)