fog 1.3.1 → 1.4.0

data/lib/fog/aws/requests/dns/list_resource_record_sets.rb

@@ -12,6 +12,7 @@ module Fog
         # * options<~Hash>
         #   * type<~String> -
         #   * name<~String> -
+        #   * identifier<~String> -
         #   * max_items<~Integer> -
         #
         # ==== Returns
@@ -29,7 +30,8 @@ module Fog
         #     * 'IsTruncated'<~String> -
         #     * 'MaxItems'<~String> -
         #     * 'NextRecordName'<~String>
-        #     * 'NexRecordType'<~String>
+        #     * 'NextRecordType'<~String>
+        #     * 'NextRecordIdentifier'<~String>
         #   * status<~Integer> - 201 when successful
         def list_resource_record_sets(zone_id, options = {})
 
@@ -40,7 +42,7 @@ module Fog
           parameters = {}
           options.each do |option, value|
             case option
-            when :type, :name
+            when :type, :name, :identifier
               parameters[option] = "#{value}"
             when :max_items
               parameters['maxitems'] = "#{value}"

data/lib/fog/aws/requests/dynamodb/batch_get_item.rb

@@ -31,7 +31,7 @@ module Fog
           }
 
           request(
-            :body       => MultiJson.encode(body),
+            :body       => Fog::JSON.encode(body),
             :headers    => {'x-amz-target' => 'DynamoDB_20111205.BatchGetItem'},
             :idempotent => true
           )

data/lib/fog/aws/requests/dynamodb/batch_write_item.rb

@@ -0,0 +1,35 @@
+module Fog
+  module AWS
+    class DynamoDB
+      class Real
+
+        def batch_put_item(request_items)
+          Fog::Logger.deprecation("batch_put_item is deprecated, use batch_write_item instead")
+          batch_write_item(request_items)
+        end
+
+        #request_items has form:
+        #{"table_name"=>
+        #  [{"PutRequest"=>
+        #    {"Item"=>
+        #      {"hash_key"=>{"N"=>"99"},
+        #       "range_key"=>{"N"=>"99"},
+        #       "attribute"=>{"S"=>"hi"}
+        #       }}}, ... ]}
+        # For more information:
+        # http://docs.amazonwebservices.com/amazondynamodb/latest/developerguide/API_BatchWriteItems.html
+        def batch_write_item(request_items)
+          body = {
+            'RequestItems' => request_items
+          }
+
+          request(
+            :body       => Fog::JSON.encode(body),
+            :headers    => {'x-amz-target' => 'DynamoDB_20111205.BatchWriteItem'}
+          )
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/dynamodb/create_table.rb

@@ -43,7 +43,7 @@ module Fog
           }
 
           request(
-            :body       => MultiJson.encode(body),
+            :body       => Fog::JSON.encode(body),
             :headers    => {'x-amz-target' => 'DynamoDB_20111205.CreateTable'},
             :idempotent => true
           )

data/lib/fog/aws/requests/dynamodb/delete_item.rb

@@ -33,7 +33,7 @@ module Fog
           }.merge(options)
 
           request(
-            :body       => MultiJson.encode(body),
+            :body       => Fog::JSON.encode(body),
             :headers    => {'x-amz-target' => 'DynamoDB_20111205.DeleteItem'},
             :idempotent => true
           )

data/lib/fog/aws/requests/dynamodb/delete_table.rb

@@ -30,7 +30,7 @@ module Fog
           }
 
           request(
-            :body       => MultiJson.encode(body),
+            :body       => Fog::JSON.encode(body),
             :headers    => {'x-amz-target' => 'DynamoDB_20111205.DeleteTable'},
             :idempotent => true
           )

data/lib/fog/aws/requests/dynamodb/describe_table.rb

@@ -32,7 +32,7 @@ module Fog
           }
 
           request(
-            :body       => MultiJson.encode(body),
+            :body       => Fog::JSON.encode(body),
             :headers    => {'x-amz-target' => 'DynamoDB_20111205.DescribeTable'},
             :idempotent => true
           )

data/lib/fog/aws/requests/dynamodb/get_item.rb

@@ -31,7 +31,7 @@ module Fog
           }.merge(options)
 
           request(
-            :body       => MultiJson.encode(body),
+            :body       => Fog::JSON.encode(body),
             :headers    => {'x-amz-target' => 'DynamoDB_20111205.GetItem'},
             :idempotent => true
           )

data/lib/fog/aws/requests/dynamodb/list_tables.rb

@@ -17,7 +17,7 @@ module Fog
         #     * 'TableNames'<~Array> - table names
         def list_tables(options = {})
           request(
-            :body       => MultiJson.encode(options),
+            :body       => Fog::JSON.encode(options),
             :headers    => {'x-amz-target' => 'DynamoDB_20111205.ListTables'},
             :idempotent => true
           )

data/lib/fog/aws/requests/dynamodb/put_item.rb

@@ -30,7 +30,7 @@ module Fog
           }.merge(options)
 
           request(
-            :body       => MultiJson.encode(body),
+            :body       => Fog::JSON.encode(body),
             :headers    => {'x-amz-target' => 'DynamoDB_20111205.PutItem'}
           )
         end

data/lib/fog/aws/requests/dynamodb/query.rb

@@ -33,7 +33,7 @@ module Fog
           }.merge(options)
 
           request(
-            :body     => MultiJson.encode(body),
+            :body     => Fog::JSON.encode(body),
             :headers  => {'x-amz-target' => 'DynamoDB_20111205.Query'}
           )
         end

data/lib/fog/aws/requests/dynamodb/scan.rb

@@ -33,7 +33,7 @@ module Fog
           }.merge(options)
 
           request(
-            :body     => MultiJson.encode(body),
+            :body     => Fog::JSON.encode(body),
             :headers  => {'x-amz-target' => 'DynamoDB_20111205.Scan'},
             :idempotent => true
           )

data/lib/fog/aws/requests/dynamodb/update_item.rb

@@ -38,7 +38,7 @@ module Fog
           }.merge(options)
 
           request(
-            :body     => MultiJson.encode(body),
+            :body     => Fog::JSON.encode(body),
             :headers  => {'x-amz-target' => 'DynamoDB_20111205.UpdateItem'}
           )
         end

data/lib/fog/aws/requests/dynamodb/update_table.rb

@@ -34,7 +34,7 @@ module Fog
           }
 
           request(
-            :body       => MultiJson.encode(body),
+            :body       => Fog::JSON.encode(body),
             :headers    => {'x-amz-target' => 'DynamoDB_20111205.UpdateTable'},
             :idempotent => true
           )

data/lib/fog/aws/requests/elb/apply_security_groups_to_load_balancer.rb

@@ -0,0 +1,61 @@
+module Fog
+  module AWS
+    class ELB
+      class Real
+
+        require 'fog/aws/parsers/elb/apply_security_groups_to_load_balancer'
+
+        # Sets the security groups for an ELB in VPC
+        #
+        # ==== Parameters
+        # * security_group_ids<~Array> - List of security group ids to enable on ELB
+        # * lb_name<~String> - Load balancer to disable availability zones on
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'ResponseMetadata'<~Hash>:
+        #       * 'RequestId'<~String> - Id of request
+        #     * 'ApplySecurityGroupsToLoadBalancer'<~Hash>:
+        #       * 'SecurityGroups'<~Array> - array of strings describing the security group ids currently enabled
+        def apply_security_groups_to_load_balancer(security_group_ids, lb_name)
+          params = Fog::AWS.indexed_param('SecurityGroups.member', [*security_group_ids])
+          request({
+            'Action'           => 'ApplySecurityGroupsToLoadBalancer',
+            'LoadBalancerName' => lb_name,
+            :parser            => Fog::Parsers::AWS::ELB::ApplySecurityGroupsToLoadBalancer.new
+          }.merge!(params))
+        end
+
+        alias :apply_security_groups :apply_security_groups_to_load_balancer
+
+      end
+
+      class Mock
+
+        def apply_security_groups_to_load_balancer(security_group_ids, lb_name)
+          raise Fog::AWS::ELB::NotFound unless load_balancer = self.data[:load_balancers][lb_name]
+
+          response = Excon::Response.new
+          response.status = 200
+
+          load_balancer['SecurityGroups'] << security_group_ids
+          load_balancer['SecurityGroups'].flatten!.uniq!
+
+          response.body = {
+            'ResponseMetadata' => {
+              'RequestId' => Fog::AWS::Mock.request_id
+            },
+            'DetachLoadBalancerFromSubnetsResult' => {
+              'SecurityGroups' => load_balancer['SecurityGroups']
+            }
+          }
+
+          response
+        end
+
+      alias :apply_security_groups :apply_security_groups_to_load_balancer
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/elb/attach_load_balancer_to_subnets.rb

@@ -0,0 +1,61 @@
+module Fog
+  module AWS
+    class ELB
+      class Real
+
+        require 'fog/aws/parsers/elb/attach_load_balancer_to_subnets'
+
+        # Enable a subnet for an existing ELB
+        #
+        # ==== Parameters
+        # * subnet_ids<~Array> - List of subnet ids to enable on ELB
+        # * lb_name<~String> - Load balancer to enable availability zones on
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'ResponseMetadata'<~Hash>:
+        #       * 'RequestId'<~String> - Id of request
+        #     * 'AttachLoadBalancerToSubnetsResult'<~Hash>:
+        #       * 'Subnets'<~Array> - array of strings describing the subnet ids currently enabled
+        def attach_load_balancer_to_subnets(subnet_ids, lb_name)
+          params = Fog::AWS.indexed_param('Subnets.member', [*subnet_ids])
+          request({
+            'Action'           => 'AttachLoadBalancerToSubnets',
+            'LoadBalancerName' => lb_name,
+            :parser            => Fog::Parsers::AWS::ELB::AttachLoadBalancerToSubnets.new
+          }.merge!(params))
+        end
+
+        alias :enable_subnets :attach_load_balancer_to_subnets
+
+      end
+
+      class Mock
+
+        def attach_load_balancer_to_subnets(subnet_ids, lb_name)
+          raise Fog::AWS::ELB::NotFound unless load_balancer = self.data[:load_balancers][lb_name]
+
+          response = Excon::Response.new
+          response.status = 200
+
+          load_balancer['Subnets'] << subnet_ids
+          load_balancer['Subnets'].flatten!.uniq!
+
+          response.body = {
+            'ResponseMetadata' => {
+              'RequestId' => Fog::AWS::Mock.request_id
+            },
+            'AttachLoadBalancerToSubnetsResult' => {
+              'Subnets' => load_balancer['Subnets']
+            }
+          }
+
+          response
+        end
+
+        alias :enable_subnets :attach_load_balancer_to_subnets
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/elb/create_load_balancer.rb

@@ -23,8 +23,11 @@ module Fog
         #       * 'RequestId'<~String> - Id of request
         #     * 'CreateLoadBalancerResult'<~Hash>:
         #       * 'DNSName'<~String> - DNS name for the newly created ELB
-        def create_load_balancer(availability_zones, lb_name, listeners)
+        def create_load_balancer(availability_zones, lb_name, listeners, options = {})
           params = Fog::AWS.indexed_param('AvailabilityZones.member', [*availability_zones])
+          params.merge!(Fog::AWS.indexed_param('Subnets.member.%d', options[:subnet_ids]))
+          params.merge!(Fog::AWS.serialize_keys('Scheme', options[:scheme]))
+          params.merge!(Fog::AWS.indexed_param('SecurityGroups.member.%d', options[:security_groups])) 
 
           listener_protocol = []
           listener_lb_port = []
@@ -54,7 +57,7 @@ module Fog
       end
 
       class Mock
-        def create_load_balancer(availability_zones, lb_name, listeners = [])
+        def create_load_balancer(availability_zones, lb_name, listeners = [], options = {})
           response = Excon::Response.new
           response.status = 200
 
@@ -72,6 +75,9 @@ module Fog
           dns_name = Fog::AWS::ELB::Mock.dns_name(lb_name, @region)
           self.data[:load_balancers][lb_name] = {
             'AvailabilityZones' => availability_zones,
+            'Subnets' => options[:subnet_ids],
+            'Scheme' => options[:scheme],
+            'SecurityGroups' => options[:security_groups],
             'CanonicalHostedZoneName' => '',
             'CanonicalHostedZoneNameID' => '',
             'CreatedTime' => Time.now,
@@ -96,7 +102,6 @@ module Fog
               'OwnerAlias' => ''
             }
           }
-
           response.body = {
             'ResponseMetadata' => {
               'RequestId' => Fog::AWS::Mock.request_id

data/lib/fog/aws/requests/elb/describe_load_balancers.rb

@@ -8,7 +8,9 @@ module Fog
         # Describe all or specified load balancers
         #
         # ==== Parameters
-        # * lb_name<~Array> - List of load balancer names to describe, defaults to all
+        # * options<~Hash>
+        #   * 'LoadBalancerNames'<~Array> - List of load balancer names to describe, defaults to all
+        #   * 'Marker'<String> - Indicates where to begin in your list of load balancers
         #
         # ==== Returns
         # * response<~Excon::Response>:
@@ -42,18 +44,34 @@ module Fog
         #         * 'SourceSecurityGroup'<~Hash>:
         #           * 'GroupName'<~String> - Name of the source security group to use with inbound security group rules
         #           * 'OwnerAlias'<~String> - Owner of the source security group
-        def describe_load_balancers(lb_name = [])
-          params = Fog::AWS.indexed_param('LoadBalancerNames.member', [*lb_name])
+        #         * 'NextMarker'<~String> - Marker to specify for next page
+        def describe_load_balancers(options = {})
+          unless options.is_a?(Hash)
+            Fog::Logger.deprecation("describe_load_balancers with #{options.class} is deprecated, use all('LoadBalancerNames' => []) instead [light_black](#{caller.first})[/]")
+            options = { 'LoadBalancerNames' => [options].flatten }
+          end
+
+          if names = options.delete('LoadBalancerNames')
+            options.update(Fog::AWS.indexed_param('LoadBalancerNames.member', [*names]))
+          end
+
           request({
             'Action'  => 'DescribeLoadBalancers',
             :parser   => Fog::Parsers::AWS::ELB::DescribeLoadBalancers.new
-          }.merge!(params))
+          }.merge!(options))
         end
 
       end
 
       class Mock
-        def describe_load_balancers(lb_names = [])
+        def describe_load_balancers(options = {})
+          unless options.is_a?(Hash)
+            Fog::Logger.deprecation("describe_load_balancers with #{options.class} is deprecated, use all('LoadBalancerNames' => []) instead [light_black](#{caller.first})[/]")
+            options = { 'LoadBalancerNames' => [options].flatten }
+          end
+
+          lb_names = options['LoadBalancerNames'] || []
+
           lb_names = [*lb_names]
           load_balancers = if lb_names.any?
             lb_names.map do |lb_name|
@@ -65,6 +83,14 @@ module Fog
             self.data[:load_balancers].map { |lb, values| values.dup }
           end
 
+          marker = options.fetch('Marker', 0).to_i
+          if load_balancers.count - marker > 400
+            next_marker = marker + 400
+            load_balancers = load_balancers[marker...next_marker]
+          else
+            next_marker = nil
+          end
+
           response = Excon::Response.new
           response.status = 200
 
@@ -81,6 +107,10 @@ module Fog
             }
           }
 
+          if next_marker
+            response.body['DescribeLoadBalancersResult']['NextMarker'] = next_marker
+          end
+
           response
         end
       end

data/lib/fog/aws/requests/elb/detach_load_balancer_from_subnets.rb

@@ -0,0 +1,61 @@
+module Fog
+  module AWS
+    class ELB
+      class Real
+
+        require 'fog/aws/parsers/elb/detach_load_balancer_from_subnets'
+
+        # Disable a subnet for an existing ELB
+        #
+        # ==== Parameters
+        # * subnet_ids<~Array> - List of subnet ids to enable on ELB
+        # * lb_name<~String> - Load balancer to disable availability zones on
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'ResponseMetadata'<~Hash>:
+        #       * 'RequestId'<~String> - Id of request
+        #     * 'DetachLoadBalancerFromSubnetsResult'<~Hash>:
+        #       * 'Subnets'<~Array> - array of strings describing the subnet ids currently enabled
+        def detach_load_balancer_from_subnets(subnet_ids, lb_name)
+          params = Fog::AWS.indexed_param('Subnets.member', [*subnet_ids])
+          request({
+            'Action'           => 'DetachLoadBalancerFromSubnets',
+            'LoadBalancerName' => lb_name,
+            :parser            => Fog::Parsers::AWS::ELB::DetachLoadBalancerFromSubnets.new
+          }.merge!(params))
+        end
+
+        alias :disable_subnets :detach_load_balancer_from_subnets
+
+      end
+
+      class Mock
+
+        def detach_load_balancer_from_subnets(subnet_ids, lb_name)
+          raise Fog::AWS::ELB::NotFound unless load_balancer = self.data[:load_balancers][lb_name]
+
+          response = Excon::Response.new
+          response.status = 200
+
+          load_balancer['Subnets'] << subnet_ids
+          load_balancer['Subnets'].flatten!.uniq!
+
+          response.body = {
+            'ResponseMetadata' => {
+              'RequestId' => Fog::AWS::Mock.request_id
+            },
+            'DetachLoadBalancerFromSubnetsResult' => {
+              'Subnets' => load_balancer['Subnets']
+            }
+          }
+
+          response
+        end
+
+        alias :disable_subnets :detach_load_balancer_from_subnets
+      end
+    end
+  end
+end