Hello community, here is the log from the commit of package azure-cli-dls for openSUSE:Factory checked in at 2019-05-22 10:59:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/azure-cli-dls (Old) and /work/SRC/openSUSE:Factory/.azure-cli-dls.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "azure-cli-dls" Wed May 22 10:59:48 2019 rev:5 rq:696831 version:0.1.8 Changes: -------- --- /work/SRC/openSUSE:Factory/azure-cli-dls/azure-cli-dls.changes 2018-10-15 10:48:18.455078194 +0200 +++ /work/SRC/openSUSE:Factory/.azure-cli-dls.new.5148/azure-cli-dls.changes 2019-05-22 10:59:50.698780823 +0200 @@ -1,0 +2,16 @@ +Tue Apr 16 14:26:51 UTC 2019 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com> + +- New upstream release + + Version 0.1.8 + + For detailed information about changes see the + HISTORY.txt file provided with this package +- Bump minimum version for Python Azure SDK namespace + packages to 3.0.0 in BuildRequires and Requires +- Remove python3-devel package from BuildRequires +- Remove unzip package from BuildRequires +- Run fdupes to hardlink duplicate files + + Add fdupes to BuildRequires + + Add %fdupes invocation to %install +- Update Requires from setup.py + +------------------------------------------------------------------- Old: ---- azure-cli-dls-0.1.1.tar.gz New: ---- azure-cli-dls-0.1.8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ azure-cli-dls.spec ++++++ --- /var/tmp/diff_new_pack.H3vvWb/_old 2019-05-22 10:59:51.770779434 +0200 +++ /var/tmp/diff_new_pack.H3vvWb/_new 2019-05-22 10:59:51.798779398 +0200 @@ -1,7 +1,7 @@ # # spec file for package azure-cli-dls # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: azure-cli-dls -Version: 0.1.1 +Version: 0.1.8 Release: 0 Summary: Microsoft Azure CLI 'data lake store' Command Module License: MIT @@ -27,16 +27,15 @@ Source1: LICENSE.txt BuildRequires: azure-cli-command-modules-nspkg BuildRequires: azure-cli-nspkg -BuildRequires: python3-azure-nspkg -BuildRequires: python3-devel +BuildRequires: fdupes +BuildRequires: python3-azure-nspkg >= 3.0.0 BuildRequires: python3-setuptools -BuildRequires: unzip Requires: azure-cli-command-modules-nspkg Requires: azure-cli-core Requires: azure-cli-nspkg -Requires: python3-azure-datalake-store >= 0.0.27 -Requires: python3-azure-mgmt-datalake-store >= 0.2.0 -Requires: python3-azure-nspkg +Requires: python3-azure-datalake-store >= 0.0.39 +Requires: python3-azure-mgmt-datalake-store >= 0.5.0 +Requires: python3-azure-nspkg >= 3.0.0 Conflicts: azure-cli < 2.0.0 BuildArch: noarch @@ -56,6 +55,7 @@ %install python3 setup.py install --root=%{buildroot} --prefix=%{_prefix} --install-lib=%{python3_sitelib} +%python_expand %fdupes %{buildroot}%{$python_sitelib} rm -rf %{buildroot}%{python3_sitelib}/azure/cli/command_modules/__init__.* rm -rf %{buildroot}%{python3_sitelib}/azure/cli/command_modules/__pycache__ rm -rf %{buildroot}%{python3_sitelib}/azure/cli/__init__.* ++++++ azure-cli-dls-0.1.1.tar.gz -> azure-cli-dls-0.1.8.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/azure-cli-dls-0.1.1/HISTORY.rst new/azure-cli-dls-0.1.8/HISTORY.rst --- old/azure-cli-dls-0.1.1/HISTORY.rst 2018-08-23 01:07:57.000000000 +0200 +++ new/azure-cli-dls-0.1.8/HISTORY.rst 2019-02-12 03:05:13.000000000 +0100 @@ -2,6 +2,34 @@ Release History =============== +0.1.8 ++++++ +* Minor fixes. + +0.1.7 +++++++ +* Minor fixes. + +0.1.6 ++++++ +* Update ADLS version(0.0.39). + +0.1.5 ++++++ +* Update ADLS version(0.0.38). + +0.1.4 ++++++ +* Update ADLS version(0.0.34). API version change to 2018-05-01 + +0.1.3 ++++++ +* Update ADLS version to latest(0.0.31) +* Added commands for virtual network rules. + +0.1.2 ++++++ +* Update ADLS version to latest(0.0.29) 0.1.1 +++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/azure-cli-dls-0.1.1/PKG-INFO new/azure-cli-dls-0.1.8/PKG-INFO --- old/azure-cli-dls-0.1.1/PKG-INFO 2018-08-23 01:09:11.000000000 +0200 +++ new/azure-cli-dls-0.1.8/PKG-INFO 2019-02-12 03:05:57.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: azure-cli-dls -Version: 0.1.1 +Version: 0.1.8 Summary: Microsoft Azure Command-Line Tools Data Lake Store Command Module Home-page: https://github.com/Azure/azure-cli Author: Microsoft Corporation @@ -19,6 +19,34 @@ Release History =============== + 0.1.8 + +++++ + * Minor fixes. + + 0.1.7 + ++++++ + * Minor fixes. + + 0.1.6 + +++++ + * Update ADLS version(0.0.39). + + 0.1.5 + +++++ + * Update ADLS version(0.0.38). + + 0.1.4 + +++++ + * Update ADLS version(0.0.34). API version change to 2018-05-01 + + 0.1.3 + +++++ + * Update ADLS version to latest(0.0.31) + * Added commands for virtual network rules. + + 0.1.2 + +++++ + * Update ADLS version to latest(0.0.29) 0.1.1 +++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/azure-cli-dls-0.1.1/azure/cli/command_modules/dls/_client_factory.py new/azure-cli-dls-0.1.8/azure/cli/command_modules/dls/_client_factory.py --- old/azure-cli-dls-0.1.1/azure/cli/command_modules/dls/_client_factory.py 2018-08-23 01:07:57.000000000 +0200 +++ new/azure-cli-dls-0.1.8/azure/cli/command_modules/dls/_client_factory.py 2019-02-12 03:05:13.000000000 +0100 @@ -7,7 +7,7 @@ def cf_dls_account(cli_ctx, _): from azure.cli.core.commands.client_factory import get_mgmt_service_client from azure.mgmt.datalake.store import DataLakeStoreAccountManagementClient - return get_mgmt_service_client(cli_ctx, DataLakeStoreAccountManagementClient).account + return get_mgmt_service_client(cli_ctx, DataLakeStoreAccountManagementClient).accounts def cf_dls_account_firewall(cli_ctx, _): @@ -16,6 +16,12 @@ 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 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 azure.mgmt.datalake.store import DataLakeStoreAccountManagementClient diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/azure-cli-dls-0.1.1/azure/cli/command_modules/dls/_help.py new/azure-cli-dls-0.1.8/azure/cli/command_modules/dls/_help.py --- old/azure-cli-dls-0.1.1/azure/cli/command_modules/dls/_help.py 2018-08-23 01:07:57.000000000 +0200 +++ new/azure-cli-dls-0.1.8/azure/cli/command_modules/dls/_help.py 2019-02-12 03:05:13.000000000 +0100 @@ -5,301 +5,382 @@ # -------------------------------------------------------------------------------------------- from knack.help_files import helps - +# pylint: disable=line-too-long, too-many-lines helps['dls'] = """ - type: group - short-summary: (PREVIEW) Manage Data Lake Store accounts and filesystems. +type: group +short-summary: (PREVIEW) Manage Data Lake Store accounts and filesystems. """ helps['dls account'] = """ - type: group - short-summary: (PREVIEW) Manage Data Lake Store accounts. +type: group +short-summary: (PREVIEW) Manage Data Lake Store accounts. """ helps['dls account create'] = """ - type: command - short-summary: Creates a Data Lake Store account. - parameters: - - name: --default-group - type: string - short-summary: 'Name of the default group to give permissions to for freshly created files and folders in the Data Lake Store account.' - - name: --key-vault-id - type: string - short-summary: 'Key vault for the user-assigned encryption type.' - - name: --key-name - type: string - short-summary: 'Key name for the user-assigned encryption type.' - - name: --key-version - type: string - short-summary: 'Key version for the user-assigned encryption type.' +type: command +short-summary: Creates a Data Lake Store account. +parameters: + - name: --default-group + type: string + short-summary: 'Name of the default group to give permissions to for freshly created files and folders in the Data Lake Store account.' + - name: --key-vault-id + type: string + short-summary: 'Key vault for the user-assigned encryption type.' + - name: --key-name + type: string + short-summary: 'Key name for the user-assigned encryption type.' + - name: --key-version + type: string + short-summary: 'Key version for the user-assigned encryption type.' """ -helps['dls account update'] = """ - type: command - short-summary: Updates a Data Lake Store account. +helps['dls account delete'] = """ +type: command +short-summary: Delete a Data Lake Store account. """ -helps['dls account show'] = """ - type: command - short-summary: Get the details of a Data Lake Store account. +helps['dls account enable-key-vault'] = """ +type: command +short-summary: Enable the use of Azure Key Vault for encryption of a Data Lake Store account. +""" + +helps['dls account firewall'] = """ +type: group +short-summary: (PREVIEW) Manage Data Lake Store account firewall rules. +""" + +helps['dls account firewall create'] = """ +type: command +short-summary: Creates a firewall rule in a Data Lake Store account. +parameters: + - name: --end-ip-address + type: string + short-summary: 'The end of the valid ip range for the firewall rule.' + - name: --start-ip-address + type: string + short-summary: 'The start of the valid ip range for the firewall rule.' + - name: --firewall-rule-name + type: string + short-summary: 'The name of the firewall rule.' +""" + +helps['dls account firewall delete'] = """ +type: command +short-summary: Deletes a firewall rule in a Data Lake Store account. +""" + +helps['dls account firewall list'] = """ +type: command +short-summary: Lists firewall rules in a Data Lake Store account. +""" + +helps['dls account firewall show'] = """ +type: command +short-summary: Get the details of a firewall rule in a Data Lake Store account. +""" + +helps['dls account firewall update'] = """ +type: command +short-summary: Updates a firewall rule in a Data Lake Store account. """ helps['dls account list'] = """ - type: command - short-summary: Lists available Data Lake Store accounts. +type: command +short-summary: Lists available Data Lake Store accounts. +examples: + - name: Lists available Data Lake Store accounts. (autogenerated) + text: az dls account list --resource-group MyResourceGroup + crafted: true """ -helps['dls account enable-key-vault'] = """ - type: command - short-summary: Enable the use of Azure Key Vault for encryption of a Data Lake Store account. +helps['dls account network-rule'] = """ +type: group +short-summary: (PREVIEW) Manage Data Lake Store account virtual network rules. """ -helps['dls account delete'] = """ - type: command - short-summary: Delete a Data Lake Store account. +helps['dls account network-rule create'] = """ +type: command +short-summary: Creates a virtual network rule in a Data Lake Store account. +parameters: + - name: --subnet + type: string + short-summary: 'The subnet name or id for the virtual network rule.' + - name: --vnet-name + type: string + short-summary: 'The name of the virtual network rule.' """ -helps['dls account trusted-provider'] = """ - type: group - short-summary: (PREVIEW) Manage Data Lake Store account trusted identity providers. +helps['dls account network-rule delete'] = """ +type: command +short-summary: Deletes a virtual network rule in a Data Lake Store account. """ -helps['dls account firewall'] = """ - type: group - short-summary: (PREVIEW) Manage Data Lake Store account firewall rules. +helps['dls account network-rule list'] = """ +type: command +short-summary: Lists virtual network rules in a Data Lake Store account. """ -helps['dls account firewall create'] = """ - type: command - short-summary: Creates a firewall rule in a Data Lake Store account. - parameters: - - name: --end-ip-address - type: string - short-summary: 'The end of the valid ip range for the firewall rule.' - - name: --start-ip-address - type: string - short-summary: 'The start of the valid ip range for the firewall rule.' - - name: --firewall-rule-name - type: string - short-summary: 'The name of the firewall rule.' +helps['dls account network-rule show'] = """ +type: command +short-summary: Get the details of a virtual network rule in a Data Lake Store account. """ -helps['dls account firewall update'] = """ - type: command - short-summary: Updates a firewall rule in a Data Lake Store account. +helps['dls account network-rule update'] = """ +type: command +short-summary: Updates a virtual network rule in a Data Lake Store account. """ -helps['dls account firewall show'] = """ - type: command - short-summary: Get the details of a firewall rule in a Data Lake Store account. +helps['dls account show'] = """ +type: command +short-summary: Get the details of a Data Lake Store account. """ -helps['dls account firewall list'] = """ - type: command - short-summary: Lists firewall rules in a Data Lake Store account. +helps['dls account trusted-provider'] = """ +type: group +short-summary: (PREVIEW) Manage Data Lake Store account trusted identity providers. """ -helps['dls account firewall delete'] = """ - type: command - short-summary: Deletes a firewall rule in a Data Lake Store account. +helps['dls account update'] = """ +type: command +short-summary: Updates a Data Lake Store account. """ helps['dls fs'] = """ - type: group - short-summary: (PREVIEW) Manage a Data Lake Store filesystem. +type: group +short-summary: (PREVIEW) Manage a Data Lake Store filesystem. """ -helps['dls fs create'] = """ - type: command - short-summary: Creates a file or folder in a Data Lake Store account. - parameters: - - name: --content - type: string - short-summary: 'Content for the file to contain upon creation.' +helps['dls fs access'] = """ +type: group +short-summary: Manage Data Lake Store filesystem access and permissions. """ -helps['dls fs show'] = """ - type: command - short-summary: Get file or folder information in a Data Lake Store account. +helps['dls fs access remove-all'] = """ +type: command +short-summary: Remove the access control list for a file or folder. """ -helps['dls fs list'] = """ - type: command - short-summary: List the files and folders in a Data Lake Store account. +helps['dls fs access remove-entry'] = """ +type: command +short-summary: Remove entries for the access control list of a file or folder. """ -helps['dls fs append'] = """ - type: command - short-summary: Append content to a file in a Data Lake Store account. - parameters: - - name: --content - type: string - short-summary: 'Content to be appended to the file.' +helps['dls fs access set'] = """ +type: command +short-summary: Replace the existing access control list for a file or folder. """ -helps['dls fs delete'] = """ - type: command - short-summary: Delete a file or folder in a Data Lake Store account. +helps['dls fs access set-entry'] = """ +type: command +short-summary: Update the access control list for a file or folder. """ -helps['dls fs upload'] = """ - type: command - short-summary: Upload a file or folder to a Data Lake Store account. - parameters: - - name: --source-path - type: string - short-summary: The path to the file or folder to upload. - - name: --destination-path - type: string - short-summary: The full path in the Data Lake Store filesystem to upload the file or folder to. - - name: --thread-count - type: int - short-summary: 'Parallelism of the upload. Default: The number of cores in the local machine.' - - name: --chunk-size - type: int - short-summary: Size of a chunk, in bytes. - long-summary: Large files are split into chunks. Files smaller than this size will always be transferred in a single thread. - - name: --buffer-size - type: int - short-summary: Size of the transfer buffer, in bytes. - long-summary: A buffer cannot be bigger than a chunk and cannot be smaller than a block. - - name: --block-size - type: int - short-summary: Size of a block, in bytes. - long-summary: Within each chunk, a smaller block is written for each API call. A block cannot be bigger than a chunk and must be bigger than a buffer. - +helps['dls fs access set-owner'] = """ +type: command +short-summary: Set the owner information for a file or folder in a Data Lake Store account. +parameters: + - name: --owner + type: string + short-summary: The user Azure Active Directory object ID or user principal name to set as the owner. + - name: --group + type: string + short-summary: The group Azure Active Directory object ID or user principal name to set as the owning group. """ -helps['dls fs download'] = """ - type: command - short-summary: Download a file or folder from a Data Lake Store account to the local machine. - parameters: - - name: --source-path - type: string - short-summary: The full path in the Data Lake Store filesystem to download the file or folder from. - - name: --destination-path - type: string - short-summary: The local path where the file or folder will be downloaded to. - - name: --thread-count - type: int - short-summary: 'Parallelism of the download. Default: The number of cores in the local machine.' - - name: --chunk-size - type: int - short-summary: Size of a chunk, in bytes. - long-summary: Large files are split into chunks. Files smaller than this size will always be transferred in a single thread. - - name: --buffer-size - type: int - short-summary: Size of the transfer buffer, in bytes. - long-summary: A buffer cannot be bigger than a chunk and cannot be smaller than a block. - - name: --block-size - type: int - short-summary: Size of a block, in bytes. - long-summary: Within each chunk, a smaller block is written for each API call. A block cannot be bigger than a chunk and must be bigger than a buffer. +helps['dls fs access set-permission'] = """ +type: command +short-summary: Set the permissions for a file or folder in a Data Lake Store account. +parameters: + - name: --permission + type: int + short-summary: The octal representation of the permissions for user, group and mask. +example: + - name: Set full permissions for a user, read-execute permissions for a group, and execute permissions for all. + text: az fs access set-permission --path /path/to/file.txt --permission 751 +examples: + - name: Set the permissions for a file or folder in a Data Lake Store account. (autogenerated) + text: az dls fs access set-permission --account {account} --path {path} --permission 777 + crafted: true """ -helps['dls fs test'] = """ - type: command - short-summary: Test for the existence of a file or folder in a Data Lake Store account. +helps['dls fs access show'] = """ +type: command +short-summary: Display the access control list (ACL). +examples: + - name: Display the access control list (ACL). (autogenerated) + text: az dls fs access show --account {account} --path {path} + crafted: true """ -helps['dls fs preview'] = """ - type: command - short-summary: Preview the content of a file in a Data Lake Store account. - parameters: - - name: --length - type: long - short-summary: The amount of data to preview in bytes. - long-summary: If not specified, attempts to preview the full file. If the file is > 1MB `--force` must be specified. - - name: --offset - type: long - short-summary: The position in bytes to start the preview from. +helps['dls fs append'] = """ +type: command +short-summary: Append content to a file in a Data Lake Store account. +parameters: + - name: --content + type: string + short-summary: 'Content to be appended to the file.' """ -helps['dls fs join'] = """ - type: command - short-summary: Join files in a Data Lake Store account into one file. - parameters: - - name: --source-paths - type: list - short-summary: The space-separated list of files in the Data Lake Store account to join. - - name: --destination-path - type: string - short-summary: The destination path in the Data Lake Store account. +helps['dls fs create'] = """ +type: command +short-summary: Creates a file or folder in a Data Lake Store account. +parameters: + - name: --content + type: string + short-summary: 'Content for the file to contain upon creation.' +examples: + - name: Creates a file or folder in a Data Lake Store account. (autogenerated) + text: az dls fs create --account {account} --folder --path {path} + crafted: true """ -helps['dls fs move'] = """ - type: command - short-summary: Move a file or folder in a Data Lake Store account. - parameters: - - name: --source-path - type: list - short-summary: The file or folder to move. - - name: --destination-path - type: string - short-summary: The destination path in the Data Lake Store account. +helps['dls fs delete'] = """ +type: command +short-summary: Delete a file or folder in a Data Lake Store account. +examples: + - name: Delete a file or folder in a Data Lake Store account. (autogenerated) + text: az dls fs delete --account {account} --path {path} + crafted: true """ -helps['dls fs set-expiry'] = """ - type: command - short-summary: Set the expiration time for a file. +helps['dls fs download'] = """ +type: command +short-summary: Download a file or folder from a Data Lake Store account to the local machine. +parameters: + - name: --source-path + type: string + short-summary: The full path in the Data Lake Store filesystem to download the file or folder from. + - name: --destination-path + type: string + short-summary: The local path where the file or folder will be downloaded to. + - name: --thread-count + type: int + short-summary: 'Parallelism of the download. Default: The number of cores in the local machine.' + - name: --chunk-size + type: int + short-summary: Size of a chunk, in bytes. + long-summary: Large files are split into chunks. Files smaller than this size will always be transferred in a single thread. + - name: --buffer-size + type: int + short-summary: Size of the transfer buffer, in bytes. + long-summary: A buffer cannot be bigger than a chunk and cannot be smaller than a block. + - name: --block-size + type: int + short-summary: Size of a block, in bytes. + long-summary: Within each chunk, a smaller block is written for each API call. A block cannot be bigger than a chunk and must be bigger than a buffer. +examples: + - name: Download a file or folder from a Data Lake Store account to the local machine. (autogenerated) + text: az dls fs download --account {account} --destination-path {destination-path} --source-path {source-path} + crafted: true """ -helps['dls fs remove-expiry'] = """ - type: command - short-summary: Remove the expiration time for a file. +helps['dls fs join'] = """ +type: command +short-summary: Join files in a Data Lake Store account into one file. +parameters: + - name: --source-paths + type: list + short-summary: The space-separated list of files in the Data Lake Store account to join. + - name: --destination-path + type: string + short-summary: The destination path in the Data Lake Store account. """ -helps['dls fs access'] = """ - type: group - short-summary: Manage Data Lake Store filesystem access and permissions. +helps['dls fs list'] = """ +type: command +short-summary: List the files and folders in a Data Lake Store account. +examples: + - name: List the files and folders in a Data Lake Store account. (autogenerated) + text: az dls fs list --account {account} --path {path} + crafted: true """ -helps['dls fs access show'] = """ - type: command - short-summary: Display the access control list (ACL). +helps['dls fs move'] = """ +type: command +short-summary: Move a file or folder in a Data Lake Store account. +parameters: + - name: --source-path + type: list + short-summary: The file or folder to move. + - name: --destination-path + type: string + short-summary: The destination path in the Data Lake Store account. +examples: + - name: Move a file or folder in a Data Lake Store account. (autogenerated) + text: az dls fs move --account {account} --destination-path {destination-path} --source-path {source-path} + crafted: true """ -helps['dls fs access set-owner'] = """ - type: command - short-summary: Set the owner information for a file or folder in a Data Lake Store account. - parameters: - - name: --owner - type: string - short-summary: The user Azure Active Directory object ID or user principal name to set as the owner. - - name: --group - type: string - short-summary: The group Azure Active Directory object ID or user principal name to set as the owning group. +helps['dls fs preview'] = """ +type: command +short-summary: Preview the content of a file in a Data Lake Store account. +parameters: + - name: --length + type: long + short-summary: The amount of data to preview in bytes. + long-summary: If not specified, attempts to preview the full file. If the file is > 1MB `--force` must be specified. + - name: --offset + type: long + short-summary: The position in bytes to start the preview from. """ -helps['dls fs access set-permission'] = """ - type: command - short-summary: Set the permissions for a file or folder in a Data Lake Store account. - parameters: - - name: --permission - type: int - short-summary: The octal representation of the permissions for user, group and mask. - example: - - name: Set full permissions for a user, read-execute permissions for a group, and execute permissions for all. - text: az fs access set-permission --path /path/to/file.txt --permission 751 +helps['dls fs remove-expiry'] = """ +type: command +short-summary: Remove the expiration time for a file. """ -helps['dls fs access set-entry'] = """ - type: command - short-summary: Update the access control list for a file or folder. +helps['dls fs set-expiry'] = """ +type: command +short-summary: Set the expiration time for a file. """ -helps['dls fs access set'] = """ - type: command - short-summary: Replace the existing access control list for a file or folder. +helps['dls fs show'] = """ +type: command +short-summary: Get file or folder information in a Data Lake Store account. +examples: + - name: Get file or folder information in a Data Lake Store account. (autogenerated) + text: az dls fs show --account {account} --path {path} + crafted: true """ -helps['dls fs access remove-entry'] = """ - type: command - short-summary: Remove entries for the access control list of a file or folder. +helps['dls fs test'] = """ +type: command +short-summary: Test for the existence of a file or folder in a Data Lake Store account. +examples: + - name: Test for the existence of a file or folder in a Data Lake Store account. (autogenerated) + text: az dls fs test --account {account} --path {path} + crafted: true """ -helps['dls fs access remove-all'] = """ - type: command - short-summary: Remove the access control list for a file or folder. +helps['dls fs upload'] = """ +type: command +short-summary: Upload a file or folder to a Data Lake Store account. +parameters: + - name: --source-path + type: string + short-summary: The path to the file or folder to upload. + - name: --destination-path + type: string + short-summary: The full path in the Data Lake Store filesystem to upload the file or folder to. + - name: --thread-count + type: int + short-summary: 'Parallelism of the upload. Default: The number of cores in the local machine.' + - name: --chunk-size + type: int + short-summary: Size of a chunk, in bytes. + long-summary: Large files are split into chunks. Files smaller than this size will always be transferred in a single thread. + - name: --buffer-size + type: int + short-summary: Size of the transfer buffer, in bytes. + long-summary: A buffer cannot be bigger than a chunk and cannot be smaller than a block. + - name: --block-size + type: int + short-summary: Size of a block, in bytes. + long-summary: Within each chunk, a smaller block is written for each API call. A block cannot be bigger than a chunk and must be bigger than a buffer. + +examples: + - name: Upload a file or folder to a Data Lake Store account. (autogenerated) + text: az dls fs upload --account {account} --destination-path {destination-path} --overwrite --source-path {source-path} + crafted: true """ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/azure-cli-dls-0.1.1/azure/cli/command_modules/dls/_params.py new/azure-cli-dls-0.1.8/azure/cli/command_modules/dls/_params.py --- old/azure-cli-dls-0.1.1/azure/cli/command_modules/dls/_params.py 2018-08-23 01:07:57.000000000 +0200 +++ new/azure-cli-dls-0.1.8/azure/cli/command_modules/dls/_params.py 2019-02-12 03:05:13.000000000 +0100 @@ -20,6 +20,9 @@ # pylint: disable=line-too-long, too-many-statements def load_arguments(self, _): + from ._validators import ( + validate_subnet + ) # ARGUMENT DEFINITIONS datalake_store_name_type = CLIArgumentType(help='Name of the Data Lake Store account.', options_list=['--account_name'], completer=get_resource_name_completion_list('Microsoft.DataLakeStore/accounts'), id_part='name') @@ -56,6 +59,39 @@ with self.argument_context('dls account list') as c: c.argument('resource_group_name', resource_group_name_type, validator=None) + ##### + # virtual network rule + ##### + with self.argument_context('dls account network-rule') as c: + c.argument('account_name', datalake_store_name_type, options_list=['--account-name'], id_part=None) + c.argument('resource_group_name', resource_group_name_type, id_part='resource_group') + + c.argument('virtual_network_rule_name', + options_list=['--name', '-n'], + help='The virtual network rule name', + id_part='name') + + c.argument('subnet', + options_list=['--subnet'], + help='Name or ID of the subnet that allows access to DLS. ' + 'If subnet name is provided, --name must be provided.') + + with self.argument_context('dls account network-rule create') as c: + c.extra('vnet_name', + help='The virtual network rule name', + validator=validate_subnet) + + with self.argument_context('dls account network-rule update') as c: + c.argument('subnet_id', + options_list=['--subnet'], + help='Name or ID of the subnet that allows access to DLS. ' + 'If subnet name is provided, --name must be provided.') + + c.extra('vnet_name', help='The virtual network rule name') + + with self.argument_context('dls account network-rule list') as c: + c.argument('virtual_network_rule_name', id_part=None) + # filesystem with self.argument_context('dls fs') as c: c.argument('path', help='The path in the specified Data Lake Store account where the action should take place. In the format \'/folder/file.txt\', where the first \'/\' after the DNS indicates the root of the file system.') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/azure-cli-dls-0.1.1/azure/cli/command_modules/dls/_validators.py new/azure-cli-dls-0.1.8/azure/cli/command_modules/dls/_validators.py --- old/azure-cli-dls-0.1.1/azure/cli/command_modules/dls/_validators.py 2018-08-23 01:07:57.000000000 +0200 +++ new/azure-cli-dls-0.1.8/azure/cli/command_modules/dls/_validators.py 2019-02-12 03:05:13.000000000 +0100 @@ -3,12 +3,10 @@ # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -from msrestazure.tools import parse_resource_id from knack.util import CLIError from azure.cli.core.commands.client_factory import get_mgmt_service_client -from azure.mgmt.datalake.store import DataLakeStoreAccountManagementClient # Helpers @@ -19,6 +17,7 @@ :return: resource group name or None :rtype: str """ + from msrestazure.tools import parse_resource_id for acct in client.list(): id_comps = parse_resource_id(acct.id) if id_comps['name'] == account_name: @@ -30,11 +29,37 @@ # COMMAND NAMESPACE VALIDATORS def validate_resource_group_name(cmd, ns): + from azure.mgmt.datalake.store import DataLakeStoreAccountManagementClient if not ns.resource_group_name: try: account_name = ns.name except AttributeError: account_name = ns.account_name - client = get_mgmt_service_client(cmd.cli_ctx, DataLakeStoreAccountManagementClient).account + client = get_mgmt_service_client(cmd.cli_ctx, DataLakeStoreAccountManagementClient).accounts group_name = _get_resource_group_from_account_name(client, account_name) ns.resource_group_name = group_name + + +# Validates if a subnet id or name have been given by the user. If subnet id is given, vnet-name should not be provided. +def validate_subnet(cmd, namespace): + from msrestazure.tools import resource_id, is_valid_resource_id + from azure.cli.core.commands.client_factory import get_subscription_id + + subnet = namespace.subnet + subnet_is_id = is_valid_resource_id(subnet) + vnet = namespace.vnet_name + + if (subnet_is_id and not vnet) or (not subnet and not vnet): + pass + elif subnet and not subnet_is_id and vnet: + namespace.subnet = resource_id( + subscription=get_subscription_id(cmd.cli_ctx), + resource_group=namespace.resource_group_name, + namespace='Microsoft.Network', + type='virtualNetworks', + name=vnet, + child_type_1='subnets', + child_name_1=subnet) + else: + raise CLIError('incorrect usage: [--subnet ID | --subnet NAME --vnet-name NAME]') + delattr(namespace, 'vnet_name') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/azure-cli-dls-0.1.1/azure/cli/command_modules/dls/commands.py new/azure-cli-dls-0.1.8/azure/cli/command_modules/dls/commands.py --- old/azure-cli-dls-0.1.1/azure/cli/command_modules/dls/commands.py 2018-08-23 01:07:57.000000000 +0200 +++ new/azure-cli-dls-0.1.8/azure/cli/command_modules/dls/commands.py 2019-02-12 03:05:13.000000000 +0100 @@ -8,17 +8,21 @@ from azure.cli.command_modules.dls._client_factory import ( cf_dls_account, cf_dls_account_firewall, + cf_dls_account_virtual_network, cf_dls_account_trusted_provider) +# pylint: disable=too-many-statements def load_command_table(self, _): - + from ._validators import ( + validate_subnet + ) adls_format_path = 'azure.mgmt.datalake.store.operations.{}#{}.{{}}' dls_custom = CliCommandType(operations_tmpl='azure.cli.command_modules.dls.custom#{}') dls_account_sdk = CliCommandType( - operations_tmpl=adls_format_path.format('account_operations', 'AccountOperations'), + operations_tmpl=adls_format_path.format('accounts_operations', 'AccountsOperations'), client_factory=cf_dls_account ) @@ -27,6 +31,11 @@ client_factory=cf_dls_account ) + dls_virtual_network_sdk = CliCommandType( + operations_tmpl=adls_format_path.format('virtual_network_rules_operations', 'VirtualNetworkRulesOperations'), + client_factory=cf_dls_account + ) + dls_provider_sdk = CliCommandType( operations_tmpl=adls_format_path.format('trusted_id_providers_operations', 'TrustedIdProvidersOperations'), client_factory=cf_dls_account_trusted_provider @@ -48,6 +57,16 @@ g.command('list', 'list_by_account') g.show_command('show', 'get') g.command('delete', 'delete') + + # account virtual network rule operations + with self.command_group('dls account network-rule', + dls_virtual_network_sdk, + client_factory=cf_dls_account_virtual_network) as g: + g.custom_command('create', 'add_adls_virtual_network_rule', validator=validate_subnet) + g.generic_update_command('update') + g.command('list', 'list_by_account') + g.show_command('show', 'get') + g.command('delete', 'delete') # account trusted id provider operations with self.command_group('dls account trusted-provider', dls_provider_sdk) as g: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/azure-cli-dls-0.1.1/azure/cli/command_modules/dls/custom.py new/azure-cli-dls-0.1.8/azure/cli/command_modules/dls/custom.py --- old/azure-cli-dls-0.1.1/azure/cli/command_modules/dls/custom.py 2018-08-23 01:07:57.000000000 +0200 +++ new/azure-cli-dls-0.1.8/azure/cli/command_modules/dls/custom.py 2019-02-12 03:05:13.000000000 +0100 @@ -7,9 +7,8 @@ from knack.util import CLIError from azure.mgmt.datalake.store.models import ( - DataLakeStoreAccountUpdateParameters, - FirewallRule, - DataLakeStoreAccount, + UpdateDataLakeStoreAccountParameters, + CreateDataLakeStoreAccountParameters, EncryptionConfigType, EncryptionIdentity, EncryptionConfig, @@ -51,10 +50,11 @@ key_version=None, disable_encryption=False, tier=None): location = location or _get_resource_group_location(cmd.cli_ctx, resource_group_name) - create_params = DataLakeStoreAccount(location, - tags=tags, - default_group=default_group, - new_tier=tier) + create_params = CreateDataLakeStoreAccountParameters( + location=location, + tags=tags, + default_group=default_group, + new_tier=tier) if not disable_encryption: identity = EncryptionIdentity() @@ -63,7 +63,10 @@ if not key_name or not key_vault_id or not key_version: # pylint: disable=line-too-long raise CLIError('For user managed encryption, --key_vault_id, --key_name and --key_version are required parameters and must be supplied.') - config.key_vault_meta_info = KeyVaultMetaInfo(key_vault_id, key_name, key_version) + config.key_vault_meta_info = KeyVaultMetaInfo( + key_vault_resource_id=key_vault_id, + encryption_key_name=key_name, + encryption_key_version=key_version) else: if key_name or key_vault_id or key_version: # pylint: disable=line-too-long @@ -81,7 +84,7 @@ def update_adls_account(client, account_name, resource_group_name, tags=None, default_group=None, firewall_state=None, allow_azure_ips=None, trusted_id_provider_state=None, tier=None, key_version=None): - update_params = DataLakeStoreAccountUpdateParameters( + update_params = UpdateDataLakeStoreAccountParameters( tags=tags, default_group=default_group, firewall_state=firewall_state, @@ -92,7 +95,7 @@ # this will fail if the encryption is not user managed, as service managed key rotation is not supported. if key_version: update_params.encryption_config = UpdateEncryptionConfig( - UpdateKeyVaultMetaInfo(key_version)) + key_vault_meta_info=UpdateKeyVaultMetaInfo(encryption_key_version=key_version)) return client.update(resource_group_name, account_name, update_params).result() # endregion @@ -105,11 +108,24 @@ start_ip_address, end_ip_address, resource_group_name): - create_params = FirewallRule(start_ip_address, end_ip_address) return client.create_or_update(resource_group_name, account_name, firewall_rule_name, - create_params) + start_ip_address, + end_ip_address) +# endregion + + +# region virtual network +def add_adls_virtual_network_rule(client, + account_name, + virtual_network_rule_name, + subnet, + resource_group_name): + return client.create_or_update(resource_group_name, + account_name, + virtual_network_rule_name, + subnet) # endregion diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/azure-cli-dls-0.1.1/azure_cli_dls.egg-info/PKG-INFO new/azure-cli-dls-0.1.8/azure_cli_dls.egg-info/PKG-INFO --- old/azure-cli-dls-0.1.1/azure_cli_dls.egg-info/PKG-INFO 2018-08-23 01:09:11.000000000 +0200 +++ new/azure-cli-dls-0.1.8/azure_cli_dls.egg-info/PKG-INFO 2019-02-12 03:05:57.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: azure-cli-dls -Version: 0.1.1 +Version: 0.1.8 Summary: Microsoft Azure Command-Line Tools Data Lake Store Command Module Home-page: https://github.com/Azure/azure-cli Author: Microsoft Corporation @@ -19,6 +19,34 @@ Release History =============== + 0.1.8 + +++++ + * Minor fixes. + + 0.1.7 + ++++++ + * Minor fixes. + + 0.1.6 + +++++ + * Update ADLS version(0.0.39). + + 0.1.5 + +++++ + * Update ADLS version(0.0.38). + + 0.1.4 + +++++ + * Update ADLS version(0.0.34). API version change to 2018-05-01 + + 0.1.3 + +++++ + * Update ADLS version to latest(0.0.31) + * Added commands for virtual network rules. + + 0.1.2 + +++++ + * Update ADLS version to latest(0.0.29) 0.1.1 +++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/azure-cli-dls-0.1.1/azure_cli_dls.egg-info/requires.txt new/azure-cli-dls-0.1.8/azure_cli_dls.egg-info/requires.txt --- old/azure-cli-dls-0.1.1/azure_cli_dls.egg-info/requires.txt 2018-08-23 01:09:11.000000000 +0200 +++ new/azure-cli-dls-0.1.8/azure_cli_dls.egg-info/requires.txt 2019-02-12 03:05:57.000000000 +0100 @@ -1,3 +1,3 @@ -azure-mgmt-datalake-store==0.2.0 -azure-datalake-store==0.0.27 +azure-mgmt-datalake-store==0.5.0 +azure-datalake-store==0.0.39 azure-cli-core diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/azure-cli-dls-0.1.1/setup.py new/azure-cli-dls-0.1.8/setup.py --- old/azure-cli-dls-0.1.1/setup.py 2018-08-23 01:07:57.000000000 +0200 +++ new/azure-cli-dls-0.1.8/setup.py 2019-02-12 03:05:13.000000000 +0100 @@ -16,7 +16,7 @@ cmdclass = {} -VERSION = "0.1.1" +VERSION = "0.1.8" # The full list of classifiers is available at # https://pypi.python.org/pypi?%3Aaction=list_classifiers CLASSIFIERS = [ @@ -34,8 +34,8 @@ ] DEPENDENCIES = [ - 'azure-mgmt-datalake-store==0.2.0', - 'azure-datalake-store==0.0.27', + 'azure-mgmt-datalake-store==0.5.0', + 'azure-datalake-store==0.0.39', 'azure-cli-core', ]