feat(storage): add OwnerEntity to bucketAttrs (#11857)

madisonhall38 · web-flow · commit 4cd4a0ca1f61 · 2025-03-17T11:56:22.000-04:00
diff --git a/storage/bucket.go b/storage/bucket.go
@@ -514,6 +514,9 @@ type BucketAttrs struct {
 	// It cannot be modified after bucket creation time.
 	// UniformBucketLevelAccess must also also be enabled on the bucket.
 	HierarchicalNamespace *HierarchicalNamespace
+
+	// OwnerEntity contains entity information in the form "project-owner-projectId".
+	OwnerEntity string
 }
 
 // BucketPolicyOnly is an alias for UniformBucketLevelAccess.
@@ -864,6 +867,7 @@ func newBucket(b *raw.Bucket) (*BucketAttrs, error) {
 		Autoclass:                toAutoclassFromRaw(b.Autoclass),
 		SoftDeletePolicy:         toSoftDeletePolicyFromRaw(b.SoftDeletePolicy),
 		HierarchicalNamespace:    toHierarchicalNamespaceFromRaw(b.HierarchicalNamespace),
+		OwnerEntity:              ownerEntityFromRaw(b.Owner),
 	}, nil
 }
 
@@ -900,6 +904,7 @@ func newBucketFromProto(b *storagepb.Bucket) *BucketAttrs {
 		Autoclass:                toAutoclassFromProto(b.GetAutoclass()),
 		SoftDeletePolicy:         toSoftDeletePolicyFromProto(b.SoftDeletePolicy),
 		HierarchicalNamespace:    toHierarchicalNamespaceFromProto(b.HierarchicalNamespace),
+		OwnerEntity:              ownerEntityFromProto(b.GetOwner()),
 	}
 }
 
@@ -2224,6 +2229,20 @@ func toHierarchicalNamespaceFromRaw(r *raw.BucketHierarchicalNamespace) *Hierarc
 	}
 }
 
+func ownerEntityFromRaw(r *raw.BucketOwner) string {
+	if r == nil {
+		return ""
+	}
+	return r.Entity
+}
+
+func ownerEntityFromProto(p *storagepb.Owner) string {
+	if p == nil {
+		return ""
+	}
+	return p.GetEntity()
+}
+
 // Objects returns an iterator over the objects in the bucket that match the
 // Query q. If q is nil, no filtering is done. Objects will be iterated over
 // lexicographically by name.
diff --git a/storage/bucket_test.go b/storage/bucket_test.go
@@ -674,6 +674,7 @@ func TestNewBucket(t *testing.T) {
 			RetentionDurationSeconds: 3600,
 		},
 		HierarchicalNamespace: &raw.BucketHierarchicalNamespace{Enabled: true},
+		Owner:                 &raw.BucketOwner{Entity: "project-owner-projectId"},
 	}
 	want := &BucketAttrs{
 		Name:                  "name",
@@ -737,6 +738,7 @@ func TestNewBucket(t *testing.T) {
 			RetentionDuration: time.Hour,
 		},
 		HierarchicalNamespace: &HierarchicalNamespace{Enabled: true},
+		OwnerEntity:           "project-owner-projectId",
 	}
 	got, err := newBucket(rb)
 	if err != nil {
@@ -810,6 +812,7 @@ func TestNewBucketFromProto(t *testing.T) {
 				},
 			},
 		},
+		Owner: &storagepb.Owner{Entity: "project-owner-projectId"},
 	}
 	want := &BucketAttrs{
 		Name:             "name",
@@ -859,6 +862,7 @@ func TestNewBucketFromProto(t *testing.T) {
 				},
 			}},
 		},
+		OwnerEntity: "project-owner-projectId",
 	}
 	got := newBucketFromProto(pb)
 	if diff := cmp.Diff(got, want); diff != "" {
