Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
f721fd3
{Packaging} Hotfix: Only remove `dist-info` for azure packages in MSI…
fengzhou-msft Mar 24, 2021
962f0ca
{Packaging} Hotfix: Only remove `dist-info` for azure packages in MSI…
fengzhou-msft Mar 25, 2021
fb1fb85
Merge branch 'release' into dev
jiasli Mar 25, 2021
d727390
{Network} Fix network tests which will cause CI fail in Eventgrid mod…
evelyn-ys Mar 25, 2021
f821690
add microsoft.search scenario test for private endpoint connections (…
Mar 26, 2021
23facb0
Update azdev_setup.yml (#17463)
Infinite-Blue-1042 Mar 26, 2021
490cafb
[NetAppFiles] Update azure-mgmt-netapp version to 2.0.0 (#17370)
Mar 26, 2021
0bfe544
Adding optional parameter 'backup-management-type' in 'backup protect…
hiaga Mar 26, 2021
212f925
[ARM] Fix #17379: bicep auto install results in invalid json output f…
felipebbc Mar 26, 2021
19073d6
{EventGrid} Add support for StorageQueueMessageTTL, AdvancedFilters, …
VidyaKukke Mar 26, 2021
eb08437
{Packaging} Bump knack to 0.8.0 (#17470)
jiasli Mar 26, 2021
984e06a
{Feedback} Explain what `az feedback` does (#17396)
jiasli Mar 26, 2021
3bff786
{Log} Adapt az_command_data_logger to Knack 0.8.0 (#17324)
jiasli Mar 26, 2021
ad284d0
Fix ssl bind bug (#17479)
calvinsID Mar 29, 2021
8828c74
Update azdev to version 0.1.30 (#17489)
kairu-ms Mar 29, 2021
0194d3b
{CI} Restore `az self-test` (#17456)
jiasli Mar 29, 2021
f331b03
[Storage] `az storage fs file list`: Support --show-next-marker (#17408)
evelyn-ys Mar 29, 2021
44e1af8
[Interactive] Fix #16931: Fix `KeyError` in `az interactive --update`…
fengzhou-msft Mar 29, 2021
7a5538f
{AppConfig} Fix bug in print preview of restore command (#17344)
avanigupta Mar 29, 2021
39f2968
Fix live test (#17388)
zhoxing-ms Mar 30, 2021
e536c7e
[Core] Add spinner progress bar for long running operation (#17262)
Juliehzl Mar 30, 2021
b457d86
{EventGrid} Add support for delivery attribute mapping, topicKind (#1…
VidyaKukke Mar 30, 2021
bbf753f
{Core} Make _prepare_client_kwargs_track2 public (#17411)
jiasli Mar 30, 2021
db4c326
[RDBMS] Allowing DB server private access from different subscription…
DaeunYim Mar 30, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[Storage] az storage fs file list: Support --show-next-marker (Azur…
…e#17408)

* `az storage fs file list`: Support --show-next-marker
  • Loading branch information
evelyn-ys authored Mar 29, 2021
commit f331b036790b9df81ae0b8374479535df9537dab
2 changes: 2 additions & 0 deletions src/azure-cli/azure/cli/command_modules/storage/_params.py
Original file line number Diff line number Diff line change
Expand Up @@ -1603,6 +1603,8 @@ def load_arguments(self, _): # pylint: disable=too-many-locals, too-many-statem
help='An opaque continuation token. This value can be retrieved from the next_marker field of a '
'previous generator object. If specified, this generator will begin returning results from this '
'point.')
c.argument('show_next_marker', action='store_true', is_preview=True,
help='Show nextMarker in result when specified.')

for item in ['create', 'show', 'delete', 'exists', 'upload', 'append', 'download', 'show', 'metadata update',
'metadata show']:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,20 @@ def get_file_properties(client, timeout=None):
return result


def list_fs_files(client, path=None, recursive=True, num_results=None, timeout=None, exclude_dir=None, marker=None):
def list_fs_files(client, path=None, recursive=True, num_results=None, timeout=None, exclude_dir=None,
marker=None, show_next_marker=None):
generator = client.get_paths(path=path, max_results=num_results, recursive=recursive, timeout=timeout)
pages = generator.by_page(continuation_token=marker)

result = next(pages)
result = list(next(pages))

if pages.continuation_token:
logger.warning('Next Marker:')
logger.warning(pages.continuation_token)
if show_next_marker:
next_marker = {"nextMarker": pages.continuation_token}
result.append(next_marker)
else:
if pages.continuation_token:
logger.warning('Next Marker:')
logger.warning(pages.continuation_token)

if exclude_dir:
return list(f for f in result if not f.is_directory)
Expand Down
Loading