fog-aws 1.2.1 → 1.3.0

data/lib/fog/aws/requests/compute/describe_volumes_modifications.rb

@@ -0,0 +1,93 @@
+module Fog
+  module Compute
+    class AWS
+      class Real
+        require 'fog/aws/parsers/compute/describe_volumes_modifications'
+
+        # Reports the current modification status of EBS volumes.
+        #
+        # ==== Parameters
+        # * filters<~Hash> - List of filters to limit results with
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>
+        #     * 'volumeModificationSet'<~Array>:
+        #       * 'targetIops'<~Integer> - Target IOPS rate of the volume being modified.
+        #       * 'originalIops'<~Integer> - Original IOPS rate of the volume being modified.
+        #       * 'modificationState'<~String> - Current state of modification. Modification state is null for unmodified volumes.
+        #       * 'targetSize'<~Integer> - Target size of the volume being modified.
+        #       * 'targetVolumeType'<~String> - Target EBS volume type of the volume being modified.
+        #       * 'volumeId'<~String> - ID of the volume being modified.
+        #       * 'progress'<~Integer> - Modification progress from 0 to 100%.
+        #       * 'startTime'<~Time> - Modification start time
+        #       * 'endTime'<~Time> - Modification end time
+        #       * 'originalSize'<~Integer> - Original size of the volume being modified.
+        #       * 'originalVolumeType'<~String> - Original EBS volume type of the volume being modified.
+
+        def describe_volumes_modifications(filters = {})
+          params = {}
+          if volume_id = filters.delete('volume-id')
+            params.merge!(Fog::AWS.indexed_param('VolumeId.%d', [*volume_id]))
+          end
+          params.merge!(Fog::AWS.indexed_filters(filters))
+          request({
+            'Action'    => 'DescribeVolumesModifications',
+            :idempotent => true,
+            :parser     => Fog::Parsers::Compute::AWS::DescribeVolumesModifications.new
+          }.merge(params))
+        end
+      end
+
+      class Mock
+        def describe_volumes_modifications(filters = {})
+          response = Excon::Response.new
+
+          modification_set = self.data[:volume_modifications].values
+
+          aliases = {
+            'volume-id'            => 'volumeId',
+            'modification-state'   => 'modificationState',
+            'target-size'          => 'targetSize',
+            'target-iops'          => 'targetIops',
+            'target-volume-type'   => 'targetVolumeType',
+            'original-size'        => 'originalSize',
+            'original-iops'        => 'originalIops',
+            'original-volume-type' => 'originalVolumeType',
+            'start-time'           => 'startTime'
+          }
+
+          attribute_aliases = {
+            'targetSize'       => 'size',
+            'targetVolumeType' => 'volumeType',
+            'targetIops'       => 'iops'
+          }
+
+          for filter_key, filter_value in filters
+            aliased_key = aliases[filter_key]
+            modification_set = modification_set.reject { |m| ![*filter_value].include?(m[aliased_key]) }
+          end
+
+          modification_set.each do |modification|
+            case modification['modificationState']
+            when 'modifying'
+              volume = self.data[:volumes][modification['volumeId']]
+              modification['modificationState'] = 'optimizing'
+              %w(targetSize targetIops targetVolumeType).each do |attribute|
+                aliased_attribute = attribute_aliases[attribute]
+                volume[aliased_attribute] = modification[attribute] if modification[attribute]
+              end
+              self.data[:volumes][modification['volumeId']] = volume
+            when 'optimizing'
+              modification['modificationState'] = 'completed'
+              modification['endTime']           = Time.now
+            end
+          end
+
+          response.body = {'requestId' => Fog::AWS::Mock.request_id, 'volumeModificationSet' => modification_set}
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/compute/describe_vpc_classic_link.rb

@@ -45,7 +45,7 @@ module Fog
           vpcs = apply_tag_filters(vpcs, options[:filters], 'vpcId') if options[:filters]
 
           response.status = 200
-          vpc_data = vpcs.collect do |vpc| 
+          vpc_data = vpcs.collect do |vpc|
             {
               'vpcId' => vpc['vpcId'],
               'classicLinkEnabled' => vpc['classicLinkEnabled'],
@@ -56,6 +56,7 @@ module Fog
             'requestId' => Fog::AWS::Mock.request_id,
             'vpcSet' => vpc_data
           }
+          response
         end
       end
     end

data/lib/fog/aws/requests/compute/describe_vpc_classic_link_dns_support.rb

@@ -0,0 +1,53 @@
+module Fog
+  module Compute
+    class AWS
+      class Real
+        require 'fog/aws/parsers/compute/describe_vpc_classic_link_dns_support'
+
+        # escribes the ClassicLink DNS support status of one or more VPCs
+        #
+        # ==== Parameters
+        # * options<~Hash>
+        #   * vpc_ids<~Array> - An array of vpc ids to restrict results to
+        #   * 'MaxResults'    - Maximum number of items to return
+        #   * 'NextToken'     - The token for the next set of items to return
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'requestId'<~String> - Id of the request
+        #     * 'vpcs'<~Array>       - Information about the ClassicLink DNS support status of the VPCs
+        #       * 'vpcId'<~String>
+        #       * 'classicLinkDnsSupported'<~Boolean>
+        #
+        # http://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeVpcClassicLinkDnsSupport.html
+
+        def describe_vpc_classic_link_dns_support(options={})
+          params = {}
+          params.merge!(Fog::AWS.indexed_param('VpcIds', options[:vpc_ids])) if options[:vpc_ids]
+          request({
+            'Action'     => 'DescribeVpcClassicLinkDnsSupport',
+            'MaxResults' => options['MaxResults'],
+            'NextToken'  => options['NextToken'],
+            :parser      => Fog::Parsers::Compute::AWS::DescribeVpcClassicLinkDnsSupport.new
+          }.merge(params))
+        end
+      end
+
+      class Mock
+        def describe_vpc_classic_link_dns_support(options={})
+          response = Excon::Response.new
+
+          vpcs = self.data[:vpcs]
+
+          if options[:vpc_ids]
+            vpcs = vpcs.select { |v| options[:vpc_ids].include?(v['vpcId']) }
+          end
+
+          response.body = {'vpcs' => vpcs.map { |v| {"vpcId" => v['vpcId'], "classicLinkDnsSupported" => v['classicLinkDnsSupport']} } }
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/compute/detach_classic_link_vpc.rb

@@ -26,7 +26,6 @@ module Fog
             'DryRun'    => dry_run,
             :parser     => Fog::Parsers::Compute::AWS::Basic.new
           )
-          
         end
       end
 
@@ -47,12 +46,11 @@ module Fog
               instance['classicLinkVpcId'] = nil
             end
             response
-          elsif !instance 
+          elsif !instance
             raise Fog::Compute::AWS::NotFound.new("The instance ID '#{instance_id}' does not exist.")
           elsif !vpc
             raise Fog::Compute::AWS::NotFound.new("The VPC '#{vpc_id}' does not exist.")
           end
-
         end
       end
     end

data/lib/fog/aws/requests/compute/disable_vpc_classic_link_dns_support.rb

@@ -0,0 +1,45 @@
+module Fog
+  module Compute
+    class AWS
+      class Real
+        require 'fog/aws/parsers/compute/basic'
+
+        # Disables DNS hostname resolution for ClassicLink
+        #
+        # ==== Parameters
+        # * vpc_id<~String> - The ID of the ClassicLink-enabled VPC.
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'requestId'<~String> - Id of the request
+        #     * 'return'<~Boolean>   - Whether the request succeeded
+        #
+        # http://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DisableVpcClassicLinkDnsSupport.html
+
+        def disable_vpc_classic_link_dns_support(vpc_id)
+          request(
+            'Action' => 'DisableVpcClassicLinkDnsSupport',
+            'VpcId'  => vpc_id,
+            :parser  => Fog::Parsers::Compute::AWS::Basic.new
+          )
+        end
+      end
+
+      class Mock
+        def disable_vpc_classic_link_dns_support(vpc_id)
+          response = Excon::Response.new
+          unless vpc = self.data[:vpcs].find { |v| v['vpcId'] == vpc_id }
+            raise Fog::Compute::AWS::NotFound.new("The VPC '#{vpc_id}' does not exist")
+          end
+          vpc['classicLinkDnsSupport'] = false
+          response.body = {
+            'requestId' => Fog::AWS::Mock.request_id,
+            'return'    => true
+          }
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/compute/enable_vpc_classic_link_dns_support.rb

@@ -0,0 +1,45 @@
+module Fog
+  module Compute
+    class AWS
+      class Real
+        require 'fog/aws/parsers/compute/basic'
+
+        # Enables a VPC to support DNS hostname resolution for ClassicLink
+        #
+        # ==== Parameters
+        # * vpc_id<~String> - The ID of the ClassicLink-enabled VPC.
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'requestId'<~String> - Id of the request
+        #     * 'return'<~Boolean>   - Whether the request succeeded
+        #
+        # http://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_EnableVpcClassicLinkDnsSupport.html
+
+        def enable_vpc_classic_link_dns_support(vpc_id)
+          request(
+            'Action' => 'EnableVpcClassicLinkDnsSupport',
+            'VpcId'  => vpc_id,
+            :parser  => Fog::Parsers::Compute::AWS::Basic.new
+          )
+        end
+      end
+
+      class Mock
+        def enable_vpc_classic_link_dns_support(vpc_id)
+          response = Excon::Response.new
+          unless vpc = self.data[:vpcs].find { |v| v['vpcId'] == vpc_id }
+            raise Fog::Compute::AWS::NotFound.new("The VPC '#{vpc_id}' does not exist")
+          end
+          vpc['classicLinkDnsSupport'] = true
+          response.body = {
+            'requestId' => Fog::AWS::Mock.request_id,
+            'return'    => true
+          }
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/compute/modify_volume.rb

@@ -0,0 +1,88 @@
+module Fog
+  module Compute
+    class AWS
+      class Real
+        require 'fog/aws/parsers/compute/modify_volume'
+
+        # Modifies a volume
+        #
+        # ==== Parameters
+        # * volume_id<~String> - The ID of the volume
+        # * options<~Hash>:
+        #   * 'VolumeType'<~String> - Type of volume
+        #   * 'Size'<~Integer> - Size in GiBs fo the volume
+        #   * 'Iops'<~Integer> - Number of IOPS the volume supports
+        #
+        # ==== Response
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'targetIops'<~Integer> - Target IOPS rate of the volume being modified.
+        #     * 'originalIops'<~Integer> - Original IOPS rate of the volume being modified.
+        #     * 'modificationState'<~String> - Current state of modification. Modification state is null for unmodified volumes.
+        #     * 'targetSize'<~Integer> - Target size of the volume being modified.
+        #     * 'targetVolumeType'<~String> - Target EBS volume type of the volume being modified.
+        #     * 'volumeId'<~String> - ID of the volume being modified.
+        #     * 'progress'<~Integer> - Modification progress from 0 to 100%.
+        #     * 'startTime'<~Time> - Modification start time
+        #     * 'endTime'<~Time> - Modification end time
+        #     * 'originalSize'<~Integer> - Original size of the volume being modified.
+        #     * 'originalVolumeType'<~String> - Original EBS volume type of the volume being modified.
+
+        def modify_volume(volume_id, options={})
+          request({
+            'Action'   => "ModifyVolume",
+            'VolumeId' => volume_id,
+            :parser    => Fog::Parsers::Compute::AWS::ModifyVolume.new
+          }.merge(options))
+        end
+      end
+
+      class Mock
+        def modify_volume(volume_id, options={})
+          response = Excon::Response.new
+          volume   = self.data[:volumes][volume_id]
+
+          if volume["volumeType"] == 'standard' && options['VolumeType']
+            raise Fog::Compute::AWS::Error.new("InvalidParameterValue => Volume type EBS Magnetic is not supported.")
+          end
+
+          volume_modification = {
+            'modificationState' => 'modifying',
+            'progress'          => 0,
+            'startTime'         => Time.now,
+            'volumeId'          => volume_id
+          }
+
+          if options['Size']
+            volume_modification.merge!(
+              'originalSize' => volume['size'],
+              'targetSize'   => options['Size']
+            )
+          end
+
+          if options['Iops']
+            volume_modification.merge!(
+              'originalIops' => volume['iops'],
+              'targetIops'   => options['Iops']
+            )
+          end
+
+          if options['VolumeType']
+            if options["VolumeType"] == 'standard'
+              raise Fog::Compute::AWS::Error.new("InvalidParameterValue => Volume type EBS Magnetic is not supported.")
+            end
+            volume_modification.merge!(
+              'originalVolumeType' => volume['volumeType'],
+              'targetVolumeType'   => options['VolumeType']
+            )
+          end
+
+          self.data[:volume_modifications][volume_id] = volume_modification
+
+          response.body = {'volumeModification' => volume_modification, 'requestId' => Fog::AWS::Mock.request_id}
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/rds/authorize_db_security_group_ingress.rb

@@ -15,8 +15,8 @@ module Fog
         # * response<~Excon::Response>:
         #   * body<~Hash>:
         def authorize_db_security_group_ingress(name, opts={})
-          unless opts.key?('CIDRIP') || (opts.key?('EC2SecurityGroupName') && opts.key?('EC2SecurityGroupOwnerId'))
-            raise ArgumentError, 'Must specify CIDRIP, or both EC2SecurityGroupName and EC2SecurityGroupOwnerId'
+          unless opts.key?('CIDRIP') || ((opts.key?('EC2SecurityGroupName') || opts.key?('EC2SecurityGroupId')) && opts.key?('EC2SecurityGroupOwnerId'))
+            raise ArgumentError, 'Must specify CIDRIP, or one of EC2SecurityGroupName or EC2SecurityGroupId, and EC2SecurityGroupOwnerId'
           end
 
           request({
@@ -29,8 +29,13 @@ module Fog
 
       class Mock
         def authorize_db_security_group_ingress(name, opts = {})
-          unless opts.key?('CIDRIP') || (opts.key?('EC2SecurityGroupName') && opts.key?('EC2SecurityGroupOwnerId'))
-            raise ArgumentError, 'Must specify CIDRIP, or both EC2SecurityGroupName and EC2SecurityGroupOwnerId'
+          unless opts.key?('CIDRIP') || ((opts.key?('EC2SecurityGroupName') || opts.key?('EC2SecurityGroupId')) && opts.key?('EC2SecurityGroupOwnerId'))
+            raise ArgumentError, 'Must specify CIDRIP, or one of EC2SecurityGroupName or EC2SecurityGroupId, and EC2SecurityGroupOwnerId'
+          end
+
+          if ec2_security_group_id = opts.delete("EC2SecurityGroupId")
+            ec2_security_group = (Fog::Compute::AWS::Mock.data[self.region][self.aws_access_key_id][:security_groups] || {}).values.detect { |sg| sg['groupId'] == ec2_security_group_id }
+            opts['EC2SecurityGroupName'] = ec2_security_group['groupName']
           end
 
           response = Excon::Response.new
@@ -42,7 +47,7 @@ module Fog
               end
               sec_group['IPRanges'] << opts.merge({"Status" => 'authorizing'})
             else
-              if sec_group['EC2SecurityGroups'].find{|h| h['EC2SecurityGroupName'] == opts['EC2SecurityGroupName']}
+              if sec_group['EC2SecurityGroups'].find{|h| h['EC2SecurityGroupName'] == opts['EC2SecurityGroupName'] || h['EC2SecurityGroupId'] == opts['EC2SecurityGroupId']}
                 raise Fog::AWS::RDS::AuthorizationAlreadyExists.new("AuthorizationAlreadyExists => #{opts['EC2SecurityGroupName']} is alreay defined")
               end
               sec_group['EC2SecurityGroups'] << opts.merge({"Status" => 'authorizing'})

data/lib/fog/aws/requests/rds/create_db_subnet_group.rb

@@ -31,15 +31,14 @@ module Fog
           end
 
           # collection = Fog::Compute::AWS.new(:aws_access_key_id => 'mock key', :aws_secret_access_key => 'mock secret')
-          collection = Fog::Compute[:aws]
-          collection.region = @region
+          compute_data = Fog::Compute::AWS::Mock.data[self.region][self.aws_access_key_id]
 
           subnets = subnet_ids.map do |snid|
-            subnet = collection.subnets.get(snid)
+            subnet = compute_data[:subnets].detect { |s| s['subnetId'] == snid }
             raise Fog::AWS::RDS::NotFound.new("InvalidSubnet => The subnet '#{snid}' was not found") if subnet.nil?
             subnet
           end
-          vpc_id = subnets.first.vpc_id
+          vpc_id = subnets.first['vpcId']
 
           data = {
             'DBSubnetGroupName' => name,

data/lib/fog/aws/requests/rds/delete_db_subnet_group.rb

@@ -26,6 +26,8 @@ module Fog
             raise Fog::AWS::RDS::NotFound.new("DBSubnetGroupNotFound => The subnet group '#{name}' doesn't exists")
           end
 
+          self.data[:subnet_groups].delete(name)
+
           response.body = {
             'ResponseMetadata'=>{ 'RequestId'=> Fog::AWS::Mock.request_id },
             'return' => true,

data/lib/fog/aws/requests/rds/revoke_db_security_group_ingress.rb

@@ -15,8 +15,8 @@ module Fog
         # * response<~Excon::Response>:
         #   * body<~Hash>:
         def revoke_db_security_group_ingress(name, opts={})
-          unless opts.key?('CIDRIP') || (opts.key?('EC2SecurityGroupName') && opts.key?('EC2SecurityGroupOwnerId'))
-            raise ArgumentError, 'Must specify CIDRIP, or both EC2SecurityGroupName and EC2SecurityGroupOwnerId'
+          unless opts.key?('CIDRIP') || ((opts.key?('EC2SecurityGroupName') || opts.key?('EC2SecurityGroupId')) && opts.key?('EC2SecurityGroupOwnerId'))
+            raise ArgumentError, 'Must specify CIDRIP, or one of EC2SecurityGroupName or EC2SecurityGroupId, and EC2SecurityGroupOwnerId'
           end
 
           request({
@@ -29,8 +29,13 @@ module Fog
 
       class Mock
         def revoke_db_security_group_ingress(name, opts = {})
-          unless opts.key?('CIDRIP') || (opts.key?('EC2SecurityGroupName') && opts.key?('EC2SecurityGroupOwnerId'))
-            raise ArgumentError, 'Must specify CIDRIP, or both EC2SecurityGroupName and EC2SecurityGroupOwnerId'
+          unless opts.key?('CIDRIP') || ((opts.key?('EC2SecurityGroupName') || opts.key?('EC2SecurityGroupId')) && opts.key?('EC2SecurityGroupOwnerId'))
+            raise ArgumentError, 'Must specify CIDRIP, or one of EC2SecurityGroupName or EC2SecurityGroupId, and EC2SecurityGroupOwnerId'
+          end
+
+          if ec2_security_group_id = opts.delete("EC2SecurityGroupId")
+            ec2_security_group = (Fog::Compute::AWS::Mock.data[self.region][self.aws_access_key_id][:security_groups] || {}).values.detect { |sg| sg['groupId'] == ec2_security_group_id }
+            opts['EC2SecurityGroupName'] = ec2_security_group['groupName']
           end
 
           response = Excon::Response.new