fog-aws 0.11.0 → 3.18.0

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

@@ -0,0 +1,93 @@
+module Fog
+  module AWS
+    class Compute
+      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::AWS::Compute::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_attribute.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/describe_vpc_attribute'
         # Describes a vpc attribute value
@@ -23,7 +23,7 @@ module Fog
             'Action'    => 'DescribeVpcAttribute',
             'VpcId'     => vpc_id,
             'Attribute' => attribute,
-            :parser     => Fog::Parsers::Compute::AWS::DescribeVpcAttribute.new
+            :parser     => Fog::Parsers::AWS::Compute::DescribeVpcAttribute.new
           )
         end
       end
@@ -42,11 +42,11 @@ module Fog
             when 'enableDnsSupport', 'enableDnsHostnames'
               response.body[attribute] = vpc[attribute]
             else
-              raise Fog::Compute::AWS::Error.new("Illegal attribute '#{attribute}' specified")
+              raise Fog::AWS::Compute::Error.new("Illegal attribute '#{attribute}' specified")
             end
             response
           else
-            raise Fog::Compute::AWS::NotFound.new("The VPC '#{vpc_id}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The VPC '#{vpc_id}' does not exist")
           end
         end
       end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/describe_vpc_classic_link'
         # Describes the ClassicLink status of one or more VPCs.
@@ -26,7 +26,7 @@ module Fog
           params.merge!(Fog::AWS.indexed_filters(options[:filters])) if options[:filters]
           request({
             'Action'    => 'DescribeVpcClassicLink',
-            :parser     => Fog::Parsers::Compute::AWS::DescribeVpcClassicLink.new
+            :parser     => Fog::Parsers::AWS::Compute::DescribeVpcClassicLink.new
           }.merge(params))
         end
       end
@@ -38,14 +38,14 @@ module Fog
           if vpc_ids = options[:vpc_ids]
             vpcs = vpc_ids.collect do |vpc_id|
               vpc = vpcs.find{ |v| v['vpcId'] == vpc_id }
-              raise Fog::Compute::AWS::NotFound.new("The VPC '#{vpc_id}' does not exist") unless vpc
+              raise Fog::AWS::Compute::NotFound.new("The VPC '#{vpc_id}' does not exist") unless vpc
               vpc
             end
           end
           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 AWS
+    class Compute
+      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::AWS::Compute::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/describe_vpcs.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/describe_vpcs'
 
@@ -33,7 +33,7 @@ module Fog
           request({
             'Action' => 'DescribeVpcs',
             :idempotent => true,
-            :parser => Fog::Parsers::Compute::AWS::DescribeVpcs.new
+            :parser => Fog::Parsers::AWS::Compute::DescribeVpcs.new
           }.merge!(params))
         end
       end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
         # Links an EC2-Classic instance to a ClassicLink-enabled VPC through one or more of the VPC's security groups
@@ -24,9 +24,8 @@ module Fog
             'VpcId'     => vpc_id,
             'InstanceId'=> instance_id,
             'DryRun'    => dry_run,
-            :parser     => Fog::Parsers::Compute::AWS::Basic.new
+            :parser     => Fog::Parsers::AWS::Compute::Basic.new
           )
-          
         end
       end
 
@@ -47,12 +46,11 @@ module Fog
               instance['classicLinkVpcId'] = nil
             end
             response
-          elsif !instance 
-            raise Fog::Compute::AWS::NotFound.new("The instance ID '#{instance_id}' does not exist.")
+          elsif !instance
+            raise Fog::AWS::Compute::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.")
+            raise Fog::AWS::Compute::NotFound.new("The VPC '#{vpc_id}' does not exist.")
           end
-
         end
       end
     end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
         # Detaches an Internet gateway to a VPC, enabling connectivity between the Internet and the VPC
@@ -22,7 +22,7 @@ module Fog
             'InternetGatewayId'    => internet_gateway_id,
             'VpcId'                => vpc_id,
             :idempotent   => true,
-            :parser       => Fog::Parsers::Compute::AWS::Basic.new
+            :parser       => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
@@ -43,7 +43,7 @@ module Fog
             elsif !vpc_id
               message << 'The request must contain the parameter vpc_id'
             end
-            raise Fog::Compute::AWS::Error.new(message)
+            raise Fog::AWS::Compute::Error.new(message)
           end
         end
       end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
         # Detaches a network interface.
@@ -21,7 +21,7 @@ module Fog
             'Action'       => 'DetachNetworkInterface',
             'AttachmentId' => attachment_id,
             'Force'        => force,
-            :parser        => Fog::Parsers::Compute::AWS::Basic.new
+            :parser        => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
@@ -39,7 +39,7 @@ module Fog
             }
             response
           else
-            raise Fog::Compute::AWS::NotFound.new("The network interface '#{network_interface_id}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The network interface '#{network_interface_id}' does not exist")
           end
         end
       end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/detach_volume'
 
@@ -29,7 +29,7 @@ module Fog
             'Action'    => 'DetachVolume',
             'VolumeId'  => volume_id,
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::DetachVolume.new
+            :parser     => Fog::Parsers::AWS::Compute::DetachVolume.new
           }.merge!(options))
         end
       end
@@ -49,10 +49,10 @@ module Fog
               response
             else
               # real response has spacing issue below
-              raise Fog::Compute::AWS::Error.new("IncorrectState => Volume '#{volume_id}'is in the 'available' state.")
+              raise Fog::AWS::Compute::Error.new("IncorrectState => Volume '#{volume_id}'is in the 'available' state.")
             end
           else
-            raise Fog::Compute::AWS::NotFound.new("The volume '#{volume_id}' does not exist.")
+            raise Fog::AWS::Compute::NotFound.new("The volume '#{volume_id}' does not exist.")
           end
         end
       end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
         # disavbles classic link for a vpc
@@ -21,7 +21,7 @@ module Fog
             'Action'    => 'DisableVpcClassicLink',
             'VpcId'     => vpc_id,
             'DryRun'    => dry_run,
-            :parser     => Fog::Parsers::Compute::AWS::Basic.new
+            :parser     => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
@@ -38,7 +38,7 @@ module Fog
             vpc['classicLinkEnabled'] = false unless dry_run
             response
           else
-            raise Fog::Compute::AWS::NotFound.new("The VPC '#{vpc_id}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The VPC '#{vpc_id}' does not exist")
           end
         end
       end

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

@@ -0,0 +1,45 @@
+module Fog
+  module AWS
+    class Compute
+      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::AWS::Compute::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::AWS::Compute::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/disassociate_address.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
@@ -23,16 +23,19 @@ module Fog
             'PublicIp'      => public_ip,
             'AssociationId' => association_id,
             :idempotent     => true,
-            :parser         => Fog::Parsers::Compute::AWS::Basic.new
+            :parser         => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
 
       class Mock
-        def disassociate_address(public_ip)
+        def disassociate_address(public_ip, association_id=nil)
           response = Excon::Response.new
           response.status = 200
           if address = self.data[:addresses][public_ip]
+            if address['allocationId'] && association_id.nil?
+              raise Fog::AWS::Compute::Error.new("InvalidParameterValue => You must specify an association id when unmapping an address from a VPC instance")
+            end
             instance_id = address['instanceId']
             if instance = self.data[:instances][instance_id]
               instance['ipAddress']         = instance['originalIpAddress']
@@ -46,7 +49,7 @@ module Fog
             }
             response
           else
-            raise Fog::Compute::AWS::Error.new("AuthFailure => The address '#{public_ip}' does not belong to you.")
+            raise Fog::AWS::Compute::Error.new("AuthFailure => The address '#{public_ip}' does not belong to you.")
           end
         end
       end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
@@ -20,7 +20,7 @@ module Fog
           request(
             'Action'        => 'DisassociateRouteTable',
             'AssociationId' => association_id,
-            :parser         => Fog::Parsers::Compute::AWS::Basic.new
+            :parser         => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
@@ -43,9 +43,9 @@ module Fog
             }
             response
           elsif assoc_array.nil?
-            raise Fog::Compute::AWS::NotFound.new("The association ID '#{association_id}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The association ID '#{association_id}' does not exist")
           elsif assoc_array['main'] == true
-            raise Fog::Compute::AWS::Error, "InvalidParameterValue => cannot disassociate the main route table association #{association_id}"
+            raise Fog::AWS::Compute::Error, "InvalidParameterValue => cannot disassociate the main route table association #{association_id}"
           end
         end
       end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
         # enables classic link for a vpc
@@ -21,7 +21,7 @@ module Fog
             'Action'    => 'EnableVpcClassicLink',
             'VpcId'     => vpc_id,
             'DryRun'    => dry_run,
-            :parser     => Fog::Parsers::Compute::AWS::Basic.new
+            :parser     => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
@@ -38,7 +38,7 @@ module Fog
             vpc['classicLinkEnabled'] = true unless dry_run
             response
           else
-            raise Fog::Compute::AWS::NotFound.new("The VPC '#{vpc_id}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The VPC '#{vpc_id}' does not exist")
           end
         end
       end

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

@@ -0,0 +1,45 @@
+module Fog
+  module AWS
+    class Compute
+      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::AWS::Compute::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::AWS::Compute::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/get_console_output.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/get_console_output'
 
@@ -23,7 +23,7 @@ module Fog
             'Action'      => 'GetConsoleOutput',
             'InstanceId'  => instance_id,
             :idempotent   => true,
-            :parser       => Fog::Parsers::Compute::AWS::GetConsoleOutput.new
+            :parser       => Fog::Parsers::AWS::Compute::GetConsoleOutput.new
           )
         end
       end
@@ -41,7 +41,7 @@ module Fog
             }
             response
           else;
-            raise Fog::Compute::AWS::NotFound.new("The instance ID '#{instance_id}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The instance ID '#{instance_id}' does not exist")
           end
         end
       end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/get_password_data'
 
@@ -25,7 +25,7 @@ module Fog
             'Action'      => 'GetPasswordData',
             'InstanceId'  => instance_id,
             :idempotent   => true,
-            :parser       => Fog::Parsers::Compute::AWS::GetPasswordData.new
+            :parser       => Fog::Parsers::AWS::Compute::GetPasswordData.new
           )
         end
       end
@@ -43,7 +43,7 @@ module Fog
             }
             response
           else;
-            raise Fog::Compute::AWS::NotFound.new("The instance ID '#{instance_id}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The instance ID '#{instance_id}' does not exist")
           end
         end
       end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/import_key_pair'
 
@@ -23,7 +23,7 @@ module Fog
             'Action'  => 'ImportKeyPair',
             'KeyName' => key_name,
             'PublicKeyMaterial' => Base64::encode64(public_key_material),
-            :parser   => Fog::Parsers::Compute::AWS::ImportKeyPair.new
+            :parser   => Fog::Parsers::AWS::Compute::ImportKeyPair.new
           )
         end
       end
@@ -43,7 +43,7 @@ module Fog
             }.merge!(data)
             response
           else
-            raise Fog::Compute::AWS::Error.new("InvalidKeyPair.Duplicate => The keypair '#{key_name}' already exists.")
+            raise Fog::AWS::Compute::Error.new("InvalidKeyPair.Duplicate => The keypair '#{key_name}' already exists.")
           end
         end
       end