fog-aws 0.1.0 → 0.1.1

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

@@ -46,53 +46,67 @@ module Fog
           if name && id
             raise Fog::Compute::AWS::Error.new("May not specify both group_name and group_id")
           end
+
           if id
             name = self.data[:security_groups].reject { |k,v| v['groupId'] != id } .keys.first
           end
 
+          unless self.data[:security_groups][name]
+            raise Fog::Compute::AWS::NotFound.new("The security group '#{name}' does not exist")
+          end
+
           response = Excon::Response.new
-          if self.data[:security_groups][name]
 
-            used_by_groups = []
-            self.region_data.each do |access_key, key_data|
-              key_data[:security_groups].each do |group_name, group|
-                next if group == self.data[:security_groups][name]
+          used_by_groups = []
 
-                group['ipPermissions'].each do |group_ip_permission|
-                  group_ip_permission['groups'].each do |group_group_permission|
-                    if group_group_permission['groupName'] == name &&
-                        group_group_permission['userId'] == self.data[:owner_id]
-                      used_by_groups << "#{key_data[:owner_id]}:#{group_name}"
-                    end
+          # ec2 authorizations
+          self.region_data.each do |_, key_data|
+            key_data[:security_groups].each do |group_name, group|
+              next if group == self.data[:security_groups][name]
+
+              group['ipPermissions'].each do |group_ip_permission|
+                group_ip_permission['groups'].each do |group_group_permission|
+                  if group_group_permission['groupName'] == name &&
+                      group_group_permission['userId'] == self.data[:owner_id]
+                    used_by_groups << "#{key_data[:owner_id]}:#{group_name}"
                   end
                 end
               end
             end
+          end
 
-            active_instances = self.data[:instances].values.select do |instance|
-              if instance['groupSet'].include?(name) && instance['instanceState'] != "terminated"
-                instance
+          # rds authorizations
+          Fog::AWS::RDS::Mock.data[self.region].each do |_, data|
+            (data[:security_groups] || []).each do |group_name, group|
+              (group["EC2SecurityGroups"] || []).each do |ec2_group|
+                if ec2_group["EC2SecurityGroupName"] == name
+                  used_by_groups << "#{group["OwnerId"]}:#{group_name}"
+                end
               end
             end
+          end
 
-            unless used_by_groups.empty?
-              raise Fog::Compute::AWS::Error.new("InvalidGroup.InUse => Group #{self.data[:owner_id]}:#{name} is used by groups: #{used_by_groups.uniq.join(" ")}")
+          active_instances = self.data[:instances].values.select do |instance|
+            if instance['groupSet'].include?(name) && instance['instanceState'] != "terminated"
+              instance
             end
+          end
 
-            if active_instances.any?
-              raise Fog::Compute::AWS::Error.new("InUse => There are active instances using security group '#{name}'")
-            end
+          unless used_by_groups.empty?
+            raise Fog::Compute::AWS::Error.new("InvalidGroup.InUse => Group #{self.data[:owner_id]}:#{name} is used by groups: #{used_by_groups.uniq.join(" ")}")
+          end
 
-            self.data[:security_groups].delete(name)
-            response.status = 200
-            response.body = {
-              'requestId' => Fog::AWS::Mock.request_id,
-              'return'    => true
-            }
-            response
-          else
-            raise Fog::Compute::AWS::NotFound.new("The security group '#{name}' does not exist")
+          if active_instances.any?
+            raise Fog::Compute::AWS::Error.new("InUse => There are active instances using security group '#{name}'")
           end
+
+          self.data[:security_groups].delete(name)
+          response.status = 200
+          response.body = {
+            'requestId' => Fog::AWS::Mock.request_id,
+            'return'    => true
+          }
+          response
         end
       end
     end

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

@@ -155,20 +155,25 @@ module Fog
           response = Excon::Response.new
           errors   = []
 
+
           if (zone = self.data[:zones][zone_id])
             response.status = 200
 
             change_id = Fog::AWS::Mock.change_id
             change_batch.each do |change|
+
+              change_name = change[:name]
+              change_name = change_name + "." unless change_name.end_with?(".")
+
               case change[:action]
               when "CREATE"
                 if zone[:records][change[:type]].nil?
                   zone[:records][change[:type]] = {}
                 end
 
-                if zone[:records][change[:type]][change[:name]].nil?
+                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]
@@ -178,17 +183,17 @@ module Fog
                       :ttl => change[:ttl].to_s,
                     }
                   end
-                  zone[:records][change[:type]][change[:name]] = {
-                    :change_id => change_id,
+                  zone[:records][change[:type]][change_name] = {
+                    :change_id        => change_id,
                     :resource_records => change[:resource_records] || [],
-                    :name => change[:name],
-                    :type => change[:type]
+                    :name             => change_name,
+                    :type             => change[:type]
                   }.merge(record)
                 else
                   errors << "Tried to create resource record set #{change[:name]}. type #{change[:type]}, but it already exists"
                 end
               when "DELETE"
-                if zone[:records][change[:type]].nil? || zone[:records][change[:type]].delete(change[:name]).nil?
+                if zone[:records][change[:type]].nil? || zone[:records][change[:type]].delete(change_name).nil?
                   errors << "Tried to delete resource record set #{change[:name]}. type #{change[:type]}, but it was not found"
                 end
               end
@@ -196,35 +201,30 @@ module Fog
 
             if errors.empty?
               change = {
-                :id => change_id,
-                :status => 'PENDING',
+                :id           => change_id,
+                :status       => 'PENDING',
                 :submitted_at => Time.now.utc.iso8601
               }
               self.data[:changes][change[:id]] = change
               response.body = {
-                'Id' => change[:id],
-                'Status' => change[:status],
+                'Id'          => change[:id],
+                'Status'      => change[:status],
                 'SubmittedAt' => change[:submitted_at]
               }
               response
             else
-              response.status = 400
-              response.body = "<?xml version=\"1.0\"?><InvalidChangeBatch xmlns=\"https://route53.amazonaws.com/doc/2012-02-29/\"><Messages>#{errors.map {|e| "<Message>#{e}</Message>"}.join()}</Messages></InvalidChangeBatch>"
-              raise(Excon::Errors.status_error({:expects => 200}, response))
+              raise Fog::DNS::AWS::Error.new("InvalidChangeBatch => #{errors.join(", ")}")
             end
           else
-            response.status = 404
-            response.body = "<?xml version=\"1.0\"?><Response><Errors><Error><Code>NoSuchHostedZone</Code><Message>A hosted zone with the specified hosted zone ID does not exist.</Message></Error></Errors><RequestID>#{Fog::AWS::Mock.request_id}</RequestID></Response>"
-            raise(Excon::Errors.status_error({:expects => 200}, response))
+            raise Fog::DNS::AWS::NotFound.new("NoSuchHostedZone => A hosted zone with the specified hosted zone ID does not exist.")
           end
         end
       end
 
       def self.hosted_zone_for_alias_target(dns_name)
-        k = elb_hosted_zone_mapping.keys.find do |k|
+        elb_hosted_zone_mapping.select { |k, _|
           dns_name =~ /\A.+\.#{k}\.elb\.amazonaws\.com\.?\z/
-        end
-        elb_hosted_zone_mapping[k]
+        }.last
       end
 
       def self.elb_hosted_zone_mapping

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

@@ -97,9 +97,7 @@ module Fog
             }
             response
           else
-            response.status = 400
-            response.body = "<?xml version=\"1.0\"?><Response><Errors><Error><Code>DelegationSetNotAvailable</Code><Message>Amazon Route 53 allows some duplication, but Amazon Route 53 has a maximum threshold of duplicated domains. This error is generated when you reach that threshold. In this case, the error indicates that too many hosted zones with the given domain name exist. If you want to create a hosted zone and Amazon Route 53 generates this error, contact Customer Support.</Message></Error></Errors><RequestID>#{Fog::AWS::Mock.request_id}</RequestID></Response>"
-            raise(Excon::Errors.status_error({:expects => 200}, response))
+            raise Fog::DNS::AWS::Error.new("DelegationSetNotAvailable => Amazon Route 53 allows some duplication, but Amazon Route 53 has a maximum threshold of duplicated domains. This error is generated when you reach that threshold. In this case, the error indicates that too many hosted zones with the given domain name exist. If you want to create a hosted zone and Amazon Route 53 generates this error, contact Customer Support.")
           end
         end
       end

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

@@ -36,14 +36,17 @@ module Fog
 
         def delete_hosted_zone(zone_id)
           response = Excon::Response.new
-          key = [zone_id, "/hostedzone/#{zone_id}"].find{|k| !self.data[:zones][k].nil?}
-          if key
+          key = [zone_id, "/hostedzone/#{zone_id}"].find { |k| !self.data[:zones][k].nil? } ||
+            raise(Fog::DNS::AWS::NotFound.new("NoSuchHostedZone => A hosted zone with the specified hosted zone does not exist."))
+
             change = {
               :id => Fog::AWS::Mock.change_id,
               :status => 'INSYNC',
               :submitted_at => Time.now.utc.iso8601
             }
+
             self.data[:changes][change[:id]] = change
+
             response.status = 200
             response.body = {
               'ChangeInfo' => {
@@ -54,11 +57,6 @@ module Fog
             }
             self.data[:zones].delete(key)
             response
-          else
-            response.status = 404
-            response.body = "<?xml version=\"1.0\"?><ErrorResponse xmlns=\"https://route53.amazonaws.com/doc/2012-02-29/\"><Error><Type>Sender</Type><Code>NoSuchHostedZone</Code><Message>The specified hosted zone does not exist.</Message></Error><RequestId>#{Fog::AWS::Mock.request_id}</RequestId></ErrorResponse>"
-            raise(Excon::Errors.status_error({:expects => 200}, response))
-          end
         end
       end
     end

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

@@ -35,23 +35,18 @@ module Fog
           response = Excon::Response.new
           # find the record with matching change_id
           # records = data[:zones].values.map{|z| z[:records].values.map{|r| r.values}}.flatten
-          change = self.data[:changes][change_id]
+          change = self.data[:changes][change_id] ||
+            raise(Fog::DNS::AWS::NotFound.new("NoSuchChange => Could not find resource with ID: #{change_id}"))
 
-          if change
-            response.status = 200
-            submitted_at = Time.parse(change[:submitted_at])
-            response.body = {
-              'Id' => change[:id],
-              # set as insync after some time
-              'Status' => (submitted_at + Fog::Mock.delay) < Time.now ? 'INSYNC' : change[:status],
-              'SubmittedAt' => change[:submitted_at]
-            }
-            response
-          else
-            response.status = 404
-            response.body = "<?xml version=\"1.0\"?><ErrorResponse xmlns=\"https://route53.amazonaws.com/doc/2012-02-29/\"><Error><Type>Sender</Type><Code>NoSuchChange</Code><Message>Could not find resource with ID: #{change_id}</Message></Error><RequestId>#{Fog::AWS::Mock.request_id}</RequestId></ErrorResponse>"
-            raise(Excon::Errors.status_error({:expects => 200}, response))
-          end
+          response.status = 200
+          submitted_at = Time.parse(change[:submitted_at])
+          response.body = {
+            'Id' => change[:id],
+            # set as insync after some time
+            'Status' => (submitted_at + Fog::Mock.delay) < Time.now ? 'INSYNC' : change[:status],
+            'SubmittedAt' => change[:submitted_at]
+          }
+          response
         end
       end
     end

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

@@ -51,9 +51,7 @@ module Fog
             }
             response
           else
-            response.status = 404
-            response.body = "<?xml version=\"1.0\"?><ErrorResponse xmlns=\"https://route53.amazonaws.com/doc/2012-02-29/\"><Error><Type>Sender</Type><Code>NoSuchHostedZone</Code><Message>The specified hosted zone does not exist.</Message></Error><RequestId>#{Fog::AWS::Mock.request_id}</RequestId></ErrorResponse>"
-            raise(Excon::Errors.status_error({:expects => 200}, response))
+            raise Fog::DNS::AWS::NotFound.new("NoSuchHostedZone => A hosted zone with the specified hosted zone ID does not exist.")
           end
         end
       end

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

@@ -64,19 +64,15 @@ module Fog
 
           response = Excon::Response.new
 
-          zone = self.data[:zones][zone_id]
-          if zone.nil?
-            response.status = 404
-            response.body = "<?xml version=\"1.0\"?>\n<ErrorResponse xmlns=\"https://route53.amazonaws.com/doc/2012-02-29/\"><Error><Type>Sender</Type><Code>NoSuchHostedZone</Code><Message>No hosted zone found with ID: #{zone_id}</Message></Error><RequestId>#{Fog::AWS::Mock.request_id}</RequestId></ErrorResponse>"
-            raise(Excon::Errors.status_error({:expects => 200}, response))
-          end
+          zone = self.data[:zones][zone_id] ||
+            raise(Fog::DNS::AWS::NotFound.new("NoSuchHostedZone => A hosted zone with the specified hosted zone ID does not exist."))
 
           records = if options[:type]
-            records_type = zone[:records][options[:type]]
-            records_type.values if records_type
-          else
-            zone[:records].values.map{|r| r.values}.flatten
-          end
+                      records_type = zone[:records][options[:type]]
+                      records_type.values if records_type
+                    else
+                      zone[:records].values.map{|r| r.values}.flatten
+                    end
 
           records ||= []
 
@@ -86,7 +82,6 @@ module Fog
           if options[:name]
             name = options[:name].gsub(zone[:name],"")
             records = records.select{|r| r[:name].gsub(zone[:name],"") >= name }
-            require 'pp'
           end
 
           next_record  = records[maxitems]

data/lib/fog/aws/requests/dynamodb/scan.rb

@@ -13,7 +13,8 @@ module Fog
         #   * 'Limit'<~Integer> - limit of total items to return
         #   * 'ScanFilter'<~Hash>: value to compare against
         #     * attribute_name<~Hash>:
-        #       * 'AttributeValueList'<~Hash>: one or more values to compare against
+        #       * 'AttributeValueList'<~Array>: one or more values to compare against
+        #         * 'AttributeValue'<~Hash> - formated as {type => value}
         #       * 'ComparisonOperator'<~String>: comparison operator to use with attribute value list, in %w{BETWEEN BEGINS_WITH EQ LE LT GE GT}
         #   * 'ScanIndexForward'<~Boolean>: Whether to scan from start or end of index, defaults to start
         #   * 'ExclusiveStartKey'<~Hash>: Key to start listing from, can be taken from LastEvaluatedKey in response

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

@@ -0,0 +1,32 @@
+module Fog
+  module AWS
+    class IAM
+      class Real
+        require 'fog/aws/parsers/iam/basic'
+
+        # Attaches a managed policy to a group
+        #
+        # ==== Parameters
+        # * group_name<~String>: name of the group
+        # * policy_arn<~String>: arn of the managed policy
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'RequestId'<~String> - Id of the request
+        #
+        # ==== See Also
+        # http://docs.aws.amazon.com/IAM/latest/APIReference/API_AttachGroupPolicy.html
+        #
+        def attach_group_policy(group_name, policy_arn)
+          request(
+            'Action'          => 'AttachGroupPolicy',
+            'GroupName'       => group_name,
+            'PolicyArn'      => policy_arn,
+            :parser           => Fog::Parsers::AWS::IAM::Basic.new
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,32 @@
+module Fog
+  module AWS
+    class IAM
+      class Real
+        require 'fog/aws/parsers/iam/basic'
+
+        # Attaches a managed policy to a role
+        #
+        # ==== Parameters
+        # * role_name<~String>: name of the role
+        # * policy_arn<~String>: arn of the managed policy
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'RequestId'<~String> - Id of the request
+        #
+        # ==== See Also
+        # http://docs.aws.amazon.com/IAM/latest/APIReference/API_AttachRolePolicy.html
+        #
+        def attach_role_policy(role_name, policy_arn)
+          request(
+            'Action'          => 'AttachRolePolicy',
+            'RoleName'       => role_name,
+            'PolicyArn'      => policy_arn,
+            :parser           => Fog::Parsers::AWS::IAM::Basic.new
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,32 @@
+module Fog
+  module AWS
+    class IAM
+      class Real
+        require 'fog/aws/parsers/iam/basic'
+
+        # Attaches a managed policy to a user
+        #
+        # ==== Parameters
+        # * user_name<~String>: name of the user
+        # * policy_arn<~String>: arn of the managed policy
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'RequestId'<~String> - Id of the request
+        #
+        # ==== See Also
+        # http://docs.aws.amazon.com/IAM/latest/APIReference/API_AttachUserPolicy.html
+        #
+        def attach_user_policy(user_name, policy_arn)
+          request(
+            'Action'          => 'AttachUserPolicy',
+            'UserName'       => user_name,
+            'PolicyArn'      => policy_arn,
+            :parser           => Fog::Parsers::AWS::IAM::Basic.new
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,47 @@
+module Fog
+  module AWS
+    class IAM
+      class Real
+        require 'fog/aws/parsers/iam/single_policy'
+
+        # Creates a managed policy
+        #
+        # ==== Parameters
+        # * policy_name<~String>: name of policy document
+        # * policy_document<~Hash>: policy document, see: http://docs.amazonwebservices.com/IAM/latest/UserGuide/PoliciesOverview.html
+        # * path <~String>: path of the policy
+        # * description <~String>: description for the policy
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'RequestId'<~String> - Id of the request
+        #     * 'Policy'<~Hash>:
+        #       * Arn
+        #       * AttachmentCount
+        #       * CreateDate
+        #       * DefaultVersionId
+        #       * Description
+        #       * IsAttachable
+        #       * Path
+        #       * PolicyId
+        #       * PolicyName
+        #       * UpdateDate
+        # ==== See Also
+        # http://docs.aws.amazon.com/IAM/latest/APIReference/API_CreatePolicy.html
+        #
+        def create_policy(policy_name, policy_document, path=nil, description=nil)
+          request({
+            'Action'          => 'CreatePolicy',
+            'PolicyName'      => policy_name,
+            'PolicyDocument'  => Fog::JSON.encode(policy_document),
+            'Path'            => path,
+            'Description'     => description,  
+            :parser           => Fog::Parsers::AWS::IAM::SinglePolicy.new
+          }.reject {|_, value| value.nil?})
+        end
+      end
+
+      
+    end
+  end
+end