kotovalexarian-likes-github/fog--fog
1
0
Fork 0
mirror of https://github.com/fog/fog.git synced 2022-11-09 13:51:43 -05:00
Code Releases Activity

Merge pull request #1855 from burns/rackspace_object_manifest

Browse source 
[rackspace|storage] allow headers to be specified for object manifest
This commit is contained in:
Kyle Rames 2013-06-05 07:01:26 -07:00
commit 16633ed3ea
2 changed files with 82 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
lib/fog/rackspace/requests/storage/put_object_manifest.rb
View file

@ -5,22 +5,33 @@ module Fog
# Create a new manifest object # Create a new manifest object
# #
# ==== Parameters # Creates an object with a +X-Object-Manifest+ header that specifies the common prefix ("<container>/<prefix>")
# * container<~String> - Name for container, should be < 256 bytes and must not contain '/' # for all uploaded segments. Retrieving the manifest object streams all segments matching this prefix.
# * object<~String> - Name for manifest object # Segments must sort in the order they should be concatenated. Note that any future objects stored in the container
# * options<~Hash>: # along with the segments that match the prefix will be included when retrieving the manifest object.
# * 'segments_container'<~String> - Name of container where segments are stored. +container+ will be used if not given. #
# * 'segments_prefix'<~String> - Name prefix used for segmented objects. +object+ will be used if not given. # All segments must be stored in the same container, but may be in a different container than the manifest object.
# @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404 # The default +X-Object-Manifest+ header is set to "+container+/+object+", but may be overridden in +options+
# @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400 # to specify the prefix and/or the container where segments were stored.
# @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500 # If overridden, names should be CGI escaped (excluding spaces) if needed (see {Fog::Rackspace.escape}).
#
# @param container [String] Name for container where +object+ will be stored. Should be < 256 bytes and must not contain '/'
# @param object [String] Name for manifest object.
# @param options [Hash] Config headers for +object+.
# @option options [String] 'X-Object-Manifest' ("container/object") "<container>/<prefix>" for segment objects.
#
# @raise [Fog::Storage::Rackspace::NotFound] HTTP 404
# @raise [Fog::Storage::Rackspace::BadRequest] HTTP 400
# @raise [Fog::Storage::Rackspace::InternalServerError] HTTP 500
# @raise [Fog::Storage::Rackspace::ServiceError] # @raise [Fog::Storage::Rackspace::ServiceError]
#
# @see http://docs.rackspace.com/files/api/v1/cf-devguide/content/Large_Object_Creation-d1e2019.html
def put_object_manifest(container, object, options = {}) def put_object_manifest(container, object, options = {})
path = "#{Fog::Rackspace.escape(container)}/#{Fog::Rackspace.escape(object)}" path = "#{Fog::Rackspace.escape(container)}/#{Fog::Rackspace.escape(object)}"
prefix = "#{Fog::Rackspace.escape(options['segments_container'] || container)}/#{Fog::Rackspace.escape(options['segments_prefix'] || object)}" headers = {'X-Object-Manifest' => path}.merge(options)
request( request(
:expects => 201, :expects => 201,
:headers => {'X-Object-Manifest' => prefix}, :headers => headers,
:method => 'PUT', :method => 'PUT',
:path => path :path => path
) )

120
tests/rackspace/requests/storage/large_object_tests.rb
View file

@ -17,79 +17,80 @@ Shindo.tests('Fog::Storage[:rackspace] | large object requests', ["rackspace"])
Fog::Storage[:rackspace].put_object(@directory.identity, 'fog_large_object/2', ('x' * 2 * 1024 * 1024)) Fog::Storage[:rackspace].put_object(@directory.identity, 'fog_large_object/2', ('x' * 2 * 1024 * 1024))
end end
tests("#put_object_manifest('foglargeobjecttests', 'fog_large_object')").succeeds do tests("#put_object('foglargeobjecttests', 'fog_large_object2/1', ('x' * 1 * 1024 * 1024))").succeeds do
pending if Fog.mocking? pending if Fog.mocking?
Fog::Storage[:rackspace].put_object_manifest(@directory.identity, 'fog_large_object') Fog::Storage[:rackspace].put_object(@directory.identity, 'fog_large_object2/1', ('x' * 1 * 1024 * 1024))
end end
tests("#get_object('foglargeobjecttests', 'fog_large_object').body").succeeds do tests("using default X-Object-Manifest header") do
pending if Fog.mocking?
Fog::Storage[:rackspace].get_object(@directory.identity, 'fog_large_object').body == ('x' * 6 * 1024 * 1024) tests("#put_object_manifest('foglargeobjecttests', 'fog_large_object')").succeeds do
pending if Fog.mocking?
Fog::Storage[:rackspace].put_object_manifest(@directory.identity, 'fog_large_object')
end
tests("#get_object streams all segments matching the default prefix").succeeds do
pending if Fog.mocking?
Fog::Storage[:rackspace].get_object(@directory.identity, 'fog_large_object').body == ('x' * 7 * 1024 * 1024)
end
tests("#head_object returns Etag that includes manifest object in calculation").succeeds do
pending if Fog.mocking?
etags = []
# When the manifest object name is equal to the prefix, OpenStack treats it as if it's the first segment.
etags << Digest::MD5.hexdigest('') # Etag for manifest object => "d41d8cd98f00b204e9800998ecf8427e"
etags << Digest::MD5.hexdigest('x' * 4 * 1024 * 1024) # => "44981362d3ba9b5bacaf017c2f29d355"
etags << Digest::MD5.hexdigest('x' * 2 * 1024 * 1024) # => "67b2f816a30e8956149b2d7beb479e51"
etags << Digest::MD5.hexdigest('x' * 1 * 1024 * 1024) # => "b561f87202d04959e37588ee05cf5b10"
expected = Digest::MD5.hexdigest(etags.join) # => "42e92048bd2c8085e7072b0b55fd76ab"
actual = Fog::Storage[:rackspace].head_object(@directory.identity, 'fog_large_object').headers['Etag']
actual.gsub('"', '') == expected # actual is returned in quotes "\"42e92048bd2c8085e7072b0b55fd76abu"\"
end
end end
tests("returns manifest Etag, computed including manifest file").succeeds do tests("specifying X-Object-Manifest segment prefix") do
pending if Fog.mocking?
tests("#put_object_manifest('foglargeobjecttests', 'fog_large_object', {'X-Object-Manifest' => 'foglargeobjecttests/fog_large_object/')").succeeds do
pending if Fog.mocking?
Fog::Storage[:rackspace].put_object_manifest(@directory.identity, 'fog_large_object', {'X-Object-Manifest' => "#{@directory.identity}/fog_large_object/"})
end
tests("#get_object streams segments only matching the specified prefix").succeeds do
pending if Fog.mocking?
Fog::Storage[:rackspace].get_object(@directory.identity, 'fog_large_object').body == ('x' * 6 * 1024 * 1024)
end
tests("#head_object returns Etag that does not include manifest object in calculation").succeeds do
pending if Fog.mocking?
etags = []
etags << Digest::MD5.hexdigest('x' * 4 * 1024 * 1024) # => "44981362d3ba9b5bacaf017c2f29d355"
etags << Digest::MD5.hexdigest('x' * 2 * 1024 * 1024) # => "67b2f816a30e8956149b2d7beb479e51"
expected = Digest::MD5.hexdigest(etags.join) # => "0b348495a774eaa4d4c4bbf770820f84"
actual = Fog::Storage[:rackspace].head_object(@directory.identity, 'fog_large_object').headers['Etag']
actual.gsub('"', '') == expected # actual is returned in quotes "\"0b348495a774eaa4d4c4bbf770820f84"\"
end
etags = []
# When the manifest object name is equal to the prefix for the segments,
# OpenStack treats it as if it's the first segment.
etags << Digest::MD5.hexdigest('') # Etag for manifest object => "d41d8cd98f00b204e9800998ecf8427e"
etags << Digest::MD5.hexdigest('x' * 4 * 1024 * 1024) # => "44981362d3ba9b5bacaf017c2f29d355"
etags << Digest::MD5.hexdigest('x' * 2 * 1024 * 1024) # => "67b2f816a30e8956149b2d7beb479e51"
expected = Digest::MD5.hexdigest(etags.join) # => "2537ea40a5a8cac247a912906cb62fc2"
actual = Fog::Storage[:rackspace].head_object(@directory.identity, 'fog_large_object').headers['Etag']
actual.gsub('"', '') == expected # actual is returned in quotes "\"2537ea40a5a8cac247a912906cb62fc2"\"
end end
tests("#delete_object('foglargeobjecttests', 'fog_large_object')").succeeds do tests("storing manifest object in a different container than the segments") do
pending if Fog.mocking?
Fog::Storage[:rackspace].delete_object('foglargeobjecttests', 'fog_large_object')
end
tests("#put_object_manifest('foglargeobjecttests', 'large_object_manifest', {'segments_prefix' => 'fog_large_object'})").succeeds do tests("#put_object_manifest('foglargeobjecttests2', 'fog_large_object', {'X-Object-Manifest' => 'foglargeobjecttests/fog_large_object/'})").succeeds do
pending if Fog.mocking? pending if Fog.mocking?
Fog::Storage[:rackspace].put_object_manifest(@directory.identity, 'large_object_manifest', {'segments_prefix' => 'fog_large_object'}) Fog::Storage[:rackspace].put_object_manifest(@directory2.identity, 'fog_large_object', {'X-Object-Manifest' => "#{@directory.identity}/fog_large_object/"})
end end
tests("#get_object('foglargeobjecttests', 'large_object_manifest').body").succeeds do tests("#get_object('foglargeobjecttests2', 'fog_large_object').body").succeeds do
pending if Fog.mocking? pending if Fog.mocking?
Fog::Storage[:rackspace].get_object(@directory.identity, 'large_object_manifest').body == ('x' * 6 * 1024 * 1024) Fog::Storage[:rackspace].get_object(@directory2.identity, 'fog_large_object').body == ('x' * 6 * 1024 * 1024)
end end
tests("returns manifest Etag, computed without manifest file").succeeds do
pending if Fog.mocking?
etags = []
etags << Digest::MD5.hexdigest('x' * 4 * 1024 * 1024) # => "44981362d3ba9b5bacaf017c2f29d355"
etags << Digest::MD5.hexdigest('x' * 2 * 1024 * 1024) # => "67b2f816a30e8956149b2d7beb479e51"
expected = Digest::MD5.hexdigest(etags.join) # => "0b348495a774eaa4d4c4bbf770820f84"
actual = Fog::Storage[:rackspace].head_object(@directory.identity, 'large_object_manifest').headers['Etag']
actual.gsub('"', '') == expected # actual is returned in quotes "\"0b348495a774eaa4d4c4bbf770820f84"\"
end
tests("#put_object_manifest('foglargeobjecttests2', 'fog_large_object', {'segments_container' => 'foglargeobjecttests', 'segments_prefix' => 'fog_large_object'})").succeeds do
pending if Fog.mocking?
Fog::Storage[:rackspace].put_object_manifest(@directory2.identity, 'fog_large_object', {'segments_container' => @directory.identity, 'segments_prefix' => 'fog_large_object'})
end
tests("#get_object('foglargeobjecttests2', 'fog_large_object').body").succeeds do
pending if Fog.mocking?
Fog::Storage[:rackspace].get_object(@directory2.identity, 'fog_large_object').body == ('x' * 6 * 1024 * 1024)
end
tests("returns manifest Etag, computed without manifest file").succeeds do
pending if Fog.mocking?
etags = []
etags << Digest::MD5.hexdigest('x' * 4 * 1024 * 1024) # => "44981362d3ba9b5bacaf017c2f29d355"
etags << Digest::MD5.hexdigest('x' * 2 * 1024 * 1024) # => "67b2f816a30e8956149b2d7beb479e51"
expected = Digest::MD5.hexdigest(etags.join) # => "0b348495a774eaa4d4c4bbf770820f84"
actual = Fog::Storage[:rackspace].head_object(@directory2.identity, 'fog_large_object').headers['Etag']
actual.gsub('"', '') == expected # actual is returned in quotes "\"0b348495a774eaa4d4c4bbf770820f84"\"
end end
unless Fog.mocking? unless Fog.mocking?
['large_object_manifest', 'fog_large_object/1', 'fog_large_object/2'].each do |key| ['fog_large_object', 'fog_large_object/1', 'fog_large_object/2', 'fog_large_object2/1'].each do |key|
@directory.files.new(:key => key).destroy @directory.files.new(:key => key).destroy
end end
@directory2.files.new(:key => 'fog_large_object').destroy @directory2.files.new(:key => 'fog_large_object').destroy
@ -107,5 +108,4 @@ Shindo.tests('Fog::Storage[:rackspace] | large object requests', ["rackspace"])
@directory.destroy @directory.destroy
@directory2.destroy @directory2.destroy
end end
end end