Skip to content

fix: Avoid pickling processed credentials #1016

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
merged 5 commits into from
May 1, 2023
Merged

fix: Avoid pickling processed credentials #1016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
394ff2f
fix: Avoid pickling processed credentials
andrewsg Apr 12, 2023
a364ff1
Merge branch 'main' into tm-cryptography-fix
andrewsg Apr 13, 2023
f1c84ca
Merge branch 'main' into tm-cryptography-fix
andrewsg Apr 20, 2023
b7f27e5
Merge branch 'main' into tm-cryptography-fix
andrewsg Apr 27, 2023
f511e4c
Merge branch 'main' into tm-cryptography-fix
andrewsg Apr 28, 2023
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
3 changes: 2 additions & 1 deletion google/cloud/storage/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,11 @@ def __init__(
if project is _marker:
project = None

# Save the initial value of client_info and client_options before they
# Save the initial value of constructor arguments before they
# are passed along, for use in __reduce__ defined elsewhere.
self._initial_client_info = client_info
self._initial_client_options = client_options
self._initial_credentials = credentials

kw_args = {"client_info": client_info}

Expand Down
2 changes: 1 addition & 1 deletion google/cloud/storage/transfer_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -879,7 +879,7 @@ def _reduce_client(cl):

client_object_id = id(cl)
project = cl.project
credentials = cl._credentials
credentials = cl._initial_credentials
_http = None # Can't carry this over
client_info = cl._initial_client_info
client_options = cl._initial_client_options
Expand Down