{Keyvault-preview} Remove __import__('pkg_resources').declare_namespace(__name__) (#9593)

* feature: remove pkg_resource usage

* fix: remove extra plus signs

* fix: remove unused imports

* fix: remove unused import

* fix: change logging placeholders

* fix: fix conditional logic

Author: DanielMicrosoft

src/keyvault-preview/HISTORY.rst

@@ -2,6 +2,11 @@
 
 Release History
 ===============
+
+1.0.2
+++++++
+* Remove `__import__('pkg_resources').declare_namespace(__name__)` to fix the namespace package issue.
+
 1.0.1
 ++++++
 * Specify minCliCoreVersion

src/keyvault-preview/azext_keyvault_preview/__init__.py

@@ -14,7 +14,7 @@ class KeyVaultCommandsLoader(AzCommandsLoader):
     def __init__(self, cli_ctx=None):
         from azure.cli.core.commands import CliCommandType
         from ._client_factory import keyvault_mgmt_client_factory
-        from azure.cli.command_modules.keyvault._command_type import KeyVaultCommandGroup, KeyVaultArgumentContext
+        from azure.cli.command_modules.keyvault._command_type import KeyVaultCommandGroup
 
         register_resource_type('latest', CUSTOM_MGMT_KEYVAULT, '2021-12-01-preview')
 
@@ -27,8 +27,7 @@ def __init__(self, cli_ctx=None):
             cli_ctx=cli_ctx,
             resource_type=CUSTOM_MGMT_KEYVAULT,
             custom_command_type=keyvault_custom,
-            command_group_cls=KeyVaultCommandGroup,
-            argument_context_cls=KeyVaultArgumentContext)
+            command_group_cls=KeyVaultCommandGroup)
 
     def load_command_table(self, args):
         from .commands import load_command_table

src/keyvault-preview/azext_keyvault_preview/_validators.py

@@ -17,7 +17,7 @@ def validate_resource_group_name(cmd, ns):
 
     vault_name = getattr(ns, 'vault_name', None)
     hsm_name = getattr(ns, 'hsm_name', None)
-    if 'keyvault update-hsm' in cmd.name or 'keyvault region':
+    if 'keyvault update-hsm' in cmd.name or 'keyvault region' in cmd.name:
         hsm_name = getattr(ns, 'name', None)
 
     if vault_name and hsm_name:

src/keyvault-preview/azext_keyvault_preview/commands.py

@@ -3,7 +3,7 @@
 # Licensed under the MIT License. See License.txt in the project root for license information.
 # --------------------------------------------------------------------------------------------
 from azure.cli.core.commands import CliCommandType
-from ._client_factory import is_azure_stack_profile, cf_mhsm, cf_mhsm_region
+from ._client_factory import cf_mhsm, cf_mhsm_region
 from .profiles import CUSTOM_MGMT_KEYVAULT
 
 

src/keyvault-preview/azext_keyvault_preview/custom.py

@@ -55,7 +55,7 @@ def add_hsm_region(cmd, client, resource_group_name, name, region_name, no_wait=
     existing_regions = hsm.properties.regions or []
     for existing_region in existing_regions:
         if region_name == existing_region.name:
-            logger.warning("{} has already existed".format(region_name))
+            logger.warning("%s has already existed", region_name)
             return hsm
     existing_regions.append(MHSMGeoReplicatedRegion(name=region_name))
     hsm.properties.regions = existing_regions
@@ -75,5 +75,5 @@ def remove_hsm_region(client, resource_group_name, name, region_name, no_wait=Fa
             return sdk_no_wait(no_wait, client.begin_update,
                                resource_group_name=resource_group_name,
                                name=name, parameters=hsm)
-    logger.warning("{} doesn't exist".format(region_name))
+    logger.warning("%s doesn't exist", region_name)
     return hsm

src/keyvault-preview/azext_keyvault_preview/vendored_sdks/__init__.py

@@ -2,5 +2,3 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License. See License.txt in the project root for license information.
 # --------------------------------------------------------------------------------------------
-
-__import__('pkg_resources').declare_namespace(__name__)

src/keyvault-preview/setup.py

@@ -10,7 +10,7 @@
 from setuptools import setup, find_packages
 
 # HISTORY.rst entry.
-VERSION = '1.0.1'
+VERSION = '1.0.2'
 
 # The full list of classifiers is available at
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers