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

[aws|glacier] Updates reference to service

This commit is contained in:
Paul Thornthwaite 2012-12-22 23:30:46 +00:00
parent 95e8c34b96
commit 13733d01dc
5 changed files with 21 additions and 21 deletions

View file

@ -22,15 +22,15 @@ module Fog
if multipart_chunk_size && body.respond_to?(:read)
self.id = multipart_save
else
data = connection.create_archive(vault.id, body, 'description' => description)
data = service.create_archive(vault.id, body, 'description' => description)
self.id = data.headers['x-amz-archive-id']
end
true
end
def destroy
requires :id
connection.delete_archive(vault.id,id)
service.delete_archive(vault.id,id)
end
private
@ -41,7 +41,7 @@ module Fog
def multipart_save
# Initiate the upload
res = connection.initiate_multipart_upload vault.id, multipart_chunk_size, 'description' => description
res = service.initiate_multipart_upload vault.id, multipart_chunk_size, 'description' => description
upload_id = res.headers["x-amz-multipart-upload-id"]
hash = Fog::AWS::Glacier::TreeHash.new
@ -50,17 +50,17 @@ module Fog
offset = 0
while (chunk = body.read(multipart_chunk_size)) do
part_hash = hash.add_part(chunk)
part_upload = connection.upload_part(vault.id, upload_id, chunk, offset, part_hash )
part_upload = service.upload_part(vault.id, upload_id, chunk, offset, part_hash )
offset += chunk.bytesize
end
rescue
# Abort the upload & reraise
connection.abort_multipart_upload(vault.id, upload_id) if upload_id
service.abort_multipart_upload(vault.id, upload_id) if upload_id
raise
else
# Complete the upload
connection.complete_multipart_upload(vault.id, upload_id, offset, hash.hexdigest).headers['x-amz-archive-id']
service.complete_multipart_upload(vault.id, upload_id, offset, hash.hexdigest).headers['x-amz-archive-id']
end
end

View file

@ -35,7 +35,7 @@ module Fog
requires :vault, :type
specification = {'Type' => type, 'ArchiveId' => archive_id, 'Format' => format, 'Description' => description, 'SNSTopic' => sns_topic}.reject{|k,v| v.nil?}
data = connection.initiate_job(vault.id, specification)
data = service.initiate_job(vault.id, specification)
self.id = data.headers['x-amz-job-id']
reload
end
@ -51,7 +51,7 @@ module Fog
options = options.merge :response_block => lambda {|chunk, remaining_bytes, total_bytes| io.write chunk}
end
options['Range'] = options.delete :range
connection.get_job_output(vault.id, id, options)
service.get_job_output(vault.id, id, options)
end
private

View file

@ -10,7 +10,7 @@ module Fog
model Fog::AWS::Glacier::Job
attribute :vault
attribute :filters
def initialize(attributes)
self.filters = {}
super
@ -21,12 +21,12 @@ module Fog
# completed (true/false)
def all(filters = self.filters)
self.filters = filters
data = connection.list_jobs(vault.id, self.filters).body['JobList']
data = service.list_jobs(vault.id, self.filters).body['JobList']
load(data)
end
def get(key)
data = connection.describe_job(vault.id, key).body
data = service.describe_job(vault.id, key).body
new(data)
rescue Excon::Errors::NotFound
nil

View file

@ -21,30 +21,30 @@ module Fog
end
def archives
@archives ||= Fog::AWS::Glacier::Archives.new(:vault => self, :connection => connection)
@archives ||= Fog::AWS::Glacier::Archives.new(:vault => self, :service => service)
end
def jobs(filters={})
Fog::AWS::Glacier::Jobs.new(:vault => self, :connection => connection, :filters => filters)
Fog::AWS::Glacier::Jobs.new(:vault => self, :service => service, :filters => filters)
end
def set_notification_configuration(topic, events)
connection.set_vault_notification_configuration(id, topic, events)
service.set_vault_notification_configuration(id, topic, events)
end
def delete_notification_configuration
connection.delete_vault_notification_configuration
service.delete_vault_notification_configuration
end
def save
requires :id
connection.create_vault(id)
service.create_vault(id)
reload
end
def destroy
requires :id
connection.delete_vault(id)
service.delete_vault(id)
end
end

View file

@ -10,12 +10,12 @@ module Fog
model Fog::AWS::Glacier::Vault
def all
data = connection.list_vaults.body['VaultList']
data = service.list_vaults.body['VaultList']
load(data)
end
def get(key)
data = connection.describe_vault(key).body
data = service.describe_vault(key).body
new(data)
rescue Excon::Errors::NotFound
nil