fog-aws 3.12.0 → 3.13.0

data/tests/requests/cloud_watch/put_metric_data_tests.rb

@@ -1,36 +0,0 @@
-Shindo.tests('AWS::CloudWatch | metric requests', ['aws', 'cloudwatch']) do
-  tests('success') do
-
-    namespace = 'Custom/Test'
-    @puts_format = {'ResponseMetadata' => {'RequestId' => String}}
-
-    tests('#puts_value').formats(@puts_format) do
-      pending if Fog.mocking?
-      Fog::AWS[:cloud_watch].put_metric_data(namespace, [{'MetricName' => 'RequestTest', 'Unit' => 'None', 'Value' => 1}]).body
-    end
-
-    tests('#puts_statistics_set').succeeds do
-      pending if Fog.mocking?
-      Fog::AWS[:cloud_watch].put_metric_data(namespace, [{'MetricName' => 'RequestTest', 'Unit' => 'None', 'StatisticValues' => {'Minimum' => 0, 'Maximum' => 9, 'Sum' => 45, 'SampleCount' => 10, 'Average' => 4.5}}]).body
-    end
-
-    tests('#puts with dimensions').succeeds do
-      pending if Fog.mocking?
-      dimensions = [{}]
-      Fog::AWS[:cloud_watch].put_metric_data(namespace, [{'MetricName' => 'RequestTest', 'Unit' => 'None', 'Value' => 1, 'Dimensions' => dimensions}]).body
-    end
-
-    tests('#puts more than one').succeeds do
-      pending if Fog.mocking?
-      datapoints = (0...3).map do |i|
-        dp = {'MetricName' => "#{i}RequestTest", 'Unit' => 'None', 'Value' => i}
-        if i%2==0
-          dp['Dimensions'] = [{'Name' => 'Ruler', 'Value' => "measurement_#{i}"}]
-        end
-        dp
-      end
-      Fog::AWS[:cloud_watch].put_metric_data(namespace, datapoints).body
-    end
-
-  end
-end

data/tests/requests/compute/address_tests.rb

@@ -1,144 +0,0 @@
-Shindo.tests('Fog::Compute[:aws] | address requests', ['aws']) do
-  compute = Fog::Compute[:aws]
-
-  @addresses_format = {
-    'addressesSet' => [{
-      'allocationId'  => Fog::Nullable::String,
-      'associationId' => Fog::Nullable::String,
-      'domain'        => String,
-      'instanceId'    => Fog::Nullable::String,
-      'publicIp'      => String
-    }],
-    'requestId' => String
-  }
-  @server = compute.servers.create
-  @server.wait_for { ready? }
-  @ip_address = @server.public_ip_address
-
-  tests('success') do
-
-    @public_ip = nil
-    @vpc_public_ip = nil
-    @vpc_allocation_id = nil
-
-    tests('#allocate_address').formats({'domain' => String, 'publicIp' => String, 'requestId' => String}) do
-      data = compute.allocate_address.body
-      @public_ip = data['publicIp']
-      data
-    end
-
-    tests("#allocate_address('vpc')").formats({'domain' => String, 'publicIp' => String, 'allocationId' => String, 'requestId' => String}) do
-      data = compute.allocate_address('vpc').body
-      @vpc_public_ip = data['publicIp']
-      @vpc_allocation_id = data['allocationId']
-      data
-    end
-
-    # the following 2 tests imply that your account is old enough that the tested region does not have a default VPC.  These methods do not work with an ip created in a vpc.  this probably means that they will probably fail if they aren't mocked
-    tests("#move_address_to_vpc('#{@public_ip}')").formats({'status' => String, 'allocationId' => String, 'requestId' => String}) do
-      compute.move_address_to_vpc(@public_ip).body
-    end
-
-    tests("#restore_address_to_classic('#{@public_ip}')").formats({'status' => String, 'publicIp' => String, 'requestId' => String}) do
-      compute.restore_address_to_classic(@public_ip).body
-    end
-
-    tests('#describe_addresses').formats(@addresses_format) do
-      compute.describe_addresses.body
-    end
-
-    tests("#describe_addresses('public-ip' => #{@public_ip}')").formats(@addresses_format) do
-      compute.describe_addresses('public-ip' => @public_ip).body
-    end
-
-    tests("#associate_address('#{@server.identity}', '#{@public_ip}')").formats(AWS::Compute::Formats::BASIC) do
-      compute.associate_address(@server.identity, @public_ip).body
-    end
-
-    tests("#associate_address({:instance_id=>'#{@server.identity}', :public_ip=>'#{@public_ip}'})").formats(AWS::Compute::Formats::BASIC) do
-      compute.associate_address({:instance_id=>@server.identity,:public_ip=> @public_ip}).body
-    end
-
-    tests("#dissassociate_address('#{@public_ip}')").formats(AWS::Compute::Formats::BASIC) do
-      compute.disassociate_address(@public_ip).body
-    end
-
-    tests("#associate_address('#{@server.id}', nil, nil, '#{@vpc_allocation_id}')").formats(AWS::Compute::Formats::BASIC) do
-      compute.associate_address(@server.id, nil, nil, @vpc_allocation_id).body
-    end
-
-    $pry = true
-    tests("#associate_address({:instance_id=>'#{@server.id}', :allocation_id=>'#{@vpc_allocation_id}'})").formats(AWS::Compute::Formats::BASIC) do
-      compute.associate_address({:instance_id=>@server.id, :allocation_id=>@vpc_allocation_id}).body
-    end
-
-    tests("#disassociate_address('#{@vpc_public_ip}')").raises(Fog::AWS::Compute::Error) do
-      compute.disassociate_address(@vpc_public_ip)
-    end
-
-    tests("#release_address('#{@public_ip}')").formats(AWS::Compute::Formats::BASIC) do
-      compute.release_address(@public_ip).body
-    end
-
-    tests("#disassociate_address('#{@vpc_public_ip}', '#{@vpc_allocation_id}')").formats(AWS::Compute::Formats::BASIC) do
-      address = compute.describe_addresses('public-ip' => @vpc_public_ip).body['addressesSet'].first
-      compute.disassociate_address(@vpc_public_ip, address['associationId']).body
-    end
-
-    tests("#release_address('#{@vpc_allocation_id}')").formats(AWS::Compute::Formats::BASIC) do
-      compute.release_address(@vpc_allocation_id).body
-    end
-  end
-
-  tests('failure') do
-
-    @address     = compute.addresses.create
-    @vpc_address = compute.addresses.create(:domain => 'vpc')
-
-    tests("#associate_addresses({:instance_id =>'i-00000000', :public_ip => '#{@address.identity}')}").raises(Fog::AWS::Compute::NotFound) do
-      compute.associate_address({:instance_id => 'i-00000000', :public_ip => @address.identity})
-    end
-
-    tests("#associate_addresses({:instance_id =>'#{@server.identity}', :public_ip => '127.0.0.1'})").raises(Fog::AWS::Compute::Error) do
-      compute.associate_address({:instance_id => @server.identity, :public_ip => '127.0.0.1'})
-    end
-
-    tests("#associate_addresses({:instance_id =>'i-00000000', :public_ip => '127.0.0.1'})").raises(Fog::AWS::Compute::NotFound) do
-      compute.associate_address({:instance_id =>'i-00000000', :public_ip =>'127.0.0.1'})
-    end
-
-    tests("#restore_address_to_classic('#{@vpc_address.identity}')").raises(Fog::AWS::Compute::Error) do
-      compute.restore_address_to_classic(@vpc_address.identity)
-    end
-
-    tests("#disassociate_addresses('127.0.0.1') raises BadRequest error").raises(Fog::AWS::Compute::Error) do
-      compute.disassociate_address('127.0.0.1')
-    end
-
-    tests("#release_address('127.0.0.1')").raises(Fog::AWS::Compute::Error) do
-      compute.release_address('127.0.0.1')
-    end
-
-    tests("#release_address('#{@vpc_address.identity}')").raises(Fog::AWS::Compute::Error) do
-      compute.release_address(@vpc_address.identity)
-    end
-
-    if Fog.mocking?
-      old_limit = compute.data[:limits][:addresses]
-
-      tests("#allocate_address", "limit exceeded").raises(Fog::AWS::Compute::Error) do
-        compute.data[:limits][:addresses] = 0
-        compute.allocate_address
-      end
-
-      compute.data[:limits][:addresses] = old_limit
-    end
-
-    @address.destroy
-    @vpc_address.destroy
-
-  end
-
-  @server.destroy
-
-end

data/tests/requests/compute/assign_private_ip_tests.rb

@@ -1,55 +0,0 @@
-Shindo.tests('Fog::Compute[:aws] | internet_gateway requests', ['aws']) do
-
-  tests('success') do
-    Fog::AWS::Compute::Mock.reset if Fog.mocking?
-
-    @vpc=Fog::Compute[:aws].vpcs.create('cidr_block' => '10.0.10.0/24')
-    @vpc_id = @vpc.id
-
-    @subnet=Fog::Compute[:aws].subnets.create('vpc_id' => @vpc_id, 'cidr_block' => '10.0.10.0/24')
-    @subnet_id = @subnet.subnet_id
-
-    @network_interface = Fog::Compute[:aws].network_interfaces.new(:subnet_id => @subnet_id)
-    @network_interface.save
-    @network_interface_id =  @network_interface.network_interface_id
-
-    @ip_address = Fog::AWS::Mock.ip_address
-    @second_ip_address = Fog::AWS::Mock.ip_address
-
-    tests("#assign_private_ip_addresses('#{@network_interface_id}', {'PrivateIpAddresses'=>['#{@ip_address}','#{@second_ip_address}']})").formats(AWS::Compute::Formats::BASIC) do
-      Fog::Compute[:aws].assign_private_ip_addresses(@network_interface_id, { 'PrivateIpAddresses' =>[@ip_address, @second_ip_address]}).body
-    end
-
-    tests("#assign_private_ip_addresses('#{@network_interface_id}', {'SecondaryPrivateIpAddressCount'=>4})").formats(AWS::Compute::Formats::BASIC) do
-      Fog::Compute[:aws].assign_private_ip_addresses(@network_interface_id, {'SecondaryPrivateIpAddressCount'=>4}).body
-    end
-
-    @network_interface.destroy
-    @subnet.destroy
-    @vpc.destroy
-  end
-
-  tests('failure') do
-    Fog::AWS::Compute::Mock.reset if Fog.mocking?
-
-    @vpc=Fog::Compute[:aws].vpcs.create('cidr_block' => '10.0.10.0/24')
-    @vpc_id = @vpc.id
-
-    @subnet=Fog::Compute[:aws].subnets.create('vpc_id' => @vpc_id, 'cidr_block' => '10.0.10.0/24')
-    @subnet_id = @subnet.subnet_id
-
-    @network_interface = Fog::Compute[:aws].network_interfaces.new(:subnet_id => @subnet_id)
-    @network_interface.save
-    @network_interface_id =  @network_interface.network_interface_id
-
-    @ip_address = Fog::AWS::Mock.ip_address
-
-    tests("#assign_private_ip_addresses('#{@network_interface_id}', {'PrivateIpAddresses'=>['#{@ip_address}','#{@second_ip_address}'], 'SecondaryPrivateIpAddressCount'=>4 })").raises(Fog::AWS::Compute::Error) do
-      Fog::Compute[:aws].assign_private_ip_addresses(@network_interface_id, { 'PrivateIpAddresses' =>[@ip_address, @second_ip_address], 'SecondaryPrivateIpAddressCount'=>4 }).body
-    end
-
-    @network_interface.destroy
-    @subnet.destroy
-    @vpc.destroy
-  end
-end

data/tests/requests/compute/availability_zone_tests.rb

@@ -1,25 +0,0 @@
-Shindo.tests('Fog::Compute[:aws] | availability zone requests', ['aws']) do
-
-  @availability_zones_format = {
-    'availabilityZoneInfo'  => [{
-      'messageSet'  => [],
-      'regionName'  => String,
-      'zoneName'    => String,
-      'zoneState'   => String
-    }],
-    'requestId'             => String
-  }
-
-  tests('success') do
-
-    tests('#describe_availability_zones').formats(@availability_zones_format) do
-      Fog::Compute[:aws].describe_availability_zones.body
-    end
-
-    tests("#describe_availability_zones('zone-name' => 'us-east-1a')").formats(@availability_zones_format) do
-      Fog::Compute[:aws].describe_availability_zones('zone-name' => 'us-east-1a').body
-    end
-
-  end
-
-end

data/tests/requests/compute/client_tests.rb

@@ -1,25 +0,0 @@
-Shindo.tests('Fog::Compute[:aws] | account tests', ['aws']) do
-  if Fog.mocking?
-    tests('check for vpc') do
-      tests('supports both vpc and ec2 in compatibility mode').succeeds do
-        client = Fog::Compute[:aws]
-        client.enable_ec2_classic
-        data = Fog::Compute[:aws].describe_account_attributes.body
-        data['accountAttributeSet'].any? { |s| [*s["values"]].include?("VPC") && [*s["values"]].include?("EC2") }
-      end
-      tests('supports VPC in vpc mode').succeeds do
-        client = Fog::Compute[:aws]
-        client.enable_ec2_classic
-        data = Fog::Compute[:aws].describe_account_attributes.body
-        data['accountAttributeSet'].any? { |s| [*s["values"]].include?("VPC") }
-      end
-
-      tests('does not support VPC and EC2 in vpc mode').succeeds do
-        client = Fog::Compute[:aws]
-        client.disable_ec2_classic
-        data = Fog::Compute[:aws].describe_account_attributes.body
-        !data['accountAttributeSet'].any? { |s| [*s["values"]].include?("VPC") && [*s["values"]].include?("EC2") }
-      end
-    end
-  end
-end

data/tests/requests/compute/dhcp_options_tests.rb

@@ -1,39 +0,0 @@
-Shindo.tests('Fog::Compute[:aws] | dhcp_options requests', ['aws']) do
-
-  @dhcp_options_format = {
-    'dhcpOptionsSet' => [{
-      'dhcpOptionsId'            => String,
-      'dhcpConfigurationSet'     => Hash,
-      'tagSet'                   => Fog::Nullable::Hash,
-    }],
-    'requestId' => String
-  }
-
-  tests('success') do
-    @vpc=Fog::Compute[:aws].vpcs.create('cidr_block' => '10.0.10.0/24')
-    @vpc_id = @vpc.id
-
-    tests('#create_dhcp_options').formats(@dhcp_options_format) do
-      data = Fog::Compute[:aws].create_dhcp_options({'domain-name' => 'example.com', 'domain-name-servers' => '10.10.10.10'}).body
-      @dopt_id = data['dhcpOptionsSet'].first['dhcpOptionsId']
-      data
-    end
-
-    tests('#describe_dhcp_options').formats(@dhcp_options_format) do
-      Fog::Compute[:aws].describe_dhcp_options.body
-    end
-
-    tests("#associate_dhcp_options('#{@dopt_id}, #{@vpc_id}')").formats(AWS::Compute::Formats::BASIC) do
-      Fog::Compute[:aws].associate_dhcp_options(@dopt_id, @vpc_id).body
-    end
-
-    tests("#associate_default_dhcp_options('default', #{@vpc_id}')").formats(AWS::Compute::Formats::BASIC) do
-      Fog::Compute[:aws].associate_dhcp_options('default', @vpc_id).body
-    end
-
-    tests("#delete_dhcp_options('#{@dopt_id}')").formats(AWS::Compute::Formats::BASIC) do
-      Fog::Compute[:aws].delete_dhcp_options(@dopt_id).body
-    end
-    @vpc.destroy
-  end
-end

data/tests/requests/compute/helper.rb

@@ -1,27 +0,0 @@
-class AWS
-  module Compute
-    module Formats
-      BASIC = {
-        'requestId' => String
-      }
-
-      DESCRIBE_IMAGES = BASIC.merge({
-        "imagesSet" => [{
-          "imageId" => String,
-          "imageLocation" => String,
-          "imageState" => String,
-          "imageOwnerId" => String,
-          "creationDate" => Fog::Nullable::String,
-          "isPublic" => Fog::Nullable::Boolean,
-          "architecture" => String,
-          "imageType" => String,
-          "imageOwnerAlias" => String,
-          "rootDeviceType" => String,
-          "blockDeviceMapping" => Array,
-          "virtualizationType" => String,
-          "hypervisor" => String
-        }]
-      })
-    end
-  end
-end

data/tests/requests/compute/image_tests.rb

@@ -1,169 +0,0 @@
-Shindo.tests('Fog::Compute[:aws] | image requests', ['aws']) do
-  @describe_images_format = {
-    'imagesSet'    => [{
-      'architecture'        => String,
-      'blockDeviceMapping'  => [Fog::Nullable::Hash],
-      'description'         => Fog::Nullable::String,
-      'hypervisor'          => String,
-      'imageId'             => String,
-      'imageLocation'       => String,
-      'imageOwnerAlias'     => Fog::Nullable::String,
-      'imageOwnerId'        => String,
-      'imageState'          => String,
-      'imageType'           => String,
-      'isPublic'            => Fog::Boolean,
-      'kernelId'            => String,
-      'name'                => String,
-      'platform'            => Fog::Nullable::String,
-      'productCodes'        => [],
-      'ramdiskId'           => Fog::Nullable::String,
-      'rootDeviceName'      => String,
-      'rootDeviceType'      => String,
-      'stateReason'         => {},
-      'tagSet'              => {},
-      'virtualizationType'  => String,
-      'creationDate' => Fog::Nullable::Time,
-      'enaSupport' => Fog::Nullable::Boolean
-    }],
-    'requestId'     => String,
-  }
-
-  @register_image_format = {
-    'imageId'               => String,
-    'requestId'             => String
-  }
-
-  @modify_image_attribute_format = {
-    'return'                => Fog::Boolean,
-    'requestId'             => String
-  }
-  @describe_image_attribute_format = {
-    'requestId'             => String,
-    'imageId'               => String,
-    'launchPermission'      => [Fog::Nullable::String]
-  }
-  @create_image_format = {
-    'requestId'             => String,
-    'imageId'               => String
-  }
-
-  @image_copy_result = {
-    'requestId'   => String,
-    'imageId'  => String
-  }
-
-  tests('success') do
-    # the result for this is HUGE and relatively uninteresting...
-    # tests("#describe_images").formats(@images_format) do
-    #   Fog::Compute[:aws].describe_images.body
-    # end
-    @image_id = 'ami-1aad5273'
-
-    if Fog.mocking?
-      @other_account = Fog::AWS::Compute.new(:aws_access_key_id => 'other', :aws_secret_access_key => 'account')
-
-      @server = Fog::Compute[:aws].servers.create
-      @server.wait_for{state == 'running'}
-      @created_image
-      tests("#create_image").formats(@create_image_format) do
-        result = Fog::Compute[:aws].create_image(@server.id, 'Fog-Test-Image', 'Fog Test Image', false).body
-        @created_image = Fog::Compute[:aws].images.get(result['imageId'])
-        result
-      end
-      tests("#create_image - no reboot").formats(@create_image_format) do
-        result = Fog::Compute[:aws].create_image(@server.id, 'Fog-Test-Image', 'Fog Test Image', true).body
-        @created_image = Fog::Compute[:aws].images.get(result['imageId'])
-        result
-      end
-      tests("#create_image - automatic ebs image registration").returns(true) do
-      create_image_response = Fog::Compute[:aws].create_image(@server.id, 'Fog-Test-Image', 'Fog Test Image')
-      Fog::Compute[:aws].images.get(create_image_response.body['imageId']) != nil
-      end
-      @server.destroy
-
-      tests("#copy_image (#{@image_id}, 'eu-west-1')").formats(@image_copy_result) do
-        data = Fog::Compute.new(:provider => :aws, :region => "us-west-1", :version => "2013-02-01").copy_image(@image_id, "eu-east-1").body
-        @eu_image_id = data['imageId']
-        data
-      end
-
-      tests("#register_image").formats(@register_image_format) do
-        @image = Fog::Compute[:aws].register_image('image', 'image', '/dev/sda1').body
-      end
-
-      tests("#register_image - with ebs block device mapping").formats(@register_image_format) do
-        @ebs_image = Fog::Compute[:aws].register_image('image', 'image', '/dev/sda1', [ { 'DeviceName' => '/dev/sdh', "SnapshotId" => "snap-123456789", "VolumeSize" => "10G", "DeleteOnTermination" => true}]).body
-      end
-
-      tests("#register_image - with ephemeral block device mapping").formats(@register_image_format) do
-        @ephemeral_image = Fog::Compute[:aws].register_image('image', 'image', '/dev/sda1', [ { 'VirtualName' => 'ephemeral0', "DeviceName" => "/dev/sdb"} ]).body
-      end
-
-      @image_id = @image['imageId']
-      sleep 1
-
-      tests("#describe_images('Owner' => 'self')").formats(@describe_images_format) do
-        Fog::Compute[:aws].describe_images('Owner' => 'self').body
-      end
-
-      tests("#describe_images('state' => 'available')").formats(@describe_images_format) do
-        Fog::Compute[:aws].describe_images('state' => 'available').body
-      end
-
-      tests("other_account#describe_images('image-id' => '#{@image_id}')").returns([]) do
-        @other_account.describe_images('image-id' => @image_id).body['imagesSet']
-      end
-
-      tests("#modify_image_attribute('#{@image_id}', 'Add.UserId' => ['#{@other_account.data[:owner_id]}'])").formats(@modify_image_attribute_format) do
-        Fog::Compute[:aws].modify_image_attribute(@image_id, { 'Add.UserId' => [@other_account.data[:owner_id]] }).body
-      end
-
-      tests("#describe_image_attribute('#{@image_id}', 'launchPermission'])").formats(@describe_image_attribute_format) do
-        Fog::Compute[:aws].describe_image_attribute(@image_id, 'launchPermission' ).body
-      end
-
-      tests("other_account#describe_images('image-id' => '#{@image_id}')").returns([@image_id]) do
-        @other_account.describe_images('image-id' => @image_id).body['imagesSet'].map {|i| i['imageId'] }
-      end
-
-      tests("#modify_image_attribute('#{@image_id}', 'Remove.UserId' => ['#{@other_account.data[:owner_id]}'])").formats(@modify_image_attribute_format) do
-        Fog::Compute[:aws].modify_image_attribute(@image_id, { 'Remove.UserId' => [@other_account.data[:owner_id]] }).body
-      end
-
-      tests("other_account#describe_images('image-id' => '#{@image_id}')").returns([]) do
-        @other_account.describe_images('image-id' => @image_id).body['imagesSet']
-      end
-    end
-
-    tests("#describe_images('image-id' => '#{@image_id}')").formats(@describe_images_format) do
-      @other_image = Fog::Compute[:aws].describe_images('image-id' => @image_id).body
-    end
-
-    unless Fog.mocking?
-      tests("#describe_images('Owner' => '#{@other_image['imageOwnerAlias']}', 'image-id' => '#{@image_id}')").formats(@describe_images_format) do
-        Fog::Compute[:aws].describe_images('Owner' => @other_image['imageOwnerAlias'], 'image-id' => @image_id).body
-      end
-    end
-
-    #NOTE: waiting for the image to complete can sometimes take up to 1 hour
-    # for quicker tests: uncomment the rest of this block
-    #Fog.wait_for { Fog::Compute.new(:provider => :aws, :region => "us-west-1").snapshots.get(@eu_image_id) }
-
-    #tests("#delete_snapshots(#{@eu_image_id})").formats(AWS::Compute::Formats::BASIC) do
-    #  Fog::Compute.new(:provider => :aws, :region => "us-west-1").delete_snapshot(@eu_image_id).body
-    #end
-
-  end
-
-  tests('failure') do
-    tests("#modify_image_attribute(nil, { 'Add.Group' => ['all'] })").raises(ArgumentError) do
-      Fog::Compute[:aws].modify_image_attribute(nil, { 'Add.Group' => ['all'] }).body
-    end
-
-    tests("#modify_image_attribute('ami-00000000', { 'Add.UserId' => ['123456789012'] })").raises(Fog::AWS::Compute::NotFound) do
-      pending unless Fog.mocking?
-
-      Fog::Compute[:aws].modify_image_attribute('ami-00000000', { 'Add.UserId' => ['123456789012'] }).body
-    end
-  end
-end