fog 1.20.0 → 1.21.0

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

@@ -46,7 +46,7 @@ module Fog
           response.body = {'requestId' => 'some_request_id', 'instancesSet' => instances_set}
           response
         end
-        
+
       end
 
     end

data/lib/fog/aws/requests/data_pipeline/list_pipelines.rb

@@ -7,7 +7,7 @@ module Fog
         # List all pipelines
         # http://docs.aws.amazon.com/datapipeline/latest/APIReference/API_ListPipelines.html
         # ==== Parameters
-        # * Marker <~String> - The starting point for the results to be returned. 
+        # * Marker <~String> - The starting point for the results to be returned.
         # ==== Returns
         # * response<~Excon::Response>:
         #   * body<~Hash>:

data/lib/fog/aws/requests/data_pipeline/query_objects.rb

@@ -10,14 +10,16 @@ module Fog
         # * PipelineId <~String> - The ID of the pipeline
         # * Sphere <~String> - Specifies whether the query applies to components or instances.
         #                      Allowable values: COMPONENT, INSTANCE, ATTEMPT.
+        # * Marker <~String> - The starting point for the results to be returned.
         # ==== Returns
         # * response<~Excon::Response>:
         #   * body<~Hash>:
-        def query_objects(id, sphere)
+        def query_objects(id, sphere, options={})
           params = {
             'pipelineId' => id,
             'sphere' => sphere,
           }
+          params['marker'] = options[:marker] if options[:marker]
 
           response = request({
             :body => Fog::JSON.encode(params),
@@ -30,7 +32,7 @@ module Fog
       end
 
       class Mock
-        def query_objects(id, objects)
+        def query_objects(id, sphere, options={})
           Fog::Mock.not_implemented
         end
       end

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

@@ -151,7 +151,7 @@ module Fog
 
                 if zone[:records][change[:type]][change[:name]].nil?
                   # raise change.to_s if change[:resource_records].nil?
-                  zone[:records][change[:type]][change[:name]] = 
+                  zone[:records][change[:type]][change[:name]] =
                   if change[:alias_target]
                     record = {
                       :alias_target => change[:alias_target]

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

@@ -75,12 +75,15 @@ module Fog
             raise(Excon::Errors.status_error({:expects => 200}, response))
           end
 
-          if options[:type]
-            records = zone[:records][options[:type]].values
+          records = if options[:type]
+            records_type = zone[:records][options[:type]]
+            records_type.values if records_type
           else
-            records = zone[:records].values.map{|r| r.values}.flatten
+            zone[:records].values.map{|r| r.values}.flatten
           end
 
+          records ||= []
+
           # sort for pagination
           records.sort! { |a,b| a[:name].gsub(zone[:name],"") <=> b[:name].gsub(zone[:name],"") }
 

data/lib/fog/aws/requests/elasticache/create_cache_cluster.rb

@@ -23,6 +23,7 @@ module Fog
         #   * :preferred_availablility_zone <~String>
         #   * :preferred_maintenance_window <~String>
         #   * :cache_subnet_group_name <~String>
+        #   * :s3_snapshot_location <~String> - Amazon resource location for snapshot
         # === Returns
         # * response <~Excon::Response>:
         #   * body <~Hash>
@@ -45,6 +46,10 @@ module Fog
             :parser => Fog::Parsers::AWS::Elasticache::SingleCacheCluster.new
           }
 
+          if s3_snapshot_location = options.delete(:s3_snapshot_location)
+            req_options.merge!(Fog::AWS.indexed_param('SnapshotArns.member.%d', [*s3_snapshot_location]))
+          end
+
           if cache_security_groups = options.delete(:security_group_names)
               req_options.merge!(Fog::AWS.indexed_param('CacheSecurityGroupNames.member.%d', [*cache_security_groups]))
           end

data/lib/fog/aws/requests/elasticache/create_cache_parameter_group.rb

@@ -27,9 +27,25 @@ module Fog
       end
 
       class Mock
-        def create_cache_parameter_group(name, description = name,
-          family = 'memcached1.4')
-          Fog::Mock.not_implemented
+        def create_cache_parameter_group(name, description = name, family = 'memcached1.4')
+          response = Excon::Response.new
+          if self.data[:parameter_groups] and self.data[:parameter_groups][name]
+            raise Fog::AWS::Elasticache::IdentifierTaken.new("Parameter group #{name} already exists")
+          end
+
+          data = {
+            'CacheParameterGroupName' => name,
+            'CacheParameterGroupFamily' => family.downcase,
+            'Description' => description
+          }
+          self.data[:parameter_groups][name] = data
+
+          response.body = {
+            "ResponseMetadata"=>{ "RequestId"=> Fog::AWS::Mock.request_id },
+            "CreateCacheParameterGroupResult"=> {"CacheParameterGroup"=> data}
+          }
+          response.status = 200
+          response
         end
       end
     end

data/lib/fog/aws/requests/elasticache/create_cache_subnet_group.rb

@@ -16,11 +16,11 @@ module Fog
         # * response<~Excon::Response>:
         #   * body<~Hash>:
         def create_cache_subnet_group(name, subnet_ids, description = name)
-          params = { 
+          params = {
             'Action' => 'CreateCacheSubnetGroup',
             'CacheSubnetGroupName' => name,
             'CacheSubnetGroupDescription' => description,
-            :parser => Fog::Parsers::AWS::Elasticache::CreateCacheSubnetGroup.new 
+            :parser => Fog::Parsers::AWS::Elasticache::CreateCacheSubnetGroup.new
           }
           params.merge!(Fog::AWS.indexed_param("SubnetIds.member", Array(subnet_ids)))
           request(params)

data/lib/fog/aws/requests/elasticache/delete_cache_parameter_group.rb

@@ -23,7 +23,17 @@ module Fog
 
       class Mock
         def delete_cache_parameter_group(name)
-          Fog::Mock.not_implemented
+          response = Excon::Response.new
+
+          if self.data[:parameter_groups].delete(name)
+            response.status = 200
+            response.body = {
+              "ResponseMetadata"=>{ "RequestId"=> Fog::AWS::Mock.request_id },
+            }
+            response
+          else
+            raise Fog::AWS::Elasticache::NotFound.new("CacheParameterGroup not found: #{name}")
+          end
         end
       end
     end

data/lib/fog/aws/requests/elasticache/describe_cache_parameter_groups.rb

@@ -26,7 +26,23 @@ module Fog
 
       class Mock
         def describe_cache_parameter_groups(name = nil, options = {})
-          Fog::Mock.not_implemented
+          response = Excon::Response.new
+          parameter_set = []
+          if name
+            if server = self.data[:parameter_groups][name]
+              parameter_set << server
+            else
+              raise Fog::AWS::Elasticache::NotFound.new("CacheParameterGroup #{name} not found")
+            end
+          else
+            parameter_set = self.data[:parameter_groups].values
+          end
+
+
+          response.status = 200
+
+          response.body = { "CacheParameterGroups" => parameter_set }
+          response
         end
       end
     end

data/lib/fog/aws/requests/elasticache/describe_reserved_cache_nodes.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class Elasticache 
+    class Elasticache
       class Real
 
         require 'fog/aws/parsers/elasticache/describe_reserved_cache_nodes'
@@ -21,7 +21,7 @@ module Fog
           if opts[:max_records]
             params['MaxRecords'] = opts[:max_records]
           end
-          
+
           request({
             'Action'  => 'DescribeReservedCacheNodes',
             :parser   => Fog::Parsers::AWS::Elasticache::DescribeReservedCacheNodes.new

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

@@ -8,7 +8,7 @@ module Fog
         # Describe the load balancer attributes
         # http://docs.aws.amazon.com/ElasticLoadBalancing/latest/APIReference/API_DescribeLoadBalancerAttributes.html
         # ==== Parameters
-        # * lb_name<~String> - The mnemonic name associated with the LoadBalancer. 
+        # * lb_name<~String> - The mnemonic name associated with the LoadBalancer.
         #
         # ==== Returns
         # * response<~Excon::Response>:

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

@@ -41,7 +41,7 @@ module Fog
           if attributes['CrossZoneLoadBalancing']
             load_balancer['LoadBalancerAttributes'].merge! attributes
           end
-          
+
           response = Excon::Response.new
 
           response.status = 200

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

@@ -16,16 +16,16 @@ module Fog
         #   * '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,

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

@@ -19,16 +19,16 @@ module Fog
         #       * '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,

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

@@ -12,7 +12,7 @@ module Fog
         # * 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>:
@@ -80,15 +80,15 @@ module Fog
         #         * '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,

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

@@ -11,16 +11,16 @@ module Fog
         # * 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,

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

@@ -43,31 +43,31 @@ module Fog
         #       * '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 run_job_flow(name, options={})
-          
+
           if bootstrap_actions = options.delete('BootstrapActions')
             options.merge!(Fog::AWS.serialize_keys('BootstrapActions', bootstrap_actions))
           end
-          
+
           if instances = options.delete('Instances')
             options.merge!(Fog::AWS.serialize_keys('Instances', instances))
           end
-          
+
           if steps = options.delete('Steps')
             options.merge!(Fog::AWS.serialize_keys('Steps', steps))
           end
-    
+
           request({
             'Action'  => 'RunJobFlow',
             'Name' => name,
             :parser   => Fog::Parsers::AWS::EMR::RunJobFlow.new,
           }.merge(options))
         end
-        
+
         def run_hive(name, options={})
           steps = []
           steps << {
@@ -77,7 +77,7 @@ module Fog
               'Args' => ['s3://us-east-1.elasticmapreduce/libs/hive/hive-script', '--base-path', 's3://us-east-1.elasticmapreduce/libs/hive/', '--install-hive']},
             'ActionOnFailure' => 'TERMINATE_JOB_FLOW'
           }
-          
+
           # To add a configuration step to the Hive flow, see the step below
           # steps << {
           #   'Name' => 'Install Hive Site Configuration',
@@ -87,11 +87,11 @@ module Fog
           #   'ActionOnFailure' => 'TERMINATE_JOB_FLOW'
           # }
           options['Steps'] = steps
-          
+
           if not options['Instances'].nil?
             options['Instances']['KeepJobFlowAliveWhenNoSteps'] = true
           end
-          
+
           run_job_flow name, options
         end
       end

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

@@ -10,12 +10,12 @@ module Fog
         # ==== Parameters
         # * JobFlowIds <~String list> - list of strings that uniquely identify the job flows to protect
         # * TerminationProtected <~Boolean> - indicates whether to protect the job flow
-        # 
+        #
         # ==== Returns
         # * response<~Excon::Response>:
         #   * body<~Hash>
         def set_termination_protection(is_protected, options={})
-          
+
           if job_ids = options.delete('JobFlowIds')
             options.merge!(Fog::AWS.serialize_keys('JobFlowIds', job_ids))
           end

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

@@ -9,12 +9,12 @@ module Fog
         # http://docs.amazonwebservices.com/ElasticMapReduce/latest/API/API_TerminateJobFlows.html
         # ==== Parameters
         # * JobFlowIds <~String list> - list of strings that uniquely identify the job flows to protect
-        # 
+        #
         # ==== Returns
         # * response<~Excon::Response>:
         #   * body<~Hash>
         def terminate_job_flows(options={})
-          
+
           if job_ids = options.delete('JobFlowIds')
             options.merge!(Fog::AWS.serialize_keys('JobFlowIds', job_ids))
           end

data/lib/fog/aws/requests/iam/add_role_to_instance_profile.rb

@@ -6,7 +6,7 @@ module Fog
         require 'fog/aws/parsers/iam/basic'
 
         # Add a role to an instance profile
-        # 
+        #
         # ==== Parameters
         # * instance_profile_name<~String>: Name of the instance profile to update.
         # * role_name<~String>:Name of the role to add.

data/lib/fog/aws/requests/iam/add_user_to_group.rb

@@ -6,7 +6,7 @@ module Fog
         require 'fog/aws/parsers/iam/basic'
 
         # Add a user to a group
-        # 
+        #
         # ==== Parameters
         # * group_name<~String>: name of the group
         # * user_name<~String>: name of user to add

data/lib/fog/aws/requests/iam/create_access_key.rb

@@ -6,7 +6,7 @@ module Fog
         require 'fog/aws/parsers/iam/create_access_key'
 
         # Create a access keys for user (by default detects user from access credentials)
-        # 
+        #
         # ==== Parameters
         # * options<~Hash>:
         #   * 'UserName'<~String> - name of the user to create (do not include path)

data/lib/fog/aws/requests/iam/create_group.rb

@@ -6,7 +6,7 @@ module Fog
         require 'fog/aws/parsers/iam/create_group'
 
         # Create a new group
-        # 
+        #
         # ==== Parameters
         # * group_name<~String>: name of the group to create (do not include path)
         # * path<~String>: optional path to group, defaults to '/'

data/lib/fog/aws/requests/iam/create_instance_profile.rb

@@ -6,7 +6,7 @@ module Fog
         require 'fog/aws/parsers/iam/instance_profile'
 
         # Create a new instance_profile
-        # 
+        #
         # ==== Parameters
         # * instance_profile_name<~String>: name of the instance profile to create (do not include path)
         # * path<~String>: optional path to group, defaults to '/'
@@ -23,7 +23,7 @@ module Fog
         #       * Roles<~Array> -
         #         role<~Hash>:
         #           * 'Arn'<~String> -
-        #           * 'AssumeRolePolicyDocument'<~String<  
+        #           * 'AssumeRolePolicyDocument'<~String<
         #           * 'Path'<~String> -
         #           * 'RoleId'<~String> -
         #           * 'RoleName'<~String> -