Skip to content

Commit 7c16c61

Browse files
committed
One Last defensivce
Signed-off-by: Daniel Valdivia <[email protected]>
1 parent 228fdf8 commit 7c16c61

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

restapi/user_buckets.go

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -308,16 +308,10 @@ func getAccountInfo(ctx context.Context, client MinioAdmin) ([]*models.Bucket, e
308308
var bucketInfos []*models.Bucket
309309
for _, bucket := range info.Buckets {
310310

311-
tags := make(map[string]string)
312-
if bucket.Details != nil && bucket.Details.Tagging != nil {
313-
tags = bucket.Details.Tagging.ToMap()
314-
}
315-
316311
bucketElem := &models.Bucket{
317312
CreationDate: bucket.Created.Format(time.RFC3339),
318313
Details: &models.BucketDetails{
319314
Quota: nil,
320-
Tags: tags,
321315
},
322316
RwAccess: &models.BucketRwAccess{
323317
Read: bucket.Access.Read,
@@ -329,6 +323,10 @@ func getAccountInfo(ctx context.Context, client MinioAdmin) ([]*models.Bucket, e
329323
}
330324

331325
if bucket.Details != nil {
326+
if bucket.Details.Tagging != nil {
327+
bucketElem.Details.Tags = bucket.Details.Tagging.ToMap()
328+
}
329+
332330
bucketElem.Details.Locking = bucket.Details.Locking
333331
bucketElem.Details.Replication = bucket.Details.Replication
334332
bucketElem.Details.Versioning = bucket.Details.Versioning

0 commit comments

Comments
 (0)