fog-aws 3.5.0 → 3.28.0

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

@@ -16,7 +16,7 @@ module Fog
         #   * UsePreviousTemplate [Boolean] Reuse the template that is associated with the stack to create the change set.
         #   * NotificationARNs [Array] List of SNS topics to publish events to.
         #   * 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.
+        #   * Capabilities [Array] List of capabilities the stack is granted. Currently CAPABILITY_IAM for allowing the creation of IAM resources.
         #
         # @return [Excon::Response]:
         #   * body [Hash:

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

@@ -16,7 +16,7 @@ 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
+        #   * Capabilities [Array] List of capabilities the stack is granted. Currently CAPABILITY_IAM for allowing the creation of IAM resources
         #   * StackPolicyBody [String] Structure containing the stack policy body.
         #   * StackPolicyURL [String] URL of file containing the stack policy.
         #   * Tags [Array] Key-value pairs to associate with this stack.

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

@@ -15,7 +15,7 @@ module Fog
         #
         # @return [Excon::Response]:
         #   * body [Hash:
-        #     * Capabilities [Array] List of capabilties in the template.
+        #     * Capabilities [Array] List of capabilities in the template.
         #     * CapabilitiesReason [String] The list of resources that generated the values in the Capabilities response element.
         #     * Description [String] Template Description.
         #     * Metadata [String] Template Metadata.

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

@@ -12,7 +12,7 @@ module Fog
         #   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.
+        #   * Capabilities [Array] List of capabilities the stack is granted. Currently CAPABILITY_IAM for allowing the creation of IAM resources.
         #   * NotificationARNs [Array] List of SNS topics to publish events to.
         #   * ResourceTypes [Array] The template resource types that you have permissions to work.
         #   * StackPolicyBody [String] Structure containing the stack policy body.

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

@@ -4,7 +4,7 @@ module Fog
       class Real
         require 'fog/aws/parsers/cloud_watch/list_metrics'
 
-        # List availabe metrics
+        # List available metrics
         #
         # ==== Options
         # * Dimensions<~Array>: a list of dimensions to filter against,

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

@@ -7,7 +7,7 @@ module Fog
         # Add permissions to a security group
         #
         # ==== Parameters
-        # * group_name<~String> - Name of group, optional (can also be specifed as GroupName in options)
+        # * group_name<~String> - Name of group, optional (can also be specified as GroupName in options)
         # * options<~Hash>:
         #   * 'GroupName'<~String> - Name of security group to modify
         #   * 'GroupId'<~String> - Id of security group to modify

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

@@ -7,7 +7,7 @@ module Fog
         # Add permissions to a security group
         #
         # ==== Parameters
-        # * group_name<~String> - Name of group, optional (can also be specifed as GroupName in options)
+        # * group_name<~String> - Name of group, optional (can also be specified as GroupName in options)
         # * options<~Hash>:
         #   * 'GroupName'<~String> - Name of security group to modify
         #   * 'GroupId'<~String> - Id of security group to modify
@@ -30,6 +30,9 @@ module Fog
         #       * 'IpRanges'<~Array>:
         #         * ip_range<~Hash>:
         #           * 'CidrIp'<~String> - CIDR range
+        #       * 'Ipv6Ranges'<~Array>:
+        #         * ip_range<~Hash>:
+        #           * 'CidrIpv6'<~String> - CIDR range
         #       * 'ToPort'<~Integer> - End of port range (or -1 for ICMP wildcard)
         #
         # === Returns
@@ -72,6 +75,10 @@ module Fog
               range_index += 1
               params[format('IpPermissions.%d.IpRanges.%d.CidrIp', key_index, range_index)] = ip_range['CidrIp']
             end
+            (permission['Ipv6Ranges'] || []).each_with_index do |ip_range, range_index|
+              range_index += 1
+              params[format('IpPermissions.%d.Ipv6Ranges.%d.CidrIpv6', key_index, range_index)] = ip_range['CidrIpv6']
+            end
           end
           params.reject {|k, v| v.nil? }
         end
@@ -186,6 +193,14 @@ module Fog
               'groups'     => [],
               'ipRanges'   => [{'cidrIp' => options['CidrIp']}]
             }
+          elsif options['CidrIpv6']
+            normalized_permissions << {
+              'ipProtocol' => options['IpProtocol'],
+              'fromPort'   => Integer(options['FromPort']),
+              'toPort'     => Integer(options['ToPort']),
+              'groups'     => [],
+              'ipv6Ranges' => [{'cidrIpv6' => options['CidrIpv6']}]
+            }
           elsif options['IpPermissions']
             options['IpPermissions'].each do |permission|
 

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

@@ -2,6 +2,7 @@ module Fog
   module AWS
     class Compute
       class Real
+        require 'ipaddr'
         require 'fog/aws/parsers/compute/create_network_interface'
 
         # Creates a network interface
@@ -24,7 +25,7 @@ module Fog
         # *   'availabilityZone'<~String>   - The availability zone
         # *   'description'<~String>        - The description
         # *   'ownerId'<~String>            - The ID of the person who created the interface
-        # *   'requesterId'<~String>        - The ID ot teh entity requesting this interface
+        # *   'requesterId'<~String>        - The ID or the entity requesting this interface
         # *   'requesterManaged'<~String>   -
         # *   'status'<~String>             - "available" or "in-use"
         # *   'macAddress'<~String>         -
@@ -68,7 +69,7 @@ module Fog
               raise Fog::AWS::Compute::Error.new("Unknown subnet '#{subnetId}' specified")
             else
               id = Fog::AWS::Mock.network_interface_id
-              cidr_block = IPAddress.parse(subnet['cidrBlock'])
+              cidr_block = IPAddr.new(subnet['cidrBlock'])
 
               groups = {}
               if options['GroupSet']
@@ -82,12 +83,14 @@ module Fog
               end
 
               if options['PrivateIpAddress'].nil?
+                range = cidr_block.to_range
                 # Here we try to act like a DHCP server and pick the first
                 # available IP (not including the first in the cidr block,
                 # which is typically reserved for the gateway).
-                cidr_block.each_host do |p_ip|
-                  unless self.data[:network_interfaces].map{ |ni, ni_conf| ni_conf['privateIpAddress'] }.include?p_ip.to_s ||
-                    cidr_block.first == p_ip
+                range = range.drop(2)[0..-2] if cidr_block.ipv4?
+
+                range.each do |p_ip|
+                  unless self.data[:network_interfaces].map{ |ni, ni_conf| ni_conf['privateIpAddress'] }.include?p_ip.to_s
                     options['PrivateIpAddress'] = p_ip.to_s
                     break
                   end

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

@@ -2,7 +2,7 @@ module Fog
   module AWS
     class Compute
       class Real
-        require 'ipaddress'
+        require 'ipaddr'
         require 'fog/aws/parsers/compute/create_subnet'
 
         # Creates a Subnet with the CIDR block you specify.
@@ -50,11 +50,11 @@ module Fog
               if vpc.nil?
                 raise Fog::AWS::Compute::NotFound.new("The vpc ID '#{vpcId}' does not exist")
               end
-              if ! ::IPAddress.parse(vpc['cidrBlock']).include?(::IPAddress.parse(cidrBlock))
+              if ! ::IPAddr.new(vpc['cidrBlock']).include?(::IPAddr.new(cidrBlock))
                 raise Fog::AWS::Compute::Error.new("Range => The CIDR '#{cidrBlock}' is invalid.")
               end
               self.data[:subnets].select{ |s| s['vpcId'] == vpcId }.each do |subnet|
-                if ::IPAddress.parse(subnet['cidrBlock']).include?(::IPAddress.parse(cidrBlock))
+                if ::IPAddr.new(subnet['cidrBlock']).include?(::IPAddr.new(cidrBlock))
                   raise Fog::AWS::Compute::Error.new("Conflict => The CIDR '#{cidrBlock}' conflicts with another subnet")
                 end
               end

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

@@ -11,7 +11,6 @@ module Fog
         # * options<~Hash>:
         #   * InstanceTenancy<~String> - The allowed tenancy of instances launched into the VPC. A value of default
         #     means instances can be launched with any tenancy; a value of dedicated means instances must be launched with tenancy as dedicated.
-        #     please not that the documentation is incorrect instanceTenancy will not work while InstanceTenancy will
         #
         # === Returns
         # * response<~Excon::Response>:
@@ -54,7 +53,8 @@ module Fog
                 'classicLinkEnabled'          => false,
                 'classicLinkDnsSupport'       => false,
                 'cidrBlockAssociationSet'     => [{ 'cidrBlock' => cidrBlock, 'state' => 'associated', 'associationId' => "vpc-cidr-assoc-#{vpc_id}" }],
-                'ipv6CidrBlockAssociationSet' => []
+                'ipv6CidrBlockAssociationSet' => [],
+                'instanceTenancy'             => options['InstanceTenancy'] || 'default'
               }
               self.data[:vpcs].push(vpc)
 
@@ -67,7 +67,7 @@ module Fog
               route_table = self.data[:route_tables].find { |routetable| routetable["routeTableId"].eql? default_route.id }
 
               # This pushes a main route to the associationSet
-              # add_route_association(routeTableId, subnetId, main=false) is declared in assocate_route_table.rb
+              # add_route_association(routeTableId, subnetId, main=false) is declared in associate_route_table.rb
               assoc = add_route_association(default_route.id, nil, true)
               route_table["associationSet"].push(assoc)
 

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

@@ -20,7 +20,7 @@ module Fog
         # *   'availabilityZone'<~String>   - The availability zone
         # *   'description'<~String>        - The description
         # *   'ownerId'<~String>            - The ID of the person who created the interface
-        # *   'requesterId'<~String>        - The ID ot teh entity requesting this interface
+        # *   'requesterId'<~String>        - The ID of the entity requesting this interface
         # *   'requesterManaged'<~String>   -
         # *   'status'<~String>             - "available" or "in-use"
         # *   'macAddress'<~String>         -
@@ -49,7 +49,7 @@ module Fog
         # *   'privateIpAddresses' <~Array>:
         # *     'privateIpAddress'<~String> - One of the additional private ip address
         # *     'privateDnsName'<~String>   - The private DNS associate to the ip address
-        # *     'primay'<~String>           - Whether main ip associate with NIC true of false
+        # *     'primary'<~String>          - Whether main ip associate with NIC true of false
         #
         # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/2012-03-01/APIReference/index.html?ApiReference-query-DescribeNetworkInterfaces.html]
         def describe_network_interfaces(filters = {})

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

@@ -27,6 +27,8 @@ module Fog
         #         * 'ipProtocol'<~String> - Ip protocol, must be in ['tcp', 'udp', 'icmp']
         #         * 'ipRanges'<~Array>:
         #           * 'cidrIp'<~String> - CIDR range
+        #         * 'ipv6Ranges'<~Array>:
+        #           * 'cidrIpv6'<~String> - CIDR ipv6 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

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

@@ -9,7 +9,7 @@ module Fog
         # ==== Parameters
         # * network_interface_id<~String> - The ID of the network interface you want to describe an attribute of
         # * attribute<~String>            - The attribute to modify, must be one of 'description', 'groupSet', 'sourceDestCheck' or 'attachment'
-        # * value<~Object>                - New value of attribute, the actual tyep depends on teh attribute:
+        # * value<~Object>                - New value of attribute, the actual type depends on the attribute:
         #                                   description     - a string
         #                                   groupSet        - a list of group id's
         #                                   sourceDestCheck - a boolean value

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

@@ -10,7 +10,7 @@ module Fog
         # * volume_id<~String> - The ID of the volume
         # * options<~Hash>:
         #   * 'VolumeType'<~String> - Type of volume
-        #   * 'Size'<~Integer> - Size in GiBs fo the volume
+        #   * 'Size'<~Integer> - Size in GiBs of the volume
         #   * 'Iops'<~Integer> - Number of IOPS the volume supports
         #
         # ==== Response

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

@@ -113,7 +113,7 @@ module Fog
               raise Fog::AWS::Compute::Error.new(message)
             end
 
-            if !image_id.match(/^ami-[a-f0-9]{8}$/)
+            if !image_id.match(/^ami-[a-f0-9]{8,17}$/)
               message = "The image id '[#{image_id}]' does not exist"
               raise Fog::AWS::Compute::NotFound.new(message)
             end

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

@@ -7,7 +7,7 @@ module Fog
         # Remove permissions from a security group
         #
         # ==== Parameters
-        # * group_name<~String> - Name of group, optional (can also be specifed as GroupName in options)
+        # * group_name<~String> - Name of group, optional (can also be specified as GroupName in options)
         # * options<~Hash>:
         #   * 'GroupName'<~String> - Name of security group to modify
         #   * 'GroupId'<~String> - Id of security group to modify

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

@@ -7,7 +7,7 @@ module Fog
         # Remove permissions from a security group
         #
         # ==== Parameters
-        # * group_name<~String> - Name of group, optional (can also be specifed as GroupName in options)
+        # * group_name<~String> - Name of group, optional (can also be specified as GroupName in options)
         # * options<~Hash>:
         #   * 'GroupName'<~String> - Name of security group to modify
         #   * 'GroupId'<~String> - Id of security group to modify

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

@@ -30,6 +30,8 @@ module Fog
         #     * 'Ebs.Encrypted'<~Boolean> - specifies whether or not the volume is to be encrypted unless snapshot is specified
         #     * 'Ebs.VolumeType'<~String> - Type of EBS volue. Valid options in ['standard', 'io1'] default is 'standard'.
         #     * 'Ebs.Iops'<~String> - The number of I/O operations per second (IOPS) that the volume supports. Required when VolumeType is 'io1'
+        #   * 'HibernationOptions'<~Array>: array of hashes
+        #     * 'Configured'<~Boolean> - specifies whether or not the instance is configured for hibernation.  This parameter is valid only if the instance meets the hibernation prerequisites.  
         #   * 'NetworkInterfaces'<~Array>: array of hashes
         #     * 'NetworkInterfaceId'<~String> - An existing interface to attach to a single instance
         #     * 'DeviceIndex'<~String> - The device index. Applies both to attaching an existing network interface and creating a network interface
@@ -42,6 +44,11 @@ module Fog
         #     * 'PrivateIpAddresses.Primary'<~Bool> - Indicates whether the private IP address is the primary private IP address.
         #     * 'SecondaryPrivateIpAddressCount'<~Bool> - The number of private IP addresses to assign to the network interface.
         #     * 'AssociatePublicIpAddress'<~String> - Indicates whether to assign a public IP address to an instance in a VPC. The public IP address is assigned to a specific network interface
+        #   * 'TagSpecifications'<~Array>: array of hashes
+        #     * 'ResourceType'<~String> - Type of resource to apply tags on, e.g: instance or volume
+        #     * 'Tags'<~Array> - List of hashes reprensenting tag to be set
+        #       * 'Key'<~String> - Tag name
+        #       * 'Value'<~String> - Tag value
         #   * 'ClientToken'<~String> - unique case-sensitive token for ensuring idempotency
         #   * 'DisableApiTermination'<~Boolean> - specifies whether or not to allow termination of the instance from the api
         #   * 'SecurityGroup'<~Array> or <~String> - Name of security group(s) for instances (not supported for VPC)
@@ -75,6 +82,8 @@ module Fog
         #           * 'deviceName'<~String> - specifies how volume is exposed to instance
         #           * 'status'<~String> - status of attached volume
         #           * 'volumeId'<~String> - Id of attached volume
+        #         * 'hibernationOptions'<~Array>
+        #           * 'configured'<~Boolean> - whether or not the instance is enabled for hibernation               
         #         * 'dnsName'<~String> - public dns name, blank until instance is running
         #         * 'imageId'<~String> - image id of ami used to launch instance
         #         * 'instanceId'<~String> - id of the instance
@@ -111,6 +120,13 @@ module Fog
               end
             end
           end
+          if hibernation_options = options.delete('HibernationOptions')
+            hibernation_options.each_with_index do |mapping, index|
+              for key, value in mapping
+                options.merge!({ format("HibernationOptions.%d.#{key}", index) => value })
+              end
+            end
+          end
           if security_groups = options.delete('SecurityGroup')
             options.merge!(Fog::AWS.indexed_param('SecurityGroup', [*security_groups]))
           end
@@ -133,6 +149,45 @@ module Fog
               end
             end
           end
+          if tag_specifications = options.delete('TagSpecifications')
+            # From https://docs.aws.amazon.com/sdk-for-ruby/v2/api/Aws/EC2/Client.html#run_instances-instance_method
+            # And https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RunInstances.html
+            # Discussed at https://github.com/fog/fog-aws/issues/603
+            #
+            # Example
+            #
+            # TagSpecifications: [
+            #     {
+            #       ResourceType: "instance",
+            #       Tags: [
+            #         {
+            #           Key: "Project",
+            #           Value: "MyProject",
+            #         },
+            #       ],
+            #     },
+            #     {
+            #       ResourceType: "volume",
+            #       Tags: [
+            #         {
+            #           Key: "Project",
+            #           Value: "MyProject",
+            #         },
+            #       ],
+            #     },
+            # ]
+            tag_specifications.each_with_index do |val, idx|
+              resource_type = val["ResourceType"]
+              tags = val["Tags"]
+              options["TagSpecification.#{idx}.ResourceType"] = resource_type
+              tags.each_with_index do |tag, tag_idx|
+                aws_tag_key = "TagSpecification.#{idx}.Tag.#{tag_idx}.Key"
+                aws_tag_value = "TagSpecification.#{idx}.Tag.#{tag_idx}.Value"
+                options[aws_tag_key] = tag["Key"]
+                options[aws_tag_value] = tag["Value"]
+              end
+            end
+          end
 
           idempotent = !(options['ClientToken'].nil? || options['ClientToken'].empty?)
 
@@ -182,6 +237,14 @@ module Fog
               }
             end
 
+	    hibernation_options = (options['HibernationOptions'] || []).reduce([]) do |mapping, device|
+              configure = device.fetch("Configure", true)
+
+              mapping << {
+                "Configure" => configure,
+              }
+            end
+
             if options['SubnetId']
               if options['PrivateIpAddress']
                 ni_options = {'PrivateIpAddress' => options['PrivateIpAddress']}
@@ -221,6 +284,7 @@ module Fog
               'associatePublicIP'     => options['associatePublicIP'] || false,
               'architecture'          => 'i386',
               'blockDeviceMapping'    => block_device_mapping,
+              'hibernationOptions'    => hibernation_options,
               'networkInterfaces'     => network_interfaces,
               'clientToken'           => options['clientToken'],
               'dnsName'               => nil,

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

@@ -16,9 +16,17 @@ module Fog
         #     * TODO: fill in the blanks
         #
         # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-StopInstances.html]
-        def stop_instances(instance_id, force = false)
+        def stop_instances(instance_id, options = {})
           params = Fog::AWS.indexed_param('InstanceId', instance_id)
-          params.merge!('Force' => 'true') if force
+          unless options.is_a?(Hash)
+            Fog::Logger.warning("stop_instances with #{options.class} param is deprecated, use stop_instances('force' => boolean) instead [light_black](#{caller.first})[/]")
+            options = {'force' => options}
+          end
+          params.merge!('Force' => 'true') if options['force']
+          if options['hibernate']
+            params.merge!('Hibernate' => 'true')
+            params.merge!('Force' => 'false')
+          end
           request({
             'Action'    => 'StopInstances',
             :idempotent => true,
@@ -28,7 +36,7 @@ module Fog
       end
 
       class Mock
-        def stop_instances(instance_id, force = false)
+        def stop_instances(instance_id, options = {})
           instance_ids = Array(instance_id)
 
           instance_set = self.data[:instances].values

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

@@ -15,7 +15,7 @@ module Fog
 
           response = request({
             :body => Fog::JSON.encode(params),
-            :headers => { 'X-Amz-Target' => 'DataPipeline.DectivatePipeline' }
+            :headers => { 'X-Amz-Target' => 'DataPipeline.DeactivatePipeline' }
           })
         end
       end

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

@@ -1,139 +1,6 @@
 module Fog
   module AWS
     class DNS
-
-      def self.hosted_zone_for_alias_target(dns_name)
-        hosted_zones = if dns_name.match(/^dualstack\./)
-          elb_dualstack_hosted_zone_mapping
-        else
-          elb_hosted_zone_mapping
-        end
-
-        Hash[hosted_zones.select { |k, _|
-          dns_name =~ /\A.+\.#{k}\.elb\.amazonaws\.com\.?\z/
-        }].values.last
-      end
-
-      def self.elb_hosted_zone_mapping
-        @elb_hosted_zone_mapping ||= {
-          "ap-northeast-1" => "Z2YN17T5R711GT",
-          "ap-southeast-1" => "Z1WI8VXHPB1R38",
-          "ap-southeast-2" => "Z2999QAZ9SRTIC",
-          "eu-west-1"      => "Z3NF1Z3NOM5OY2",
-          "eu-central-1"   => "Z215JYRZR1TBD5",
-          "sa-east-1"      => "Z2ES78Y61JGQKS",
-          "us-east-1"      => "Z3DZXE0Q79N41H",
-          "us-west-1"      => "Z1M58G0W56PQJA",
-          "us-west-2"      => "Z33MTJ483KN6FU",
-        }
-      end
-
-      # See https://docs.aws.amazon.com/general/latest/gr/rande.html#elb_region
-      # This needs to be kept in sync manually sadly for now as seemingly this data is not available via an API
-      def self.elb_dualstack_hosted_zone_mapping
-        @elb_dualstack_hosted_zone_mapping ||= {
-          "ap-northeast-1" => "Z14GRHDCWA56QT",
-          "ap-northeast-2" => "ZWKZPGTI48KDX",
-          "ap-northeast-3" => "Z5LXEXXYW11ES",
-          "ap-south-1" => "ZP97RAFLXTNZK",
-          "ap-southeast-1" => "Z1LMS91P8CMLE5",
-          "ap-southeast-2" => "Z1GM3OXH4ZPM65",
-          "ca-central-1" => "ZQSVJUPU6J1EY",
-          "eu-central-1" => "Z215JYRZR1TBD5",
-          "eu-west-1" => "Z32O12XQLNTSW2",
-          "eu-west-2" => "ZHURV8PSTC4K8",
-          "eu-west-3" => "Z3Q77PNBQS71R4",
-          "us-east-1" => "Z35SXDOTRQ7X7K",
-          "us-east-2" => "Z3AADJGX6KTTL2",
-          "us-west-1" => "Z368ELLRRE2KJ0",
-          "us-west-2" => "Z1H1FL5HABSF5",
-          "sa-east-1" => "Z2P70J7HTTTPLU",
-        }
-      end
-
-      # Returns the xml request for a given changeset
-      def self.change_resource_record_sets_data(zone_id, change_batch, version, options = {})
-        # AWS methods return zone_ids that looks like '/hostedzone/id'.  Let the caller either use
-        # that form or just the actual id (which is what this request needs)
-        zone_id = zone_id.sub('/hostedzone/', '')
-
-        optional_tags = ''
-        options.each do |option, value|
-          case option
-          when :comment
-            optional_tags += "<Comment>#{value}</Comment>"
-          end
-        end
-
-        #build XML
-        if change_batch.count > 0
-
-          changes = "<ChangeBatch>#{optional_tags}<Changes>"
-
-          change_batch.each do |change_item|
-            action_tag = %Q{<Action>#{change_item[:action]}</Action>}
-            name_tag   = %Q{<Name>#{change_item[:name]}</Name>}
-            type_tag   = %Q{<Type>#{change_item[:type]}</Type>}
-
-            # TTL must be omitted if using an alias record
-            ttl_tag = ''
-            ttl_tag += %Q{<TTL>#{change_item[:ttl]}</TTL>} unless change_item[:alias_target]
-
-            weight_tag = ''
-            set_identifier_tag = ''
-            region_tag = ''
-            if change_item[:set_identifier]
-              set_identifier_tag += %Q{<SetIdentifier>#{change_item[:set_identifier]}</SetIdentifier>}
-              if change_item[:weight] # Weighted Record
-                weight_tag += %Q{<Weight>#{change_item[:weight]}</Weight>}
-              elsif change_item[:region] # Latency record
-                region_tag += %Q{<Region>#{change_item[:region]}</Region>}
-              end
-            end
-
-            failover_tag = if change_item[:failover]
-                             %Q{<Failover>#{change_item[:failover]}</Failover>}
-                           end
-
-            geolocation_tag = if change_item[:geo_location]
-                                xml_geo = change_item[:geo_location].map { |k,v| "<#{k}>#{v}</#{k}>" }.join
-                                %Q{<GeoLocation>#{xml_geo}</GeoLocation>}
-                              end
-
-            resource_records = change_item[:resource_records] || []
-            resource_record_tags = ''
-            resource_records.each do |record|
-              resource_record_tags += %Q{<ResourceRecord><Value>#{record}</Value></ResourceRecord>}
-            end
-
-            # ResourceRecords must be omitted if using an alias record
-            resource_tag = ''
-            resource_tag += %Q{<ResourceRecords>#{resource_record_tags}</ResourceRecords>} if resource_records.any?
-
-            alias_target_tag = ''
-            if change_item[:alias_target]
-              # Accept either underscore or camel case for hash keys.
-              dns_name = change_item[:alias_target][:dns_name] || change_item[:alias_target][:DNSName]
-              hosted_zone_id = change_item[:alias_target][:hosted_zone_id] || change_item[:alias_target][:HostedZoneId] || AWS.hosted_zone_for_alias_target(dns_name)
-              evaluate_target_health = change_item[:alias_target][:evaluate_target_health] || change_item[:alias_target][:EvaluateTargetHealth] || false
-              evaluate_target_health_xml = !evaluate_target_health.nil? ? %Q{<EvaluateTargetHealth>#{evaluate_target_health}</EvaluateTargetHealth>} : ''
-              alias_target_tag += %Q{<AliasTarget><HostedZoneId>#{hosted_zone_id}</HostedZoneId><DNSName>#{dns_name}</DNSName>#{evaluate_target_health_xml}</AliasTarget>}
-            end
-
-            health_check_id_tag = if change_item[:health_check_id]
-                                    %Q{<HealthCheckId>#{change_item[:health_check_id]}</HealthCheckId>}
-                                  end
-
-            change_tags = %Q{<Change>#{action_tag}<ResourceRecordSet>#{name_tag}#{type_tag}#{set_identifier_tag}#{weight_tag}#{region_tag}#{failover_tag}#{geolocation_tag}#{ttl_tag}#{resource_tag}#{alias_target_tag}#{health_check_id_tag}</ResourceRecordSet></Change>}
-            changes += change_tags
-          end
-
-          changes += '</Changes></ChangeBatch>'
-        end
-
-        %Q{<?xml version="1.0" encoding="UTF-8"?><ChangeResourceRecordSetsRequest xmlns="https://route53.amazonaws.com/doc/#{version}/">#{changes}</ChangeResourceRecordSetsRequest>}
-      end
-
       class Real
         require 'fog/aws/parsers/dns/change_resource_record_sets'
 

data/lib/fog/aws/requests/ecs/list_task_definitions.rb

@@ -13,7 +13,7 @@ module Fog
         # ==== Returns
         # * response<~Excon::Response>:
         #   * body<~Hash>:
-        #     * 'TaskDefinitionArns' <~Array> - list of task definition Amazon Resource Name (ARN) entries for the ListTaskDefintions request.
+        #     * 'TaskDefinitionArns' <~Array> - list of task definition Amazon Resource Name (ARN) entries for the ListTaskDefinitions request.
         #     * 'NextToken' <~String> - nextToken value to include in a future ListTaskDefinitions request
         def list_task_definitions(params={})
           request({

data/lib/fog/aws/requests/efs/create_file_system.rb

@@ -23,7 +23,7 @@ module Fog
             :method           => 'POST',
             :expects          => 201,
             'CreationToken'   => creation_token,
-            'PerformanceMode' => options[:peformance_mode] || 'generalPurpose',
+            'PerformanceMode' => options[:performance_mode] || 'generalPurpose',
             'Encrypted'       => options[:encrypted] || false
           }
           params[:kms_key_id] = options[:kms_key_id] if options.key?(:kms_key_id)

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

@@ -34,7 +34,7 @@ module Fog
           if sec_group = self.data[:security_groups][name]
 
             if sec_group['EC2SecurityGroups'].find{|h| h['EC2SecurityGroupName'] == opts['EC2SecurityGroupName']}
-              raise Fog::AWS::Elasticache::AuthorizationAlreadyExists.new("AuthorizationAlreadyExists => #{opts['EC2SecurityGroupName']} is alreay defined")
+              raise Fog::AWS::Elasticache::AuthorizationAlreadyExists.new("AuthorizationAlreadyExists => #{opts['EC2SecurityGroupName']} is already defined")
             end
             sec_group['EC2SecurityGroups'] << opts.merge({'Status' => 'authorizing'})
 

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

@@ -19,7 +19,7 @@ module Fog
         #   * :engine_version <~String> - The Cluster's caching software version
         #   * :notification_topic_arn <~String> - Amazon SNS Resource Name
         #   * :port <~Integer> - The memcached port number
-        #   * :preferred_availablility_zone <~String>
+        #   * :preferred_availability_zone <~String>
         #   * :preferred_maintenance_window <~String>
         #   * :cache_subnet_group_name <~String>
         #   * :s3_snapshot_location <~String> - Amazon resource location for snapshot
@@ -39,7 +39,7 @@ module Fog
             'EngineVersion'               => options[:engine_version],
             'NotificationTopicArn'        => options[:notification_topic_arn],
             'Port'                        => options[:port],
-            'PreferredAvailabilityZone'   => options[:preferred_availablility_zone],
+            'PreferredAvailabilityZone'   => options[:preferred_availability_zone],
             'PreferredMaintenanceWindow'  => options[:preferred_maintenance_window],
             :parser => Fog::Parsers::AWS::Elasticache::SingleCacheCluster.new
           }

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

@@ -24,7 +24,7 @@ module Fog
       end
 
       class Mock
-        def describe_engine_defalut_parameters(options = {})
+        def describe_engine_default_parameters(options = {})
           Fog::Mock.not_implemented
         end
       end