Skip to content

Commit

Permalink
fix(grpc): correct prefix for project resources (#280)
Browse files Browse the repository at this point in the history
  • Loading branch information
coryan authored Feb 14, 2022
1 parent c8a1813 commit d2f4dc0
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
4 changes: 2 additions & 2 deletions gcs/bucket.py
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ def __postprocess_rest(cls, data):
{
"name": lambda x: ("name", bucket_id),
"bucketId": lambda x: ("id", bucket_id),
"project": lambda x: ("projectNumber", x.replace("project/", "")),
"project": lambda x: ("projectNumber", x.replace("projects/", "")),
"createTime": lambda x: ("timeCreated", x),
"updateTime": lambda x: ("updated", x),
"iamConfig": lambda x: (
Expand Down Expand Up @@ -452,7 +452,7 @@ def init(cls, request, context):
)
metadata.iam_config.uniform_bucket_level_access.enabled = is_uniform
metadata.bucket_id = testbench.common.bucket_name_from_proto(metadata.name)
metadata.project = "project/" + testbench.acl.PROJECT_NUMBER
metadata.project = "projects/" + testbench.acl.PROJECT_NUMBER
return (
cls(metadata, {}, cls.__init_iam_policy(metadata, context)),
testbench.common.extract_projection(request, default_projection, context),
Expand Down
3 changes: 3 additions & 0 deletions tests/test_bucket_grpc.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@ def test_init_grpc_simple(self):
self.assertEqual(bucket.metadata.storage_class, "REGIONAL")
self.assertLess(0, bucket.metadata.metageneration)

rest = bucket.rest()
self.assertNotEqual(int(rest.get("projectNumber")), 0)

def test_init_validates_names(self):
request = storage_pb2.CreateBucketRequest(
parent="projects/test-project",
Expand Down
1 change: 1 addition & 0 deletions tests/test_grpc_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ def test_create_bucket(self):
response = self.grpc.CreateBucket(request, context)
self.assertEqual(response.name, "projects/_/buckets/test-bucket-name")
self.assertEqual(response.bucket_id, "test-bucket-name")
self.assertTrue(response.project.startswith("projects/"))

def test_create_bucket_predefined_acls(self):
acls = [
Expand Down

0 comments on commit d2f4dc0

Please sign in to comment.