fog-aws 3.0.0 → 3.10.0

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

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

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/describe_instances'
 
@@ -81,7 +81,7 @@ module Fog
           request({
             'Action'    => 'DescribeInstances',
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::DescribeInstances.new
+            :parser     => Fog::Parsers::AWS::Compute::DescribeInstances.new
           }.merge!(params))
         end
       end
@@ -178,7 +178,7 @@ module Fog
 
           # Error if filtering for a brand new instance directly
           if (filters['instance-id'] || filters['instanceId']) && !brand_new_instances.empty?
-            raise Fog::Compute::AWS::NotFound.new("The instance ID '#{brand_new_instances.first['instanceId']}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The instance ID '#{brand_new_instances.first['instanceId']}' does not exist")
           end
 
           # Otherwise don't include it in the list

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

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

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

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

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

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

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/describe_network_interface_attribute'
         # Describes a network interface attribute value
@@ -34,7 +34,7 @@ module Fog
             'Action'             => 'DescribeNetworkInterfaceAttribute',
             'NetworkInterfaceId' => network_interface_id,
             'Attribute'          => attribute,
-            :parser              => Fog::Parsers::Compute::AWS::DescribeNetworkInterfaceAttribute.new
+            :parser              => Fog::Parsers::AWS::Compute::DescribeNetworkInterfaceAttribute.new
           )
         end
       end
@@ -46,7 +46,7 @@ module Fog
 
 
           unless network_interface
-            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
 
           response.status = 200
@@ -58,7 +58,7 @@ module Fog
           when 'description', 'groupSet', 'sourceDestCheck', 'attachment'
             response.body[attribute] = network_interface[attribute]
           else
-            raise Fog::Compute::AWS::Error.new("Illegal attribute '#{attribute}' specified")
+            raise Fog::AWS::Compute::Error.new("Illegal attribute '#{attribute}' specified")
           end
           response
         end

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

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

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

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

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

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

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

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

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

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

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/describe_route_tables'
 
@@ -47,7 +47,7 @@ module Fog
           params = Fog::AWS.indexed_filters(filters)
           request({
             'Action'    => 'DescribeRouteTables',
-            :parser     => Fog::Parsers::Compute::AWS::DescribeRouteTables.new
+            :parser     => Fog::Parsers::AWS::Compute::DescribeRouteTables.new
           }.merge!(params))
         end
       end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/describe_security_groups'
 
@@ -8,6 +8,8 @@ module Fog
         #
         # ==== Parameters
         # * filters<~Hash> - List of filters to limit results with
+        #   * 'MaxResults'<~Integer> - The maximum number of results to return for the request in a single page
+        #   * 'NextToken'<~String> - The token to retrieve the next page of results
         #
         # === Returns
         # * response<~Excon::Response>:
@@ -27,6 +29,7 @@ module Fog
         #           * 'cidrIp'<~String> - CIDR range
         #         * 'toPort'<~Integer> - End of port range (or -1 for ICMP wildcard)
         #       * 'ownerId'<~String> - AWS Access Key Id of the owner of the security group
+        #     * 'NextToken'<~String> - The token to retrieve the next page of results
         #
         # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeSecurityGroups.html]
         def describe_security_groups(filters = {})
@@ -34,11 +37,19 @@ module Fog
             Fog::Logger.deprecation("describe_security_groups with #{filters.class} param is deprecated, use describe_security_groups('group-name' => []) instead [light_black](#{caller.first})[/]")
             filters = {'group-name' => [*filters]}
           end
-          params = Fog::AWS.indexed_filters(filters)
+
+          options = {}
+          for key in %w[MaxResults NextToken]
+            if filters.is_a?(Hash) && filters.key?(key)
+              options[key] = filters.delete(key)
+            end
+          end
+
+          params = Fog::AWS.indexed_filters(filters).merge!(options)
           request({
             'Action'    => 'DescribeSecurityGroups',
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::DescribeSecurityGroups.new
+            :parser     => Fog::Parsers::AWS::Compute::DescribeSecurityGroups.new
           }.merge!(params))
         end
       end

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

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

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/spot_datafeed_subscription'
 
@@ -24,7 +24,7 @@ module Fog
           request({
             'Action'    => 'DescribeSpotDatafeedSubscription',
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::SpotDatafeedSubscription.new
+            :parser     => Fog::Parsers::AWS::Compute::SpotDatafeedSubscription.new
           })
         end
       end

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

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

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/describe_spot_price_history'
 
@@ -52,7 +52,7 @@ module Fog
           request({
             'Action'    => 'DescribeSpotPriceHistory',
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::DescribeSpotPriceHistory.new
+            :parser     => Fog::Parsers::AWS::Compute::DescribeSpotPriceHistory.new
           }.merge!(params))
         end
       end
@@ -82,14 +82,14 @@ module Fog
           zones = params['AvailabilityZone']
           if (!zones.nil? && !all_zones.include?([*zones].shuffle.first))
             az_error = "InvalidParameterValue => Invalid availability zone: [#{zones}]"
-            raise Fog::Compute::AWS::Error, az_error
+            raise Fog::AWS::Compute::Error, az_error
           end
           zones = all_zones if zones.nil?
 
           max_results = params['MaxResults'] || Fog::Mock.random_numbers(3).to_i
           if !(max_results.is_a?(Integer) && max_results > 0)
             max_results_error = "InvalidParameterValue => Invalid value '#{max_results}' for maxResults"
-            raise Fog::Compute::AWS::Error, max_results_error
+            raise Fog::AWS::Compute::Error, max_results_error
           end
 
           all_instance_types = flavors.map { |f| f.id }

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

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

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

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

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

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

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

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