fog 1.17.0 → 1.18.0

data/lib/fog/hp/simple_http_instrumentor.rb

@@ -0,0 +1,59 @@
+module Excon
+  class SimpleHttpInstrumentor
+    class << self
+      attr_accessor :events
+
+      def instrument(name, params = {}, &block)
+        params = params.dup
+        if params.has_key?(:headers) && params[:headers].has_key?('Authorization')
+          params[:headers] = params[:headers].dup
+          params[:headers]['Authorization'] = REDACTED
+        end
+        if params.has_key?(:password)
+          params[:password] = REDACTED
+        end
+        $stderr.puts("--- #{name} ---")
+        if name.include?('.request')
+          query = ''
+          tmp_query = ''
+          if params.has_key?(:query) && !params[:query].nil?
+            params[:query].each do |key, value|
+              tmp_query += "#{key}=#{value}&"
+            end
+            if !tmp_query.nil?
+              query = "?#{tmp_query}"
+              query.chomp!('&')
+            end
+          end
+          $stderr.puts("#{params[:method]} #{params[:path]}#{query} HTTP/1.1" )
+          $stderr.puts("User-Agent: #{params[:headers]['User-Agent']}")
+          $stderr.puts("Host: #{params[:host]} Port: #{params[:port]}")
+          $stderr.puts("Accept: #{params[:headers]['Accept']}")
+          $stderr.puts("X-Auth-Token: #{params[:headers]['X-Auth-Token']}")
+          $stderr.puts("Body: #{params[:body]}")
+        elsif name.include?('.response')
+          $stderr.puts("HTTP/1.1 #{params[:status]}")
+          $stderr.puts("Content-Length: #{params[:headers]['Content-Length']}")
+          $stderr.puts("Content-Type: #{params[:headers]['Content-Type']}")
+          $stderr.puts("Date: #{params[:headers]['Date']}")
+          params[:headers].each do |key, value|
+            if !['Content-Length', 'Content-Type', 'Date'].include?(key)
+              $stderr.puts("#{key}: #{value}")
+            end
+          end
+          $stderr.puts("Date: #{params[:headers]['Date']}\n")
+          $stderr.puts("Body: #{params[:body]}")
+        elsif name.include?('.retry')
+          $stderr.puts("#{params.inspect}")
+        elsif name.include?('.error')
+          $stderr.puts("#{params.inspect}")
+        end
+
+        if block_given?
+          yield
+        end
+      end
+
+    end
+  end
+end

data/lib/fog/hp/storage.rb

@@ -6,7 +6,7 @@ module Fog
     class HP < Fog::Service
 
       requires    :hp_secret_key, :hp_tenant_id, :hp_avl_zone
-      recognizes  :hp_auth_uri, :hp_cdn_ssl, :hp_cdn_uri, :hp_service_type
+      recognizes  :hp_auth_uri, :hp_cdn_ssl, :hp_cdn_uri, :credentials, :hp_service_type
       recognizes  :persistent, :connection_options
       recognizes  :hp_use_upass_auth_style, :hp_auth_version, :user_agent
       recognizes  :hp_access_key, :hp_account_id  # :hp_account_id is deprecated use hp_access_key instead
@@ -41,6 +41,8 @@ module Fog
       request :head_object
       request :head_shared_container
       request :head_shared_object
+      request :post_container
+      request :post_object
       request :put_container
       request :put_object
       request :put_shared_object
@@ -57,6 +59,7 @@ module Fog
               :hp_cdn_uri     => @hp_cdn_uri,
               :hp_tenant_id   => @hp_tenant_id,
               :hp_avl_zone    => @hp_avl_zone,
+              :credentials    => @credentials,
               :connection_options => @connection_options
             )
             if @cdn.enabled?
@@ -203,9 +206,6 @@ module Fog
         # ==== Returns
         # * response<~Excon::Response>:
         #   * body<~String> - url for object
-        #
-        # ==== See Also
-        # http://docs.rackspace.com/files/api/v1/cf-devguide/content/Create_TempURL-d1a444.html
         def create_temp_url(container, object, expires, method, options = {})
           raise ArgumentError, "Insufficient parameters specified." unless (container && object && expires && method)
           raise ArgumentError, "Storage must my instantiated with the :os_account_meta_temp_url_key option" if @os_account_meta_temp_url_key.nil?
@@ -299,6 +299,7 @@ module Fog
 
       class Real
         include Utils
+        attr_reader :credentials
         attr_reader :hp_cdn_ssl
 
         def initialize(options={})
@@ -333,6 +334,7 @@ module Fog
             # the CS service catalog returns the cdn endpoint
             @hp_storage_uri = credentials[:endpoint_url]
             @hp_cdn_uri  = credentials[:cdn_endpoint_url]
+            @credentials = credentials
           else
             # Call the legacy v1.0/v1.1 authentication
             credentials = Fog::HP.authenticate_v1(options, @connection_options)
@@ -365,7 +367,6 @@ module Fog
                 'Accept'       => 'application/json',
                 'X-Auth-Token' => @auth_token
               }.merge!(params[:headers] || {}),
-              :host     => @host,
               :path     => "#{@path}/#{params[:path]}",
             }), &block)
           rescue Excon::Errors::HTTPStatusError => error
@@ -391,7 +392,6 @@ module Fog
                 'Accept'       => 'application/json',
                 'X-Auth-Token' => @auth_token
               }.merge!(params[:headers] || {}),
-              :host     => @host,
               :path     => "#{params[:path]}",
             }), &block)
           rescue Excon::Errors::HTTPStatusError => error

data/lib/fog/internet_archive/models/storage/file.rb

@@ -152,7 +152,7 @@ module Fog
 
 
         # Get publicly acessible url via http GET.
-        # 
+        #
         #     required attributes: directory, key
         # 
         # @return [String] public url

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

@@ -13,7 +13,7 @@ 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
-        # 
+        #
         # @return [Excon::Response] response: 
         #   * body [String] Contents of object
         #   * headers [Hash]: 
@@ -58,4 +58,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/openstack/identity.rb

@@ -292,4 +292,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/openstack/models/storage/file.rb

@@ -82,7 +82,7 @@ module Fog
           requires :key
           self.collection.get_url(self.key)
         end
-        
+
 
         def save(options = {})
           requires :body, :directory, :key

data/lib/fog/rackspace.rb

@@ -64,9 +64,12 @@ module Fog
       class ServiceUnavailable < ServiceError; end
       class MethodNotAllowed < ServiceError; end
       class BadRequest < ServiceError
-        #TODO - Need to find a better way to print out these validation errors when they are thrown
         attr_reader :validation_errors
 
+        def to_s
+          "#{super} - #{validation_errors}"
+        end
+
         def self.slurp(error, service=nil)
           new_error = super(error)
           unless new_error.response_data.nil? or new_error.response_data['badRequest'].nil?

data/lib/fog/rackspace/docs/compute_v2.md

@@ -138,7 +138,7 @@ To view the status of the response:
 	response.status
 	
 **Note**: Fog is aware of valid HTTP response statuses for each request type. If an unexpected HTTP response status occurs, Fog will raise an exception.
-	
+
 To view response body:
 
 	response.body
@@ -152,7 +152,7 @@ To learn more about Compute request methods refer to [rdoc](http://rubydoc.info/
 
 ### Model Layer
 
-Fog models behave in a manner similar to `ActiveModel`. Models will generally respond to `create`, `save`,  `persisted?`, `destroy`, `reload` and `attributes` methods. Additionally, fog will automatically create attribute accessors.  
+Fog models behave in a manner similar to `ActiveModel`. Models will generally respond to `create`, `save`,  `persisted?`, `destroy`, `reload` and `attributes` methods. Additionally, fog will automatically create attribute accessors.
 
 Here is a summary of common model methods:
 

data/lib/fog/rackspace/docs/storage.md

@@ -193,7 +193,7 @@ To learn more about `Fog::Storage` request methods refer to [rdoc](http://rubydo
 
 ### Model Layer
 
-Fog models behave in a manner similar to `ActiveModel`. Models will generally respond to `create`, `save`,  `destroy`, `reload` and `attributes` methods. Additionally, fog will automatically create attribute accessors.  
+Fog models behave in a manner similar to `ActiveModel`. Models will generally respond to `create`, `save`,  `destroy`, `reload` and `attributes` methods. Additionally, fog will automatically create attribute accessors.
 
 Here is a summary of common model methods:
 

data/lib/fog/rackspace/examples/compute_v2/create_image.rb

@@ -12,7 +12,7 @@ end
 
 def select_server(servers)
   abort "\nThere are not any servers available to image in the Chicago region. Try running create_server.rb\n\n" if servers.empty?
-  
+
   puts "\nSelect Server To Image:\n\n"
   servers.each_with_index do |server, i|
     puts "\t #{i}. #{server.name} [#{server.public_ip_address}]"

data/lib/fog/rackspace/examples/compute_v2/delete_image.rb

@@ -12,7 +12,7 @@ end
 
 def select_image(snapshot_images)
   abort "\nThere are not any images to delete in the Chicago region. Try running create_image.rb\n\n" if snapshot_images.empty?
-  
+
   puts "\nSelect Image To Delete:\n\n"
   snapshot_images.each_with_index do |image, i|
     puts "\t #{i}. #{image.name}"

data/lib/fog/rackspace/examples/compute_v2/delete_server.rb

@@ -12,7 +12,7 @@ end
 
 def select_server(servers)
   abort "\nThere are not any servers to delete in the Chicago region. Try running create_server.rb\n\n" if servers.empty?
-  
+
   puts "\nSelect Server To Delete:\n\n"
   servers.each_with_index do |server, i|
     puts "\t #{i}. #{server.name} [#{server.public_ip_address}]"

data/lib/fog/rackspace/examples/compute_v2/detach_volume.rb

@@ -12,7 +12,7 @@ end
 
 def select_server(servers)
   abort "\nThere are not any servers in the Chicago region. Try running create_server.rb\n\n" if servers.empty?
-  
+
   puts "\nSelect Server For Volume Detachment:\n\n"
   servers.each_with_index do |server, i|
     puts "\t #{i}. #{server.name} [#{server.public_ip_address}]"
@@ -24,7 +24,7 @@ end
 
 def select_attachment(attachments)
   abort "\nThis server does not contain any volumes in the Chicago region. Try running server_attachments.rb\n\n" if attachments.empty?
-  
+
   puts "\nSelect Volume To Detach:\n\n"
   attachments.each_with_index do |attachment, i|
     puts "\t #{i}. #{attachment.device}"

data/lib/fog/rackspace/examples/compute_v2/resize_server.rb

@@ -23,7 +23,7 @@ end
 
 def select_server(servers)
   abort "\nThere are not any servers to resize in the Chicago region. Try running create_server.rb\n\n" if servers.empty?
-  
+
   puts "\nSelect Server Resize:\n\n"
   servers.each_with_index do |server, i|
     puts "\t #{i}. #{server.name} [#{server.public_ip_address}]"

data/lib/fog/rackspace/examples/compute_v2/server_attachments.rb

@@ -12,7 +12,7 @@ end
 
 def select_server(servers)
   abort "\nThere are not any servers in the Chicago region. Try running create_server.rb\n\n" if servers.empty?
-  
+
   puts "\nSelect Server For Attachment:\n\n"
   servers.each_with_index do |server, i|
     puts "\t #{i}. #{server.name} [#{server.public_ip_address}]"

data/lib/fog/rackspace/examples/storage/create_cdn_directory.rb

@@ -28,7 +28,7 @@ service = Fog::Storage.new({
   :rackspace_username   => rackspace_username,
   :rackspace_api_key    => rackspace_api_key,
   :rackspace_region => :ord #Use Chicago Region
-  }) 
+  })
   
 # prompt for directory name
 directory_name = get_user_input "\nEnter name of directory to create"

data/lib/fog/rackspace/examples/storage/delete_directory.rb

@@ -12,7 +12,7 @@ end
 
 def select_directory(directories)
   abort "\nThere are not any directories to delete in the Chicago region. Try running create_directory.rb\n\n" if directories.empty?
-  
+
   puts "\nSelect Directory To Delete:\n\n"
   directories.each_with_index do |dir, i|
     puts "\t #{i}. #{dir.key} [#{dir.count} objects]"

data/lib/fog/rackspace/examples/storage/delete_file.rb

@@ -12,7 +12,7 @@ end
 
 def select_directory(directories)
   abort "\nThere are not any directories with files to delete in the Chicago region. Try running create_file.rb\n\n" if directories.empty?
-  
+
   puts "\nSelect Directory:\n\n"
   directories.each_with_index do |dir, i|
     puts "\t #{i}. #{dir.key} [#{dir.count} objects]"

data/lib/fog/rackspace/examples/storage/download_file.rb

@@ -12,7 +12,7 @@ end
 
 def select_directory(directories)
   abort "\nThere are not any directories with files in the Chicago region. Try running create_file.rb\n\n" if directories.empty?
-  
+
   puts "\nSelect Directory:\n\n"
   directories.each_with_index do |dir, i|
     puts "\t #{i}. #{dir.key} [#{dir.count} objects]"

data/lib/fog/rackspace/models/compute_v2/images.rb

@@ -61,7 +61,7 @@ module Fog
         # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400
         # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500
         # @raise [Fog::Compute::RackspaceV2::ServiceError]
-        # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Get_Image_Details-d1e4848.html 
+        # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Get_Image_Details-d1e4848.html
         def get(image_id)
           data = service.get_image(image_id).body['image']
           new(data)

data/lib/fog/rackspace/models/compute_v2/metadata.rb

@@ -46,7 +46,7 @@ module Fog
         # Retrieve specific value for key from Metadata.
         # * If key is of type String, this method will return the value of the metadatum
         # * If key is of type Fixnum, this method will return a Fog::Compute::RackspaceV2::Metadatum object (legacy)
-        # @param [#key] key 
+        # @param [#key] key
         # @return [#value] 
         def [](key)
           return super(key) if key.is_a?(Integer)
@@ -58,7 +58,7 @@ module Fog
         # Set value for key.
         # * If key is of type String, this method will set/add the value to Metadata
         # * If key is of type Fixnum, this method will set a Fog::Compute::RackspaceV2::Metadatum object (legacy)
-        # @param [#key] key 
+        # @param [#key] key
         # @return [String] 
         def []=(key, value)
           return super(key,value) if key.is_a?(Integer)          

data/lib/fog/rackspace/models/compute_v2/server.rb

@@ -56,7 +56,7 @@ module Fog
         # @return [String] server (extended) status. 
         # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/List_Servers-d1e2078.html#server_status
         attribute :state_ext, :aliases => 'OS-EXT-STS:task_state'
-                
+
         # @!attribute [r] progress
         # @return [Fixnum] The build completion progress, as a percentage. Value is from 0 to 100.
         attribute :progress
@@ -426,7 +426,7 @@ module Fog
         # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400
         # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500
         # @raise [Fog::Compute::RackspaceV2::ServiceError]
-        # @note All resizes are automatically confirmed after 24 hours if you do not explicitly confirm or revert the resize.        
+        # @note All resizes are automatically confirmed after 24 hours if you do not explicitly confirm or revert the resize.
         # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Confirm_Resized_Server-d1e3868.html
         # @see #resize
         #

data/lib/fog/rackspace/models/compute_v2/servers.rb

@@ -29,7 +29,7 @@ module Fog
         # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400
         # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500
         # @raise [Fog::Compute::RackspaceV2::ServiceError]
-        # @note This method is incompatible with Cloud Servers utlizing RackConnect. RackConnect users 
+        # @note This method is incompatible with Cloud Servers utlizing RackConnect. RackConnect users
         #     should use server personalization to install keys.  Please see Server#personality for more information.
         # @example
         #   service.servers.bootstrap :name => 'bootstrap-server',

data/lib/fog/rackspace/models/storage/file.rb

@@ -160,6 +160,25 @@ module Fog
           directory.public?
         end
         
+
+        # Get a url for file.
+        #
+        #     required attributes: key
+        #
+        # @param expires [String] number of seconds (since 1970-01-01 00:00) before url expires
+        # @param options [Hash]
+        # @return [String] url
+        # @note This URL does not use the Rackspace CDN
+        #
+        def url(expires, options = {})
+          requires :key
+          if service.ssl?
+            service.get_object_https_url(directory.key, key, expires, options)
+          else
+            service.get_object_http_url(directory.key, key, expires, options)
+          end
+        end
+
         # Returns the public url for the file.
         # If the file has not been published to the CDN, this method will return nil as it is not publically accessible. This method will return the approprate
         # url in the following order:

data/lib/fog/rackspace/models/storage/files.rb

@@ -137,6 +137,31 @@ module Fog
           end
         end
         
+        # Get a temporary http url for a file.
+        #
+        # required attributes: key
+        # @param key [String] the key of the file within the directory
+        # @param expires [String] number of seconds (since 1970-01-01 00:00) before url expires
+        # @param options [Hash]
+        # @return [String] url
+        # @note This URL does not use the Rackspace CDN
+        def get_http_url(key, expires, options = {})
+          requires :directory
+          service.get_object_http_url(directory.key, key, expires, options)
+        end
+
+        # Get a temporary https url for a file.
+        #
+        # required attributes: key
+        # @param key [String] the key of the file within the directory
+        # @param expires [String] number of seconds (since 1970-01-01 00:00) before url expires
+        # @param options [Hash]
+        # @return [String] url
+        # @note This URL does not use the Rackspace CDN
+        def get_https_url(key, expires, options = {})
+          service.get_object_https_url(directory.key, key, expires, options)
+        end
+
         # View directory detail without loading file contents
         # @param key of the object
         # @param options Required for compatibility with other Fog providers. Not Used.

data/lib/fog/rackspace/monitoring.rb

@@ -13,10 +13,26 @@ module Fog
       class IdentifierTaken < Fog::Errors::Error; end
       class ServiceError < Fog::Rackspace::Errors::ServiceError; end
       class InternalServerError < Fog::Rackspace::Errors::InternalServerError; end
-      class BadRequest < Fog::Rackspace::Errors::BadRequest; end
       class Conflict < Fog::Rackspace::Errors::Conflict; end
       class ServiceUnavailable < Fog::Rackspace::Errors::ServiceUnavailable; end
 
+
+      class BadRequest < Fog::Rackspace::Errors::BadRequest
+        attr_reader :validation_errors
+
+        def self.slurp(error, service=nil)
+          new_error = super(error)
+          if  new_error.response_data && new_error.response_data['details']
+            new_error.instance_variable_set(:@validation_errors, new_error.response_data['details'])
+          end
+
+          status_code = error.response ? error.response.status : nil
+          new_error.instance_variable_set(:@status_code, status_code)
+          new_error.set_transaction_id(error, service)
+          new_error
+        end
+      end
+
       requires :rackspace_api_key, :rackspace_username
       recognizes :rackspace_auth_url
       recognizes :persistent
@@ -82,6 +98,9 @@ module Fog
 
       request      :evaluate_alarm_example
 
+      request      :list_monitoring_zones
+      request      :get_monitoring_zone
+
 
       class Mock < Fog::Rackspace::Service