fog 1.24.0 → 1.25.0

data/lib/fog/aws/sts.rb

@@ -72,7 +72,6 @@ module Fog
         # ==== Returns
         # * STS object with connection to AWS.
         def initialize(options={})
-          require 'fog/core/parser'
 
           @use_iam_profile = options[:use_iam_profile]
           setup_credentials(options)
@@ -99,19 +98,21 @@ module Fog
           @aws_secret_access_key  = options[:aws_secret_access_key]
           @aws_session_token      = options[:aws_session_token]
           @aws_credentials_expire_at = options[:aws_credentials_expire_at]
-          @hmac = Fog::HMAC.new('sha256', @aws_secret_access_key)
+
+          @signer = Fog::AWS::SignatureV4.new(@aws_access_key_id, @aws_secret_access_key, 'us-east-1', 'sts')
         end
 
         def request(params)
           idempotent  = params.delete(:idempotent)
           parser      = params.delete(:parser)
 
-          body = Fog::AWS.signed_params(
+          body, headers = Fog::AWS.signed_params_v4(
             params,
+            { 'Content-Type' => 'application/x-www-form-urlencoded' },
             {
-              :aws_access_key_id  => @aws_access_key_id,
+              :method             => 'POST',
               :aws_session_token  => @aws_session_token,
-              :hmac               => @hmac,
+              :signer             => @signer,
               :host               => @host,
               :path               => @path,
               :port               => @port,
@@ -121,19 +122,19 @@ module Fog
 
           if @instrumentor
             @instrumentor.instrument("#{@instrumentor_name}.request", params) do
-              _request(body, idempotent, parser)
+              _request(body, headers, idempotent, parser)
             end
           else
-            _request(body, idempotent, parser)
+            _request(body, headers, idempotent, parser)
           end
         end
 
-        def _request(body, idempotent, parser)
+        def _request(body, headers, idempotent, parser)
           @connection.request({
             :body       => body,
             :expects    => 200,
             :idempotent => idempotent,
-            :headers    => { 'Content-Type' => 'application/x-www-form-urlencoded' },
+            :headers    => headers,
             :method     => 'POST',
             :parser     => parser
           })

data/lib/fog/bare_metal_cloud/compute.rb

@@ -45,7 +45,6 @@ module Fog
 
       class Real
         def initialize(options={})
-          require 'fog/core/parser'
 
           @bare_metal_cloud_password = options[:bare_metal_cloud_password]
           @bare_metal_cloud_username = options[:bare_metal_cloud_username]

data/lib/fog/bin.rb

@@ -81,6 +81,7 @@ require 'fog/bin/rage4'
 require 'fog/bin/riakcs'
 require 'fog/bin/openstack'
 require 'fog/bin/ovirt'
+require 'fog/bin/profitbricks'
 require 'fog/bin/sakuracloud'
 require 'fog/bin/serverlove'
 require 'fog/bin/softlayer'

data/lib/fog/bin/brightbox.rb

@@ -4,8 +4,10 @@ class Brightbox < Fog::Bin
       case key
       when :compute
         Fog::Compute::Brightbox
+      when :storage
+        Fog::Storage::Brightbox
       else
-        raise ArgumentError, "Unrecognized service: #{key}"
+        raise ArgumentError, "Unsupported #{self} service: #{key}"
       end
     end
 

data/lib/fog/bin/rackspace.rb

@@ -26,6 +26,8 @@ class Rackspace < Fog::Bin
         Fog::Rackspace::Monitoring
       when :queues
         Fog::Rackspace::Queues
+      when :networking
+        Fog::Rackspace::Networking
       else
         raise ArgumentError, "Unrecognized service: #{key}"
       end
@@ -63,6 +65,8 @@ class Rackspace < Fog::Bin
           Fog::Rackspace::Monitoring.new
         when :queues
           Fog::Rackspace::Queues.new
+        when :networking
+          Fog::Rackspace::Networking.new
         else
           raise ArgumentError, "Unrecognized service: #{key.inspect}"
         end

data/lib/fog/bluebox/models/compute/server.rb

@@ -20,6 +20,7 @@ module Fog
         attribute :storage
         attribute :template
         attribute :ipv6_only
+        attribute :vsh_id
 
         attr_accessor :hostname, :password, :lb_applications, :lb_services, :lb_backends
 

data/lib/fog/cloudstack/models/compute/server.rb

@@ -50,7 +50,18 @@ module Fog
         end
 
         def ip_addresses
-          addresses.map{|a| a.ip_address}
+          addresses.map(&:ip_address)
+        end
+
+        def volumes
+          requires :id
+          service.volumes.all('virtualmachineid' => id)
+        end
+
+        def reset_password
+          requires :id
+          data = service.reset_password_for_virtual_machine(id)
+          service.jobs.new(data['resetpasswordforvirtualmachineresponse'])
         end
 
         def public_ip_addresses

data/lib/fog/cloudstack/models/compute/snapshots.rb

@@ -7,8 +7,9 @@ module Fog
       class Snapshots < Fog::Collection
         model Fog::Compute::Cloudstack::Snapshot
 
-        def all
-          data = service.list_snapshots["listsnapshotsresponse"]["snapshot"] || []
+        def all(attributes = {})
+          response = service.list_snapshots(attributes)
+          data = response["listsnapshotsresponse"]["snapshot"] || []
           load(data)
         end
 

data/lib/fog/cloudstack/models/compute/volume.rb

@@ -58,6 +58,11 @@ module Fog
           end
         end
 
+        def snapshots
+          requires :id
+          service.snapshots.all('volumeid' => id)
+        end
+
         def reload
           requires :identity
 

data/lib/fog/cloudstack/models/compute/volumes.rb

@@ -7,8 +7,9 @@ module Fog
       class Volumes < Fog::Collection
         model Fog::Compute::Cloudstack::Volume
 
-        def all
-          data = service.list_volumes["listvolumesresponse"]["volume"] || []
+        def all(attributes = {})
+          response = service.list_volumes(attributes)
+          data = response["listvolumesresponse"]["volume"] || []
           load(data)
         end
 

data/lib/fog/core/parser.rb

@@ -1,112 +1,2 @@
-require "nokogiri"
-
-module Fog
-  module Parsers
-    class Base < Nokogiri::XML::SAX::Document
-      attr_reader :response
-
-      def initialize
-        reset
-      end
-
-      def attr_value(name, attrs)
-        (entry = attrs.find {|a, v| a == name }) && entry.last
-      end
-
-      def reset
-        @response = {}
-      end
-
-      def characters(string)
-        @value ||= ''
-        @value << string
-      end
-
-      # ###############################################################################
-      # This is a workaround. Original implementation from Nokogiri is overwritten with
-      # one that does not join namespace prefix with local name.
-      def start_element_namespace name, attrs = [], prefix = nil, uri = nil, ns = []
-        start_element name, attrs
-      end
-
-      def end_element_namespace name, prefix = nil, uri = nil
-        end_element name
-      end
-
-      # ###############################################################################
-
-      def start_element(name, attrs = [])
-        @value = nil
-      end
-
-      def value
-        @value && @value.dup
-      end
-    end
-  end
-end
-
-module Fog
-  class ToHashDocument < Nokogiri::XML::SAX::Document
-    def initialize
-      @stack = []
-    end
-
-    def characters(string)
-      @value ||= ''
-      @value << string.strip
-    end
-
-    def end_element(name)
-      last = @stack.pop
-      if last.empty? && @value.empty?
-        @stack.last[name.to_sym] = ''
-      elsif last == {:i_nil=>"true"}
-        @stack.last[name.to_sym] = nil
-      elsif !@value.empty?
-        @stack.last[name.to_sym] = @value
-      end
-      @value = ''
-    end
-
-    def body
-      @stack.first
-    end
-
-    def response
-      body
-    end
-
-    def start_element(name, attributes = [])
-      @value = ''
-      parsed_attributes = {}
-      until attributes.empty?
-        if attributes.first.is_a?(Array)
-          key, value = attributes.shift
-        else
-          key, value = attributes.shift, attributes.shift
-        end
-        parsed_attributes[key.gsub(':','_').to_sym] = value
-      end
-      if @stack.last.is_a?(Array)
-        @stack.last << {name.to_sym => parsed_attributes}
-      else
-        data = if @stack.empty?
-          @stack.push(parsed_attributes)
-          parsed_attributes
-        elsif @stack.last[name.to_sym]
-          unless @stack.last[name.to_sym].is_a?(Array)
-            @stack.last[name.to_sym] = [@stack.last[name.to_sym]]
-          end
-          @stack.last[name.to_sym] << parsed_attributes
-          @stack.last[name.to_sym].last
-        else
-          @stack.last[name.to_sym] = {}
-          @stack.last[name.to_sym].merge!(parsed_attributes)
-          @stack.last[name.to_sym]
-        end
-        @stack.push(data)
-      end
-    end
-  end
-end
+Fog::Logger.deprecation("fog/core/parser is deprecated use fog/xml instead [light_black](#{caller.first})[/]")
+require 'fog/xml'

data/lib/fog/dnsmadeeasy/dns.rb

@@ -76,7 +76,6 @@ module Fog
         # ==== Returns
         # * dns object with connection to aws.
         def initialize(options={})
-          require 'fog/core/parser'
 
           @dnsmadeeasy_api_key = options[:dnsmadeeasy_api_key]
           @dnsmadeeasy_secret_key = options[:dnsmadeeasy_secret_key]

data/lib/fog/dynect/core.rb

@@ -2,7 +2,6 @@ require 'nokogiri'
 
 require 'fog/core'
 require 'fog/xml'
-require 'fog/core/parser'
 
 module Fog
   module Dynect

data/lib/fog/dynect/dns.rb

@@ -4,7 +4,7 @@ module Fog
   module DNS
     class Dynect < Fog::Service
       requires :dynect_customer, :dynect_username, :dynect_password
-      recognizes :timeout, :persistent
+      recognizes :timeout, :persistent, :job_poll_timeout
       recognizes :provider # remove post deprecation
 
       model_path 'fog/dynect/models/dns'
@@ -102,8 +102,16 @@ module Fog
               raise Error, response.body['msgs'].first['INFO']
             end
 
-            if response.status == 307 && params[:path] !~ %r{^/REST/Job/}
-              response = poll_job(response, params[:expects], @job_poll_timeout)
+            if params[:path] !~ %r{^/REST/Job/}
+              if response.status == 307
+                response = poll_job(response, params[:expects], @job_poll_timeout)
+
+              # Dynect intermittently returns 200 with an incomplete status.  When this
+              # happens, the job should still be polled.
+              elsif response.status == 200 && response.body['status'].eql?('incomplete')
+                response.headers['Location'] = "/REST/Job/#{ response.body['job_id'] }"
+                response = poll_job(response, params[:expects], @job_poll_timeout)
+              end
             end
 
             response

data/lib/fog/ecloud/compute.rb

@@ -284,7 +284,6 @@ module Fog
         end
 
         def initialize(options = {})
-          require 'fog/core/parser'
           @base_path               = options[:base_path] || '/cloudapi/ecloud'
           @connections             = {}
           @connection_options      = options[:connection_options] || {}

data/lib/fog/ecloud/core.rb

@@ -1,5 +1,5 @@
 require 'fog/core'
-
+require 'fog/xml'
 module Fog
   module Ecloud
     ECLOUD_OPTIONS = [:ecloud_authentication_method]

data/lib/fog/fogdocker/compute.rb

@@ -25,6 +25,7 @@ module Fog
       request :image_create
       request :image_delete
       request :image_get
+      request :image_search
 
       class Mock
         def initialize(options={})
@@ -40,7 +41,9 @@ module Fog
           url      = options[:docker_url]
 
           Docker.url = url
-          Docker.authenticate!('username' => username, 'password' => password, 'email' => email) unless username. nil? || username.empty?
+          Docker.authenticate!('username' => username, 'password' => password, 'email' => email) unless username.nil? || username.empty?
+        rescue Docker::Error::AuthenticationError => e
+          raise Fog::Errors::Fogdocker::AuthenticationError.new(e.message)
         end
 
         def downcase_hash_keys(hash, k = [])

data/lib/fog/fogdocker/core.rb

@@ -1,15 +1,9 @@
 require 'fog/core'
+require 'fog/fogdocker/errors'
 
 module Fog
   module Fogdocker
     extend Fog::Provider
-
-    module Errors
-      class ServiceError < Fog::Errors::Error; end
-      class SecurityError < ServiceError; end
-      class NotFound < ServiceError; end
-    end
-
     service(:compute, 'Compute')
   end
 end

data/lib/fog/fogdocker/errors.rb

@@ -0,0 +1,9 @@
+module Fog
+  module Errors
+    module Fogdocker
+      class ServiceError < Fog::Errors::Error; end
+      class AuthenticationError < Fog::Errors::Fogdocker::ServiceError; end
+    end
+  end
+end
+

data/lib/fog/fogdocker/models/compute/images.rb

@@ -14,6 +14,10 @@ module Fog
         def get(id)
           new service.image_get(id)
         end
+
+        def image_search(query = {})
+          service.image_search(query)
+        end
       end
     end
   end

data/lib/fog/fogdocker/models/compute/server.rb

@@ -14,15 +14,24 @@ module Fog
         attribute :path
         attribute :args
         attribute :hostname
+        attribute :links,                       :aliases => 'hostconfig_links'
+        attribute :privileged,                  :aliases => 'hostconfig_privileged'
+        attribute :port_bindings,               :aliases => 'hostconfig_port_bindings'
         attribute :ipaddress,                   :aliases => 'network_settings_ipaddress'
         attribute :bridge,                      :aliases => 'network_settings_bridge'
         attribute :state_running
         attribute :state_pid
-        attribute :cores,                       :aliases => 'config_cpu_shares'
+        attribute :state_exit_code
+        attribute :cores,                       :aliases => 'config_cpu_sets'
+        attribute :cpu_shares,                  :aliases => 'config_cpu_shares'
         attribute :memory,                      :aliases => 'config_memory'
         attribute :hostname,                    :aliases => 'config_hostname'
         attribute :cmd,                         :aliases => 'config_cmd'
         attribute :entrypoint,                  :aliases => 'config_entrypoint'
+        attribute :tty,                         :aliases => 'config_tty'
+        attribute :attach_stdin,                :aliases => 'config_attach_stdin'
+        attribute :attach_stdout,               :aliases => 'config_attach_stdout'
+        attribute :attach_stderr,               :aliases => 'config_attach_stderr'
         attribute :host
         attribute :image
         attribute :exposed_ports,               :aliases => 'config_exposed_ports'
@@ -115,6 +124,14 @@ module Fog
           service.container_delete(:id => id)
         end
 
+        def logs(options = { :stdout => 1, :stderr => 1 })
+          service.container_action(:id =>id, :action => :logs, :options => options)
+        end
+
+        def top(options = {})
+          service.container_action(:id =>id, :action => :top)
+        end
+
         def save
           if persisted?
             service.container_update(attributes)