MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2024-12-23 21:55:53 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix StorageClass field in ListObject/ListObjectV2 response (#5766)

Browse Source 
Fixes: #5754
This commit is contained in:
Nitish Tiwari 2018-04-05 23:26:28 +05:30 committed by kannappanr
parent 30ab71c9d9
commit 9eb94fe8c8
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/api-response.go
View File

@ -339,7 +339,7 @@ func generateListObjectsV1Response(bucket, prefix, marker, delimiter string, max
content.ETag = "\"" + object.ETag + "\""
}
content.Size = object.Size
content.StorageClass = globalMinioDefaultStorageClass
content.StorageClass = object.StorageClass
content.Owner = owner
contents = append(contents, content)
}
@ -385,7 +385,7 @@ func generateListObjectsV2Response(bucket, prefix, token, nextToken, startAfter,
content.ETag = "\"" + object.ETag + "\""
}
content.Size = object.Size
content.StorageClass = globalMinioDefaultStorageClass
content.StorageClass = object.StorageClass
content.Owner = owner
contents = append(contents, content)
}

3
cmd/object-api-datatypes.go
View File

@ -98,6 +98,9 @@ type ObjectInfo struct {
// by the Content-Type header field.
ContentEncoding string
// Specify object storage class
StorageClass string
// User-Defined metadata
UserDefined map[string]string

7
cmd/xl-v1-metadata.go
View File

@ -315,6 +315,13 @@ func (m xlMetaV1) ToObjectInfo(bucket, object string) ObjectInfo {
// All the parts per object.
objInfo.Parts = m.Parts
// Update storage class
if sc, ok := m.Meta[amzStorageClass]; ok {
objInfo.StorageClass = sc
} else {
objInfo.StorageClass = globalMinioDefaultStorageClass
}
// Success.
return objInfo
}