Skip to content

Storage: Expose id field for HMAC key #9115

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 2 commits into from
Aug 28, 2019
Merged

Storage: Expose id field for HMAC key #9115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e78912c
Expose id field for HMAC key
tritone Aug 27, 2019
a33fe51
Merge remote-tracking branch 'upstream/master'
tritone Aug 28, 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
11 changes: 10 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 @@ -63,7 +63,7 @@ def __hash__(self):

@property
def access_id(self):
"""ID of the key.
"""Access ID of the key.

:rtype: str or None
:returns: unique identifier of the key within a project.
Expand All @@ -79,6 +79,15 @@ def etag(self):
"""
return self._properties.get("etag")

@property
def id(self):
"""ID of the key, including the Project ID and the Access ID.

:rtype: str or None
:returns: ID of the key.
"""
return self._properties.get("id")

@property
def project(self):
"""Project ID associated with the key.
Expand Down
8 changes: 8 additions & 0 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 @@ -36,6 +36,7 @@ def test_ctor_defaults(self):
self.assertEqual(metadata._properties, {})
self.assertIsNone(metadata.access_id)
self.assertIsNone(metadata.etag)
self.assertIsNone(metadata.id)
self.assertIsNone(metadata.project)
self.assertIsNone(metadata.service_account_email)
self.assertIsNone(metadata.state)
Expand All @@ -52,6 +53,7 @@ def test_ctor_explicit(self):
self.assertEqual(metadata._properties, expected)
self.assertEqual(metadata.access_id, ACCESS_ID)
self.assertIsNone(metadata.etag)
self.assertIsNone(metadata.id)
self.assertEqual(metadata.project, OTHER_PROJECT)
self.assertIsNone(metadata.service_account_email)
self.assertIsNone(metadata.state)
Expand Down Expand Up @@ -104,6 +106,12 @@ def test_etag_getter(self):
metadata._properties["etag"] = expected
self.assertEqual(metadata.etag, expected)

def test_id_getter(self):
metadata = self._make_one()
expected = "ID"
metadata._properties["id"] = expected
self.assertEqual(metadata.id, expected)

def test_project_getter(self):
metadata = self._make_one()
expected = "PROJECT-ID"
Expand Down