fog 1.10.0 → 1.10.1

data/lib/fog/internet_archive/requests/storage/delete_object.rb

@@ -14,11 +14,7 @@ module Fog
         # @see http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectDELETE.html
 
         def delete_object(bucket_name, object_name, options = {})
-          if version_id = options.delete('versionId')
-            path = "#{CGI.escape(object_name)}?versionId=#{CGI.escape(version_id)}"
-          else
-            path = CGI.escape(object_name)
-          end
+          path = CGI.escape(object_name)
 
           headers = options
           request({
@@ -40,56 +36,7 @@ module Fog
           if bucket = self.data[:buckets][bucket_name]
             response.status = 204
 
-            version_id = options.delete('versionId')
-
-            if bucket[:versioning]
-              bucket[:objects][object_name] ||= []
-
-              if version_id
-                version = bucket[:objects][object_name].find { |object| object['VersionId'] == version_id}
-
-                # S3 special cases the 'null' value to not error out if no such version exists.
-                if version || (version_id == 'null')
-                  bucket[:objects][object_name].delete(version)
-                  bucket[:objects].delete(object_name) if bucket[:objects][object_name].empty?
-
-                  response.headers['x-amz-delete-marker'] = 'true' if version[:delete_marker]
-                  response.headers['x-amz-version-id'] = version_id
-                else
-                  response.status = 400
-                  response.body = invalid_version_id_payload(version_id)
-                  raise(Excon::Errors.status_error({:expects => 200}, response))
-                end
-              else
-                delete_marker = {
-                  :delete_marker    => true,
-                  'Key'             => object_name,
-                  'VersionId'       => bucket[:versioning] == 'Enabled' ? Fog::Mock.random_base64(32) : 'null',
-                  'Last-Modified'   => Fog::Time.now.to_date_header
-                }
-
-                # When versioning is suspended, a delete marker is placed if the last object ID is not the value 'null',
-                # otherwise the last object is replaced.
-                if bucket[:versioning] == 'Suspended' && bucket[:objects][object_name].first['VersionId'] == 'null'
-                  bucket[:objects][object_name].shift
-                end
-
-                bucket[:objects][object_name].unshift(delete_marker)
-
-                response.headers['x-amz-delete-marker'] = 'true'
-                response.headers['x-amz-version-id'] = delete_marker['VersionId']
-              end
-            else
-              if version_id && version_id != 'null'
-                response.status = 400
-                response.body = invalid_version_id_payload(version_id)
-                raise(Excon::Errors.status_error({:expects => 200}, response))
-              else
-                bucket[:objects].delete(object_name)
-
-                response.headers['x-amz-version-id'] = 'null'
-              end
-            end
+            bucket[:objects].delete(object_name)
           else
             response.status = 404
             raise(Excon::Errors.status_error({:expects => 204}, response))
@@ -97,21 +44,6 @@ module Fog
           response
         end
 
-        private
-
-        def invalid_version_id_payload(version_id)
-          {
-            'Error' => {
-              'Code' => 'InvalidArgument',
-              'Message' => 'Invalid version id specified',
-              'ArgumentValue' => version_id,
-              'ArgumentName' => 'versionId',
-              'RequestId' => Fog::Mock.random_hex(16),
-              'HostId' => Fog::Mock.random_base64(65)
-            }
-          }
-        end
-
       end
     end
   end

data/lib/fog/internet_archive/requests/storage/get_object.rb

@@ -13,7 +13,6 @@ module Fog
         # @option options If-None-Match [String] Returns object only if its etag differs from this value, otherwise returns 304 (Not Modified)
         # @option options If-Unmodified-Since [Time] Returns object only if it has not been modified since this time, otherwise returns 412 (Precodition Failed).
         # @option options Range [String] Range of object to download
-        # @option options versionId [String] specify a particular version to retrieve
         #
         # @return [Excon::Response] response:
         #   * body [String]- Contents of object
@@ -34,9 +33,6 @@ module Fog
           end
 
           params = { :headers => {} }
-          if version_id = options.delete('versionId')
-            params[:query] = {'versionId' => version_id}
-          end
           params[:headers].merge!(options)
           if options['If-Modified-Since']
             params[:headers]['If-Modified-Since'] = Fog::Time.at(options['If-Modified-Since'].to_i).to_date_header
@@ -63,7 +59,6 @@ module Fog
       class Mock # :nodoc:all
 
         def get_object(bucket_name, object_name, options = {}, &block)
-          version_id = options.delete('versionId')
 
           unless bucket_name
             raise ArgumentError.new('bucket_name is required')
@@ -77,7 +72,7 @@ module Fog
           if (bucket = self.data[:buckets][bucket_name])
             object = nil
             if bucket[:objects].has_key?(object_name)
-              object = version_id ? bucket[:objects][object_name].find { |object| object['VersionId'] == version_id} : bucket[:objects][object_name].first
+              object = bucket[:objects][object_name].first
             end
 
             if (object && !object[:delete_marker])
@@ -98,8 +93,6 @@ module Fog
                   end
                 end
 
-                response.headers['x-amz-version-id'] = object['VersionId'] if bucket[:versioning]
-
                 body = object[:body]
                 if options['Range']
                   # since AWS S3 itself does not support multiple range headers, we will use only the first
@@ -122,20 +115,6 @@ module Fog
                   end
                 end
               end
-            elsif version_id && !object
-              response.status = 400
-              response.body = {
-                'Error' => {
-                  'Code' => 'InvalidArgument',
-                  'Message' => 'Invalid version id specified',
-                  'ArgumentValue' => version_id,
-                  'ArgumentName' => 'versionId',
-                  'RequestId' => Fog::Mock.random_hex(16),
-                  'HostId' => Fog::Mock.random_base64(65)
-                }
-              }
-
-              raise(Excon::Errors.status_error({:expects => 200}, response))
             else
               response.status = 404
               response.body = "...<Code>NoSuchKey<\/Code>..."

data/lib/fog/internet_archive/requests/storage/get_object_acl.rb

@@ -10,7 +10,6 @@ module Fog
         # @param bucket_name [String] name of bucket containing object
         # @param object_name [String] name of object to get access control list for
         # @param options [Hash]
-        # @option options versionId [String] specify a particular version to retrieve
         #
         # @return [Excon::Response] response:
         #   * body [Hash]:
@@ -37,9 +36,6 @@ module Fog
             raise ArgumentError.new('object_name is required')
           end
           query = {'acl' => nil}
-          if version_id = options.delete('versionId')
-            query['versionId'] = version_id
-          end
           request({
             :expects    => 200,
             :headers    => {},

data/lib/fog/internet_archive/requests/storage/get_service.rb

@@ -25,8 +25,7 @@ module Fog
             :host     => @host,
             :idempotent => true,
             :method   => 'GET',
-            :parser   => Fog::Parsers::Storage::InternetArchive::GetService.new,
-            :url      => @host
+            :parser   => Fog::Parsers::Storage::InternetArchive::GetService.new
           })
         end
 

data/lib/fog/internet_archive/requests/storage/head_object.rb

@@ -13,7 +13,6 @@ module Fog
         # @option options [String] If-None-Match Returns object only if its etag differs from this value, otherwise returns 304 (Not Modified)
         # @option options [Time]   If-Unmodified-Since Returns object only if it has not been modified since this time, otherwise returns 412 (Precodition Failed).
         # @option options [String] Range Range of object to download
-        # @option options [String] versionId specify a particular version to retrieve
         # 
         # @return [Excon::Response] response: 
         #   * body [String] Contents of object
@@ -32,9 +31,6 @@ module Fog
           unless object_name
             raise ArgumentError.new('object_name is required')
           end
-          if version_id = options.delete('versionId')
-            query = {'versionId' => version_id}
-          end
           headers = {}
           headers['If-Modified-Since'] = Fog::Time.at(options['If-Modified-Since'].to_i).to_date_header if options['If-Modified-Since']
           headers['If-Unmodified-Since'] = Fog::Time.at(options['If-Unmodified-Since'].to_i).to_date_header if options['If-Modified-Since']

data/lib/fog/internet_archive/requests/storage/post_object_hidden_fields.rb

@@ -4,7 +4,7 @@ module Fog
       class Real
 
         # Get a hash of hidden fields for form uploading to S3, in the form {:field_name => :field_value}
-        # Form should look like: <form action="http://#{bucket_name}.s3.#{Fog::InternetArchive::DOMAIN_NAME}/" method="post" enctype="multipart/form-data">
+        # Form should look like: <form action="http://#{bucket_name}.#{Fog::InternetArchive::API_DOMAIN_NAME}/" method="post" enctype="multipart/form-data">
         # These hidden fields should then appear, followed by a field named 'file' which is either a textarea or file input.
         #
         # @param options Hash:

data/lib/fog/internet_archive/requests/storage/put_object.rb

@@ -67,30 +67,16 @@ module Fog
               'Key'             => object_name,
               'Last-Modified'   => Fog::Time.now.to_date_header,
               'Content-Length'  => options['Content-Length'] || data[:headers]['Content-Length'],
-              'StorageClass'    => options['x-amz-storage-class'] || 'STANDARD',
-              'VersionId'       => bucket[:versioning] == 'Enabled' ? Fog::Mock.random_base64(32) : 'null'
             }
 
             for key, value in options
               case key
-              when 'Cache-Control', 'Content-Disposition', 'Content-Encoding', 'Content-MD5', 'Expires', /^x-amz-meta-/
+              when 'Cache-Control', 'Content-Disposition', 'Content-Encoding', 'Content-MD5', 'Expires', /^x-amz-meta-/, /^x-archive-/
                 object[key] = value
               end
             end
 
-            if bucket[:versioning]
-              bucket[:objects][object_name] ||= []
-
-              # When versioning is suspended, putting an object will create a new 'null' version if the latest version
-              # is a value other than 'null', otherwise it will replace the latest version.
-              if bucket[:versioning] == 'Suspended' && bucket[:objects][object_name].first['VersionId'] == 'null'
-                bucket[:objects][object_name].shift
-              end
-
-              bucket[:objects][object_name].unshift(object)
-            else
-              bucket[:objects][object_name] = [object]
-            end
+            bucket[:objects][object_name] = [object]
 
             response.headers = {
               'Content-Length'   => object['Content-Length'],
@@ -99,7 +85,6 @@ module Fog
               'Last-Modified'    => object['Last-Modified'],
             }
 
-            response.headers['x-amz-version-id'] = object['VersionId'] if object['VersionId'] != 'null'
           else
             response.status = 404
             raise(Excon::Errors.status_error({:expects => 200}, response))

data/lib/fog/internet_archive/requests/storage/put_object_acl.rb

@@ -24,16 +24,11 @@ module Fog
         #     * Permission [String] Permission, in [FULL_CONTROL, WRITE, WRITE_ACP, READ, READ_ACP]
         # @param acl [String] Permissions, must be in ['private', 'public-read', 'public-read-write', 'authenticated-read']
         # @param options [Hash]
-        # @option options versionId [String] specify a particular version to retrieve
         #
         # @see http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectPUTacl.html
 
         def put_object_acl(bucket_name, object_name, acl, options = {})
           query = {'acl' => nil}
-          if version_id = options.delete('versionId')
-            query['versionId'] = version_id
-          end
-          
           data = ""
           headers = {}
           

data/lib/fog/internet_archive/storage.rb

@@ -33,9 +33,7 @@ module Fog
       request :get_bucket_lifecycle
       request :get_bucket_location
       request :get_bucket_logging
-      request :get_bucket_object_versions
       request :get_bucket_policy
-      request :get_bucket_versioning
       request :get_bucket_website
       request :get_object
       request :get_object_acl
@@ -56,7 +54,6 @@ module Fog
       request :put_bucket_lifecycle
       request :put_bucket_logging
       request :put_bucket_policy
-      request :put_bucket_versioning
       request :put_bucket_website
       request :put_object
       request :put_object_acl
@@ -79,9 +76,10 @@ module Fog
 
         def url(params, expires)
           Fog::Logger.deprecation("Fog::Storage::InternetArchive => #url is deprecated, use #https_url instead [light_black](#{caller.first})[/]")
-          https_url(params, expires)
+          http_url(params, expires)
         end
 
+
         private
 
         def scheme_host_path_query(params, expires)
@@ -201,13 +199,8 @@ module Fog
           require 'mime/types'
           setup_credentials(options)
           options[:region] ||= 'us-east-1'
-          @host = options[:host] || case options[:region]
-          when 'us-east-1'
-            "s3.#{Fog::InternetArchive::DOMAIN_NAME}"
-          else
-            "s3-#{options[:region]}.#{Fog::InternetArchive::DOMAIN_NAME}"
-          end
-          @scheme = options[:scheme] || 'https'
+          @host = options[:host] || Fog::InternetArchive::API_DOMAIN_NAME
+          @scheme = options[:scheme] || 'http'
           @region = options[:region]
         end
 
@@ -273,12 +266,7 @@ module Fog
           else
             options[:region] ||= 'us-east-1'
             @region = options[:region]
-            @host = options[:host] || case options[:region]
-            when 'us-east-1'
-              "s3.#{Fog::InternetArchive::DOMAIN_NAME}"
-            else
-              "s3-#{options[:region]}.#{Fog::InternetArchive::DOMAIN_NAME}"
-            end
+            @host = options[:host] || Fog::InternetArchive::API_DOMAIN_NAME
             @path       = options[:path]        || '/'
             @persistent = options.fetch(:persistent, false)
             @port       = options[:port]        || 80
@@ -389,7 +377,7 @@ DATA
           begin
             response = @connection.request(params, &block)
           rescue Excon::Errors::TemporaryRedirect => error
-            uri = URI.parse(error.response.headers['Location'])
+            uri = URI.parse(error.response.headers['location'])
             Fog::Logger.warning("fog: followed redirect to #{uri.host}, connecting to the matching region will be more performant")
             response = Fog::Connection.new("#{@scheme}://#{uri.host}:#{@port}", false, @connection_options).request(original_params, &block)
           end

data/lib/fog/joyent.rb

@@ -1,3 +1,5 @@
+require 'fog/core'
+
 module Fog
   module Joyent
     extend Fog::Provider

data/lib/fog/libvirt/requests/compute/get_node_info.rb

@@ -14,7 +14,7 @@ module Fog
           node_hash[:uri] = client.uri
           xml = client.sys_info rescue nil
           [:uuid, :manufacturer, :product, :serial].each do |attr|
-            node_hash[attr] = node_attr(attr, xml)
+            node_hash[attr] = node_attr(attr, xml) rescue nil
           end if xml
 
           node_hash[:hostname] = client.hostname

data/lib/fog/openstack/CHANGELOG.md

@@ -0,0 +1,47 @@
+# 1.11.0 2013/04/04
+
+## Storage
+
+* Added storage (Swift) example to set account quotas:
+
+  https://github.com/fog/fog/blob/master/lib/fog/openstack/examples/storage/set-account-quota.rb
+
+* Added account impersonation to the storage service
+
+  Now it's possible to use an admin account with a reseller
+  role to impersonate other accounts and set account metadata
+  headers. See the account quotas example included in this release
+
+## Network
+
+* create_network request updated
+
+  Implements provider extensions when creating networks.
+
+  See http://docs.openstack.org/trunk/openstack-network/admin/content/provider_attributes.html
+
+* Network Router support (Quantum)
+
+  Added router model/collection and related requests.
+
+* New network service example
+
+  See https://github.com/fog/fog/blob/master/lib/fog/openstack/examples/network/network_subnets_routers.rb
+
+* :openstack_endpoint_type parameter was added to the network service
+
+## Image
+
+* Added basic image service example (Glance)
+
+  Download CirrOS 0.3.0 image from launchpad (~6.5MB) to /tmp
+  and upload it to Glance.
+
+  See https://github.com/fog/fog/blob/master/lib/fog/openstack/examples/image/upload-test-image.rb
+
+* Check for glance version (fog only supports v1)
+
+## Compute
+
+* create_server and the Server model where updated to allow booting a VM 
+  with NICs (net_id, port_id, fixed_ip).

data/lib/fog/openstack/examples/identity/basics.rb

@@ -0,0 +1,69 @@
+# OpenStack Identity Service (Keystone) Example
+
+require 'fog'
+require 'pp'
+
+auth_url = "https://example.net/v2.0/tokens"
+username = 'admin@example.net'
+password = 'secret'
+
+keystone = Fog::Identity.new :provider           => 'OpenStack',
+                             :openstack_auth_url => auth_url,
+                             :openstack_username => username,
+                             :openstack_api_key  => password
+                             # Optional, self-signed certs
+                             #:connection_options => { :ssl_verify_peer => false }
+
+#
+# Listing keystone tenants
+#
+keystone.tenants.each do |tenant|
+  # <Fog::Identity::OpenStack::Tenant
+  #   id="46b4ab...",
+  #   description=nil,
+  #   enabled=1,
+  #   name="admin@example.net"
+  # >
+  pp tenant
+end
+
+#
+# List users
+#
+keystone.users.each do |user|
+  # <Fog::Identity::OpenStack::User
+  #   id="c975f...",
+  #   email="quantum@example.net",
+  #   enabled=true,
+  #   name="quantum",
+  #   tenant_id="00928...",
+  #   password=nil
+  # >
+  # ...
+  pp user
+end
+
+#
+# Create a new tenant
+#
+tenant = keystone.tenants.create :name        => 'rubiojr@example.net',
+                                 :description => 'My foo tenant'
+
+#
+# Create a new user
+#
+user = keystone.users.create :name      => 'rubiojr@example.net',
+                             :tenant_id => tenant.id,
+                             :password  => 'rubiojr@example.net',
+                             :email     => 'rubiojr@example.net'
+
+
+# Find the recently created tenant
+tenant = keystone.tenants.find { |t| t.name == 'rubiojr@example.net' }
+# Destroy the tenant
+tenant.destroy
+
+# Find the recently created user 
+user = keystone.users.find { |u| u.name == 'rubiojr@example.net' }
+# Destroy the user
+user.destroy