fog 1.12.1 → 1.13.0

data/lib/fog/xml/sax_parser_connection.rb

@@ -0,0 +1,43 @@
+module Fog
+  module XML
+    class SAXParserConnection < Fog::Core::Connection
+
+      # Makes a request using the connection using Excon
+      #
+      # @param [Hash] params
+      # @option params [String] :body text to be sent over a socket
+      # @option params [Hash<Symbol, String>] :headers The default headers to supply in a request
+      # @option params [String] :host The destination host's reachable DNS name or IP, in the form of a String
+      # @option params [String] :path appears after 'scheme://host:port/'
+      # @option params [Fixnum] :port The port on which to connect, to the destination host
+      # @option params [Hash]   :query appended to the 'scheme://host:port/path/' in the form of '?key=value'
+      # @option params [String] :scheme The protocol; 'https' causes OpenSSL to be used
+      # @option params [Proc] :response_block
+      # @option params [Nokogiri::XML::SAX::Document] :parser
+      #
+      # @return [Excon::Response]
+      #
+      # @raise [Excon::Errors::StubNotFound]
+      # @raise [Excon::Errors::Timeout]
+      # @raise [Excon::Errors::SocketError]
+      #
+      def request(parser, params)
+        reset unless @persistent
+
+        # Prepare the SAX parser
+        data_stream = Nokogiri::XML::SAX::PushParser.new(parser)
+        params[:response_block] = lambda do |chunk, remaining, total|
+          data_stream << chunk
+        end
+
+        # Make request which read chunks into parser
+        response = @excon.request(params)
+
+        # Cease parsing and override response.body with parsed data
+        data_stream.finish
+        response.body = parser.response
+        response
+      end
+    end
+  end
+end

data/lib/tasks/changelog_task.rb

@@ -60,6 +60,7 @@ module Fog
               'Dylan Egan',
               'geemus',
               'Henry Addison',
+              'James Bence',
               'Kevin Menard',
               'Kyle Rames',
               'Lincoln Stoll',

data/tests/aws/models/auto_scaling/groups_test.rb

@@ -0,0 +1,22 @@
+Shindo.tests('AWS::AutoScaling | group', ['aws', 'auto_scaling_m']) do
+
+  params = {
+    :id => uniq_id,
+    :auto_scaling_group_name => "name",
+    :availability_zones => [],
+    :launch_configuration_name => "lc"
+  }
+
+  lc_params = {
+    :id => params[:launch_configuration_name],
+    :image_id => "image-id",
+    :instance_type => "instance-type",
+  }
+
+  Fog::AWS[:auto_scaling].configurations.new(lc_params).save
+  
+  model_tests(Fog::AWS[:auto_scaling].groups, params, true) do
+    @instance.update
+  end
+
+end

data/tests/aws/requests/compute/volume_tests.rb

@@ -192,9 +192,9 @@ Shindo.tests('Fog::Compute[:aws] | volume requests', ['aws']) do
       Fog::Compute[:aws].create_volume(@server.availability_zone, 10, 'VolumeType' => 'io1', 'Iops' => 99)
     end
 
-    # iops invalid value (greater than 2000)
-    tests("#create_volume('#{@server.availability_zone}', 1024, 'VolumeType' => 'io1', 'Iops' => 2001)").raises(Fog::Compute::AWS::Error) do
-      Fog::Compute[:aws].create_volume(@server.availability_zone, 1024, 'VolumeType' => 'io1', 'Iops' => 2001)
+    # iops invalid value (greater than 4000)
+    tests("#create_volume('#{@server.availability_zone}', 1024, 'VolumeType' => 'io1', 'Iops' => 4001)").raises(Fog::Compute::AWS::Error) do
+      Fog::Compute[:aws].create_volume(@server.availability_zone, 1024, 'VolumeType' => 'io1', 'Iops' => 4001)
     end
 
     @volume.destroy

data/tests/aws/requests/rds/helper.rb

@@ -105,6 +105,19 @@ class AWS
 
       })
 
+      DB_LOG_FILE = {
+        'LastWritten' => Time,
+        'Size' => Integer,
+        'LogFileName' => String
+      }
+
+      DESCRIBE_DB_LOG_FILES = BASIC.merge({
+        'DescribeDBLogFilesResult' => {
+          'Marker' => Fog::Nullable::String,
+          'DBLogFiles' => [DB_LOG_FILE]
+        }
+      })
+
       SNAPSHOT={
         'AllocatedStorage' => Integer,
         'AvailabilityZone' => String,
@@ -137,6 +150,7 @@ class AWS
             'DBSecurityGroupName' => String
           }],
         'DBSubnetGroupName' => Fog::Nullable::String,
+        'PubliclyAccessible' => Fog::Boolean,
         'Endpoint' => {
           'Address' => Fog::Nullable::String,
           'Port' => Fog::Nullable::Integer

data/tests/aws/requests/rds/log_file_tests.rb

@@ -0,0 +1,19 @@
+Shindo.tests('AWS::RDS | log file requests', %w[aws rds]) do
+  tests('success') do
+    pending if Fog.mocking?
+
+    suffix = rand(65536).to_s(16)
+    @db_instance_id = "fog-test-#{suffix}"
+
+    tests('#describe_db_log_files').formats(AWS::RDS::Formats::DESCRIBE_DB_LOG_FILES) do
+      result = Fog::AWS[:rds].describe_db_log_files(@db_instance_id).body['DescribeDBLogFilesResult']
+      returns(true) { result['DBLogFiles'].size > 0 }
+      result
+    end
+
+  end
+
+  tests('failures') do
+    raises(Fog::AWS::RDS::NotFound) {Fog::AWS[:rds].describe_db_log_files('doesntexist')}
+  end
+end

data/tests/aws/requests/ses/verified_domain_identity_tests.rb

@@ -0,0 +1,16 @@
+Shindo.tests('AWS::SES | verified domain identity requests', ['aws', 'ses']) do
+
+  tests('success') do
+
+    tests("#verify_domain_identity('example.com')").formats(AWS::SES::Formats::BASIC) do
+      pending if Fog.mocking?
+      Fog::AWS[:ses].verify_domain_identity('example.com').body
+    end
+
+  end
+
+  tests('failure') do
+
+  end
+
+end

data/tests/aws/requests/sts/assume_role_tests.rb

@@ -0,0 +1,19 @@
+Shindo.tests('AWS::STS | assume role', ['aws']) do
+
+	@policy = {"Statement" => [{"Effect" => "Allow", "Action" => "*", "Resource" => "*"}]}
+
+	@response_format = {
+		'SessionToken' => String,
+		'SecretAccessKey' => String,
+		'Expiration' => String,
+		'AccessKeyId' => String,
+		'Arn' => String,
+		'RequestId' => String
+	}
+	
+	tests("#assume_role('rolename', 'assumed_role_session', 'external_id', #{@policy.inspect}, 900)").formats(@response_format) do
+		pending if Fog.mocking?
+		Fog::AWS[:sts].assume_role("rolename","assumed_role_session","external_id", @policy, 900).body
+	end
+
+end

data/tests/brightbox/requests/compute/collaboration_tests.rb

@@ -0,0 +1,41 @@
+Shindo.tests('Fog::Compute[:brightbox] | collaboration requests', ['brightbox']) do
+
+  tests('success') do
+
+    tests("#create_collaboration") do
+      pending if Fog.mocking?
+      collaboration = Fog::Compute[:brightbox].create_collaboration(:email => "paul@example.com", :role => "admin")
+      @collaboration_id = collaboration['id']
+      formats(Brightbox::Compute::Formats::Full::COLLABORATION, false) { collaboration }
+    end
+
+
+    tests("#list_collaborations") do
+      pending if Fog.mocking?
+      result = Fog::Compute[:brightbox].list_collaborations
+
+      formats(Brightbox::Compute::Formats::Collection::COLLABORATIONS, false) { result }
+    end
+
+    tests("#get_collaboration") do
+      pending if Fog.mocking?
+      result = Fog::Compute[:brightbox].get_collaboration(@collaboration_id)
+      formats(Brightbox::Compute::Formats::Full::COLLABORATION, false) { result }
+    end
+
+
+    tests("#destroy_collaboration") do
+      pending if Fog.mocking?
+      result = Fog::Compute[:brightbox].destroy_collaboration(@collaboration_id)
+      formats(Brightbox::Compute::Formats::Full::COLLABORATION, false) { result }
+    end
+  end
+
+  tests("failure") do
+    tests("get_collaboration('col-abcde')").raises(Excon::Errors::NotFound) do
+      pending if Fog.mocking?
+      Fog::Compute[:brightbox].get_collaboration("col-abcde")
+    end
+  end
+
+end

data/tests/brightbox/requests/compute/helper.rb

@@ -8,6 +8,7 @@ module Fog
       module LoadBalancer; end
       module Server; end
       module ServerGroup; end
+      module User; end
       module Zone; end
     end
   end
@@ -34,6 +35,9 @@ NilClass.send :include, Fog::Brightbox::Nullable::Server
 Hash.send :include, Fog::Brightbox::Nullable::ServerGroup
 NilClass.send :include, Fog::Brightbox::Nullable::ServerGroup
 
+Hash.send :include, Fog::Brightbox::Nullable::User
+NilClass.send :include, Fog::Brightbox::Nullable::User
+
 Hash.send :include, Fog::Brightbox::Nullable::Zone
 NilClass.send :include, Fog::Brightbox::Nullable::Zone
 
@@ -75,8 +79,8 @@ class Brightbox
         raise "No available images!" if images.empty?
         images.select { |img| img["official"] && img["virtual_size"] != 0 }.sort_by { |img| img["disk_size"] }.first || images.first
       end
-
     end
+
     module Formats
       module Struct
         CIP_PORT_TRANSLATOR = {
@@ -231,6 +235,20 @@ class Brightbox
           "email_address"   => String
         }
 
+
+        COLLABORATION = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "status"          => String,
+          "email"           => Fog::Nullable::String,
+          "role"            => String,
+          "role_label"      => String,
+          "user"            => Fog::Brightbox::Nullable::User,
+          "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT,
+          "inviter"         => Brightbox::Compute::Formats::Nested::USER
+        }
+
         ZONE = {
           "id"              => String,
           "resource_type"   => String,
@@ -413,6 +431,19 @@ class Brightbox
           "default_account" => NilClass
         }
 
+        COLLABORATION = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "status"          => String,
+          "role"            => String,
+          "role_label"      => String,
+          "email"           => Fog::Nullable::String,
+          "user"            => Fog::Brightbox::Nullable::User,
+          "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT,
+          "inviter"         => Brightbox::Compute::Formats::Nested::USER
+        }
+
         ZONE = {
           "id"              => String,
           "resource_type"   => String,
@@ -656,13 +687,25 @@ class Brightbox
           "messaging_pref"  => Fog::Boolean
         }
 
+        COLLABORATION = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "status"          => String,
+          "role"            => String,
+          "role_label"      => String,
+          "email"           => Fog::Nullable::String,
+          "user"            => Fog::Brightbox::Nullable::User,
+          "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT,
+          "inviter"         => Brightbox::Compute::Formats::Nested::USER
+        }
+
         ZONE = {
           "id"              => String,
           "resource_type"   => String,
           "url"             => String,
           "handle"          => String
         }
-
       end
 
       module Collection
@@ -678,6 +721,7 @@ class Brightbox
         SERVER_TYPES = [Brightbox::Compute::Formats::Collected::SERVER_TYPE]
         USERS = [Brightbox::Compute::Formats::Collected::USER]
         ZONES = [Brightbox::Compute::Formats::Collected::ZONE]
+        COLLABORATIONS = [Brightbox::Compute::Formats::Collected::COLLABORATION]
       end
 
     end

data/tests/brightbox/requests/compute/user_collaboration_tests.rb

@@ -0,0 +1,67 @@
+Shindo.tests('Fog::Compute[:brightbox] | user collaboration requests', ['brightbox']) do
+
+  @service = Fog::Compute[:brightbox]
+
+  tests("when accessing with user application") do
+    pending unless @service.authenticating_as_user?
+    tests("success") do
+      tests("#list_user_collaborations") do
+        pending if Fog.mocking?
+        result = @service.list_user_collaborations
+
+        formats(Brightbox::Compute::Formats::Collection::COLLABORATIONS, false) { result }
+      end
+    end
+
+    tests("failure") do
+      tests("get_user_collaboration('col-abcde')").raises(Excon::Errors::NotFound) do
+        pending if Fog.mocking?
+
+        @service.get_user_collaboration('col-abcde')
+      end
+
+      tests("accept_user_collaboration('col-abcde')").raises(Excon::Errors::NotFound) do
+        pending if Fog.mocking?
+
+        @service.accept_user_collaboration('col-abcde')
+      end
+
+      tests("reject_user_collaboration('col-abcde')").raises(Excon::Errors::NotFound) do
+        pending if Fog.mocking?
+
+        @service.reject_user_collaboration('col-abcde')
+      end
+    end
+  end
+
+  tests("when accessing with API client") do
+    pending if @service.authenticating_as_user?
+    tests("forbidden") do
+
+      tests("#list_user_collaborations").raises(Excon::Errors::Forbidden) do
+        pending if Fog.mocking?
+        result = @service.list_user_collaborations
+
+        formats(Brightbox::Compute::Formats::Collection::COLLABORATIONS, false) { result }
+      end
+
+      tests("get_user_collaboration('col-abcde')").raises(Excon::Errors::Forbidden) do
+        pending if Fog.mocking?
+
+        @service.get_user_collaboration('col-abcde')
+      end
+
+      tests("accept_user_collaboration('col-abcde')").raises(Excon::Errors::Forbidden) do
+        pending if Fog.mocking?
+
+        @service.accept_user_collaboration('col-abcde')
+      end
+
+      tests("reject_user_collaboration('col-abcde')").raises(Excon::Errors::Forbidden) do
+        pending if Fog.mocking?
+
+        @service.reject_user_collaboration('col-abcde')
+      end
+    end
+  end
+end

data/tests/core/connection_tests.rb

@@ -0,0 +1,26 @@
+Shindo.tests('Fog::Core::Connection', ['core']) do
+
+  raises(ArgumentError, "raises ArgumentError when no arguments given") do
+    Fog::Core::Connection.new
+  end
+
+  tests('new("http://example.com")') do
+    @instance = Fog::Core::Connection.new("http://example.com")
+    responds_to([:request, :reset])
+
+    tests('user agent').returns("fog/#{Fog::VERSION}") do
+      @instance.instance_variable_get(:@excon).data[:headers]['User-Agent']
+    end
+  end
+
+  tests('new("http://example.com", true)') do
+    Fog::Core::Connection.new("http://example.com", true)
+  end
+
+  tests('new("http://example.com", false, options")') do
+    options = {
+      :debug_response => false
+    }
+    Fog::Core::Connection.new("http://example.com", true, options)
+  end
+end

data/tests/helper.rb

@@ -1,3 +1,16 @@
+require 'simplecov'
+require 'coveralls'
+
+unless ENV['COVERAGE'] == 'false'
+  SimpleCov.command_name "shindo:#{Process.pid.to_s}"
+  SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+    SimpleCov::Formatter::HTMLFormatter,
+    Coveralls::SimpleCov::Formatter
+  ]
+  SimpleCov.merge_timeout 3600
+  SimpleCov.start
+end
+
 ENV['FOG_RC']         = ENV['FOG_RC'] || File.expand_path('../.fog', __FILE__)
 ENV['FOG_CREDENTIAL'] = ENV['FOG_CREDENTIAL'] || 'default'
 

data/tests/openstack/requests/metering/meter_tests.rb

@@ -0,0 +1,52 @@
+Shindo.tests('Fog::Metering[:openstack] | meter requests', ['openstack']) do
+
+  @sample_format = {
+    'counter_name'      => String,
+    'user_id'           => String,
+    'resource_id'       => String,
+    'timestamp'         => String,
+    'resource_metadata' => Hash,
+    'source'            => String,
+    'counter_unit'      => String,
+    'counter_volume'    => Float,
+    'project_id'        => String,
+    'message_id'        => String,
+    'counter_type'      => String
+  }
+
+  @meter_format = {
+    'user_id'     => String,
+    'name'        => String,
+    'resource_id' => String,
+    'project_id'  => String,
+    'type'        => String,
+    'unit'        => String
+  }
+
+  @statistics_format = {
+    'count'          => Integer,
+    'duration_start' => String,
+    'min'            => Float,
+    'max'            => Float,
+    'duration_end'   => String,
+    'period'         => Integer,
+    'period_end'     => String,
+    'duration'       => Float,
+    'period_start'   => String,
+    'avg'            => Float,
+    'sum'            => Float
+  }
+  tests('success') do
+    tests('#list_meters').formats([@meter_format]) do
+      Fog::Metering[:openstack].list_meters.body
+    end
+
+    tests('#get_samples').formats([@sample_format]) do
+      Fog::Metering[:openstack].get_samples('test').body
+    end
+
+    tests('#get_statistics').formats([@statistics_format]) do
+      Fog::Metering[:openstack].get_statistics('test').body
+    end
+  end
+end