fog 1.11.1 → 1.12.0

data/lib/fog/aws/models/iam/roles.rb

@@ -0,0 +1,40 @@
+require 'fog/core/collection'
+require 'fog/aws/models/iam/role'
+
+module Fog
+  module AWS
+    class IAM
+
+      class Roles < Fog::Collection
+
+        model Fog::AWS::IAM::Role
+
+        def initialize(attributes = {})
+          super
+        end
+
+        def all
+          data = service.list_roles.body['Roles']
+          load(data)
+        end
+
+        def get(identity)
+          role = nil
+          begin
+            role = service.roles.new( service.get_role( identity ).data[:body]["Role"] )
+          rescue Excon::Errors::NotFound # ignore not found error
+          end
+          role
+        end
+
+        def new(attributes = {})
+          if not attributes.has_key?(:assume_role_policy_document)
+            attributes[:assume_role_policy_document] = Fog::AWS::IAM::EC2_ASSUME_ROLE_POLICY.to_s
+          end
+          super
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/models/rds/snapshots.rb

@@ -21,10 +21,26 @@ module Fog
           super
         end
 
+        # This will return a single page based on the current or provided filters,
+        # updating the filters with the marker for the next page.  Calling this repeatedly
+        # will iterate through pages.
         def all(filters = filters)
-          self.filters = filters
-          data = service.describe_db_snapshots(filters).body['DescribeDBSnapshotsResult']['DBSnapshots']
-          load(data) # data is an array of attribute hashes
+          self.filters.merge!(filters)
+
+          snapshots = service.describe_db_snapshots(filters)
+          self.filters[:marker] = snapshots.body['DescribeDBSnapshotsResult']['Marker']
+          data = snapshots.body['DescribeDBSnapshotsResult']['DBSnapshots']
+          load(data)
+        end
+
+        # This will execute a block for each snapshot, fetching new pages of snapshots as required.
+        def each(filters = filters)
+          begin
+            page = self.all(filters)
+            # We need to explicitly use the base 'each' method here on the page, otherwise we get infinite recursion
+            base_each = Fog::Collection.instance_method(:each)
+            base_each.bind(page).call {|snapshot| yield snapshot}
+          end while self.filters[:marker]
         end
 
         def get(identity)

data/lib/fog/aws/models/storage/file.rb

@@ -178,7 +178,7 @@ module Fog
         # 
         # @param [Hash] options  
         # @option options [String] acl sets x-amz-acl HTTP header. Valid values include, private | public-read | public-read-write | authenticated-read | bucket-owner-read | bucket-owner-full-control
-        # @option options [String] cache_controle sets Cache-Control header. For example, 'No-cache'
+        # @option options [String] cache_control sets Cache-Control header. For example, 'No-cache'
         # @option options [String] content_disposition sets Content-Disposition HTTP header. For exampple, 'attachment; filename=testing.txt'
         # @option options [String] content_encoding sets Content-Encoding HTTP header. For example, 'x-gzip'
         # @option options [String] content_md5 sets Content-MD5. For example, '79054025255fb1a26e4bc422aef54eb4'

data/lib/fog/aws/models/storage/files.rb

@@ -68,7 +68,7 @@ module Fog
           })
           new(file_data)
         rescue Excon::Errors::NotFound => error
-          case error.message
+          case error.response.body
           when /<Code>NoSuchKey<\/Code>/
             nil
           when /<Code>NoSuchBucket<\/Code>/

data/lib/fog/aws/parsers/cloud_formation/list_stack_resources.rb

@@ -0,0 +1,32 @@
+module Fog
+  module Parsers
+    module AWS
+      module CloudFormation
+
+        class ListStackResources < Fog::Parsers::Base
+
+          def reset
+            @resource = {}
+            @response = { 'StackResourceSummaries' => [] }
+          end
+
+          def end_element(name)
+            case name
+            when 'ResourceStatus', 'LogicalResourceId', 'PhysicalResourceId', 'ResourceType'
+              @resource[name] = value
+            when 'member'
+              @response['StackResourceSummaries'] << @resource
+              @resource = {}
+            when 'LastUpdatedTimestamp'
+              @resource[name] = Time.parse(value)
+            when 'RequestId'
+              @response[name] = value
+            when 'NextToken'
+              @response[name] = value
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/cloud_formation/list_stacks.rb

@@ -0,0 +1,34 @@
+module Fog
+  module Parsers
+    module AWS
+      module CloudFormation
+
+        class ListStacks < Fog::Parsers::Base
+
+          def reset
+            @stack = {}
+            @response = { 'StackSummaries' => [] }
+          end
+
+          def end_element(name)
+            case name
+            when 'StackId', 'StackStatus', 'StackName', 'TemplateDescription'
+              @stack[name] = value
+            when 'member'
+              @response['StackSummaries'] << @stack
+              @stack = {}
+            when 'RequestId'
+              @response[name] = value
+            when 'CreationTime'
+              @stack[name] = Time.parse(value)
+            when 'DeletionTime'
+              @stack[name] = Time.parse(value)
+            when 'NextToken'
+              @response[name] = value
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+module Fog
+  module Parsers
+    module Compute
+      module AWS
+
+        class CopyImage < Fog::Parsers::Base
+
+          def end_element(name)
+            case name
+            when 'imageId'
+              @response[name] = value
+            when 'requestId'
+              @response[name] = value
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

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

@@ -31,10 +31,11 @@ module Fog
               @instance[@context.last][name] = value
             when 'availabilityZone', 'tenancy'
               @instance['placement'][name] = value
-            when 'architecture', 'clientToken', 'dnsName', 'imageId',
-                  'instanceId', 'instanceType', 'ipAddress', 'kernelId',
-                  'keyName', 'platform', 'privateDnsName', 'privateIpAddress', 'ramdiskId',
-                  'reason', 'rootDeviceType', 'virtualizationType'
+            when 'architecture', 'clientToken', 'dnsName', 'hypervisor', 'imageId',
+                  'instanceId', 'instanceType', 'ipAddress', 'kernelId', 'keyName',
+                  'instanceLifecycle', 'platform', 'privateDnsName', 'privateIpAddress', 'ramdiskId',
+                  'reason', 'requesterId', 'rootDeviceType', 
+                  'spotInstanceRequestId', 'virtualizationType'
               @instance[name] = value
             when 'attachTime'
               @block_device_mapping[name] = Time.parse(value)
@@ -103,6 +104,12 @@ module Fog
               @instance['monitoring'][name] = (value == 'enabled')
             when 'ebsOptimized'
               @instance['ebsOptimized'] = (value == 'true')
+            when 'sourceDestCheck'
+              if value == 'true'
+                @instance[name] = true
+              else
+                @instance[name] = false
+              end
             # Eucalyptus passes status in schema non conforming way
             when 'stateCode'
               @instance['instanceState']['code'] = value

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

@@ -24,10 +24,11 @@ module Fog
             case name
             when 'amiLaunchIndex'
               @instance[name] = value.to_i
-            when 'architecture', 'clientToken', 'dnsName', 'imageId',
-                  'instanceId', 'instanceType', 'ipAddress', 'kernelId',
-                  'keyName', 'privateDnsName', 'privateIpAddress', 'ramdiskId',
-                  'reason', 'rootDeviceType'
+            when 'architecture', 'clientToken', 'dnsName', 'hypervisor', 'imageId',
+                  'instanceId', 'instanceType', 'ipAddress', 'kernelId', 'keyName',
+                  'instanceLifecycle', 'privateDnsName', 'privateIpAddress', 'ramdiskId',
+                  'reason', 'requesterId', 'rootDeviceType', 'sourceDestCheck',
+                  'spotInstanceRequestId', 'virtualizationType'
               @instance[name] = value
             when 'availabilityZone', 'tenancy'
               @instance['placement'][name] = value

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

@@ -23,6 +23,8 @@ module Fog
                 @response['HostedZone'] = @hosted_zone
                 @hosted_zone = {}
                 @section = :name_servers
+              when 'ResourceRecordSetCount'
+                @response['ResourceRecordSetCount'] = value.to_i
               end
             elsif @section == :name_servers
               case name

data/lib/fog/aws/rds.rb

@@ -206,7 +206,7 @@ module Fog
               :parser     => parser
             })
           rescue Excon::Errors::HTTPStatusError => error
-            if match = error.message.match(/(?:.*<Code>(.*)<\/Code>)(?:.*<Message>(.*)<\/Message>)/m)
+            if match = error.response.body.match(/(?:.*<Code>(.*)<\/Code>)(?:.*<Message>(.*)<\/Message>)/m)
               case match[1].split('.').last
               when 'DBInstanceNotFound', 'DBParameterGroupNotFound', 'DBSnapshotNotFound', 'DBSecurityGroupNotFound'
                 raise Fog::AWS::RDS::NotFound.slurp(error, match[2])

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

@@ -0,0 +1,36 @@
+module Fog
+  module AWS
+    class CloudFormation
+      class Real
+
+        require 'fog/aws/parsers/cloud_formation/list_stack_resources'
+
+        # List stack resources.
+        # 
+        # @param options [Hash]
+        # @option options StackName [String] Name of the stack to describe.
+        #
+        # @return [Excon::Response]
+        #   * body [Hash]:
+        #     * StackResourceSummaries [Array] - Matching stacks
+        #       * resources [Hash]:
+        #         * ResourceStatus [String] -
+        #         * LogicalResourceId [String] -
+        #         * PhysicalResourceId [String] -
+        #         * ResourceType [String] -
+        #         * LastUpdatedTimestamp [Time] -
+        #
+        #
+        # @see http://docs.aws.amazon.com/AWSCloudFormation/latest/APIReference/API_ListStacks.html
+        
+        def list_stack_resources(options = {})
+          request({
+            'Action'    => 'ListStackResources',
+            :parser     => Fog::Parsers::AWS::CloudFormation::ListStackResources.new
+          }.merge!(options))
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,37 @@
+module Fog
+  module AWS
+    class CloudFormation
+      class Real
+
+        require 'fog/aws/parsers/cloud_formation/list_stacks'
+
+        # List stacks.
+        # 
+        # @param options [Hash]
+        #
+        # @return [Excon::Response]
+        #   * body [Hash]:
+        #     * StackSummaries [Array] - Matching stacks
+        #       * stack [Hash]:
+        #         * StackId [String] -
+        #         * StackName [String] -
+        #         * TemplateDescription [String] -
+        #         * CreationTime [Time] -
+        #         * DeletionTime [Time] -
+        #         * StackStatus [String] -
+        #         * DeletionTime [String] -
+        #
+        #
+        # @see http://docs.aws.amazon.com/AWSCloudFormation/latest/APIReference/API_ListStacks.html
+        
+        def list_stacks(options = {})
+          request({
+            'Action'    => 'ListStacks',
+            :parser     => Fog::Parsers::AWS::CloudFormation::ListStacks.new
+          }.merge!(options))
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,63 @@
+module Fog
+  module Compute
+    class AWS
+      class Real
+
+        require 'fog/aws/parsers/compute/copy_image'
+
+        # Copy an image to a different region
+        #
+        # ==== Parameters
+        # * source_image_id<~String>    - The ID of the AMI to copy
+        # * source_region<~String>      - The name of the AWS region that contains the AMI to be copied
+        # * name<~String>               - The name of the new AMI in the destination region
+        # * description<~String>        - The description to set on the new AMI in the destination region
+        # * client_token<~String>       - Unique, case-sensitive identifier you provide to ensure idempotency of the request
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'requestId'<~String> - id of request
+        #     * 'imageId'<~String> - id of image
+        #
+        # {Amazon API Reference}[http://docs.aws.amazon.com/AWSEC2/latest/CommandLineReference/ApiReference-cmd-CopyImage.html]
+        def copy_image(source_image_id, source_region, name = nil, description = nil, client_token = nil)
+          request(
+            'Action'          => 'CopyImage',
+            'SourceImageId'   => source_image_id,
+            'SourceRegion'    => source_region,
+            'Name'            => source_region,
+            'Description'     => description,
+            'ClientToken'     => client_token,
+            :parser           => Fog::Parsers::Compute::AWS::CopyImage.new
+          )
+        end
+
+      end
+
+      class Mock
+
+        #
+        # Usage
+        #
+        # AWS[:compute].copy_image("ami-1aad5273", 'us-east-1')
+        #
+
+        def copy_image(source_image_id, source_region, name = nil, description = nil, client_token = nil)
+          response = Excon::Response.new
+          response.status = 200
+          image_id = Fog::AWS::Mock.image_id
+          data = {
+            'imageId'  => image_id,
+          }
+          self.data[:images][image_id] = data
+          response.body = {
+            'requestId' => Fog::AWS::Mock.request_id
+          }.merge!(data)
+          response
+        end
+
+      end
+    end
+  end
+end

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

@@ -212,7 +212,7 @@ module Fog
                 'ownerId'       => instance['ownerId'],
                 'reservationId' => instance['reservationId']
               }
-              reservation_set[instance['reservationId']]['instancesSet'] << instance.reject{|key,value| !['amiLaunchIndex', 'architecture', 'blockDeviceMapping', 'clientToken', 'dnsName', 'ebsOptimized', 'iamInstanceProfile', 'imageId', 'instanceId', 'instanceState', 'instanceType', 'ipAddress', 'kernelId', 'keyName', 'launchTime', 'monitoring', 'networkInterfaces', 'ownerId', 'placement', 'platform', 'privateDnsName', 'privateIpAddress', 'productCodes', 'ramdiskId', 'reason', 'rootDeviceType', 'stateReason'].include?(key)}.merge('tagSet' => self.data[:tag_sets][instance['instanceId']])
+              reservation_set[instance['reservationId']]['instancesSet'] << instance.reject{|key,value| !['amiLaunchIndex', 'architecture', 'blockDeviceMapping', 'clientToken', 'dnsName', 'ebsOptimized', 'hypervisor', 'iamInstanceProfile', 'imageId', 'instanceId', 'instanceState', 'instanceType', 'ipAddress', 'kernelId', 'keyName', 'launchTime', 'monitoring', 'networkInterfaces', 'ownerId', 'placement', 'platform', 'privateDnsName', 'privateIpAddress', 'productCodes', 'ramdiskId', 'reason', 'rootDeviceType', 'stateReason', 'virtualizationType'].include?(key)}.merge('tagSet' => self.data[:tag_sets][instance['instanceId']])
             end
           end
 

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

@@ -143,6 +143,8 @@ module Fog
               'blockDeviceMapping'  => [],
               'clientToken'         => options['clientToken'],
               'dnsName'             => nil,
+              'ebsOptimized'        => options['EbsOptimized'] || false,
+              'hypervisor'          => 'xen',
               'imageId'             => image_id,
               'instanceId'          => instance_id,
               'instanceState'       => { 'code' => 0, 'name' => 'pending' },
@@ -156,7 +158,7 @@ module Fog
               'productCodes'        => [],
               'reason'              => nil,
               'rootDeviceType'      => 'instance-store',
-              'ebsOptimized'        => options['EbsOptimized'] || false
+              'virtualizationType'  => 'paravirtual'
             }
             instances_set << instance
             self.data[:instances][instance_id] = instance.merge({

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

@@ -0,0 +1,54 @@
+module Fog
+  module Storage
+    class AWS
+      class Real
+
+        # Restore an object from Glacier to its original S3 path
+        #
+        # @param bucket_name [String] Name of bucket containing object
+        # @param object_name [String] Name of object to restore
+        # @option days [Integer] Number of days to restore object for. Defaults to 100000 (a very long time)
+        #
+        # @return [Excon::Response] response:
+        #   * status [Integer] 200 (OK) Object is previously restored
+        #   * status [Integer] 202 (Accepted) Object is not previously restored
+        #   * status [Integer] 409 (Conflict) Restore is already in progress
+        #
+        # @see http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectPOSTrestore.html
+        #
+        def post_object_restore(bucket_name, object_name, days = 100000)
+          raise ArgumentError.new('bucket_name is required') unless bucket_name
+          raise ArgumentError.new('object_name is required') unless object_name
+
+          data = '<RestoreRequest xmlns="http://s3.amazonaws.com/doc/2006-3-01"><Days>' + days.to_s + '</Days></RestoreRequest>'
+
+          headers = {}
+          headers['Content-MD5'] = Base64.encode64(Digest::MD5.digest(data)).strip
+          headers['Content-Type'] = 'application/xml'
+          headers['Date'] = Fog::Time.now.to_date_header
+
+          request({
+            :headers  => headers,
+            :host     => "#{bucket_name}.#{@host}",
+            :expects  => [200, 202, 409],
+            :body     => data,
+            :method   => 'POST',
+            :query    => {'restore' => nil},
+            :path     => CGI.escape(object_name)
+          })
+        end
+
+      end
+
+      class Mock # :nodoc:all
+
+        def post_object_restore(bucket_name, object_name, days = 100000)
+          response = get_object(bucket_name, object_name)
+          response.body = nil
+          response
+        end
+
+      end
+    end
+  end
+end