remove unused code, remove DATA_STORAGE and DATA_COSMOS_TABLE references

Author: calvinhzy

src/storage-blob-preview/HISTORY.rst

@@ -3,6 +3,10 @@
 Release History
 ===============
 
+1.0.0b2
+++++++
+* Remove DATA_COSMOS_TABLE and DATA_STORAGE references
+
 1.0.0b1
 ++++++
 * Remove ADAL dependencies

src/storage-blob-preview/azext_storage_blob_preview/_client_factory.py

@@ -4,7 +4,7 @@
 # --------------------------------------------------------------------------------------------
 # pylint: disable=unused-import
 
-from azure.cli.core.commands.client_factory import get_mgmt_service_client, prepare_client_kwargs_track2
+from azure.cli.core.commands.client_factory import prepare_client_kwargs_track2
 from azure.cli.core.profiles import ResourceType, get_sdk
 from .profiles import CUSTOM_DATA_STORAGE_BLOB
 

src/storage-blob-preview/azext_storage_blob_preview/_params.py

@@ -6,6 +6,7 @@
 
 from azure.cli.core.commands.validators import validate_tags
 from azure.cli.core.commands.parameters import (get_enum_type, get_three_state_flag)
+from azure.cli.core.profiles import ResourceType
 
 from ._validators import (validate_metadata, get_permission_validator, get_permission_help_string,
                           as_user_validator, blob_tier_validator)
@@ -16,12 +17,12 @@
 def load_arguments(self, _):  # pylint: disable=too-many-locals, too-many-statements, too-many-lines
     from knack.arguments import CLIArgumentType
 
-    from .sdkutil import get_table_data_type
     from .completers import get_storage_name_completion_list
 
     t_base_blob_service = self.get_sdk('blob.baseblobservice#BaseBlobService')
     t_file_service = self.get_sdk('file#FileService')
-    t_table_service = get_table_data_type(self.cli_ctx, 'table', 'TableService')
+    t_table_service = self.get_sdk('_table_service_client#TableServiceClient',
+                                   resource_type=ResourceType.DATA_STORAGE_TABLE)
     t_blob_tier = self.get_sdk('_generated.models._azure_blob_storage_enums#AccessTierOptional',
                                resource_type=CUSTOM_DATA_STORAGE_BLOB)
     t_rehydrate_priority = self.get_sdk('_generated.models._azure_blob_storage_enums#RehydratePriority',

src/storage-blob-preview/azext_storage_blob_preview/_validators.py

@@ -5,15 +5,14 @@
 
 from azure.cli.core.commands import CliCommandType
 from azure.cli.core.commands.arm import show_exception_handler
-from azure.cli.core.profiles import ResourceType
 
 from ._client_factory import cf_blob_client, cf_container_client, cf_blob_service
 from .profiles import CUSTOM_DATA_STORAGE_BLOB
 
 
 def load_command_table(self, _):  # pylint: disable=too-many-locals, too-many-statements
 
-    def get_custom_sdk(custom_module, client_factory, resource_type=ResourceType.DATA_STORAGE):
+    def get_custom_sdk(custom_module, client_factory, resource_type=CUSTOM_DATA_STORAGE_BLOB):
         """Returns a CliCommandType instance with specified operation template based on the given custom module name.
         This is useful when the command is not defined in the default 'custom' module but instead in a module under
         'operations' package."""

src/storage-blob-preview/azext_storage_blob_preview/commands.py

@@ -5,87 +5,10 @@
 
 """Assist the command module to get correct type from SDK based on current API version"""
 
-from azure.cli.core.profiles import get_sdk, supported_api_version, ResourceType
-from azure.cli.core.profiles._shared import APIVersionException
+from azure.cli.core.profiles import get_sdk
+from .profiles import CUSTOM_DATA_STORAGE_BLOB
 
 
-def cosmosdb_table_exists(cli_ctx):
-    try:
-        return supported_api_version(cli_ctx, ResourceType.DATA_COSMOS_TABLE, min_api='2017-04-17')
-    except APIVersionException:
-        return False
-
-
-def get_table_data_type(cli_ctx, module_name, *type_names):
-    if cosmosdb_table_exists(cli_ctx):
-        return get_sdk(cli_ctx, ResourceType.DATA_COSMOS_TABLE, *type_names, mod=module_name)
-
-    return get_sdk(cli_ctx, ResourceType.DATA_STORAGE, *type_names, mod=module_name)
-
-
-def get_blob_service_by_type(cli_ctx, blob_type):
-    type_to_service = {
-        'block': lambda ctx: get_sdk(ctx, ResourceType.DATA_STORAGE, 'BlockBlobService', mod='blob'),
-        'page': lambda ctx: get_sdk(ctx, ResourceType.DATA_STORAGE, 'PageBlobService', mod='blob'),
-        'append': lambda ctx: get_sdk(ctx, ResourceType.DATA_STORAGE, 'AppendBlobService', mod='blob')
-    }
-
-    try:
-        return type_to_service[blob_type](cli_ctx)
-    except KeyError:
-        return None
-
-
-def get_blob_types():
-    return 'block', 'page', 'append'
-
-
-def get_blob_tier_names(cli_ctx, model, **kwargs):
-    t_blob_tier_model = get_sdk(cli_ctx, attr_args=model, **kwargs)
+def get_blob_tier_names_track2(cli_ctx, model_path):
+    t_blob_tier_model = get_sdk(cli_ctx, CUSTOM_DATA_STORAGE_BLOB, model_path)
     return [v for v in dir(t_blob_tier_model) if not v.startswith('_')]
-
-
-def get_delete_blob_snapshot_type_names():
-    return 'include', 'only'
-
-
-def get_delete_blob_snapshot_type(cli_ctx, name):
-    t_delete_snapshot = get_sdk(cli_ctx, ResourceType.DATA_STORAGE, 'DeleteSnapshot', mod='blob')
-    return {'include': t_delete_snapshot.Include, 'only': t_delete_snapshot.Only}[name]
-
-
-def get_delete_file_snapshot_type_names():
-    return ['include']
-
-
-def get_delete_file_snapshot_type(cli_ctx, name):
-    t_delete_snapshot = get_sdk(cli_ctx, ResourceType.DATA_STORAGE, 'DeleteSnapshot', mod='file.models')
-    return {'include': t_delete_snapshot.Include}[name]
-
-
-def get_container_access_type_names():
-    return 'off', 'blob', 'container'
-
-
-def get_container_access_type(cli_ctx, name):
-    if name == 'off':
-        return None
-    if name == 'blob':
-        return get_sdk(cli_ctx, ResourceType.DATA_STORAGE, 'PublicAccess', mod='blob.models').Blob
-    if name == 'container':
-        return get_sdk(cli_ctx, ResourceType.DATA_STORAGE, 'PublicAccess', mod='blob.models').Container
-    raise KeyError
-
-
-def get_fs_access_type_names():
-    return 'off', 'file', 'filesystem'
-
-
-def get_fs_access_type(cli_ctx, name):
-    if name == 'off':
-        return None
-    if name == 'file':
-        return get_sdk(cli_ctx, ResourceType.DATA_STORAGE_FILEDATALAKE, 'PublicAccess', mod='_models').File
-    if name == 'filesystem':
-        return get_sdk(cli_ctx, ResourceType.DATA_STORAGE_FILEDATALAKE, 'PublicAccess', mod='_models').FileSystem
-    raise KeyError