azdev 0.1.88__tar.gz → 0.1.90__tar.gz

{azdev-0.1.88 → azdev-0.1.90}/HISTORY.rst

@@ -2,7 +2,16 @@
 
 Release History
 ===============
+0.1.90
+++++++
+* `azdev cmdcov`: Fix incorrect detection of code changes as new commands
+
+0.1.89
+++++++
+* `azdev scan/mask`: Add `--continue-on-failure` support
+
 0.1.88
+++++++
 * `azdev cmdcov`: Fix incorrect detection of code changes as new commands
 
 0.1.87

{azdev-0.1.88/azdev.egg-info → azdev-0.1.90}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: azdev
-Version: 0.1.88
+Version: 0.1.90
 Summary: Microsoft Azure CLI Developer Tools
 Home-page: https://github.com/Azure/azure-cli-dev-tools
 Author: Microsoft Corporation
@@ -148,7 +148,16 @@ License
 
 Release History
 ===============
+0.1.90
+++++++
+* `azdev cmdcov`: Fix incorrect detection of code changes as new commands
+
+0.1.89
+++++++
+* `azdev scan/mask`: Add `--continue-on-failure` support
+
 0.1.88
+++++++
 * `azdev cmdcov`: Fix incorrect detection of code changes as new commands
 
 0.1.87

{azdev-0.1.88 → azdev-0.1.90}/azdev/__init__.py

@@ -4,4 +4,4 @@
 # license information.
 # -----------------------------------------------------------------------------
 
-__VERSION__ = '0.1.88'
+__VERSION__ = '0.1.90'

{azdev-0.1.88 → azdev-0.1.90}/azdev/operations/linter/rules/command_coverage_rules.py

@@ -8,7 +8,7 @@ from ..rule_decorators import CommandCoverageRule
 from ..linter import RuleError, LinterSeverity
 
 
-@CommandCoverageRule(LinterSeverity.HIGH)
+@CommandCoverageRule(LinterSeverity.MEDIUM)
 def missing_command_test_coverage(linter):
     exec_state, violations = linter.get_command_test_coverage()
     if not exec_state:

{azdev-0.1.88 → azdev-0.1.90}/azdev/operations/regex.py

@@ -144,6 +144,7 @@ def search_argument(line):
 def search_command_group(row_num, lines, command):
     cmd = ''
     while row_num > 0:
+        row_num = len(lines) - 1 if row_num >= len(lines) else row_num
         row_num -= 1
         # Match `with self.command_group('local-context',` and `with self.command_group('xxx')`
         sub_pattern = r'with self.command_group\(\'(.*?)\',?'
@@ -166,8 +167,8 @@ def search_command(line):
 
 def search_deleted_command(line):
     command = ''
-    # Match `- g.*command(xxx)`
-    pattern = r'\-\s+g.(?:\w+)?command\((.*)\)'
+    # Match `[-!] g.*command(xxx)`
+    pattern = r'[-!]\s+g.(?:\w+)?command\((.*)\)'
     ref = re.findall(pattern, line)
     if ref:
         command = ref[0].split(',')[0].strip("'")

{azdev-0.1.88 → azdev-0.1.90}/azdev/operations/secret.py

@@ -146,7 +146,8 @@ def _scan_secrets_for_string(data, confidence_level=None, custom_pattern=None):
 def scan_secrets(file_path=None, directory_path=None, recursive=False,
                  include_pattern=None, exclude_pattern=None, data=None,
                  save_scan_result=None, scan_result_path=None,
-                 confidence_level=None, custom_pattern=None):
+                 confidence_level=None, custom_pattern=None,
+                 continue_on_failure=None):
     _validate_data_path(file_path=file_path, directory_path=directory_path,
                         include_pattern=include_pattern, exclude_pattern=exclude_pattern, data=data)
     target_files = []
@@ -165,15 +166,21 @@ def scan_secrets(file_path=None, directory_path=None, recursive=False,
             scan_results['raw_data'] = secrets
     elif target_files:
         for target_file in target_files:
-            logger.debug('start scanning secrets for %s', target_file)
-            with open(target_file, encoding='utf8') as f:
-                data = f.read()
-            if not data:
-                continue
-            secrets = _scan_secrets_for_string(data, confidence_level, custom_pattern)
-            logger.debug('%d secrets found for %s', len(secrets), target_file)
-            if secrets:
-                scan_results[target_file] = secrets
+            try:
+                logger.debug('start scanning secrets for %s', target_file)
+                with open(target_file, encoding='utf8') as f:
+                    data = f.read()
+                if not data:
+                    continue
+                secrets = _scan_secrets_for_string(data, confidence_level, custom_pattern)
+                logger.debug('%d secrets found for %s', len(secrets), target_file)
+                if secrets:
+                    scan_results[target_file] = secrets
+            except Exception as ex:  # pylint: disable=broad-exception-caught
+                if continue_on_failure:
+                    logger.warning("Error handling file %s, exception %s", target_file, str(ex))
+                else:
+                    raise ex
 
     if scan_result_path:
         save_scan_result = True
@@ -244,7 +251,7 @@ def _mask_secret_for_string(data, secret, redaction_type=None):
 def mask_secrets(file_path=None, directory_path=None, recursive=False,
                  include_pattern=None, exclude_pattern=None, data=None,
                  save_scan_result=None, scan_result_path=None,
-                 confidence_level=None, custom_pattern=None,
+                 confidence_level=None, custom_pattern=None, continue_on_failure=None,
                  saved_scan_result_path=None, redaction_type='FIXED_VALUE', yes=None):
     scan_results = {}
     if saved_scan_result_path:
@@ -259,7 +266,8 @@ def mask_secrets(file_path=None, directory_path=None, recursive=False,
         scan_response = scan_secrets(file_path=file_path, directory_path=directory_path, recursive=recursive,
                                      include_pattern=include_pattern, exclude_pattern=exclude_pattern, data=data,
                                      save_scan_result=save_scan_result, scan_result_path=scan_result_path,
-                                     confidence_level=confidence_level, custom_pattern=custom_pattern)
+                                     confidence_level=confidence_level, custom_pattern=custom_pattern,
+                                     continue_on_failure=continue_on_failure)
         if save_scan_result and scan_response['scan_result_path']:
             with open(scan_response['scan_result_path'], encoding='utf8') as f:
                 scan_results = json.load(f)
@@ -291,13 +299,19 @@ def mask_secrets(file_path=None, directory_path=None, recursive=False,
         return mask_result
 
     for scan_file_path, secrets in scan_results.items():
-        with open(scan_file_path, 'r', encoding='utf8') as f:
-            content = f.read()
-        if not content:
-            continue
-        for secret in secrets:
-            content = _mask_secret_for_string(content, secret, redaction_type)
-        with open(scan_file_path, 'w', encoding='utf8') as f:
-            f.write(content)
+        try:
+            with open(scan_file_path, 'r', encoding='utf8') as f:
+                content = f.read()
+            if not content:
+                continue
+            for secret in secrets:
+                content = _mask_secret_for_string(content, secret, redaction_type)
+            with open(scan_file_path, 'w', encoding='utf8') as f:
+                f.write(content)
+        except Exception as ex:  # pylint: disable=broad-exception-caught
+            if continue_on_failure:
+                logger.warning("Error handling file %s, exception %s", scan_file_path, str(ex))
+            else:
+                raise ex
     mask_result['mask'] = True
     return mask_result

{azdev-0.1.88 → azdev-0.1.90}/azdev/operations/testtool/__init__.py

@@ -44,8 +44,7 @@ def run_tests(tests, xml_path=None, discover=False, in_series=False,
     heading('Run Tests')
 
     path_table = get_path_table()
-
-    test_index = _get_test_index(profile or current_profile(), discover)
+    target_tests = set()
 
     if not tests:
         tests = list(path_table['mod'].keys()) + list(path_table['core'].keys()) + list(path_table['ext'].keys())
@@ -53,6 +52,10 @@ def run_tests(tests, xml_path=None, discover=False, in_series=False,
         tests = list(path_table['mod'].keys()) + list(path_table['core'].keys())
     elif tests == ['EXT']:
         tests = list(path_table['ext'].keys())
+    else:
+        target_tests = set(tests)
+
+    test_index = _get_test_index(profile or current_profile(), discover, target_tests=target_tests)
 
     # filter out tests whose modules haven't changed
     modified_mods = _filter_by_git_diff(tests, test_index, git_source, git_target, git_repo)
@@ -193,7 +196,7 @@ def _discover_module_tests(mod_name, mod_data):
 
 
 # pylint: disable=too-many-statements, too-many-locals
-def _discover_tests(profile):
+def _discover_tests(profile, target_tests):
     """ Builds an index of tests so that the user can simply supply the name they wish to test instead of the
         full path.
     """
@@ -274,13 +277,17 @@ def _discover_tests(profile):
             mod2 = extract_module_name(test_index[key])
             if mod1 != mod2:
                 # resolve conflicted keys by prefixing with the module name and a dot (.)
-                logger.warning("'%s' exists in both '%s' and '%s'. Resolve using `%s.%s` or `%s.%s`",
-                               key, mod1, mod2, mod1, key, mod2, key)
+                if key in target_tests or mod1 in target_tests or mod2 in target_tests:
+                    logger.warning("'%s' exists in both '%s' and '%s'. Resolve using `%s.%s` or `%s.%s`"
+                                   "Duplication exists in: \n\t%s\n\t%s\n",
+                                   key, mod1, mod2, mod1, key, mod2, key, path, test_index[key])
                 test_index['{}.{}'.format(mod1, key)] = path
                 test_index['{}.{}'.format(mod2, key)] = test_index[key]
             else:
-                logger.error("'%s' exists twice in the '%s' module. "
-                             "Please rename one or both and re-run --discover.", key, mod1)
+                if key in target_tests or mod1 in target_tests:
+                    logger.error("'%s' exists twice in the '%s' module. "
+                                 "Please rename one or both and re-run --discover. "
+                                 "Duplication exists in: \n\t%s\n\t%s\n", key, mod1, test_index[key], path)
         else:
             test_index[key] = path
 
@@ -310,14 +317,14 @@ def _discover_tests(profile):
     return test_index
 
 
-def _get_test_index(profile, discover):
+def _get_test_index(profile, discover, target_tests):
     config_dir = get_azdev_config_dir()
     test_index_dir = os.path.join(config_dir, 'test_index')
     make_dirs(test_index_dir)
     test_index_path = os.path.join(test_index_dir, '{}.json'.format(profile))
     test_index = {}
     if discover:
-        test_index = _discover_tests(profile)
+        test_index = _discover_tests(profile, target_tests)
         with open(test_index_path, 'w') as f:
             f.write(json.dumps(test_index))
         display('\ntest index updated: {}'.format(test_index_path))
@@ -326,7 +333,7 @@ def _get_test_index(profile, discover):
             test_index = json.loads(''.join(f.readlines()))
         display('\ntest index found: {}'.format(test_index_path))
     else:
-        test_index = _discover_tests(profile)
+        test_index = _discover_tests(profile, target_tests)
         with open(test_index_path, 'w') as f:
             f.write(json.dumps(test_index))
         display('\ntest index created: {}'.format(test_index_path))

{azdev-0.1.88 → azdev-0.1.90}/azdev/params.py

@@ -132,6 +132,10 @@ def load_arguments(self, _):
             c.argument('custom_pattern',
                        help='Additional patterns you want to apply or built-in patterns you want to exclude '
                             'for scanning. Can be json string or path to the json file.')
+            c.argument('continue_on_failure', action='store_true',
+                       help='If not, the operation will terminate quickly on encountering file operation errors. '
+                            'If true, the operation will warning the error for specific file and proceed with other files. '
+                            'If not set the default value is false.')
 
     with ArgumentsContext(self, 'mask') as c:
         c.argument('yes', options_list=['--yes', '-y'], action='store_true', help='Answer "yes" to all prompts.')

{azdev-0.1.88 → azdev-0.1.90/azdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: azdev
-Version: 0.1.88
+Version: 0.1.90
 Summary: Microsoft Azure CLI Developer Tools
 Home-page: https://github.com/Azure/azure-cli-dev-tools
 Author: Microsoft Corporation
@@ -148,7 +148,16 @@ License
 
 Release History
 ===============
+0.1.90
+++++++
+* `azdev cmdcov`: Fix incorrect detection of code changes as new commands
+
+0.1.89
+++++++
+* `azdev scan/mask`: Add `--continue-on-failure` support
+
 0.1.88
+++++++
 * `azdev cmdcov`: Fix incorrect detection of code changes as new commands
 
 0.1.87