[google|storage] also update mocks to omit storageclass
This commit is contained in:
parent
c1a1ec6b37
commit
78e36ba641
|
@ -36,7 +36,6 @@ module Fog
|
||||||
# * 'DisplayName'<~String> - Display name of object owner
|
# * 'DisplayName'<~String> - Display name of object owner
|
||||||
# * 'ID'<~String> - Id of object owner
|
# * 'ID'<~String> - Id of object owner
|
||||||
# * 'Size'<~Integer> - Size of object
|
# * 'Size'<~Integer> - Size of object
|
||||||
# * 'StorageClass'<~String> - Storage class of object
|
|
||||||
#
|
#
|
||||||
def get_bucket(bucket_name, options = {})
|
def get_bucket(bucket_name, options = {})
|
||||||
unless bucket_name
|
unless bucket_name
|
||||||
|
@ -69,7 +68,7 @@ module Fog
|
||||||
(options['prefix'] && object['Key'][0...options['prefix'].length] != options['prefix']) ||
|
(options['prefix'] && object['Key'][0...options['prefix'].length] != options['prefix']) ||
|
||||||
(options['marker'] && object['Key'] <= options['marker'])
|
(options['marker'] && object['Key'] <= options['marker'])
|
||||||
end.map do |object|
|
end.map do |object|
|
||||||
data = object.reject {|key, value| !['ETag', 'Key', 'StorageClass'].include?(key)}
|
data = object.reject {|key, value| !['ETag', 'Key'].include?(key)}
|
||||||
data.merge!({
|
data.merge!({
|
||||||
'LastModified' => Time.parse(object['Last-Modified']),
|
'LastModified' => Time.parse(object['Last-Modified']),
|
||||||
'Owner' => bucket['Owner'],
|
'Owner' => bucket['Owner'],
|
||||||
|
|
|
@ -63,8 +63,7 @@ module Fog
|
||||||
'ETag' => Fog::Google::Mock.etag,
|
'ETag' => Fog::Google::Mock.etag,
|
||||||
'Key' => object_name,
|
'Key' => object_name,
|
||||||
'Last-Modified' => Fog::Time.now.to_date_header,
|
'Last-Modified' => Fog::Time.now.to_date_header,
|
||||||
'Content-Length' => options['Content-Length'] || data[:headers]['Content-Length'],
|
'Content-Length' => options['Content-Length'] || data[:headers]['Content-Length']
|
||||||
'StorageClass' => 'STANDARD'
|
|
||||||
}
|
}
|
||||||
|
|
||||||
for key, value in options
|
for key, value in options
|
||||||
|
|
Loading…
Reference in New Issue