fog 1.0.0 → 1.1.0

data/lib/fog/aws/parsers/compute/spot_instance_requests.rb

@@ -6,7 +6,7 @@ module Fog
         class SpotInstanceRequests < Fog::Parsers::Base
 
           def reset
-            @block_device_mapping = []
+            @block_device_mapping = {}
             @context = []
             @contexts = ['blockDeviceMapping', 'groupSet']
             @spot_instance_request = { 'launchSpecification' => { 'blockDeviceMapping' => [], 'groupSet' => [] } }
@@ -42,7 +42,7 @@ module Fog
             when 'item'
               case @context.last
               when 'blockDeviceMapping'
-                @instance['blockDeviceMapping'] << @block_device_mapping
+                @spot_instance_request['launchSpecification']['blockDeviceMapping'] << @block_device_mapping
                 @block_device_mapping = {}
               when nil
                 @response['spotInstanceRequestSet'] << @spot_instance_request

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

@@ -0,0 +1,28 @@
+module Fog
+  module Parsers
+    module AWS
+      module EMR
+
+        class AddInstanceGroups < Fog::Parsers::Base
+
+          def start_element(name, attrs = [])
+            super
+            case name
+            when 'InstanceGroupIds'
+              @response['InstanceGroupIds'] = []
+            end
+          end
+
+          def end_element(name)
+            case name
+            when 'JobFlowId'
+              @response[name] = value
+            when 'member'
+              @response['InstanceGroupIds'] << value
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+module Fog
+  module Parsers
+    module AWS
+      module EMR
+
+        class AddJobFlowSteps < Fog::Parsers::Base
+          def end_element(name)
+            case name
+            when 'RequestId'
+              @response[name] = value
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,140 @@
+module Fog
+  module Parsers
+    module AWS
+      module EMR
+
+        class DescribeJobFlows < Fog::Parsers::Base
+
+          def reset
+            @context = []
+            @contexts = ['BootstrapActions', 'ExecutionStatusDetail', 'Instances', 'Steps', 'InstanceGroups', 'Args']
+            
+            @response = { 'JobFlows' => [] }
+            @bootstrap_actions = {'ScriptBootstrapActionConfig' => {'Args' => []}}
+            @instance = { 'InstanceGroups' => [], 'Placement' => {}}
+            @step = {
+              'ExecutionStatusDetail' => {}, 
+              'StepConfig' => {
+                'HadoopJarStepConfig' =>  {
+                  'Args' => [],
+                  'Properties' => []
+                }
+              }
+            }
+            @flow = {'Instances' => [], 'ExecutionStatusDetail' => {}, 'BootstrapActions' => [], 'Steps' => []}
+            @instance_group_detail = {}
+            @execution_status_detail = {}
+          end
+
+          def start_element(name, attrs = [])
+            super
+            if @contexts.include?(name)
+              @context.push(name)
+            end
+          end
+
+          def end_element(name)
+            if @context.last == 'BootstrapActions'
+              case name
+              when 'Name'
+                @bootstrap_actions[name] = value
+              when 'Path'
+                @bootstrap_actions['ScriptBootstrapActionConfig'][name] = value
+              when 'BootstrapActions'
+                @flow['BootstrapActions'] = @bootstrap_actions
+                @bootstrap_actions = {'ScriptBootstrapActionConfig' => {'Args' => []}}
+              end
+            end
+            
+            if @context.last == 'ExecutionStatusDetail'
+              case name
+              when 'CreationDateTime', 'EndDateTime', 'LastStateChangeReason', 
+                  'ReadyDateTime', 'StartDateTime', 'State'
+                @execution_status_detail[name] = value             
+              when 'ExecutionStatusDetail'
+                if @context.include?('Steps')
+                  @step['ExecutionStatusDetail'] = @execution_status_detail
+                else
+                  @flow['ExecutionStatusDetail'] = @execution_status_detail
+                end
+                @execution_status_detail = {}
+              end
+            end
+            
+            if @context.last == 'Instances'
+              case name
+              when 'AvailabilityZone'
+                @instance['Placement'][name] = value
+              when 'Ec2KeyName', 'HadoopVersion', 'InstanceCount', 'KeepJobFlowAliveWhenNoSteps',
+                    'MasterInstanceId', 'MasterInstanceType', 'MasterPublicDnsName', 'NormalizedInstanceHours',
+                    'SlaveInstanceType', 'TerminationProtected'
+                @instance[name] = value
+              when 'member'
+                @instance['InstanceGroups'] << @instance_group_detail
+                @instance_group_detail = {}      
+              when 'Instances'
+                @flow['Instances'] = @instance
+                @instance = { 'InstanceGroups' => [], 'Placement' => {}}
+              end
+            end
+            
+            if @context.last == 'InstanceGroups'
+              case name
+              when 'member'
+                @instance['InstanceGroups'] << @instance_group_detail
+                @instance_group_detail = {}
+              else
+                @instance_group_detail[name] = value
+              end
+            end
+            
+            if @context.last == 'Args'
+              if name == 'member'
+                if @context.include?('Steps')
+                  @step['StepConfig']['HadoopJarStepConfig']['Args'] << value.strip
+                else
+                  @bootstrap_actions['ScriptBootstrapActionConfig']['Args'] << value
+                end
+              end
+            end
+            
+            if @context.last == 'Steps'
+              case name
+              when 'ActionOnFailure', 'Name'
+                @step[name] = value
+              when 'Jar', 'MainClass'
+                @step['StepConfig']['HadoopJarStepConfig'][name] = value
+              when 'member'
+                @flow['Steps'] << @step
+                @step = {
+                  'ExecutionStatusDetail' => {}, 
+                  'StepConfig' => {
+                    'HadoopJarStepConfig' =>  {
+                      'Args' => [],
+                      'Properties' => []
+                    }
+                  }
+                }
+              end
+            end
+            
+            if @context.empty?
+              case name
+              when 'AmiVersion', 'JobFlowId', 'LogUri', 'Name'
+                @flow[name] = value
+              when 'member'
+                @response['JobFlows'] << @flow
+                @flow = {'Instances' => [], 'ExecutionStatusDetail' => {}, 'BootstrapActions' => [], 'Steps' => []}
+              end
+            end
+            
+            if @context.last == name
+              @context.pop
+            end
+          end
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+module Fog
+  module Parsers
+    module AWS
+      module EMR
+
+        class ModifyInstanceGroups < Fog::Parsers::Base
+          def end_element(name)
+            case name
+            when 'RequestId'
+              @response[name] = value
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/emr/run_job_flow.rb

@@ -0,0 +1,19 @@
+module Fog
+  module Parsers
+    module AWS
+      module EMR
+
+        class RunJobFlow < Fog::Parsers::Base
+          def end_element(name)
+            case name
+            when 'JobFlowId'
+              @response[name] = value
+            when 'RequestId'
+              @response[name] = value
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/emr/set_termination_protection.rb

@@ -0,0 +1,17 @@
+module Fog
+  module Parsers
+    module AWS
+      module EMR
+
+        class SetTerminationProtection < Fog::Parsers::Base
+          def end_element(name)
+            case name
+            when 'RequestId'
+              @response[name] = value
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/emr/terminate_job_flows.rb

@@ -0,0 +1,17 @@
+module Fog
+  module Parsers
+    module AWS
+      module EMR
+
+        class TerminateJobFlows < Fog::Parsers::Base
+          def end_element(name)
+            case name
+            when 'RequestId'
+              @response[name] = value
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/rds.rb

@@ -79,7 +79,7 @@ module Fog
         #
         # ==== Parameters
         # * options<~Hash> - config arguments for connection.  Defaults to {}.
-        #   * region<~String> - optional region to use, in ['eu-west-1', 'us-east-1', 'us-west-1'i, 'ap-southeast-1']
+        #   * region<~String> - optional region to use, in ['eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'ap-southeast-1']
         #
         # ==== Returns
         # * ELB object with connection to AWS.
@@ -101,6 +101,8 @@ module Fog
             'rds.us-east-1.amazonaws.com'
           when 'us-west-1'
             'rds.us-west-1.amazonaws.com'
+          when 'us-west-2'
+            'rds.us-west-2.amazonaws.com'
           else
             raise ArgumentError, "Unknown region: #{options[:region].inspect}"
           end

data/lib/fog/aws/requests/cloud_formation/create_stack.rb

@@ -17,6 +17,8 @@ module Fog
         #   * NotificationARNs<~Array>: List of SNS topics to publish events to
         #   * Parameters<~Hash>: Hash of providers to supply to template
         #   * TimeoutInMinutes<~Integer>: Minutes to wait before status is set to CREATE_FAILED
+        #   * Capabilities<~Array>: List of capabilties the stack is granted. Currently CAPABILITY_IAM
+        #     for allowing the creation of IAM resources
         #
         # ==== Returns
         # * response<~Excon::Response>:
@@ -58,6 +60,10 @@ module Fog
           if options['TimeoutInMinutes']
             params['TimeoutInMinutes'] = options['TimeoutInMinutes']
           end
+          
+          if options['Capabilities']
+            params.merge!(Fog::AWS.indexed_param("Capabilities.member", [*options['Capabilities']]))
+          end
 
           request({
             'Action'    => 'CreateStack',

data/lib/fog/aws/requests/cloud_formation/update_stack.rb

@@ -0,0 +1,62 @@
+module Fog
+  module AWS
+    class CloudFormation
+      class Real
+
+        require 'fog/aws/parsers/cloud_formation/update_stack'
+
+        # Update a stack
+        #
+        # ==== Parameters
+        # * stack_name<~String>: name of the stack to update
+        # * options<~Hash>:
+        #   * TemplateBody<~String>: structure containing the template body
+        #   or (one of the two Template parameters is required)
+        #   * TemplateURL<~String>: URL of file containing the template body
+        #   * Parameters<~Hash>: Hash of providers to supply to template
+        #   * Capabilities<~Array>: List of capabilties the stack is granted. Currently CAPABILITY_IAM
+        #     for allowing the creation of IAM resources
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'StackId'<~String> - Id of the stack being updated
+        #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/AWSCloudFormation/latest/APIReference/API_UpdateStack.html
+        #
+        def update_stack(stack_name, options = {})
+          params = {
+            'StackName' => stack_name,
+          }
+
+          if options['Parameters']
+            options['Parameters'].keys.each_with_index do |key, index|
+              index += 1 # params are 1-indexed
+              params.merge!({
+                "Parameters.member.#{index}.ParameterKey"   => key,
+                "Parameters.member.#{index}.ParameterValue" => options['Parameters'][key]
+              })
+            end
+          end
+
+          if options['TemplateBody']
+            params['TemplateBody'] = options['TemplateBody']
+          elsif options['TemplateURL']
+            params['TemplateURL'] = options['TemplateURL']
+          end
+
+          if options['Capabilities']
+            params.merge!(Fog::AWS.indexed_param("Capabilities.member", [*options['Capabilities']]))
+          end
+
+          request({
+            'Action'    => 'UpdateStack',
+            :parser     => Fog::Parsers::AWS::CloudFormation::UpdateStack.new
+          }.merge!(params))
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/cloud_watch/delete_alarms.rb

@@ -0,0 +1,30 @@
+module Fog
+  module AWS
+    class CloudWatch
+      class Real
+
+        require 'fog/aws/parsers/cloud_watch/delete_alarms'
+
+        # Delete a list of alarms
+        # ==== Options
+        # * AlarmNames<~Array>: A list of alarms to be deleted
+        # 
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/AmazonCloudWatch/latest/APIReference/index.html?API_DeleteAlarms.html
+        #
+
+        def delete_alarms(alarm_names)
+          options = {}
+          options.merge!(AWS.indexed_param('AlarmNames.member.%d', [*alarm_names]))
+          request({
+              'Action'    => 'DeleteAlarms',
+              :parser     => Fog::Parsers::AWS::CloudWatch::DeleteAlarms.new
+            }.merge(options))
+        end
+      end       
+    end
+  end
+end

data/lib/fog/aws/requests/cloud_watch/describe_alarm_history.rb

@@ -0,0 +1,33 @@
+module Fog
+  module AWS
+    class CloudWatch
+      class Real
+
+        require 'fog/aws/parsers/cloud_watch/describe_alarm_history'
+
+        # Retrieves history for the specified alarm
+        # ==== Options
+        # * AlarmName<~String>: The name of the alarm
+        # * EndDate<~DateTime>: The ending date to retrieve alarm history
+        # * HistoryItemType<~String>: The type of alarm histories to retrieve
+        # * MaxRecords<~Integer>: The maximum number of alarm history records to retrieve
+        # * NextToken<~String> The token returned by a previous call to indicate that there is more data available
+        # * StartData<~DateTime>: The starting date to retrieve alarm history
+        # 
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/AmazonCloudWatch/latest/APIReference/index.html?API_DescribeAlarmHistory.html
+        #
+
+        def describe_alarm_history(options={})
+          request({
+              'Action'    => 'DescribeAlarmHistory',
+              :parser     => Fog::Parsers::AWS::CloudWatch::DescribeAlarmHistory.new
+            }.merge(options))
+        end
+      end       
+    end
+  end
+end