Skip to content

[Storage] az storage blob upload: Add back --socket-timeout which has been renamed by SDK #23146

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.

Sign up for GitHub

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
Zhiyi Huang (calvinhzy) merged 4 commits into from
Jul 22, 2022
Merged

[Storage] az storage blob upload: Add back --socket-timeout which has been renamed by SDK #23146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
527df16
blob upload socket-timeout
calvinhzy Jul 8, 2022
963a265
pop connection timeout
calvinhzy Jul 8, 2022
0978220
merge
calvinhzy Jul 22, 2022
2a3af07
retest
calvinhzy Jul 22, 2022
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
6 changes: 4 additions & 2 deletions src/azure-cli/azure/cli/command_modules/storage/_client_factory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,8 @@ def cf_blob_service(cli_ctx, kwargs):
account_url = get_account_url(cli_ctx, account_name=account_name, service='blob')
credential = account_key or sas_token or token_credential

return t_blob_service(account_url=account_url, credential=credential, **client_kwargs)
return t_blob_service(account_url=account_url, credential=credential,
connection_timeout=kwargs.pop('connection_timeout', None), **client_kwargs)


def get_credential(kwargs):
Expand All @@ -250,7 +251,8 @@ def cf_blob_client(cli_ctx, kwargs):
kwargs.pop('blob_name')
return t_blob_client.from_blob_url(blob_url=kwargs.pop('blob_url'),
credential=credential,
snapshot=kwargs.pop('snapshot', None))
snapshot=kwargs.pop('snapshot', None),
connection_timeout=kwargs.pop('connection_timeout', None))
if 'blob_url' in kwargs:
kwargs.pop('blob_url')

Expand Down
2 changes: 2 additions & 0 deletions src/azure-cli/azure/cli/command_modules/storage/_params.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -987,6 +987,8 @@ def load_arguments(self, _): # pylint: disable=too-many-locals, too-many-statem
c.extra('tags', arg_type=tags_type, arg_group="Additional Flags")
c.argument('metadata', arg_group="Additional Flags")
c.argument('timeout', arg_group="Additional Flags")
c.extra('connection_timeout', options_list=('--socket-timeout'), type=int,
help='The socket timeout(secs), used by the service to regulate data flow.')

# pylint: disable=line-too-long
with self.argument_context('storage blob upload-batch', resource_type=ResourceType.DATA_STORAGE_BLOB) as c:
Expand Down
Loading