Skip to content

Storage: HMAC add user_project param #9237

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
tseaver merged 3 commits into from
Sep 25, 2019
Merged

Storage: HMAC add user_project param #9237

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4828c75
test(unit): tests user_project is passed through to request
jkwlui Sep 16, 2019
3de59d6
feat: implement user_project option for HMAC operations
jkwlui Sep 16, 2019
2dbabeb
fix style
jkwlui Sep 16, 2019
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
fix style
  • Loading branch information
@jkwlui
jkwlui committed Sep 16, 2019
commit 2dbabeb28a7a86bc13a2aad5c5d9bbf8ab6b42fa
4 changes: 3 additions & 1 deletion storage/google/cloud/storage/hmac_key.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,9 @@ def exists(self):
if self.user_project is not None:
qs_params["userProject"] = self.user_project

self._client._connection.api_request(method="GET", path=self.path, query_params=qs_params)
self._client._connection.api_request(
method="GET", path=self.path, query_params=qs_params
)
except NotFound:
return False
else:
Expand Down
4 changes: 3 additions & 1 deletion storage/tests/unit/test_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1194,7 +1194,9 @@ def test_get_hmac_key_metadata_w_project(self):
http = _make_requests_session([_make_json_response(resource)])
client._http_internal = http

metadata = client.get_hmac_key_metadata(ACCESS_ID, project_id=OTHER_PROJECT, user_project=USER_PROJECT)
metadata = client.get_hmac_key_metadata(
ACCESS_ID, project_id=OTHER_PROJECT, user_project=USER_PROJECT
)

self.assertIsInstance(metadata, HMACKeyMetadata)
self.assertIs(metadata._client, client)
Expand Down
8 changes: 6 additions & 2 deletions storage/tests/unit/test_hmac_key.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ def test_update_hit_w_project_set(self):
"method": "PUT",
"path": expected_path,
"data": {"state": "ACTIVE"},
"query_params": {"userProject": user_project}
"query_params": {"userProject": user_project},
}
connection.api_request.assert_called_once_with(**expected_kwargs)

Expand Down Expand Up @@ -384,7 +384,11 @@ def test_delete_miss_no_project_set(self):
expected_path = "/projects/{}/hmacKeys/{}".format(
client.DEFAULT_PROJECT, access_id
)
expected_kwargs = {"method": "DELETE", "path": expected_path, "query_params": {}}
expected_kwargs = {
"method": "DELETE",
"path": expected_path,
"query_params": {},
}
connection.api_request.assert_called_once_with(**expected_kwargs)

def test_delete_hit_w_project_set(self):
Expand Down