fog-aws 1.4.1 → 3.27.0

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

@@ -0,0 +1,100 @@
+module Fog
+  module AWS
+    class ELBV2
+      class Real
+        require 'fog/aws/parsers/elbv2/describe_load_balancers'
+
+        # Describe all or specified load balancers
+        #
+        # ==== Parameters
+        # * 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>:
+        #   * body<~Hash>:
+        #     * 'ResponseMetadata'<~Hash>:
+        #       * 'RequestId'<~String> - Id of request
+        #     * 'DescribeLoadBalancersResult'<~Hash>:
+        #       * 'LoadBalancers'<~Array>
+        #         * 'AvailabilityZones'<~Array>:
+        #           * 'SubnetId'<~String> - ID of the subnet
+        #           * 'ZoneName'<~String> - Name of the Availability Zone
+        #           * 'LoadBalancerAddresses'<~Array>:
+        #             * 'IpAddress'<~String> - IP address
+        #             * 'AllocationId'<~String> - ID of the AWS allocation
+        #         * 'CanonicalHostedZoneName'<~String> - name of the Route 53 hosted zone associated with the load balancer
+        #         * 'CanonicalHostedZoneNameID'<~String> - ID of the Route 53 hosted zone associated with the load balancer
+        #         * 'CreatedTime'<~Time> - time load balancer was created
+        #         * 'DNSName'<~String> - external DNS name of load balancer
+        #         * 'LoadBalancerName'<~String> - name of load balancer
+        #         * 'SecurityGroups'<~Array> - array of security group id
+        #         * '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::ELBV2::DescribeLoadBalancers.new
+          }.merge!(options))
+        end
+      end
+
+      class Mock
+        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_v2].find { |name, data| name == lb_name }
+              raise Fog::AWS::ELBV2::NotFound unless lb
+              lb[1].dup
+            end.compact
+          else
+            self.data[:load_balancers_v2].map { |lb, values| values.dup }
+          end
+
+          marker = options.fetch('Marker', 0).to_i
+          if load_balancers.count - marker > 400
+            next_marker = marker + 400
+            load_balancers = load_balancers[marker...next_marker]
+          else
+            next_marker = nil
+          end
+
+          response = Excon::Response.new
+          response.status = 200
+
+          response.body = {
+            'ResponseMetadata' => {
+              'RequestId' => Fog::AWS::Mock.request_id
+            },
+            'DescribeLoadBalancersResult' => {
+              'LoadBalancers' => load_balancers
+            }
+          }
+
+          if next_marker
+            response.body['DescribeLoadBalancersResult']['NextMarker'] = next_marker.to_s
+          end
+
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/elbv2/describe_tags.rb

@@ -0,0 +1,50 @@
+module Fog
+  module AWS
+    class ELBV2
+      class Real
+        require 'fog/aws/parsers/elbv2/describe_tags'
+
+        # returns a Hash of tags for a load balancer
+        # http://docs.aws.amazon.com/ElasticLoadBalancing/latest/APIReference/API_DescribeTags.html
+        # ==== Parameters
+        # * resource_arns <~Array> - ARN(s) of the ELB instance whose tags are to be retrieved
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        def describe_tags(resource_arns)
+          request({
+              'Action' => 'DescribeTags',
+              :parser  => Fog::Parsers::AWS::ELBV2::DescribeTags.new
+            }.merge!(Fog::AWS.indexed_param('ResourceArns.member.%d', [*resource_arns]))
+          )
+        end
+      end
+
+      class Mock
+        def describe_tags(resource_arns)
+          response = Excon::Response.new
+          resource_arns = [*resource_arns]
+
+          tag_descriptions = resource_arns.map do |resource_arn|
+            if self.data[:load_balancers_v2][resource_arn]
+              {
+                "Tags"=>self.data[:tags][resource_arn],
+                "ResourceArn"=>resource_arn
+              }
+            else
+              raise Fog::AWS::ELBV2::NotFound.new("Elastic load balancer #{resource_arns} not found")
+            end
+          end
+
+          response.status = 200
+          response.body = {
+            "ResponseMetadata"=>{"RequestId"=> Fog::AWS::Mock.request_id },
+            "DescribeTagsResult"=>{"TagDescriptions"=> tag_descriptions}
+          }
+
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/elbv2/remove_tags.rb

@@ -0,0 +1,45 @@
+module Fog
+  module AWS
+    class ELBV2
+      class Real
+        require 'fog/aws/parsers/elbv2/empty'
+
+        # removes tags from an elastic load balancer instance
+        # http://docs.aws.amazon.com/ElasticLoadBalancing/latest/APIReference/API_RemoveTags.html
+        # ==== Parameters
+        # * resource_arn <~String> - ARN of the ELB instance whose tags are to be retrieved
+        # * keys <~Array> A list of String keys for the tags to remove
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        def remove_tags(resource_arn, keys)
+          request(
+            { 'Action'                      => 'RemoveTags',
+              'ResourceArns.member.1'  => resource_arn,
+              :parser => Fog::Parsers::AWS::ELBV2::Empty.new,
+            }.merge(Fog::AWS.indexed_param('TagKeys.member.%d', keys))
+          )
+        end
+
+      end
+
+      class Mock
+
+        def remove_tags(resource_arn, keys)
+          response = Excon::Response.new
+          if self.data[:load_balancers_v2][resource_arn]
+            keys.each {|key| self.data[:tags][resource_arn].delete key}
+            response.status = 200
+            response.body = {
+              "ResponseMetadata"=>{ "RequestId"=> Fog::AWS::Mock.request_id }
+            }
+            response
+          else
+            raise Fog::AWS::ELBV2::NotFound.new("Elastic load balancer #{resource_arn} not found")
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/glacier/initiate_job.rb

@@ -2,7 +2,7 @@ module Fog
   module AWS
     class Glacier
       class Real
-        # This operation initates a multipart upload of an archive to a vault
+        # This operation initiates a multipart upload of an archive to a vault
         #
         # ==== Parameters
         # * name<~String> The vault name

data/lib/fog/aws/requests/glacier/initiate_multipart_upload.rb

@@ -2,7 +2,7 @@ module Fog
   module AWS
     class Glacier
       class Real
-        # This operation initates a multipart upload of an archive to a vault
+        # This operation initiates a multipart upload of an archive to a vault
         #
         # ==== Parameters
         # * name<~String> The vault name

data/lib/fog/aws/requests/kinesis/list_streams.rb

@@ -2,7 +2,7 @@ module Fog
   module AWS
     class Kinesis
       class Real
-        # List availabe streams
+        # List available streams
         #
         # ==== Options
         # * ExclusiveStartStreamName<~String>: The name of the stream to start the list with.

data/lib/fog/aws/requests/kinesis/put_record.rb

@@ -46,8 +46,7 @@ module Fog
           data = options.delete("Data")
           partition_key = options.delete("PartitionKey")
 
-          sample_method = RUBY_VERSION == "1.8.7" ? :choice : :sample
-          shard_id = stream["Shards"].send(sample_method)["ShardId"]
+          shard_id = stream["Shards"].sample["ShardId"]
           shard = stream["Shards"].detect{ |shard| shard["ShardId"] == shard_id }
           # store the records on the shard(s)
           shard["Records"] << {

data/lib/fog/aws/requests/kinesis/put_records.rb

@@ -43,8 +43,7 @@ module Fog
           record_results = records.map { |r|
             sequence_number = next_sequence_number
 
-            sample_method = RUBY_VERSION == "1.8.7" ? :choice : :sample
-            shard_id = stream["Shards"].send(sample_method)["ShardId"]
+            shard_id = stream["Shards"].sample["ShardId"]
             shard = stream["Shards"].detect{ |shard| shard["ShardId"] == shard_id }
             # store the records on the shard(s)
             shard["Records"] << r.merge("SequenceNumber" => sequence_number)

data/lib/fog/aws/requests/lambda/invoke.rb

@@ -18,10 +18,10 @@ module Fog
           headers = {}
           if client_context = params.delete('ClientContext')
             headers['X-Amz-Client-Context'] =
-              Base64::encode64(Fog::Json.encode(client_context))
+              Base64::encode64(Fog::JSON.encode(client_context))
           end
-          if client_type = params.delete('InvocationType')
-            headers['X-Amz-Client-Type'] = client_type
+          if invocation_type = params.delete('InvocationType')
+            headers['X-Amz-Invocation-Type'] = invocation_type
           end
           if log_type = params.delete('LogType')
             headers['X-Amz-Log-Type'] = log_type
@@ -51,12 +51,12 @@ module Fog
             raise Fog::AWS::Lambda::Error, message
           end
 
-          client_context = params.delete('ClientContext')
-          client_type    = params.delete('InvocationType')
-          log_type       = params.delete('LogType')
-          payload        = params.delete('Payload')
+          client_context  = params.delete('ClientContext')
+          invocation_type = params.delete('InvocationType')
+          log_type        = params.delete('LogType')
+          payload         = params.delete('Payload')
 
-          if (client_context || client_type || log_type)
+          if (client_context || invocation_type || log_type)
             message = "invoke parameters handling are not yet mocked [light_black](#{caller.first})[/]"
             Fog::Logger.warning message
             Fog::Mock.not_implemented

data/lib/fog/aws/requests/rds/add_tags_to_resource.rb

@@ -12,28 +12,30 @@ module Fog
         #   * body<~Hash>:
         def add_tags_to_resource(rds_id, tags)
           keys    = tags.keys.sort
-          values  = keys.map {|key| tags[key]}
+          values  = keys.map { |key| tags[key] }
+          resource_name = "arn:aws:rds:#{@region}:#{owner_id}:db:#{rds_id}"
+          %w[us-gov-west-1 us-gov-east-1].include?(@region) ? resource_name.insert(7, '-us-gov') : resource_name
           request({
-              'Action'        => 'AddTagsToResource',
-              'ResourceName'  => "arn:aws:rds:#{@region}:#{owner_id}:db:#{rds_id}",
-              :parser         => Fog::Parsers::AWS::RDS::Base.new,
-            }.merge(Fog::AWS.indexed_param('Tags.member.%d.Key', keys)).
-              merge(Fog::AWS.indexed_param('Tags.member.%d.Value', values)))
+            'Action' => 'AddTagsToResource',
+            'ResourceName' => resource_name,
+            :parser => Fog::Parsers::AWS::RDS::Base.new
+          }.merge(Fog::AWS.indexed_param('Tags.member.%d.Key', keys))
+              .merge(Fog::AWS.indexed_param('Tags.member.%d.Value', values)))
         end
       end
 
       class Mock
         def add_tags_to_resource(rds_id, tags)
           response = Excon::Response.new
-          if server = self.data[:servers][rds_id]
-            self.data[:tags][rds_id].merge! tags
+          if server = data[:servers][rds_id]
+            data[:tags][rds_id].merge! tags
             response.status = 200
             response.body = {
-              "ResponseMetadata"=>{ "RequestId"=> Fog::AWS::Mock.request_id }
+              'ResponseMetadata' => { 'RequestId' => Fog::AWS::Mock.request_id }
             }
             response
           else
-            raise Fog::AWS::RDS::NotFound.new("DBInstance #{rds_id} not found")
+            raise Fog::AWS::RDS::NotFound, "DBInstance #{rds_id} not found"
           end
         end
       end

data/lib/fog/aws/requests/rds/authorize_db_security_group_ingress.rb

@@ -34,7 +34,7 @@ module Fog
           end
 
           if ec2_security_group_id = opts.delete("EC2SecurityGroupId")
-            ec2_security_group = (Fog::Compute::AWS::Mock.data[self.region][self.aws_access_key_id][:security_groups] || {}).values.detect { |sg| sg['groupId'] == ec2_security_group_id }
+            ec2_security_group = (Fog::AWS::Compute::Mock.data[self.region][self.aws_access_key_id][:security_groups] || {}).values.detect { |sg| sg['groupId'] == ec2_security_group_id }
             opts['EC2SecurityGroupName'] = ec2_security_group['groupName']
           end
 
@@ -43,12 +43,12 @@ module Fog
           if sec_group = self.data[:security_groups][name]
             if opts.key?('CIDRIP')
               if sec_group['IPRanges'].find{|h| h['CIDRIP'] == opts['CIDRIP']}
-                raise Fog::AWS::RDS::AuthorizationAlreadyExists.new("AuthorizationAlreadyExists => #{opts['CIDRIP']} is alreay defined")
+                raise Fog::AWS::RDS::AuthorizationAlreadyExists.new("AuthorizationAlreadyExists => #{opts['CIDRIP']} is already defined")
               end
               sec_group['IPRanges'] << opts.merge({"Status" => 'authorizing'})
             else
               if sec_group['EC2SecurityGroups'].find{|h| h['EC2SecurityGroupName'] == opts['EC2SecurityGroupName'] || h['EC2SecurityGroupId'] == opts['EC2SecurityGroupId']}
-                raise Fog::AWS::RDS::AuthorizationAlreadyExists.new("AuthorizationAlreadyExists => #{opts['EC2SecurityGroupName']} is alreay defined")
+                raise Fog::AWS::RDS::AuthorizationAlreadyExists.new("AuthorizationAlreadyExists => #{opts['EC2SecurityGroupName']} is already defined")
               end
               sec_group['EC2SecurityGroups'] << opts.merge({"Status" => 'authorizing'})
             end

data/lib/fog/aws/requests/rds/create_db_cluster.rb

@@ -12,7 +12,7 @@ module Fog
         # * AvailabilityZones<~Array> - A list of EC2 Availability Zones that instances in the DB cluster can be created in
         # * BackupRetentionPeriod<~String> - The number of days for which automated backups are retained
         # * CharacterSetName<~String> - A value that indicates that the DB cluster should be associated with the specified CharacterSet
-        # * DatabaseName<~String> - The name for your database of up to 8 alpha-numeric characters. If you do not provide a name, Amazon RDS will not create a database in the DB cluster you are creating
+        # * DatabaseName<~String> - The name for your database of up to 8 alphanumeric characters. If you do not provide a name, Amazon RDS will not create a database in the DB cluster you are creating
         # * DBClusterIdentifier<~String> - The DB cluster identifier. This parameter is stored as a lowercase string
         # * DBClusterParameterGroupName<~String> - The name of the DB cluster parameter group to associate with this DB cluster
         # * DBSubnetGroupName<~String> - A DB subnet group to associate with this DB cluster

data/lib/fog/aws/requests/rds/create_db_instance.rb

@@ -83,7 +83,7 @@ module Fog
             raise Fog::AWS::RDS::InvalidParameterCombination.new('Requesting a specific availability zone is not valid for Multi-AZ instances.')
           end
 
-          ec2 = Fog::Compute::AWS::Mock.data[@region][@aws_access_key_id]
+          ec2 = Fog::AWS::Compute::Mock.data[@region][@aws_access_key_id]
 
           db_parameter_groups     = if pg_name = options.delete("DBParameterGroupName")
                                       group = self.data[:parameter_groups][pg_name]

data/lib/fog/aws/requests/rds/create_db_subnet_group.rb

@@ -30,8 +30,8 @@ module Fog
             raise Fog::AWS::RDS::IdentifierTaken.new("DBSubnetGroupAlreadyExists => The subnet group '#{name}' already exists")
           end
 
-          # collection = Fog::Compute::AWS.new(:aws_access_key_id => 'mock key', :aws_secret_access_key => 'mock secret')
-          compute_data = Fog::Compute::AWS::Mock.data[self.region][self.aws_access_key_id]
+          # collection = Fog::AWS::Compute.new(:aws_access_key_id => 'mock key', :aws_secret_access_key => 'mock secret')
+          compute_data = Fog::AWS::Compute::Mock.data[self.region][self.aws_access_key_id]
 
           subnets = subnet_ids.map do |snid|
             subnet = compute_data[:subnets].detect { |s| s['subnetId'] == snid }

data/lib/fog/aws/requests/rds/describe_db_snapshots.rb

@@ -9,7 +9,7 @@ module Fog
         # ==== Parameters
         # * DBInstanceIdentifier <~String> - ID of instance to retrieve information for. if absent information for all instances is returned
         # * DBSnapshotIdentifier <~String> - ID of snapshot to retrieve information for. if absent information for all snapshots is returned
-        # * SnapshotType       <~String> - type of snapshot to retrive (automated|manual)
+        # * SnapshotType       <~String> - type of snapshot to retrieve (automated|manual)
         # * Marker               <~String> - An optional marker provided in the previous DescribeDBInstances request
         # * MaxRecords           <~Integer> - Max number of records to return (between 20 and 100)
         # Only one of DBInstanceIdentifier or DBSnapshotIdentifier can be specified

data/lib/fog/aws/requests/rds/describe_orderable_db_instance_options.rb

@@ -4,8 +4,8 @@ module Fog
       class Real
         require 'fog/aws/parsers/rds/describe_orderable_db_instance_options'
 
-        # Describe all or specified load db instances
-        # http://docs.amazonwebservices.com/AmazonRDS/latest/APIReference/API_DescribeDBInstances.html
+        # Describe all or specified orderable db instances options
+        # https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_DescribeOrderableDBInstanceOptions.html
         # ==== Parameters
         # * Engine <~String> - The name of the engine to retrieve DB Instance options for. Required.
         # * Options <~Hash> - Hash of options. Optional. The following keys are used:
@@ -47,11 +47,17 @@ module Fog
                                    'ReadReplicaCapable' => true,
                                    'EngineVersion' => opts[:engine_version] || '5.6.12',
                                    'AvailabilityZones' => [
-                                      {'Name' => 'us-east-1b', 'ProvisionedIopsCapable' => true},
-                                      {'Name' => 'us-east-1c', 'ProvisionedIopsCapable' => true},
-                                      {'Name' => 'us-east-1d', 'ProvisionedIopsCapable' => false},
-                                      {'Name' => 'us-east-1e', 'ProvisionedIopsCapable' => true}],
+                                      {'Name' => 'us-east-1b'},
+                                      {'Name' => 'us-east-1c'},
+                                      {'Name' => 'us-east-1d'},
+                                      {'Name' => 'us-east-1e'}],
                                    'DBInstanceClass' => size,
+                                   'SupportsStorageEncryption' => true,
+                                   'SupportsPerformanceInsights' => false,
+                                   'StorageType' => 'gp2',
+                                   'SupportsIops' => false,
+                                   'SupportsIAMDatabaseAuthentication' => false,
+                                   'SupportsEnhancedMonitoring' => true,
                                    'Vpc' => opts[:vpc].nil? ? true : opts[:vpc]}
 
             end

data/lib/fog/aws/requests/rds/list_tags_for_resource.rb

@@ -11,11 +11,14 @@ module Fog
         # ==== Returns
         # * response<~Excon::Response>:
         #   * body<~Hash>:
+
         def list_tags_for_resource(rds_id)
+          resource_name = "arn:aws:rds:#{@region}:#{owner_id}:db:#{rds_id}"
+          %w[us-gov-west-1 us-gov-east-1].include?(@region) ? resource_name.insert(7, '-us-gov') : resource_name
           request(
-            'Action'        => 'ListTagsForResource',
-            'ResourceName'  => "arn:aws:rds:#{@region}:#{owner_id}:db:#{rds_id}",
-            :parser         => Fog::Parsers::AWS::RDS::TagListParser.new
+            'Action' => 'ListTagsForResource',
+            'ResourceName' => resource_name,
+            :parser => Fog::Parsers::AWS::RDS::TagListParser.new
           )
         end
       end
@@ -23,15 +26,15 @@ module Fog
       class Mock
         def list_tags_for_resource(rds_id)
           response = Excon::Response.new
-          if server = self.data[:servers][rds_id]
+          if server = data[:servers][rds_id]
             response.status = 200
             response.body = {
-              "ListTagsForResourceResult" =>
-                {"TagList" =>  self.data[:tags][rds_id]}
+              'ListTagsForResourceResult' =>
+                { 'TagList' => data[:tags][rds_id] }
             }
             response
           else
-            raise Fog::AWS::RDS::NotFound.new("DBInstance #{rds_id} not found")
+            raise Fog::AWS::RDS::NotFound, "DBInstance #{rds_id} not found"
           end
         end
       end

data/lib/fog/aws/requests/rds/modify_db_instance.rb

@@ -56,7 +56,7 @@ module Fog
               self.data[:modify_time] = Time.now
               # TODO verify the params options
               # if apply_immediately is false, all the options go to pending_modified_values and then apply and clear after either
-              # a reboot or the maintainance window
+              # a reboot or the maintenance window
               #if apply_immediately
               #  modified_server = server.merge(options)
               #else
@@ -68,7 +68,7 @@ module Fog
               end
 
               rds_security_groups = self.data[:security_groups].values
-              ec2_security_groups = Fog::Compute::AWS::Mock.data[@region][@aws_access_key_id][:security_groups].values
+              ec2_security_groups = Fog::AWS::Compute::Mock.data[@region][@aws_access_key_id][:security_groups].values
 
               db_security_group_names = Array(options.delete("DBSecurityGroups"))
               db_security_groups = db_security_group_names.inject([]) do |r, group_name|

data/lib/fog/aws/requests/rds/modify_db_parameter_group.rb

@@ -10,7 +10,7 @@ module Fog
         # * DBParameterGroupName <~String> - name of the parameter group
         # * Parameters<~Array> - Array of up to 20 Hashes describing parameters to set
         #   * 'ParameterName'<~String> - parameter name.
-        #   * 'ParameterValue'<~String> - new paremeter value
+        #   * 'ParameterValue'<~String> - new parameter value
         #   * 'ApplyMethod'<~String> - immediate | pending-reboot whether to set the parameter immediately or not (may require an instance restart)
         #
         # ==== Returns

data/lib/fog/aws/requests/rds/remove_tags_from_resource.rb

@@ -11,11 +11,12 @@ module Fog
         # * response<~Excon::Response>:
         #   * body<~Hash>:
         def remove_tags_from_resource(rds_id, keys)
+          resource_name = "arn:aws:rds:#{@region}:#{owner_id}:db:#{rds_id}"
+          %w[us-gov-west-1 us-gov-east-1].include?(@region) ? resource_name.insert(7, '-us-gov') : resource_name
           request(
-            { 'Action'        => 'RemoveTagsFromResource',
-              'ResourceName'  => "arn:aws:rds:#{@region}:#{owner_id}:db:#{rds_id}",
-              :parser         => Fog::Parsers::AWS::RDS::Base.new,
-            }.merge(Fog::AWS.indexed_param('TagKeys.member.%d', keys))
+            { 'Action' => 'RemoveTagsFromResource',
+              'ResourceName' => resource_name,
+              :parser => Fog::Parsers::AWS::RDS::Base.new }.merge(Fog::AWS.indexed_param('TagKeys.member.%d', keys))
           )
         end
       end
@@ -23,15 +24,15 @@ module Fog
       class Mock
         def remove_tags_from_resource(rds_id, keys)
           response = Excon::Response.new
-          if server = self.data[:servers][rds_id]
-            keys.each {|key| self.data[:tags][rds_id].delete key}
+          if server = data[:servers][rds_id]
+            keys.each { |key| data[:tags][rds_id].delete key }
             response.status = 200
             response.body = {
-              "ResponseMetadata"=>{ "RequestId"=> Fog::AWS::Mock.request_id }
+              'ResponseMetadata' => { 'RequestId' => Fog::AWS::Mock.request_id }
             }
             response
           else
-            raise Fog::AWS::RDS::NotFound.new("DBInstance #{rds_id} not found")
+            raise Fog::AWS::RDS::NotFound, "DBInstance #{rds_id} not found"
           end
         end
       end

data/lib/fog/aws/requests/rds/revoke_db_security_group_ingress.rb

@@ -34,7 +34,7 @@ module Fog
           end
 
           if ec2_security_group_id = opts.delete("EC2SecurityGroupId")
-            ec2_security_group = (Fog::Compute::AWS::Mock.data[self.region][self.aws_access_key_id][:security_groups] || {}).values.detect { |sg| sg['groupId'] == ec2_security_group_id }
+            ec2_security_group = (Fog::AWS::Compute::Mock.data[self.region][self.aws_access_key_id][:security_groups] || {}).values.detect { |sg| sg['groupId'] == ec2_security_group_id }
             opts['EC2SecurityGroupName'] = ec2_security_group['groupName']
           end
 

data/lib/fog/aws/requests/ses/send_raw_email.rb

@@ -9,7 +9,7 @@ module Fog
         # ==== Parameters
         # * RawMessage <~String> - The message to be sent.
         # * Options <~Hash>
-        #   * Source <~String> - The sender's email address. Takes precenence over Return-Path if specified in RawMessage
+        #   * Source <~String> - The sender's email address. Takes precedence over Return-Path if specified in RawMessage
         #   * Destinations <~Array> - All destinations for this email.
         #
         # ==== Returns

data/lib/fog/aws/requests/sqs/change_message_visibility.rb

@@ -8,7 +8,7 @@ module Fog
         #
         # ==== Parameters
         # * queue_url<~String> - Url of queue for message to update
-        # * receipt_handle<~String> - Token from previous recieve message
+        # * receipt_handle<~String> - Token from previous receive message
         # * visibility_timeout<~Integer> - New visibility timeout in 0..43200
         #
         # ==== See Also

data/lib/fog/aws/requests/sqs/delete_message.rb

@@ -8,7 +8,7 @@ module Fog
         #
         # ==== Parameters
         # * queue_url<~String> - Url of queue to delete message from
-        # * receipt_handle<~String> - Token from previous recieve message
+        # * receipt_handle<~String> - Token from previous receive message
         #
         # ==== See Also
         # http://docs.amazonwebservices.com/AWSSimpleQueueService/latest/APIReference/Query_QueryDeleteMessage.html

data/lib/fog/aws/requests/storage/abort_multipart_upload.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AWS
+  module AWS
+    class Storage
       class Real
         #
         # Abort a multipart upload
@@ -25,7 +25,7 @@ module Fog
 
       class Mock # :nodoc:all
         require 'fog/aws/requests/storage/shared_mock_methods'
-        include Fog::Storage::AWS::SharedMockMethods
+        include Fog::AWS::Storage::SharedMockMethods
 
         def abort_multipart_upload(bucket_name, object_name, upload_id)
           verify_mock_bucket_exists(bucket_name)

data/lib/fog/aws/requests/storage/acl_utils.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AWS
+  module AWS
+    class Storage
       require 'fog/aws/parsers/storage/access_control_list'
 
       private
@@ -51,7 +51,7 @@ module Fog
         end
 
         def self.acl_to_hash(acl_xml)
-          parser = Fog::Parsers::Storage::AWS::AccessControlList.new
+          parser = Fog::Parsers::AWS::Storage::AccessControlList.new
           Nokogiri::XML::SAX::Parser.new(parser).parse(acl_xml)
           parser.response
         end

data/lib/fog/aws/requests/storage/complete_multipart_upload.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AWS
+  module AWS
+    class Storage
       class Real
         require 'fog/aws/parsers/storage/complete_multipart_upload'
 
@@ -40,7 +40,7 @@ module Fog
             :bucket_name => bucket_name,
             :object_name => object_name,
             :method     => 'POST',
-            :parser     => Fog::Parsers::Storage::AWS::CompleteMultipartUpload.new,
+            :parser     => Fog::Parsers::AWS::Storage::CompleteMultipartUpload.new,
             :query      => {'uploadId' => upload_id}
           })
         end
@@ -48,7 +48,7 @@ module Fog
 
       class Mock # :nodoc:all
         require 'fog/aws/requests/storage/shared_mock_methods'
-        include Fog::Storage::AWS::SharedMockMethods
+        include Fog::AWS::Storage::SharedMockMethods
 
         def complete_multipart_upload(bucket_name, object_name, upload_id, parts)
           bucket = verify_mock_bucket_exists(bucket_name)