fog 1.0.0 → 1.5.0

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

@@ -40,13 +40,13 @@ module Fog
           instance_ids = [*instance_ids]
           instance_ids = load_balancer['Instances'].collect { |i| i['InstanceId'] } unless instance_ids.any?
           data = instance_ids.map do |id|
-            unless instance = Compute[:aws].servers.get(id)
+            unless Fog::Compute::AWS::Mock.data[@region][@aws_access_key_id][:instances][id]
               raise Fog::AWS::ELB::InvalidInstance
             end
 
             {
               'Description' => "",
-              'InstanceId' => instance.id,
+              'InstanceId' => id,
               'ReasonCode' => "",
               'State' => 'OutOfService'
             }

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

@@ -0,0 +1,71 @@
+module Fog
+  module AWS
+    class ELB
+      class Real
+
+        require 'fog/aws/parsers/elb/describe_load_balancer_policies'
+
+        # Describe all or specified load balancer policies
+        #
+        # ==== Parameters
+        # * lb_name<~String> - The mnemonic name associated with the LoadBalancer. If no name is specified, the operation returns the attributes of either all the sample policies pre-defined by Elastic Load Balancing or the specified sample polices.
+        # * names<~Array> - The names of LoadBalancer policies you've created or Elastic Load Balancing sample policy names.
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'ResponseMetadata'<~Hash>:
+        #       * 'RequestId'<~String> - Id of request
+        #     * 'DescribeLoadBalancerPoliciesResult'<~Hash>:
+        #       * 'PolicyDescriptions'<~Array>
+        #         * 'PolicyAttributeDescriptions'<~Array>
+        #           * 'AttributeName'<~String> - The name of the attribute associated with the policy.
+        #           * 'AttributeValue'<~String> - The value of the attribute associated with the policy.
+        #         * 'PolicyName'<~String> - The name mof the policy associated with the LoadBalancer.
+        #         * 'PolicyTypeName'<~String> - The name of the policy type.
+        def describe_load_balancer_policies(lb_name = nil, names = [])
+          params = Fog::AWS.indexed_param('PolicyNames.member', [*names])
+          request({
+            'Action'  => 'DescribeLoadBalancerPolicies',
+            'LoadBalancerName' => lb_name,
+            :parser   => Fog::Parsers::AWS::ELB::DescribeLoadBalancerPolicies.new
+          }.merge!(params))
+        end
+
+      end
+
+      class Mock
+        def describe_load_balancer_policies(lb_name = nil, names = [])
+          if lb_name
+            raise Fog::AWS::ELB::NotFound unless load_balancer = self.data[:load_balancers][lb_name]
+            names = [*names]
+            policies = if names.any?
+              names.map do |name|
+                raise Fog::AWS::ELB::PolicyNotFound unless policy = load_balancer['Policies']['Proper'].find { |p| p['PolicyName'] == name }
+                policy.dup
+              end.compact
+            else
+              load_balancer['Policies']['Proper']
+            end
+          else
+            policies = []
+          end
+
+          response = Excon::Response.new
+          response.status = 200
+
+          response.body = {
+            'ResponseMetadata' => {
+              'RequestId' => Fog::AWS::Mock.request_id
+            },
+            'DescribeLoadBalancerPoliciesResult' => {
+              'PolicyDescriptions' => policies
+            }
+          }
+
+          response
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,68 @@
+module Fog
+  module AWS
+    class ELB
+      class Real
+
+        require 'fog/aws/parsers/elb/describe_load_balancer_policy_types'
+
+        # Describe all or specified load balancer policy types
+        #
+        # ==== Parameters
+        # * type_name<~Array> - Specifies the name of the policy types. If no names are specified, returns the description of all the policy types defined by Elastic Load Balancing service.
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'ResponseMetadata'<~Hash>:
+        #       * 'RequestId'<~String> - Id of request
+        #     * 'DescribeLoadBalancerPolicyTypesResult'<~Hash>:
+        #       * 'PolicyTypeDescriptions'<~Array>
+        #         * 'Description'<~String> - A human-readable description of the policy type.
+        #         * 'PolicyAttributeTypeDescriptions'<~Array>
+        #           * 'AttributeName'<~String> - The name of the attribute associated with the policy type.
+        #           * 'AttributeValue'<~String> - The type of attribute. For example, Boolean, Integer, etc.
+        #           * 'Cardinality'<~String> - The cardinality of the attribute.
+        #           * 'DefaultValue'<~String> - The default value of the attribute, if applicable.
+        #           * 'Description'<~String> - A human-readable description of the attribute.
+        #         * 'PolicyTypeName'<~String> - The name of the policy type.
+        def describe_load_balancer_policy_types(type_names = [])
+          params = Fog::AWS.indexed_param('PolicyTypeNames.member', [*type_names])
+          request({
+            'Action'  => 'DescribeLoadBalancerPolicyTypes',
+            :parser   => Fog::Parsers::AWS::ELB::DescribeLoadBalancerPolicyTypes.new
+          }.merge!(params))
+        end
+
+      end
+
+      class Mock
+        def describe_load_balancer_policy_types(type_names = [])
+          type_names = [*type_names]
+          policy_types = if type_names.any?
+            type_names.map do |type_name|
+              policy_type = self.data[:policy_types].find { |pt| pt['PolicyTypeName'] == type_name }
+              raise Fog::AWS::ELB::PolicyTypeNotFound unless policy_type
+              policy_type[1].dup
+            end.compact
+          else
+            self.data[:policy_types].map { |policy_type| policy_type.dup }
+          end
+
+          response = Excon::Response.new
+          response.status = 200
+
+          response.body = {
+            'ResponseMetadata' => {
+              'RequestId' => Fog::AWS::Mock.request_id
+            },
+            'DescribeLoadBalancerPolicyTypesResult' => {
+              'PolicyTypeDescriptions' => policy_types
+            }
+          }
+
+          response
+        end
+      end
+    end
+  end
+end

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,27 +44,51 @@ 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|
               lb = self.data[:load_balancers].find { |name, data| name == lb_name }
               raise Fog::AWS::ELB::NotFound unless lb
-              lb[1]
+              lb[1].dup
             end.compact
           else
-            self.data[:load_balancers].values
+            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
@@ -73,10 +99,18 @@ module Fog
               'RequestId' => Fog::AWS::Mock.request_id
             },
             'DescribeLoadBalancersResult' => {
-              'LoadBalancerDescriptions' => load_balancers
+              'LoadBalancerDescriptions' => load_balancers.map do |lb|
+                lb['Instances'] = lb['Instances'].map { |i| i['InstanceId'] }
+                lb['Policies'] = lb['Policies'].reject { |name, policies| name == 'Proper' }
+                lb
+              end
             }
           }
 
+          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

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

@@ -37,14 +37,14 @@ module Fog
           raise Fog::AWS::ELB::NotFound unless load_balancer = self.data[:load_balancers][lb_name]
           instance_ids = [*instance_ids]
           instances = instance_ids.map do |instance|
-            raise Fog::AWS::ELB::InvalidInstance unless Compute[:aws].servers.get(instance)
+            raise Fog::AWS::ELB::InvalidInstance unless Fog::Compute::AWS::Mock.data[@region][@aws_access_key_id][:instances][instance]
             {'InstanceId' => instance}
           end
 
           response = Excon::Response.new
           response.status = 200
 
-          load_balancer['Instances'] = instances.dup
+          load_balancer['Instances'] = load_balancer['Instances'] | instances.dup
 
           response.body = {
             'ResponseMetadata' => {

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

@@ -34,6 +34,33 @@ module Fog
       end
 
       class Mock
+        def set_load_balancer_listener_ssl_certificate(lb_name, load_balancer_port, ssl_certificate_id)
+          raise Fog::AWS::ELB::NotFound unless load_balancer = self.data[:load_balancers][lb_name]
+
+          certificate_ids = Fog::AWS::IAM::Mock.data[@aws_access_key_id][:server_certificates].map {|n, c| c['Arn'] }
+          if !certificate_ids.include? ssl_certificate_id
+            raise Fog::AWS::IAM::NotFound.new('CertificateNotFound')
+          end
+
+          response = Excon::Response.new
+
+          unless listener = load_balancer['ListenerDescriptions'].find { |listener| listener['Listener']['LoadBalancerPort'] == load_balancer_port }
+            response.status = 400
+            response.body = "<?xml version=\"1.0\"?><Response><Errors><Error><Code>ListenerNotFound</Code><Message>LoadBalancer does not have a listnener configured at the given port.</Message></Error></Errors><RequestID>#{Fog::AWS::Mock.request_id}</RequestId></Response>"
+            raise Excon::Errors.status_error({:expects => 200}, response)
+          end
+
+          listener['Listener']['SSLCertificateId'] = ssl_certificate_id
+
+          response.status = 200
+          response.body = {
+            "ResponseMetadata" => {
+              "RequestId" => Fog::AWS::Mock.request_id
+            }
+          }
+
+          response
+        end
       end
     end
   end

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

@@ -57,7 +57,7 @@ module Fog
             raise Excon::Errors.status_error({:expects => 200}, response)
           end
 
-          unless load_balancer['Policies'].find { |name, policies| policies.find { |policy| policy['PolicyName'] == policy_names.first } }
+          unless load_balancer['Policies']['Proper'].find { |policy| policy['PolicyName'] == policy_names.first }
             response.status = 400
             response.body = "<?xml version=\"1.0\"?><Response><Errors><Error><Code>PolicyNotFound</Code><Message>One or more specified policies were not found.</Message></Error></Errors><RequestID>#{Fog::AWS::Mock.request_id}</RequestId></Response>"
             raise Excon::Errors.status_error({:expects => 200}, response)

data/lib/fog/aws/requests/emr/add_instance_groups.rb

@@ -0,0 +1,46 @@
+module Fog
+  module AWS
+    class EMR
+      class Real
+
+        require 'fog/aws/parsers/emr/add_instance_groups'
+
+        # adds an instance group to a running cluster
+        # http://docs.amazonwebservices.com/ElasticMapReduce/latest/API/API_AddInstanceGroups.html
+        # ==== Parameters
+        # * JobFlowId <~String> - Job flow in which to add the instance groups
+        # * InstanceGroups<~Array> - Instance Groups to add
+        #   * 'BidPrice'<~String> - Bid price for each Amazon EC2 instance in the instance group when launching nodes as Spot Instances, expressed in USD.
+        #   * 'InstanceCount'<~Integer> - Target number of instances for the instance group
+        #   * 'InstanceRole'<~String> - MASTER | CORE | TASK The role of the instance group in the cluster
+        #   * 'InstanceType'<~String> - The Amazon EC2 instance type for all instances in the instance group
+        #   * 'MarketType'<~String> - ON_DEMAND | SPOT Market type of the Amazon EC2 instances used to create a cluster node
+        #   * 'Name'<~String> - Friendly name given to the instance group.
+        # 
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        def add_instance_groups(job_flow_id, options={})
+          
+          if instance_groups = options.delete('InstanceGroups')
+            options.merge!(Fog::AWS.indexed_param('InstanceGroups.member.%d', [*instance_groups]))
+          end
+    
+          request({
+            'Action'  => 'AddInstanceGroups',
+            'JobFlowId' => job_flow_id,
+            :parser   => Fog::Parsers::AWS::EMR::AddInstanceGroups.new,
+          }.merge(options))
+        end
+
+      end
+
+      class Mock
+        def add_instance_groups(job_flow_id, options={})
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/emr/add_job_flow_steps.rb

@@ -0,0 +1,49 @@
+module Fog
+  module AWS
+    class EMR
+      class Real
+
+        require 'fog/aws/parsers/emr/add_job_flow_steps'
+
+        # adds new steps to a running job flow.
+        # http://docs.amazonwebservices.com/ElasticMapReduce/latest/API/API_AddJobFlowSteps.html
+        # ==== Parameters
+        # * JobFlowId <~String> - A string that uniquely identifies the job flow
+        # * Steps <~Array> - A list of steps to be executed by the job flow
+        #   * 'ActionOnFailure'<~String> - TERMINATE_JOB_FLOW | CANCEL_AND_WAIT | CONTINUE Specifies the action to take if the job flow step fails
+        #   * 'HadoopJarStep'<~Array> - Specifies the JAR file used for the job flow step
+        #     * 'Args'<~String list> - A list of command line arguments passed to the JAR file's main function when executed.
+        #     * 'Jar'<~String> - A path to a JAR file run during the step.
+        #     * 'MainClass'<~String> - The name of the main class in the specified Java file. If not specified, the JAR file should specify a Main-Class in its manifest file
+        #     * 'Properties'<~Array> - A list of Java properties that are set when the step runs. You can use these properties to pass key value pairs to your main function
+        #       * 'Key'<~String> - The unique identifier of a key value pair
+        #       * 'Value'<~String> - The value part of the identified key
+        #   * 'Name'<~String> - The name of the job flow step
+        # 
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        def add_job_flow_steps(job_flow_id, options={})
+          
+          if steps = options.delete('Steps')
+            options.merge!(Fog::AWS.serialize_keys('Steps', steps))
+          end
+    
+          request({
+            'Action'  => 'AddJobFlowSteps',
+            'JobFlowId' => job_flow_id,
+            :parser   => Fog::Parsers::AWS::EMR::AddJobFlowSteps.new,
+          }.merge(options))
+        end
+      end
+
+      class Mock
+
+        def add_job_flow_steps(db_name, options={})
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/emr/describe_job_flows.rb

@@ -0,0 +1,108 @@
+module Fog
+  module AWS
+    class EMR
+      class Real
+
+        require 'fog/aws/parsers/emr/describe_job_flows'
+
+        # returns a list of job flows that match all of the supplied parameters.
+        # http://docs.amazonwebservices.com/ElasticMapReduce/latest/API/API_DescribeJobFlows.html
+        # ==== Parameters
+        # * CreatedAfter <~DateTime> - Return only job flows created after this date and time
+        # * CreatedBefore <~DateTime> - Return only job flows created before this date and time
+        # * JobFlowIds <~String list> - Return only job flows whose job flow ID is contained in this list
+        # * JobFlowStates <~String list> - RUNNING | WAITING | SHUTTING_DOWN | STARTING Return only job flows whose state is contained in this list
+        # 
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        # * JobFlows <~Array> - A list of job flows matching the parameters supplied.
+        #   * AmiVersion <~String> - A list of bootstrap actions that will be run before Hadoop is started on the cluster nodes.
+        #   * 'BootstrapActions'<~Array> - A list of the bootstrap actions run by the job flow
+        #     * 'BootstrapConfig <~Array> - A description of the bootstrap action
+        #       * 'Name' <~String> - The name of the bootstrap action
+        #       * 'ScriptBootstrapAction' <~Array> - The script run by the bootstrap action.
+        #         * 'Args' <~String list> - A list of command line arguments to pass to the bootstrap action script.
+        #         * 'Path' <~String> - Location of the script to run during a bootstrap action.
+        #   * 'ExecutionStatusDetail'<~Array> - Describes the execution status of the job flow
+        #     * 'CreationDateTime <~DateTime> - The creation date and time of the job flow.
+        #     * 'EndDateTime <~DateTime> - The completion date and time of the job flow.
+        #     * 'LastStateChangeReason <~String> - Description of the job flow last changed state.
+        #     * 'ReadyDateTime <~DateTime> - The date and time when the job flow was ready to start running bootstrap actions.
+        #     * 'StartDateTime <~DateTime> - The start date and time of the job flow.
+        #     * 'State <~DateTime> - COMPLETED | FAILED | TERMINATED | RUNNING | SHUTTING_DOWN | STARTING | WAITING | BOOTSTRAPPING The state of the job flow.
+        #   * Instances <~Array> - A specification of the number and type of Amazon EC2 instances on which to run the job flow.
+        #     * 'Ec2KeyName'<~String> - Specifies the name of the Amazon EC2 key pair that can be used to ssh to the master node as the user called "hadoop.
+        #     * 'HadoopVersion'<~String> - "0.18" | "0.20" Specifies the Hadoop version for the job flow
+        #     * 'InstanceCount'<~Integer> - The number of Amazon EC2 instances used to execute the job flow
+        #     * 'InstanceGroups'<~Array> - Configuration for the job flow's instance groups
+        #       * 'BidPrice' <~String> - Bid price for each Amazon EC2 instance in the instance group when launching nodes as Spot Instances, expressed in USD.
+        #       * 'CreationDateTime' <~DateTime> - The date/time the instance group was created.
+        #       * 'EndDateTime' <~DateTime> - The date/time the instance group was terminated.
+        #       * 'InstanceGroupId' <~String> - Unique identifier for the instance group.
+        #       * 'InstanceRequestCount'<~Integer> - Target number of instances for the instance group
+        #       * 'InstanceRole'<~String> - MASTER | CORE | TASK The role of the instance group in the cluster
+        #       * 'InstanceRunningCount'<~Integer> - Actual count of running instances
+        #       * 'InstanceType'<~String> - The Amazon EC2 instance type for all instances in the instance group
+        #       * 'LastStateChangeReason'<~String> - Details regarding the state of the instance group
+        #       * 'Market'<~String> - ON_DEMAND | SPOT Market type of the Amazon EC2 instances used to create a cluster
+        #       * 'Name'<~String> - Friendly name for the instance group
+        #       * 'ReadyDateTime'<~DateTime> - The date/time the instance group was available to the cluster
+        #       * 'StartDateTime'<~DateTime> - The date/time the instance group was started
+        #       * 'State'<~String> - PROVISIONING | STARTING | BOOTSTRAPPING | RUNNING | RESIZING | ARRESTED | SHUTTING_DOWN | TERMINATED | FAILED | ENDED State of instance group
+        #   * 'KeepJobFlowAliveWhenNoSteps' <~Boolean> - Specifies whether the job flow should terminate after completing all steps
+        #   * 'MasterInstanceId'<~String> - The Amazon EC2 instance identifier of the master node
+        #   * 'MasterInstanceType'<~String> - The EC2 instance type of the master node
+        #   * 'MasterPublicDnsName'<~String> - The DNS name of the master node
+        #   * 'NormalizedInstanceHours'<~Integer> - An approximation of the cost of the job flow, represented in m1.small/hours.
+        #   * 'Placement'<~Array> - Specifies the Availability Zone the job flow will run in
+        #     * 'AvailabilityZone' <~String> - The Amazon EC2 Availability Zone for the job flow.
+        #   * 'SlaveInstanceType'<~String> - The EC2 instance type of the slave nodes
+        #   * 'TerminationProtected'<~Boolean> - Specifies whether to lock the job flow to prevent the Amazon EC2 instances from being terminated by API call, user intervention, or in the event of a job flow error
+        # * LogUri <~String> - Specifies the location in Amazon S3 to write the log files of the job flow. If a value is not provided, logs are not created
+        # * Name <~String> - The name of the job flow
+        # * Steps <~Array> - A list of steps to be executed by the job flow
+        #   * 'ExecutionStatusDetail'<~Array> - Describes the execution status of the job flow
+        #     * 'CreationDateTime <~DateTime> - The creation date and time of the job flow.
+        #     * 'EndDateTime <~DateTime> - The completion date and time of the job flow.
+        #     * 'LastStateChangeReason <~String> - Description of the job flow last changed state.
+        #     * 'ReadyDateTime <~DateTime> - The date and time when the job flow was ready to start running bootstrap actions.
+        #     * 'StartDateTime <~DateTime> - The start date and time of the job flow.
+        #     * 'State <~DateTime> - COMPLETED | FAILED | TERMINATED | RUNNING | SHUTTING_DOWN | STARTING | WAITING | BOOTSTRAPPING The state of the job flow.
+        #   * StepConfig <~Array> - The step configuration
+        #     * 'ActionOnFailure'<~String> - TERMINATE_JOB_FLOW | CANCEL_AND_WAIT | CONTINUE Specifies the action to take if the job flow step fails
+        #     * 'HadoopJarStep'<~Array> - Specifies the JAR file used for the job flow step
+        #       * 'Args'<~String list> - A list of command line arguments passed to the JAR file's main function when executed.
+        #       * 'Jar'<~String> - A path to a JAR file run during the step.
+        #       * 'MainClass'<~String> - The name of the main class in the specified Java file. If not specified, the JAR file should specify a Main-Class in its manifest file
+        #       * 'Properties'<~Array> - A list of Java properties that are set when the step runs. You can use these properties to pass key value pairs to your main function
+        #         * 'Key'<~String> - The unique identifier of a key value pair
+        #         * 'Value'<~String> - The value part of the identified key
+        #     * 'Name'<~String> - The name of the job flow step
+        def describe_job_flows(options={})
+          
+          if job_ids = options.delete('JobFlowIds')
+            options.merge!(Fog::AWS.serialize_keys('JobFlowIds', job_ids))
+          end
+          
+          if job_states = options.delete('JobFlowStates')
+            options.merge!(Fog::AWS.serialize_keys('JobFlowStates', job_states))
+          end
+    
+          request({
+            'Action'  => 'DescribeJobFlows',
+            :parser   => Fog::Parsers::AWS::EMR::DescribeJobFlows.new,
+          }.merge(options))
+        end
+      end
+
+      class Mock
+
+        def describe_job_flows(db_name, options={})
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/emr/modify_instance_groups.rb

@@ -0,0 +1,40 @@
+module Fog
+  module AWS
+    class EMR
+      class Real
+
+        require 'fog/aws/parsers/emr/modify_instance_groups'
+
+        # modifies the number of nodes and configuration settings of an instance group..
+        # http://docs.amazonwebservices.com/ElasticMapReduce/latest/API/API_ModifyInstanceGroups.html
+        # ==== Parameters
+        # * InstanceGroups <~InstanceGroupModifyConfig list> - Instance groups to change
+        #   * InstanceCount <~Integer> - Target size for instance group
+        #   * InstanceGroupId <~String> - Unique ID of the instance group to expand or shrink
+        # 
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>
+        def modify_instance_groups(options={})
+          
+          if job_ids = options.delete('InstanceGroups')
+            options.merge!(Fog::AWS.serialize_keys('InstanceGroups', job_ids))
+          end
+    
+          request({
+            'Action'  => 'ModifyInstanceGroups',
+            :parser   => Fog::Parsers::AWS::EMR::ModifyInstanceGroups.new,
+          }.merge(options))
+        end
+      end
+
+      class Mock
+
+        def modify_instance_groups(options={})
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end