fog-aws 1.2.1 → 1.3.0

data/lib/fog/aws/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module AWS
-    VERSION = "1.2.1"
+    VERSION = "1.3.0"
   end
 end

data/tests/models/compute/volume_tests.rb

@@ -3,7 +3,7 @@ Shindo.tests("Fog::Compute[:aws] | volume", ['aws']) do
   @server = Fog::Compute[:aws].servers.create
   @server.wait_for { ready? }
 
-  model_tests(Fog::Compute[:aws].volumes, {:availability_zone => @server.availability_zone, :size => 1, :device => '/dev/sdz1', :tags => {"key" => "value"}}, true) do
+  model_tests(Fog::Compute[:aws].volumes, {:availability_zone => @server.availability_zone, :size => 1, :device => '/dev/sdz1', :tags => {"key" => "value"}, :type => 'gp2'}, true) do
 
     @instance.wait_for { ready? }
 
@@ -32,6 +32,21 @@ Shindo.tests("Fog::Compute[:aws] | volume", ['aws']) do
 
     @instance.wait_for { ready? }
 
+    @instance.type = 'io1'
+    @instance.iops = 5000
+    @instance.size = 100
+    @instance.save
+
+    returns(true) { @instance.modification_in_progress? }
+    @instance.wait_for { !modification_in_progress? }
+
+    # avoid weirdness with merge_attributes
+    @instance = Fog::Compute[:aws].volumes.get(@instance.identity)
+
+    returns('io1') { @instance.type }
+    returns(5000)  { @instance.iops }
+    returns(100)   { @instance.size }
+
     tests('@instance.reload.tags').returns({'key' => 'value'}) do
       @instance.reload.tags
     end

data/tests/models/compute/vpc_tests.rb

@@ -1,4 +1,26 @@
 Shindo.tests("Fog::Compute[:aws] | vpc", ['aws']) do
 
-  model_tests(Fog::Compute[:aws].vpcs, {:cidr_block => '10.0.10.0/28'}, true)
+  model_tests(Fog::Compute[:aws].vpcs, {:cidr_block => '10.0.10.0/28'}, true) do
+    tests("#enable_classic_link") do
+      returns(false) { @instance.classic_link_enabled? }
+      returns(true)  { @instance.enable_classic_link }
+      returns(true)  { @instance.classic_link_enabled? }
+    end
+
+    tests("#disable_classic_link") do
+      returns(true)  { @instance.disable_classic_link }
+      returns(false) { @instance.classic_link_enabled? }
+    end
+
+    tests("#enable_classic_link_dns") do
+      returns(false) { @instance.classic_link_dns_enabled? }
+      returns(true)  { @instance.enable_classic_link_dns }
+      returns(true)  { @instance.classic_link_dns_enabled? }
+    end
+
+    tests("#disable_classic_link") do
+      returns(true)  { @instance.disable_classic_link_dns }
+      returns(false) { @instance.classic_link_dns_enabled? }
+    end
+  end
 end

data/tests/models/rds/security_group_tests.rb

@@ -6,9 +6,9 @@ Shindo.tests("AWS::RDS | security_group", ['aws', 'rds']) do
 
     tests("#description").returns('fog test') { @instance.description }
 
-    tests("#authorize_ec2_security_group").succeeds do
-      @ec2_sec_group = Fog::Compute[:aws].security_groups.create(:name => 'fog-test', :description => 'fog test')
+    @ec2_sec_group = Fog::Compute[:aws].security_groups.create(:name => uniq_id("fog-rds-test"), :description => 'fog test')
 
+    tests("#authorize_ec2_security_group('#{@ec2_sec_group.name}')").succeeds do
       @instance.authorize_ec2_security_group(@ec2_sec_group.name)
       returns('authorizing') do
         @instance.ec2_security_groups.find{|h| h['EC2SecurityGroupName'] == @ec2_sec_group.name}['Status']
@@ -17,9 +17,7 @@ Shindo.tests("AWS::RDS | security_group", ['aws', 'rds']) do
 
     @instance.wait_for { ready? }
 
-    tests("#revoke_ec2_security_group").succeeds do
-      pending if Fog.mocking?
-
+    tests("#revoke_ec2_security_group('#{@ec2_sec_group.name}')").succeeds do
       @instance.revoke_ec2_security_group(@ec2_sec_group.name)
 
       returns('revoking') do
@@ -29,9 +27,35 @@ Shindo.tests("AWS::RDS | security_group", ['aws', 'rds']) do
       @instance.wait_for { ready? }
 
       returns(false) { @instance.ec2_security_groups.any?{|h| h['EC2SecurityGroupName'] == @ec2_sec_group.name} }
-      @ec2_sec_group.destroy
     end
 
+    @instance.wait_for { ready? }
+
+    tests("#authorize_ec2_security_group('#{@ec2_sec_group.group_id}')").succeeds do
+      @instance.authorize_ec2_security_group(@ec2_sec_group.group_id)
+      returns('authorizing') do
+        @instance.ec2_security_groups.find{|h| h['EC2SecurityGroupName'] == @ec2_sec_group.name}['Status']
+      end
+    end
+
+    @instance.wait_for { ready? }
+
+    tests("#revoke_ec2_security_group('#{@ec2_sec_group.group_id}')").succeeds do
+      @instance.revoke_ec2_security_group(@ec2_sec_group.group_id)
+
+      returns('revoking') do
+        @instance.ec2_security_groups.find{|h| h['EC2SecurityGroupName'] == @ec2_sec_group.name}['Status']
+      end
+
+      @instance.wait_for { ready? }
+
+      returns(false) { @instance.ec2_security_groups.any?{|h| h['EC2SecurityGroupId'] == @ec2_sec_group.group_id} }
+    end
+
+    @instance.wait_for { ready? }
+
+    @ec2_sec_group.destroy
+
     tests("#authorize_cidrip").succeeds do
       @cidr = '127.0.0.1/32'
       @instance.authorize_cidrip(@cidr)

data/tests/requests/compute/volume_tests.rb

@@ -68,6 +68,29 @@ Shindo.tests('Fog::Compute[:aws] | volume requests', ['aws']) do
     'requestId' => String
   }
 
+  @volume_modification_format = {
+    'endTime'            => Fog::Nullable::Time,
+    'modificationState'  => String,
+    'originalIops'       => Fog::Nullable::Integer,
+    'originalSize'       => Fog::Nullable::Integer,
+    'originalVolumeType' => Fog::Nullable::String,
+    'startTime'          => Time,
+    'targetIops'         => Fog::Nullable::Integer,
+    'targetSize'         => Fog::Nullable::Integer,
+    'targetVolumeType'   => Fog::Nullable::String,
+    'volumeId'           => String,
+  }
+
+  @modify_volume_format = {
+    'requestId'          => String,
+    'volumeModification' => @volume_modification_format
+  }
+
+  @describe_volume_modifications_format = {
+    'requestId'             => String,
+    'volumeModificationSet' => [@volume_modification_format]
+  }
+
   @server = Fog::Compute[:aws].servers.create
   @server.wait_for { ready? }
 
@@ -113,13 +136,13 @@ Shindo.tests('Fog::Compute[:aws] | volume requests', ['aws']) do
     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)
+      volume = Fog::Compute[:aws].volumes.create(:availability_zone => 'us-east-1d', :size => 1, :type => 'gp2')
       volume.wait_for { ready? }
 
       snapshot = Fog::Compute[:aws].create_snapshot(volume.identity).body
       Fog::Compute[:aws].snapshots.new(snapshot).wait_for { ready? }
 
-      data = Fog::Compute[:aws].create_volume(@server.availability_zone, 1, 'SnapshotId' => snapshot['snapshotId']).body
+      data = Fog::Compute[:aws].create_volume(@server.availability_zone, 1, 'SnapshotId' => snapshot['snapshotId'], 'VolumeType' => 'gp2').body
       @volume_id = data['volumeId']
       data
     end
@@ -155,6 +178,23 @@ Shindo.tests('Fog::Compute[:aws] | volume requests', ['aws']) do
 
     Fog::Compute[:aws].volumes.get(@volume_id).wait_for { ready? }
 
+    tests("#modify_volume('#{@volume_id}', 'Size' => 100, 'VolumeType' => 'io1', 'Iops' => 5000").formats(@modify_volume_format) do
+      Fog::Compute[:aws].modify_volume(@volume_id, 'Size' => 100, 'VolumeType' => 'io1', 'Iops' => 5000).body
+    end
+
+    tests("#describe_volumes_modifications('volume-id' => '#{@volume_id}')").formats(@describe_volume_modifications_format) do
+      Fog.wait_for do
+        Fog::Compute[:aws].describe_volumes_modifications('volume-id' => @volume_id).body['volumeModificationSet'].first['modificationState'] == 'completed'
+      end
+
+      volume = Fog::Compute[:aws].describe_volumes('volume-id' => @volume_id).body['volumeSet'].first
+      returns(100)   { volume['size'] }
+      returns('io1') { volume['volumeType'] }
+      returns(5000)  { volume['iops'] }
+
+      Fog::Compute[:aws].describe_volumes_modifications('volume-id' => @volume_id).body
+    end
+
     tests("#modify_volume_attribute('#{@volume_id}', true)").formats(AWS::Compute::Formats::BASIC) do
       Fog::Compute[:aws].modify_volume_attribute(@volume_id, true).body
     end

data/tests/requests/compute/vpc_tests.rb

@@ -42,6 +42,13 @@ Shindo.tests('Fog::Compute[:aws] | vpc requests', ['aws']) do
     'requestId' => String
   }
 
+  @describe_vpc_classic_link_dns_support_format = {
+    "vpcs" => [{
+      "vpcId"                   => String,
+      "classicLinkDnsSupported" => Fog::Boolean
+    }]
+  }
+
   tests('success') do
 
     @vpc_id = nil
@@ -126,14 +133,14 @@ Shindo.tests('Fog::Compute[:aws] | vpc requests', ['aws']) do
     end
 
     tests("describe_vpc_classic_link(:filters => {'tag-key' => 'foo'}").formats(@describe_vpcs_classic_link_format) do
-      body = Fog::Compute[:aws].describe_vpc_classic_link(:filters => {'tag-key' => 'foo'})
+      body = Fog::Compute[:aws].describe_vpc_classic_link(:filters => {'tag-key' => 'foo'}).body
       tests("returns 1 vpc").returns(1) { body['vpcSet'].size }
       body
     end
 
     tests("enable_vpc_classic_link").returns(true) do
       Fog::Compute[:aws].enable_vpc_classic_link @vpc_id
-      body = Fog::Compute[:aws].describe_vpc_classic_link(:vpc_ids => [@vpc_id])
+      body = Fog::Compute[:aws].describe_vpc_classic_link(:vpc_ids => [@vpc_id]).body
       body['vpcSet'].first['classicLinkEnabled']
     end
 
@@ -143,7 +150,7 @@ Shindo.tests('Fog::Compute[:aws] | vpc requests', ['aws']) do
     @group = Fog::Compute[:aws].security_groups.create :name => 'test-group', :description => 'vpc security group'
 
     tests("attach_classic_link_vpc") do
-      Fog::Compute[:aws].attach_classic_link_vpc(@server.id, @vpc_id, [@group])
+      Fog::Compute[:aws].attach_classic_link_vpc(@server.id, @vpc_id, [@group.group_id])
     end
 
     tests('describe_classic_link_instances').formats(@describe_classic_link_instances) do
@@ -154,7 +161,36 @@ Shindo.tests('Fog::Compute[:aws] | vpc requests', ['aws']) do
       Fog::Compute[:aws].detach_classic_link_vpc(@server.id, @vpc_id)
       Fog::Compute[:aws].describe_classic_link_instances().body['instancesSet']
     end
-    
+
+    tests("enable_vpc_classic_link_dns_support('#{@vpc_id}')").formats(AWS::Compute::Formats::BASIC) do
+      body = Fog::Compute[:aws].enable_vpc_classic_link_dns_support(@vpc_id).body
+      body
+    end
+
+    tests("#describe_vpc_classic_link_dns_support").formats(@describe_vpc_classic_link_dns_support_format) do
+      Fog::Compute[:aws].describe_vpc_classic_link_dns_support.body
+    end
+
+    tests("#describe_vpc_classic_link_dns_support(:vpc_ids => ['#{@vpc_id}'])").formats(@describe_vpc_classic_link_dns_support_format) do
+      body = Fog::Compute[:aws].describe_vpc_classic_link_dns_support(:vpc_ids => [@vpc_id]).body
+      returns(1)       { body['vpcs'].count }
+      returns(@vpc_id) { body['vpcs'].first['vpcId'] }
+      returns(true)    { body['vpcs'].first['classicLinkDnsSupported'] }
+      body
+    end
+
+    tests("disable_vpc_classic_link_dns_support('#{@vpc_id}')").formats(AWS::Compute::Formats::BASIC) do
+      Fog::Compute[:aws].disable_vpc_classic_link_dns_support(@vpc_id).body
+    end
+
+    tests("#describe_vpc_classic_link_dns_support(:vpc_ids => ['#{@vpc_id}'])").formats(@describe_vpc_classic_link_dns_support_format) do
+      body = Fog::Compute[:aws].describe_vpc_classic_link_dns_support(:vpc_ids => [@vpc_id]).body
+      returns(1)       { body['vpcs'].count }
+      returns(@vpc_id) { body['vpcs'].first['vpcId'] }
+      returns(false)   { body['vpcs'].first['classicLinkDnsSupported'] }
+      body
+    end
+
     if !Fog.mocking?
       @server.destroy
       @server.wait_for {state == 'terminated'}
@@ -162,7 +198,7 @@ Shindo.tests('Fog::Compute[:aws] | vpc requests', ['aws']) do
 
     tests("disable_vpc_classic_link").returns(false) do
       Fog::Compute[:aws].disable_vpc_classic_link @vpc_id
-      body = Fog::Compute[:aws].describe_vpc_classic_link(:vpc_ids => [@vpc_id])
+      body = Fog::Compute[:aws].describe_vpc_classic_link(:vpc_ids => [@vpc_id]).body
       body['vpcSet'].first['classicLinkEnabled']
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-aws
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Josh Lane
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-27 00:00:00.000000000 Z
+date: 2017-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -456,14 +456,17 @@ files:
 - lib/fog/aws/parsers/compute/describe_tags.rb
 - lib/fog/aws/parsers/compute/describe_volume_status.rb
 - lib/fog/aws/parsers/compute/describe_volumes.rb
+- lib/fog/aws/parsers/compute/describe_volumes_modifications.rb
 - lib/fog/aws/parsers/compute/describe_vpc_attribute.rb
 - lib/fog/aws/parsers/compute/describe_vpc_classic_link.rb
+- lib/fog/aws/parsers/compute/describe_vpc_classic_link_dns_support.rb
 - lib/fog/aws/parsers/compute/describe_vpcs.rb
 - lib/fog/aws/parsers/compute/detach_volume.rb
 - lib/fog/aws/parsers/compute/get_console_output.rb
 - lib/fog/aws/parsers/compute/get_password_data.rb
 - lib/fog/aws/parsers/compute/import_key_pair.rb
 - lib/fog/aws/parsers/compute/modify_subnet_attribute.rb
+- lib/fog/aws/parsers/compute/modify_volume.rb
 - lib/fog/aws/parsers/compute/monitor_unmonitor_instances.rb
 - lib/fog/aws/parsers/compute/move_address_to_vpc.rb
 - lib/fog/aws/parsers/compute/network_acl_parser.rb
@@ -927,17 +930,21 @@ files:
 - lib/fog/aws/requests/compute/describe_tags.rb
 - lib/fog/aws/requests/compute/describe_volume_status.rb
 - lib/fog/aws/requests/compute/describe_volumes.rb
+- lib/fog/aws/requests/compute/describe_volumes_modifications.rb
 - lib/fog/aws/requests/compute/describe_vpc_attribute.rb
 - lib/fog/aws/requests/compute/describe_vpc_classic_link.rb
+- lib/fog/aws/requests/compute/describe_vpc_classic_link_dns_support.rb
 - lib/fog/aws/requests/compute/describe_vpcs.rb
 - lib/fog/aws/requests/compute/detach_classic_link_vpc.rb
 - lib/fog/aws/requests/compute/detach_internet_gateway.rb
 - lib/fog/aws/requests/compute/detach_network_interface.rb
 - lib/fog/aws/requests/compute/detach_volume.rb
 - lib/fog/aws/requests/compute/disable_vpc_classic_link.rb
+- lib/fog/aws/requests/compute/disable_vpc_classic_link_dns_support.rb
 - lib/fog/aws/requests/compute/disassociate_address.rb
 - lib/fog/aws/requests/compute/disassociate_route_table.rb
 - lib/fog/aws/requests/compute/enable_vpc_classic_link.rb
+- lib/fog/aws/requests/compute/enable_vpc_classic_link_dns_support.rb
 - lib/fog/aws/requests/compute/get_console_output.rb
 - lib/fog/aws/requests/compute/get_password_data.rb
 - lib/fog/aws/requests/compute/import_key_pair.rb
@@ -946,6 +953,7 @@ files:
 - lib/fog/aws/requests/compute/modify_network_interface_attribute.rb
 - lib/fog/aws/requests/compute/modify_snapshot_attribute.rb
 - lib/fog/aws/requests/compute/modify_subnet_attribute.rb
+- lib/fog/aws/requests/compute/modify_volume.rb
 - lib/fog/aws/requests/compute/modify_volume_attribute.rb
 - lib/fog/aws/requests/compute/modify_vpc_attribute.rb
 - lib/fog/aws/requests/compute/monitor_instances.rb