Revert "{Packaging} Vendor azure-mgmt-datalake-store (Azure#29275)"

This reverts commit acec6c3.
akharit · Oct 14, 2024 · be9dbea · be9dbea
1 parent 5cbb8ef
commit be9dbea
Show file tree

Hide file tree

Showing 91 changed files with 14 additions and 5,913 deletions.
diff --git a/src/azure-cli-core/azure/cli/core/profiles/_shared.py b/src/azure-cli-core/azure/cli/core/profiles/_shared.py
@@ -101,7 +101,7 @@ class ResourceType(Enum):  # pylint: disable=too-few-public-methods
     MGMT_CONTAINERINSTANCE = ('azure.mgmt.containerinstance', None)
     MGMT_COSMOSDB = ('azure.mgmt.cosmosdb', None)
     MGMT_DATALAKE_ANALYTICS = ('azure.cli.command_modules.dla.vendored_sdks.azure_mgmt_datalake_analytics', None)
-    MGMT_DATALAKE_STORE = ('azure.cli.command_modules.dls.vendored_sdks.azure_mgmt_datalake_store', None)
+    MGMT_DATALAKE_STORE = ('azure.mgmt.datalake.store', None)
     MGMT_DATAMIGRATION = ('azure.mgmt.datamigration', None)
     MGMT_EVENTGRID = ('azure.mgmt.eventgrid', None)
     MGMT_MAPS = ('azure.mgmt.maps', None)

diff --git a/src/azure-cli/azure/cli/command_modules/dls/_client_factory.py b/src/azure-cli/azure/cli/command_modules/dls/_client_factory.py
@@ -6,25 +6,25 @@
 
 def cf_dls_account(cli_ctx, _):
     from azure.cli.core.commands.client_factory import get_mgmt_service_client
-    from .vendored_sdks.azure_mgmt_datalake_store import DataLakeStoreAccountManagementClient
+    from azure.mgmt.datalake.store import DataLakeStoreAccountManagementClient
     return get_mgmt_service_client(cli_ctx, DataLakeStoreAccountManagementClient).accounts
 
 
 def cf_dls_account_firewall(cli_ctx, _):
     from azure.cli.core.commands.client_factory import get_mgmt_service_client
-    from .vendored_sdks.azure_mgmt_datalake_store import DataLakeStoreAccountManagementClient
+    from azure.mgmt.datalake.store import DataLakeStoreAccountManagementClient
     return get_mgmt_service_client(cli_ctx, DataLakeStoreAccountManagementClient).firewall_rules
 
 
 def cf_dls_account_virtual_network(cli_ctx, _):
     from azure.cli.core.commands.client_factory import get_mgmt_service_client
-    from .vendored_sdks.azure_mgmt_datalake_store import DataLakeStoreAccountManagementClient
+    from azure.mgmt.datalake.store import DataLakeStoreAccountManagementClient
     return get_mgmt_service_client(cli_ctx, DataLakeStoreAccountManagementClient).virtual_network_rules
 
 
 def cf_dls_account_trusted_provider(cli_ctx, _):
     from azure.cli.core.commands.client_factory import get_mgmt_service_client
-    from .vendored_sdks.azure_mgmt_datalake_store import DataLakeStoreAccountManagementClient
+    from azure.mgmt.datalake.store import DataLakeStoreAccountManagementClient
     return get_mgmt_service_client(cli_ctx, DataLakeStoreAccountManagementClient).trusted_id_providers
 
 

diff --git a/src/azure-cli/azure/cli/command_modules/dls/_params.py b/src/azure-cli/azure/cli/command_modules/dls/_params.py
@@ -9,13 +9,13 @@
     tags_type, get_resource_name_completion_list, resource_group_name_type, get_enum_type)
 
 from azure.cli.command_modules.dls._validators import validate_resource_group_name
-from .vendored_sdks.azure_mgmt_datalake_store.models import (
+from azure.mgmt.datalake.store.models import (
     FirewallState,
     TrustedIdProviderState,
     TierType,
     FirewallAllowAzureIpsState)
 
-from .vendored_sdks.azure_mgmt_datalake_store.models import EncryptionConfigType
+from azure.mgmt.datalake.store.models import EncryptionConfigType
 
 
 # pylint: disable=line-too-long, too-many-statements

diff --git a/src/azure-cli/azure/cli/command_modules/dls/_validators.py b/src/azure-cli/azure/cli/command_modules/dls/_validators.py
@@ -29,7 +29,7 @@ def _get_resource_group_from_account_name(client, account_name):
 
 # COMMAND NAMESPACE VALIDATORS
 def validate_resource_group_name(cmd, ns):
-    from .vendored_sdks.azure_mgmt_datalake_store import DataLakeStoreAccountManagementClient
+    from azure.mgmt.datalake.store import DataLakeStoreAccountManagementClient
     if not ns.resource_group_name:
         try:
             account_name = ns.name

diff --git a/src/azure-cli/azure/cli/command_modules/dls/commands.py b/src/azure-cli/azure/cli/command_modules/dls/commands.py
@@ -17,7 +17,7 @@ def load_command_table(self, _):
     from ._validators import (
         validate_subnet
     )
-    adls_format_path = 'azure.cli.command_modules.dls.vendored_sdks.azure_mgmt_datalake_store.operations.{}#{}.{{}}'
+    adls_format_path = 'azure.mgmt.datalake.store.operations.{}#{}.{{}}'
 
     dls_custom = CliCommandType(operations_tmpl='azure.cli.command_modules.dls.custom#{}')
 

diff --git a/src/azure-cli/azure/cli/command_modules/dls/custom.py b/src/azure-cli/azure/cli/command_modules/dls/custom.py
@@ -6,7 +6,7 @@
 from knack.log import get_logger
 from knack.util import CLIError
 
-from .vendored_sdks.azure_mgmt_datalake_store.models import (
+from azure.mgmt.datalake.store.models import (
     UpdateDataLakeStoreAccountParameters,
     CreateDataLakeStoreAccountParameters,
     EncryptionConfigType,

diff --git a/src/azure-cli/azure/cli/command_modules/dls/vendored_sdks/__init__.py b/src/azure-cli/azure/cli/command_modules/dls/vendored_sdks/__init__.py
diff --git a/...ure-cli/azure/cli/command_modules/dls/vendored_sdks/azure_mgmt_datalake_store/__init__.py b/...ure-cli/azure/cli/command_modules/dls/vendored_sdks/azure_mgmt_datalake_store/__init__.py
diff --git a/.../dls/vendored_sdks/azure_mgmt_datalake_store/data_lake_store_account_management_client.py b/.../dls/vendored_sdks/azure_mgmt_datalake_store/data_lake_store_account_management_client.py
diff --git a/.../azure/cli/command_modules/dls/vendored_sdks/azure_mgmt_datalake_store/models/__init__.py b/.../azure/cli/command_modules/dls/vendored_sdks/azure_mgmt_datalake_store/models/__init__.py