-
Notifications
You must be signed in to change notification settings - Fork 3.4k
[Storage] az storage file list: Fix file list for nfs shares, as --include is not supported
#32268
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
4a3e55c
fix nfs file list, as --include is not supported
calvinhzy 1c55b42
rerun tests
calvinhzy eb15da7
add check for --exclude-extended-info with nfs file share
calvinhzy b05a6d3
Merge remote-tracking branch 'upstream/dev' into storage-file-list-nf…
calvinhzy File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -93,7 +93,13 @@ def create_file_url(client, protocol=None, **kwargs): | |
| def list_share_files(cmd, client, directory_name=None, timeout=None, exclude_dir=False, exclude_extended_info=False, | ||
| num_results=None, marker=None): | ||
| from ..track2_util import list_generator | ||
| include = [] if exclude_extended_info else ["timestamps", "Etag", "Attributes", "PermissionKey"] | ||
| include = None | ||
| share_properties = client.get_share_properties() | ||
| if share_properties.protocols == ['SMB']: | ||
| include = [] if exclude_extended_info else ["timestamps", "Etag", "Attributes", "PermissionKey"] | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Shall we warn/error out for nfs shares when |
||
| elif share_properties.protocols == ['NFS']: | ||
| if exclude_extended_info: | ||
| logger.warning('--exclude-extended-info is not supported for NFS shares.') | ||
| generator = client.list_directories_and_files(directory_name=directory_name, include=include, | ||
| timeout=timeout, results_per_page=num_results) | ||
| pages = generator.by_page(continuation_token=marker) | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The protocol comparison
share_properties.protocols == ['SMB']may fail if the protocols list contains multiple values or is in a different order. Consider using'SMB' in share_properties.protocolsfor more robust protocol checking.