Handle dashes in extension names better (#4839)

Author: derekbekoe

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

@@ -98,7 +98,7 @@ def get_metadata(self):
             metadata.update(azext_metadata)
         for dist_info_dirname in dist_info_dirs:
             parsed_dist_info_dir = WHEEL_INFO_RE(dist_info_dirname)
-            if parsed_dist_info_dir and parsed_dist_info_dir.groupdict().get('name') == self.name:
+            if parsed_dist_info_dir and parsed_dist_info_dir.groupdict().get('name') == self.name.replace('-', '_'):
                 whl_metadata_filepath = os.path.join(ext_dir, dist_info_dirname, WHL_METADATA_FILENAME)
                 if os.path.isfile(whl_metadata_filepath):
                     with open(whl_metadata_filepath) as f:

src/command_modules/azure-cli-extension/azure/cli/command_modules/extension/custom.py

@@ -92,7 +92,8 @@ def _add_whl_ext(source, ext_sha256=None):  # pylint: disable=too-many-statement
     logger.debug('Extension source is url? %s', is_url)
     whl_filename = os.path.basename(url_parse_result.path) if is_url else os.path.basename(source)
     parsed_filename = WHEEL_INFO_RE(whl_filename)
-    extension_name = parsed_filename.groupdict().get('name') if parsed_filename else None
+    # Extension names can have - but .whl format changes it to _ (PEP 0427). Undo this.
+    extension_name = parsed_filename.groupdict().get('name').replace('_', '-') if parsed_filename else None
     if not extension_name:
         raise CLIError('Unable to determine extension name from {}. Is the file name correct?'.format(source))
     if extension_exists(extension_name):

src/command_modules/azure-cli-extension/azure/cli/command_modules/extension/tests/data/my_second_cli_extension-0.0.1+dev-py2.py3-none-any.whl

@@ -12,7 +12,7 @@
 from azure.cli.core.util import CLIError
 from azure.cli.command_modules.extension.custom import (list_extensions, add_extension, show_extension,
                                                         remove_extension, update_extension,
-                                                        list_available_extensions, OUT_KEY_NAME, OUT_KEY_VERSION)
+                                                        list_available_extensions, OUT_KEY_NAME, OUT_KEY_VERSION, OUT_KEY_METADATA)
 from azure.cli.command_modules.extension._resolve import NoExtensionCandidatesError
 
 
@@ -30,6 +30,8 @@ def _compute_file_hash(filename):
 MY_EXT_NAME = 'myfirstcliextension'
 MY_EXT_SOURCE = _get_test_data_file('myfirstcliextension-0.0.3+dev-py2.py3-none-any.whl')
 MY_BAD_EXT_SOURCE = _get_test_data_file('notanextension.txt')
+MY_SECOND_EXT_NAME_DASHES = 'my-second-cli-extension'
+MY_SECOND_EXT_SOURCE_DASHES = _get_test_data_file('my_second_cli_extension-0.0.1+dev-py2.py3-none-any.whl')
 
 
 class TestExtensionCommands(unittest.TestCase):
@@ -62,6 +64,18 @@ def test_add_list_show_remove_extension(self):
         num_exts = len(list_extensions())
         self.assertEqual(num_exts, 0)
 
+    def test_add_list_show_remove_extension_with_dashes(self):
+        add_extension(MY_SECOND_EXT_SOURCE_DASHES)
+        actual = list_extensions()
+        self.assertEqual(len(actual), 1)
+        ext = show_extension(MY_SECOND_EXT_NAME_DASHES)
+        self.assertEqual(ext[OUT_KEY_NAME], MY_SECOND_EXT_NAME_DASHES)
+        self.assertIn(OUT_KEY_NAME, ext[OUT_KEY_METADATA], "Unable to get full metadata")
+        self.assertEqual(ext[OUT_KEY_METADATA][OUT_KEY_NAME], MY_SECOND_EXT_NAME_DASHES)
+        remove_extension(MY_SECOND_EXT_NAME_DASHES)
+        num_exts = len(list_extensions())
+        self.assertEqual(num_exts, 0)
+
     def test_add_extension_twice(self):
         add_extension(MY_EXT_SOURCE)
         num_exts = len(list_extensions())