fog 1.5.0 → 1.6.0

data/tests/aws/models/compute/security_group_tests.rb

@@ -6,6 +6,7 @@ Shindo.tests("Fog::Compute[:aws] | security_group", ['aws']) do
     @group = Fog::Compute[:aws].security_groups.create(:name => "foggroup", :description => "fog group desc")
 
     @other_group = Fog::Compute[:aws].security_groups.create(:name => 'fog other group', :description => 'another fog group')
+    @other_group.reload
 
     test("authorize access by another security group") do
       @group.authorize_group_and_owner(@other_group.name)
@@ -31,18 +32,26 @@ Shindo.tests("Fog::Compute[:aws] | security_group", ['aws']) do
       @group.ip_permissions.empty?
     end
 
-    test("authorize port range access by another security group") do
-      @other_group.reload
-      @group.authorize_port_range(5000..6000, {:group => "#{@other_group.owner_id}:#{@other_group.group_id}"})
-      @group.reload
-      @group.ip_permissions.size == 1
-    end
-
-    test("revoke port range access by another security group") do
-      @other_group.reload
-      @group.revoke_port_range(5000..6000, {:group => "#{@other_group.owner_id}:#{@other_group.group_id}"})
-      @group.reload
-      @group.ip_permissions.empty?
+    group_forms = [
+      "#{@other_group.owner_id}:#{@other_group.group_id}", # deprecated form
+      @other_group.group_id,
+      {@other_group.owner_id => @other_group.group_id}
+    ]
+
+    group_forms.each do |group_arg|
+      test("authorize port range access by another security group #{group_arg.inspect}") do
+        @other_group.reload
+        @group.authorize_port_range(5000..6000, {:group => group_arg})
+        @group.reload
+        @group.ip_permissions.size == 1
+      end
+
+      test("revoke port range access by another security group") do
+        @other_group.reload
+        @group.revoke_port_range(5000..6000, {:group => group_arg})
+        @group.reload
+        @group.ip_permissions.empty?
+      end
     end
 
     @other_group.destroy

data/tests/aws/models/dns/records_tests.rb

@@ -22,14 +22,20 @@ Shindo.tests("Fog::DNS[:aws] | records", ['aws', 'dns']) do
     records << @zone.records.create(:name => "#{i}.#{@zone.domain}", :type => "A", :ttl => 3600, :value => ['1.2.3.4'])
   end
 
-  tests("#all!").returns(102) do
+  records << @zone.records.create(:name => "*.#{@zone.domain}", :type => "A", :ttl => 3600, :value => ['1.2.3.4'])
+
+  tests("#all!").returns(103) do
     @zone.records.all!.size
   end
 
-  tests("#all!").returns(102) do
+  tests("#all!").returns(103) do
     @zone.records.all!.size
   end
 
+  tests("#all wildcard parsing").returns(true) do
+    @zone.records.map(&:name).include?("*.#{@zone.domain}")
+  end
+
   records.each do |record|
     record.destroy
   end

data/tests/aws/models/glacier/model_tests.rb

@@ -0,0 +1,47 @@
+Shindo.tests('AWS::Glacier | models', ['aws', 'glacier']) do
+  pending if Fog.mocking?
+  tests('success') do
+    tests('vaults') do
+      tests('getting a missing vault') do
+        returns(nil) { Fog::AWS[:glacier].vaults.get('no-such-vault') }
+      end
+
+      vault = nil
+      tests('creating a vault') do
+        vault = Fog::AWS[:glacier].vaults.create :id => 'Fog-Test-Vault'
+        tests("id is Fog-Test-Vault").returns('Fog-Test-Vault') {vault.id}
+      end
+
+      tests('all') do
+        tests('contains vault').returns(true) { Fog::AWS[:glacier].vaults.collect {|vault| vault.id}.include?(vault.id)}
+      end
+
+      tests('destroy') do
+        vault.destroy
+        tests('removes vault').returns(nil) {Fog::AWS[:glacier].vaults.get(vault.id)}
+      end
+    end
+
+    tests("archives") do
+      vault = Fog::AWS[:glacier].vaults.create :id => 'Fog-Test-Vault-upload'
+      tests('create') do
+        archive = vault.archives.create(:body => 'data')
+        tests('sets id').returns(true) {!archive.id.nil?}
+        archive.destroy
+      end
+      tests('create multipart') do
+        body = StringIO.new('x'*1024*1024*2)
+        body.rewind
+        archive = vault.archives.create(:body => body, :multipart_chunk_size => 1024*1024)
+        tests('sets id').returns(true) {!archive.id.nil?}
+        archive.destroy
+      end
+    end
+
+    vault = Fog::AWS[:glacier].vaults.create :id => 'Fog-Test-Vault'
+    tests("jobs") do
+      tests('all').returns([]) {vault.jobs}
+    end
+    vault.destroy
+  end
+end

data/tests/aws/models/iam/policies_tests.rb

@@ -14,7 +14,7 @@ Shindo.tests("Fog::Compute[:iam] | policies", ['aws','iam']) do
   
   tests('#create') do 
     tests('a valid policy').succeeds do
-      policy = @user.policies.create(id: @policy_name, document: @policy_document)
+      policy = @user.policies.create(:id => @policy_name, :document => @policy_document)
       policy.id == @policy_name
       policy.username == @username
       policy.document == @policy_document
@@ -26,7 +26,7 @@ Shindo.tests("Fog::Compute[:iam] | policies", ['aws','iam']) do
     #end
   end
   
-  @user.policies.create(id: 'another-policy', document: {})
+  @user.policies.create(:id => 'another-policy', :document => {})
   
   tests('#all','there are two policies').succeeds do
     @user.policies.size == 2

data/tests/aws/models/rds/server_tests.rb

@@ -6,6 +6,10 @@ Shindo.tests("AWS::RDS | server", ['aws', 'rds']) do
 
     @instance.wait_for(20*60) { ready? }
 
+    test('#read_replica_identifiers is []') do
+      returns([]) { @instance.read_replica_identifiers }
+    end
+
     tests('#snapshots') do
       snapshot = nil
 
@@ -26,7 +30,7 @@ Shindo.tests("AWS::RDS | server", ['aws', 'rds']) do
       pending if Fog.mocking?
 
       orig_parameter_group = @instance.db_parameter_groups.first['DBParameterGroupName']
-      parameter_group = Fog::AWS[:rds].parameter_groups.create(:id => uniq_id, :family => 'mysql5.1', :description => 'fog-test')
+      parameter_group = Fog::AWS[:rds].parameter_groups.create(:id => uniq_id, :family => 'mysql5.5', :description => 'fog-test')
 
       orig_security_groups = @instance.db_security_groups.map{|h| h['DBSecurityGroupName']}
       security_group = Fog::AWS[:rds].security_groups.create(:id => uniq_id, :description => 'fog-test')
@@ -77,7 +81,6 @@ Shindo.tests("AWS::RDS | server", ['aws', 'rds']) do
     @instance.reload.wait_for { ready? }
 
     tests('#create_read_replica').succeeds do
-      pending if Fog.mocking?
 
       replica = @instance_with_final_snapshot.create_read_replica(uniq_id('fog-replica'))
       @instance_with_final_snapshot.reload

data/tests/aws/models/storage/directory_tests.rb

@@ -1,4 +1,4 @@
-Shindo.tests("Storage[:aws] | directory", [:aws]) do
+Shindo.tests("Storage[:aws] | directory", ["aws"]) do
 
   directory_attributes = {
     :key => 'fogdirectorytests'

data/tests/aws/models/storage/file_tests.rb

@@ -1,4 +1,4 @@
-Shindo.tests("Storage[:aws] | file", [:aws]) do
+Shindo.tests("Storage[:aws] | file", ["aws"]) do
 
   require 'tempfile'
 

data/tests/aws/models/storage/files_tests.rb

@@ -1,4 +1,4 @@
-Shindo.tests("Storage[:aws] | files", [:aws]) do
+Shindo.tests("Storage[:aws] | files", ["aws"]) do
 
   file_attributes = {
       :key => 'fog_file_tests',

data/tests/aws/models/storage/url_tests.rb

@@ -1,17 +1,17 @@
 # encoding: utf-8
 
-Shindo.tests('AWS | url') do
+Shindo.tests('AWS | url', ["aws"]) do
 
-  @expires = DateTime.parse('2013-01-01T00:00:00Z').to_time.utc.to_i
+  @expires = Time.utc(2013,1,1).utc.to_i
 
   @storage = Fog::Storage.new(
-    provider: 'AWS',
-    aws_access_key_id: '123',
-    aws_secret_access_key: 'abc',
-    region: 'us-east-1'
+    :provider => 'AWS',
+    :aws_access_key_id => '123',
+    :aws_secret_access_key => 'abc',
+    :region => 'us-east-1'
   )
   
-  @file = @storage.directories.new(key: 'fognonbucket').files.new(key: 'test.txt')
+  @file = @storage.directories.new(:key => 'fognonbucket').files.new(:key => 'test.txt')
 
   if Fog.mock?
     signature = Fog::Storage::AWS.new.signature(nil)
@@ -22,7 +22,7 @@ Shindo.tests('AWS | url') do
   tests('#url w/ response-cache-control').returns(
     "https://fognonbucket.s3.amazonaws.com/test.txt?response-cache-control=No-cache&AWSAccessKeyId=123&Signature=#{signature}&Expires=1356998400"
   ) do
-    @file.url(@expires, query: { 'response-cache-control' => 'No-cache' })
+    @file.url(@expires, :query => { 'response-cache-control' => 'No-cache' })
   end
 
 end

data/tests/aws/models/storage/version_tests.rb

@@ -1,4 +1,4 @@
-Shindo.tests("Storage[:aws] | version", [:aws]) do
+Shindo.tests("Storage[:aws] | version", ["aws"]) do
 
   file_attributes = {
       :key => 'fog_file_tests',

data/tests/aws/models/storage/versions_tests.rb

@@ -1,4 +1,4 @@
-Shindo.tests("Storage[:aws] | versions", [:aws]) do
+Shindo.tests("Storage[:aws] | versions", ["aws"]) do
 
   file_attributes = {
       :key => 'fog_file_tests',

data/tests/aws/requests/auto_scaling/auto_scaling_tests.rb

@@ -75,6 +75,11 @@ Shindo.tests('AWS::AutoScaling | auto_scaling_tests', ['aws', 'auto_scaling']) d
     tests("#delete_auto_scaling_group").formats(AWS::AutoScaling::Formats::BASIC) do
       Fog::AWS[:auto_scaling].delete_auto_scaling_group(@asg_name).body
     end
+
+    tests("#delete_auto_scaling_group that does not exists").raises(Fog::AWS::AutoScaling::ValidationError) do
+      Fog::AWS[:auto_scaling].delete_auto_scaling_group("group that does not exist")
+    end
+
     tests("#delete_launch_configuration").formats(AWS::AutoScaling::Formats::BASIC) do
       Fog::AWS[:auto_scaling].delete_launch_configuration(@lc_name).body
     end

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

@@ -81,7 +81,8 @@ class AWS
         'MinSize' => Integer,
         'PlacementGroup' => Fog::Nullable::String,
         'SuspendedProcesses' => [SUSPENDED_PROCESS],
-        'VPCZoneIdentifier' => Fog::Nullable::String
+        'VPCZoneIdentifier' => Fog::Nullable::String,
+        'TerminationPolicies' => [String]
       }
 
       AUTO_SCALING_INSTANCE_DETAILS = INSTANCE.merge({

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

@@ -1,11 +1,12 @@
 Shindo.tests('Fog::Compute[:aws] | instance requests', ['aws']) do
 
   @instance_format = {
-    # 'architecture'    => String,
+    'architecture'        => String,
     'amiLaunchIndex'      => Integer,
     'blockDeviceMapping'  => [],
     'clientToken'         => Fog::Nullable::String,
     'dnsName'             => NilClass,
+    'ebsOptimized'        => Fog::Boolean,
     'imageId'             => String,
     'instanceId'          => String,
     'instanceState'       => {'code' => Integer, 'name' => String},
@@ -33,7 +34,7 @@ Shindo.tests('Fog::Compute[:aws] | instance requests', ['aws']) do
   @run_instances_format = {
     'groupSet'        => [String],
     'instancesSet'    => [@instance_format],
-    'ownerId'         => String,
+    'ownerId'         => Fog::Nullable::String,
     'requestId'       => String,
     'reservationId'   => String
   }
@@ -41,16 +42,20 @@ Shindo.tests('Fog::Compute[:aws] | instance requests', ['aws']) do
   @describe_instances_format = {
     'reservationSet'  => [{
       'groupSet'      => [String],
+      'groupIds'      => [String],
       'instancesSet'  => [@instance_format.merge(
         'architecture'      => String,
         'dnsName'           => Fog::Nullable::String,
+        'iamInstanceProfile' => {},
         'ipAddress'         => Fog::Nullable::String,
+        'networkInterfaces' => [],
+        'ownerId'           => String,
         'privateDnsName'    => Fog::Nullable::String,
         'privateIpAddress'  => Fog::Nullable::String,
         'stateReason'       => Hash,
         'tagSet'            => Hash
       )],
-      'ownerId'       => String,
+      'ownerId'       => Fog::Nullable::String,
       'reservationId' => String
     }],
     'requestId'       => String
@@ -145,12 +150,12 @@ Shindo.tests('Fog::Compute[:aws] | instance requests', ['aws']) do
                                   'status' => String
                                 }]
                               },
-                              'event' => {
+                              'eventsSet' => [{
                                                 'code' => String,
                                                 'description' => String,
                                                 'notBefore' => Time,
                                                 'notAfter' => Time
-                                              }
+                                              }]
                             }]
 
   }
@@ -158,34 +163,23 @@ Shindo.tests('Fog::Compute[:aws] | instance requests', ['aws']) do
   tests('success') do
 
     @instance_id = nil
-    # Use a MS Windows AMI to test #get_password_data
-    @windows_ami = 'ami-62bd440b' # Amazon Public Images - Basic Microsoft Windows Server 2008 64-bit
+    @ami = if ENV['FASTER_TEST_PLEASE']
+      'ami-6bbb1302' # ubuntu 12.04 daily build 20120728
+    else
+      # Use a MS Windows AMI to test #get_password_data
+      'ami-71b50018' # Amazon Public Images - Windows_Server-2008-SP2-English-64Bit-Base-2012.07.11
+    end
 
     # Create a keypair for decrypting the password
     key_name = 'fog-test-key'
     key = Fog::Compute[:aws].key_pairs.create(:name => key_name)
 
     tests("#run_instances").formats(@run_instances_format) do
-      data = Fog::Compute[:aws].run_instances(@windows_ami, 1, 1, 'InstanceType' => 't1.micro', 'KeyName' => key_name).body
+      data = Fog::Compute[:aws].run_instances(@ami, 1, 1, 'InstanceType' => 't1.micro', 'KeyName' => key_name).body
       @instance_id = data['instancesSet'].first['instanceId']
       data
     end
 
-    if Fog.mocking?
-      # Ensure the new instance doesn't show up in mock describe_instances right away
-      tests("#describe_instances").formats(@describe_instances_format) do
-        body = Fog::Compute[:aws].describe_instances.body
-        instance_ids = body['reservationSet'].map {|reservation| reservation['instancesSet'].map {|instance| instance['instanceId'] } }.flatten
-        test("doesn't include the new instance") { !instance_ids.include?(@instance_id) }
-        body
-      end
-
-      # But querying for the new instance directly should raise an error
-      tests("#describe_instances('instance-id' => '#{@instance_id}')").raises(Fog::Compute::AWS::NotFound) do
-        Fog::Compute[:aws].describe_instances('instance-id' => @instance_id)
-      end
-    end
-
     server = Fog::Compute[:aws].servers.get(@instance_id)
     while server.nil? do
       # It may take a moment to get the server after launching it

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

@@ -11,7 +11,8 @@ Shindo.tests('Fog::Compute[:aws] | spot instance requests', ['aws']) do
         'keyName'             => Fog::Nullable::String,
         'imageId'             => String,
         'instanceType'        => String,
-        'monitoring'          => Fog::Boolean
+        'monitoring'          => Fog::Boolean,
+        'subnetId'            => String
       },
       'productDescription'        => String,
       'spotInstanceRequestId'     => String,

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

@@ -74,4 +74,5 @@ Shindo.tests('Fog::Compute[:aws] | tag requests', ['aws']) do
     end
 
   end
+  Fog::Compute::AWS::Mock.reset if Fog.mocking?
 end

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

@@ -3,11 +3,13 @@ Shindo.tests('Fog::Compute[:aws] | volume requests', ['aws']) do
   @volume_format = {
     'availabilityZone'  => String,
     'createTime'        => Time,
+    'iops'              => Fog::Nullable::Integer,
     'requestId'         => String,
     'size'              => Integer,
     'snapshotId'        => Fog::Nullable::String,
     'status'            => String,
-    'volumeId'          => String
+    'volumeId'          => String,
+    'volumeType'        => String
   }
 
   @volume_attachment_format = {
@@ -52,11 +54,13 @@ Shindo.tests('Fog::Compute[:aws] | volume requests', ['aws']) do
       'availabilityZone'  => String,
       'attachmentSet'     => Array,
       'createTime'        => Time,
+      'iops'              => Fog::Nullable::Integer,
       'size'              => Integer,
       'snapshotId'        => Fog::Nullable::String,
       'status'            => String,
       'tagSet'            => Hash,
-      'volumeId'          => String
+      'volumeId'          => String,
+      'volumeType'        => String
     }],
     'requestId' => String
   }
@@ -73,18 +77,30 @@ Shindo.tests('Fog::Compute[:aws] | volume requests', ['aws']) do
       data
     end
 
+    Fog::Compute[:aws].delete_volume(@volume_id)
+
     tests('#create_volume from snapshot').formats(@volume_format) do
       volume = Fog::Compute[:aws].volumes.create(:availability_zone => 'us-east-1d', :size => 1)
       snapshot = Fog::Compute[:aws].create_snapshot(volume.identity).body
-      data = Fog::Compute[:aws].create_volume(@server.availability_zone, nil, snapshot['snapshotId']).body
+      data = Fog::Compute[:aws].create_volume(@server.availability_zone, nil, 'SnapshotId' => snapshot['snapshotId']).body
       @volume_id = data['volumeId']
       data
     end
 
+    Fog::Compute[:aws].delete_volume(@volume_id)
+
+    tests('#create_volume with type and iops').formats(@volume_format) do
+      data = Fog::Compute[:aws].create_volume(@server.availability_zone, 10, 'VolumeType' => 'io1', 'Iops' => 100).body
+      @volume_id = data['volumeId']
+      data
+    end
+
+    Fog::Compute[:aws].delete_volume(@volume_id)
+
     tests('#create_volume from snapshot with size').formats(@volume_format) do
       volume = Fog::Compute[:aws].volumes.create(:availability_zone => 'us-east-1d', :size => 1)
       snapshot = Fog::Compute[:aws].create_snapshot(volume.identity).body
-      data = Fog::Compute[:aws].create_volume(@server.availability_zone, 1, snapshot['snapshotId']).body
+      data = Fog::Compute[:aws].create_volume(@server.availability_zone, 1, 'SnapshotId' => snapshot['snapshotId']).body
       @volume_id = data['volumeId']
       data
     end
@@ -148,6 +164,31 @@ Shindo.tests('Fog::Compute[:aws] | volume requests', ['aws']) do
       Fog::Compute[:aws].delete_volume('vol-00000000')
     end
 
+    # Iops required
+    tests("#create_volume('#{@server.availability_zone}', 10, 'VolumeType' => 'io1')").raises(Fog::Compute::AWS::Error) do
+      Fog::Compute[:aws].create_volume(@server.availability_zone, 10, 'VolumeType' => 'io1')
+    end
+
+    # size too small for iops
+    tests("#create_volume('#{@server.availability_zone}', 9, 'VolumeType' => 'io1', 'Iops' => 100)").raises(Fog::Compute::AWS::Error) do
+      Fog::Compute[:aws].create_volume(@server.availability_zone, 9, 'VolumeType' => 'io1', 'Iops' => 100)
+    end
+
+    # iops:size ratio too big
+    tests("#create_volume('#{@server.availability_zone}', 10, 'VolumeType' => 'io1', 'Iops' => 101)").raises(Fog::Compute::AWS::Error) do
+      Fog::Compute[:aws].create_volume(@server.availability_zone, 10, 'VolumeType' => 'io1', 'Iops' => 101)
+    end
+
+    # iops invalid value (lower than 100)
+    tests("#create_volume('#{@server.availability_zone}', 10, 'VolumeType' => 'io1', 'Iops' => 99)").raises(Fog::Compute::AWS::Error) do
+      Fog::Compute[:aws].create_volume(@server.availability_zone, 10, 'VolumeType' => 'io1', 'Iops' => 99)
+    end
+
+    # iops invalid value (greater than 1000)
+    tests("#create_volume('#{@server.availability_zone}', 10, 'VolumeType' => 'io1', 'Iops' => 1001)").raises(Fog::Compute::AWS::Error) do
+      Fog::Compute[:aws].create_volume(@server.availability_zone, 1000, 'VolumeType' => 'io1', 'Iops' => 1001)
+    end
+
     @volume.destroy
   end