Remove azure stack logic

src/azure-cli-core/azure/cli/core/profiles/_shared.py

@@ -205,11 +205,11 @@ def default_api_version(self):
         }),
         # The order does make things different.
         # Please keep ResourceType.DATA_KEYVAULT_KEYS before ResourceType.DATA_KEYVAULT
-        ResourceType.DATA_KEYVAULT_CERTIFICATES: None,
-        ResourceType.DATA_KEYVAULT_KEYS: None,
-        ResourceType.DATA_KEYVAULT_SECRETS: None,
+        ResourceType.DATA_KEYVAULT_CERTIFICATES: '7.4',
+        ResourceType.DATA_KEYVAULT_KEYS: '7.6-preview.2',
+        ResourceType.DATA_KEYVAULT_SECRETS: '7.4',
         ResourceType.DATA_KEYVAULT_SECURITY_DOMAIN: None,
-        ResourceType.DATA_KEYVAULT_ADMINISTRATION_SETTING: None,
+        ResourceType.DATA_KEYVAULT_ADMINISTRATION_SETTING: '7.4',
         ResourceType.DATA_KEYVAULT_ADMINISTRATION_BACKUP: '7.5-preview.1',
         ResourceType.DATA_KEYVAULT_ADMINISTRATION_ACCESS_CONTROL: '7.4',
         ResourceType.DATA_STORAGE: '2018-11-09',

src/azure-cli/azure/cli/command_modules/keyvault/_client_factory.py

@@ -148,18 +148,6 @@ def get_client(cli_ctx, resource_type, client_name=''):
     return ClientEntity(client_factory, command_type, operations_docs_tmpl, models_docs_tmpl)
 
 
-def is_azure_stack_profile(cmd=None, cli_ctx=None):
-    cli_ctx = cmd.cli_ctx if cmd else cli_ctx
-    if not cli_ctx:
-        raise CLIError("Can't judge profile without cli_ctx!")
-    return cli_ctx.cloud.profile in [
-        '2020-09-01-hybrid',
-        '2019-03-01-hybrid',
-        '2018-03-01-hybrid',
-        '2017-03-09-profile'
-    ]
-
-
 def keyvault_mgmt_client_factory(resource_type, client_name):
     def _keyvault_mgmt_client_factory(cli_ctx, _):
         from azure.cli.core.commands.client_factory import get_mgmt_service_client
@@ -195,15 +183,15 @@ def data_plane_azure_keyvault_administration_access_control_client(cli_ctx, comm
 def data_plane_azure_keyvault_administration_setting_client(cli_ctx, command_args):
     from azure.keyvault.administration import KeyVaultSettingsClient
 
-    vault_url, credential, _ = _prepare_data_plane_azure_keyvault_client(
+    vault_url, credential, version = _prepare_data_plane_azure_keyvault_client(
         cli_ctx, command_args, ResourceType.DATA_KEYVAULT_ADMINISTRATION_SETTING)
     command_args.pop('hsm_name', None)
     command_args.pop('vault_base_url', None)
     command_args.pop('identifier', None)
     client_kwargs = prepare_client_kwargs_track2(cli_ctx)
     client_kwargs.pop('http_logging_policy')
     return KeyVaultSettingsClient(
-        vault_url=vault_url, credential=credential, api_version='7.4',
+        vault_url=vault_url, credential=credential, api_version=version,
         verify_challenge_resource=False, **client_kwargs)
 
 
@@ -215,11 +203,10 @@ def data_plane_azure_keyvault_certificate_client(cli_ctx, command_args):
     command_args.pop('hsm_name', None)
     command_args.pop('vault_base_url', None)
     command_args.pop('identifier', None)
-    api_version = '7.4' if not is_azure_stack_profile(cmd=None, cli_ctx=cli_ctx) else '2016-10-01'
     client_kwargs = prepare_client_kwargs_track2(cli_ctx)
     client_kwargs.pop('http_logging_policy')
     return CertificateClient(
-        vault_url=vault_url, credential=credential, api_version=api_version or version,
+        vault_url=vault_url, credential=credential, api_version=version,
         verify_challenge_resource=False, **client_kwargs)
 
 
@@ -231,11 +218,10 @@ def data_plane_azure_keyvault_key_client(cli_ctx, command_args):
     command_args.pop('hsm_name', None)
     command_args.pop('vault_base_url', None)
     command_args.pop('identifier', None)
-    api_version = '7.6-preview.2' if not is_azure_stack_profile(cmd=None, cli_ctx=cli_ctx) else '2016-10-01'
     client_kwargs = prepare_client_kwargs_track2(cli_ctx)
     client_kwargs.pop('http_logging_policy')
     return KeyClient(
-        vault_url=vault_url, credential=credential, api_version=api_version or version,
+        vault_url=vault_url, credential=credential, api_version=version,
         verify_challenge_resource=False, **client_kwargs)
 
 
@@ -247,11 +233,10 @@ def data_plane_azure_keyvault_secret_client(cli_ctx, command_args):
     command_args.pop('hsm_name', None)
     command_args.pop('vault_base_url', None)
     command_args.pop('identifier', None)
-    api_version = '7.4' if not is_azure_stack_profile(cmd=None, cli_ctx=cli_ctx) else '2016-10-01'
     client_kwargs = prepare_client_kwargs_track2(cli_ctx)
     client_kwargs.pop('http_logging_policy')
     return SecretClient(
-        vault_url=vault_url, credential=credential, api_version=api_version or version,
+        vault_url=vault_url, credential=credential, api_version=version,
         verify_challenge_resource=False, **client_kwargs)
 
 

src/azure-cli/azure/cli/command_modules/keyvault/_completers.py

@@ -5,6 +5,7 @@
 
 from azure.cli.core.decorators import Completer
 from azure.cli.core._profile import Profile
+from azure.cli.core.profiles import get_api_version, ResourceType
 
 
 def get_keyvault_name_completion_list(resource_name):
@@ -17,20 +18,17 @@ def completer(cmd, prefix, namespace, **kwargs):  # pylint: disable=unused-argum
         credential, _, _ = profile.get_login_credentials(subscription_id=cmd.cli_ctx.data.get('subscription_id'))
         if resource_name == 'key':
             from azure.keyvault.keys import KeyClient
-            from azure.cli.command_modules.keyvault._client_factory import is_azure_stack_profile
-            version = '7.6-preview.2' if not is_azure_stack_profile(cmd=cmd) else '2016-10-01'
+            version = str(get_api_version(cmd.cli_ctx, ResourceType.DATA_KEYVAULT_KEYS))
             client = KeyClient(vault_url=vault, credential=credential, api_version=version,
                                verify_challenge_resource=False)
         elif resource_name == 'secret':
             from azure.keyvault.secrets import SecretClient
-            from azure.cli.command_modules.keyvault._client_factory import is_azure_stack_profile
-            version = '7.4' if not is_azure_stack_profile(cmd=cmd) else '2016-10-01'
+            version = str(get_api_version(cmd.cli_ctx, ResourceType.DATA_KEYVAULT_SECRETS))
             client = SecretClient(vault_url=vault, credential=credential, api_version=version,
                                   verify_challenge_resource=False)
         else:
             from azure.keyvault.certificates import CertificateClient
-            from azure.cli.command_modules.keyvault._client_factory import is_azure_stack_profile
-            version = '7.4' if not is_azure_stack_profile(cmd=cmd) else '2016-10-01'
+            version = str(get_api_version(cmd.cli_ctx, ResourceType.DATA_KEYVAULT_CERTIFICATES))
             client = CertificateClient(vault_url=vault, credential=credential, api_version=version,
                                        verify_challenge_resource=False)
         items = []
@@ -51,20 +49,17 @@ def completer(cmd, prefix, namespace, **kwargs):  # pylint: disable=unused-argum
         credential, _, _ = profile.get_login_credentials(subscription_id=cmd.cli_ctx.data.get('subscription_id'))
         if resource_name == 'key':
             from azure.keyvault.keys import KeyClient
-            from azure.cli.command_modules.keyvault._client_factory import is_azure_stack_profile
-            version = '7.6-preview.2' if not is_azure_stack_profile(cmd=cmd) else '2016-10-01'
+            version = str(get_api_version(cmd.cli_ctx, ResourceType.DATA_KEYVAULT_KEYS))
             client = KeyClient(vault_url=vault, credential=credential, api_version=version,
                                verify_challenge_resource=False)
         elif resource_name == 'secret':
             from azure.keyvault.secrets import SecretClient
-            from azure.cli.command_modules.keyvault._client_factory import is_azure_stack_profile
-            version = '7.4' if not is_azure_stack_profile(cmd=cmd) else '2016-10-01'
+            version = str(get_api_version(cmd.cli_ctx, ResourceType.DATA_KEYVAULT_SECRETS))
             client = SecretClient(vault_url=vault, credential=credential, api_version=version,
                                   verify_challenge_resource=False)
         else:
             from azure.keyvault.certificates import CertificateClient
-            from azure.cli.command_modules.keyvault._client_factory import is_azure_stack_profile
-            version = '7.4' if not is_azure_stack_profile(cmd=cmd) else '2016-10-01'
+            version = str(get_api_version(cmd.cli_ctx, ResourceType.DATA_KEYVAULT_CERTIFICATES))
             client = CertificateClient(vault_url=vault, credential=credential, api_version=version,
                                        verify_challenge_resource=False)
         items = []

src/azure-cli/azure/cli/command_modules/keyvault/_params.py

@@ -29,7 +29,6 @@
     validate_vault_name_and_hsm_name, set_vault_base_url, validate_keyvault_resource_id,
     process_hsm_name, KeyEncryptionDataType, process_key_release_policy, process_certificate_policy,
     process_certificate_import)
-from azure.cli.command_modules.keyvault._client_factory import is_azure_stack_profile
 
 # CUSTOM CHOICE LISTS
 
@@ -684,11 +683,10 @@ class CLISecurityDomainOperation(str, Enum):
                 type=get_json_object, validator=process_certificate_policy)
         c.extra('tags', tags_type)
 
-    if not is_azure_stack_profile(self):
-        for cmd in ['list', 'list-deleted']:
-            with self.argument_context('keyvault certificate {}'.format(cmd)) as c:
-                c.extra('include_pending', arg_type=get_three_state_flag(),
-                        help='Specifies whether to include certificates which are not completely provisioned.')
+    for cmd in ['list', 'list-deleted']:
+        with self.argument_context('keyvault certificate {}'.format(cmd)) as c:
+            c.extra('include_pending', arg_type=get_three_state_flag(),
+                    help='Specifies whether to include certificates which are not completely provisioned.')
 
     with self.argument_context('keyvault certificate import') as c:
         c.argument('certificate_name', options_list=['--name', '-n'], required=True, arg_group='Id',