fog 1.8.0 → 1.9.0

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

@@ -9,7 +9,7 @@ module Fog
             @block_device_mapping = {}
             @network_interface = {}
             @context = []
-            @contexts = ['blockDeviceMapping', 'groupSet', 'iamInstanceProfile', 'instancesSet', 'instanceState', 'networkInterfaceSet', 'placement', 'productCodes', 'stateReason', 'tagSet']
+            @contexts = ['blockDevices', 'blockDeviceMapping', 'groupSet', 'iamInstanceProfile', 'instancesSet', 'instanceState', 'networkInterfaceSet', 'placement', 'productCodes', 'stateReason', 'tagSet']
             @instance = { 'blockDeviceMapping' => [], 'networkInterfaces' => [], 'iamInstanceProfile' => {}, 'instanceState' => {}, 'monitoring' => {}, 'placement' => {}, 'productCodes' => [], 'stateReason' => {}, 'tagSet' => {} }
             @reservation = { 'groupIds' => [], 'groupSet' => [], 'instancesSet' => [] }
             @response = { 'reservationSet' => [] }
@@ -81,6 +81,8 @@ module Fog
               when 'tagSet'
                 @instance['tagSet'][@tag['key']] = @tag['value']
                 @tag = {}
+              when 'blockDevices'
+                # Ignore this one (Eucalyptus specific)
               when nil
                 @response['reservationSet'] << @reservation
                 @reservation = { 'groupIds' => [], 'groupSet' => [], 'instancesSet' => [] }
@@ -101,6 +103,11 @@ module Fog
               @instance['monitoring'][name] = (value == 'enabled')
             when 'ebsOptimized'
               @instance['ebsOptimized'] = (value == 'true')
+            # Eucalyptus passes status in schema non conforming way
+            when 'stateCode'
+              @instance['instanceState']['code'] = value
+            when 'stateName'
+              @instance['instanceState']['name'] = value
             end
           end
 

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

@@ -8,8 +8,8 @@ module Fog
           def reset
             @block_device_mapping = {}
             @context = []
-            @contexts = ['blockDeviceMapping', 'groupSet']
-            @spot_instance_request = { 'launchSpecification' => { 'blockDeviceMapping' => [], 'groupSet' => [] } }
+            @contexts = ['blockDeviceMapping', 'groupSet', 'iamInstanceProfile']
+            @spot_instance_request = { 'launchSpecification' => { 'iamInstanceProfile' => {}, 'blockDeviceMapping' => [], 'groupSet' => [] } }
             @response = { 'spotInstanceRequestSet' => [] }
           end
 
@@ -37,6 +37,8 @@ module Fog
               @block_device_mapping[name] = value
             when 'groupId'
               @spot_instance_request['launchSpecification']['groupSet'] << value
+            when 'arn', 'name'
+              @spot_instance_request['launchSpecification']['iamInstanceProfile'][name] = value
             when 'instanceId', 'launchedAvailabilityZone', 'productDescription', 'spotInstanceRequestId', 'state', 'type'
               @spot_instance_request[name] = value
             when 'item'
@@ -46,7 +48,7 @@ module Fog
                 @block_device_mapping = {}
               when nil
                 @response['spotInstanceRequestSet'] << @spot_instance_request
-                @spot_instance_request = { 'launchSpecification' => { 'blockDeviceMapping' => [], 'groupSet' => [] } }
+                @spot_instance_request = { 'launchSpecification' => { 'iamInstanceProfile' => {}, 'blockDeviceMapping' => [], 'groupSet' => [] } }
               end
             when 'imageId', 'instanceType', 'keyname', 'subnetId'
               @spot_instance_request['launchSpecification'][name] = value

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

@@ -0,0 +1,37 @@
+module Fog
+  module Parsers
+    module AWS
+      module Elasticache 
+
+        class DescribeReservedCacheNodes < Fog::Parsers::Base
+
+          def reset
+            @reserved_node = {}
+            @response = { 'ReservedCacheNodes' => [] }
+          end
+
+          def end_element(name)
+            case name
+            when 'ReservedCacheNodeId', 'ReservedCacheNodesOfferingId', 'CacheNodeType', 'ProductDescription', 'State'
+              @reserved_node[name] = @value
+            when 'Duration', 'CacheNodeCount'
+              @reserved_node[name] = @value.to_i
+            when 'FixedPrice', 'UsagePrice'
+              @reserved_node[name] = @value.to_f
+            when 'ReservedCacheNode'
+              @response['ReservedCacheNodes'] << @reserved_node
+              @reserved_node = {}
+            when 'Marker'
+              @response[name] = @value
+            when 'StartTime'
+              @reserved_node[name] = Time.parse(@value)
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end
+   

data/lib/fog/aws/parsers/storage/cors_configuration.rb

@@ -0,0 +1,41 @@
+module Fog
+  module Parsers
+    module Storage
+      module AWS
+
+        class CorsConfiguration < Fog::Parsers::Base
+          def reset
+            @in_cors_configuration_list = false
+            @cors_rule = {}
+            @response = { 'CORSConfiguration' => [] }
+          end
+
+          def start_element(name, attrs = [])
+            super
+            if name == 'CORSConfiguration'
+              @in_cors_configuration_list = true
+            end
+          end
+
+          def end_element(name)
+            case name
+            when 'CORSConfiguration'
+              @in_cors_configuration_list = false
+            when 'CORSRule'
+              @response['CORSConfiguration'] << @cors_rule
+              @cors_rule = {}
+            when 'MaxAgeSeconds'
+              @cors_rule[name] = value.to_i
+            when 'ID'
+              @cors_rule[name] = value
+            when 'AllowedOrigin', 'AllowedMethod', 'AllowedHeader', 'ExposeHeader'
+              (@cors_rule[name] ||= []) << value
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/storage/get_bucket_lifecycle.rb

@@ -6,26 +6,60 @@ module Fog
         class GetBucketLifecycle < Fog::Parsers::Base
 
           def reset
+            @expiration = {}
+            @transition = {}
             @rule = {}
             @response = { 'Rules' => [] }
           end
 
-          def end_element(name)
+          def start_element(name, attrs=[])
+            super
             case name
-            when 'ID', 'Prefix'
-              @rule[name] = value
-            when 'Status'
-              @rule['Enabled'] = value == 'Enabled'
-            when 'Days'
-              @rule[name] = value.to_i
-            when 'Rule'
-              @response['Rules'] << @rule
-              @rule = {}
+            when 'Expiration'
+              @in_expiration = true
+            when 'Transition'
+              @in_transition = true
             end
           end
 
+          def end_element(name)
+            if @in_expiration
+              case name
+              when 'Days'
+                @expiration[name] = value.to_i
+              when 'Date'
+                @expiration[name] = value
+              when 'Expiration'
+                @rule['Expiration'] = @expiration
+                @in_expiration = false
+                @expiration = {}
+              end
+            elsif @in_transition
+              case name
+              when 'StorageClass', 
+                @transition['StorageClass'] = value
+              when 'Date'
+                @transition[name] = value
+              when 'Days'
+                @transition[name] = value.to_i
+              when 'Transition'
+                @rule['Transition'] = @transition
+                @in_transition = false
+                @transition = {}
+              end
+            else
+              case name
+              when 'ID', 'Prefix'
+                @rule[name] = value
+              when 'Status'
+                @rule['Enabled'] = value == 'Enabled'
+              when 'Rule'
+                @response['Rules'] << @rule
+                @rule = {}
+              end 
+            end
+          end
         end
-
       end
     end
   end

data/lib/fog/aws/requests/auto_scaling/resume_processes.rb

@@ -40,7 +40,16 @@ module Fog
       class Mock
 
         def resume_processes(auto_scaling_group_name, options = {})
-          Fog::Mock.not_implemented
+          unless self.data[:auto_scaling_groups].has_key?(auto_scaling_group_name)
+            raise Fog::AWS::AutoScaling::ValidationError.new("AutoScalingGroup name not found - no such group: #{auto_scaling_group_name}")
+          end
+
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+            'ResponseMetadata' => { 'RequestId' => Fog::AWS::Mock.request_id }
+          }
+          response
         end
 
       end

data/lib/fog/aws/requests/auto_scaling/suspend_processes.rb

@@ -44,10 +44,15 @@ module Fog
 
         def suspend_processes(auto_scaling_group_name, options = {})
           unless self.data[:auto_scaling_groups].has_key?(auto_scaling_group_name)
-            raise Fog::AWS::AutoScaling::ValidationError.new('AutoScalingGroup name not found - null')
+            raise Fog::AWS::AutoScaling::ValidationError.new("AutoScalingGroup name not found - no such group: #{auto_scaling_group_name}")
           end
 
-          Fog::Mock.not_implemented
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+            'ResponseMetadata' => { 'RequestId' => Fog::AWS::Mock.request_id }
+          }
+          response
         end
 
       end

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

@@ -51,6 +51,23 @@ module Fog
             end
           end
 
+          num_tags = 0
+          if options['Tags']
+            options['Tags'].keys.each_with_index do |key, index|
+              index += 1 # tags are 1-indexed
+              num_tags += 1 # 10 tag max
+
+              params.merge!({
+                "Tags.member.#{index}.Key"   => key,
+                "Tags.member.#{index}.Value" => options['Tags'][key]
+              })
+            end
+          end
+
+          if num_tags > 10
+            raise ArgumentError.new("a maximum of 10 tags can be specified <#{num_tags}>")
+          end
+
           if options['TemplateBody']
             params['TemplateBody'] = options['TemplateBody']
           elsif options['TemplateURL']

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

@@ -33,6 +33,33 @@ module Fog
         end
 
       end
+
+      class Mock
+        def list_metrics(options={})
+          body = case options["NextToken"]
+                 when nil
+                   { "ListMetricsResult" => {
+                      "Metrics" => (0...500).map{ {} },
+                      "NextToken" => '1'
+                   }}
+                 when "1"
+                   { "ListMetricsResult" => {
+                      "Metrics" => (0...500).map{ {} },
+                      "NextToken" => '2'
+                   }}
+                 when "2"
+                   { "ListMetricsResult" => {
+                      "Metrics" => (0...1).map{ {} }
+                   }}
+                 end
+
+          Excon::Response.new.tap do |response|
+            response.body = body
+            response.status = 200
+          end
+        end
+      end
+
     end
   end
 end

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

@@ -0,0 +1,58 @@
+module Fog
+  module Compute
+    class AWS
+      class Real
+
+        require 'fog/aws/parsers/compute/copy_snapshot'
+
+        # Copy a snapshot to a different region
+        #
+        # ==== Parameters
+        # * source_snapshot_id<~String> - Id of snapshot
+        # * source_region<~String>      - Region to move it from
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'requestId'<~String> - id of request
+        #     * 'snapshotId'<~String> - id of snapshot
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-CopySnapshot.html]
+        def copy_snapshot(source_snapshot_id, source_region, description = nil)
+          request(
+            'Action'          => 'CopySnapshot',
+            'SourceSnapshotId'=> source_snapshot_id,
+            'SourceRegion'    => source_region,
+            'Description'     => description,
+            :parser       => Fog::Parsers::Compute::AWS::CopySnapshot.new
+          )
+        end
+
+      end
+
+      class Mock
+
+        #
+        # Usage
+        #
+        # AWS[:compute].copy_snapshot("snap-1db0a957", 'us-east-1')
+        #
+
+        def copy_snapshot(source_snapshot_id, source_region, description = nil)
+          response = Excon::Response.new
+          response.status = 200
+          snapshot_id = Fog::AWS::Mock.snapshot_id
+          data = {
+            'snapshotId'  => snapshot_id,
+          }
+          self.data[:snapshots][snapshot_id] = data
+          response.body = {
+            'requestId' => Fog::AWS::Mock.request_id
+          }.merge!(data)
+          response
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,42 @@
+module Fog
+  module AWS
+    class Elasticache 
+      class Real
+
+        require 'fog/aws/parsers/elasticache/describe_reserved_cache_nodes'
+
+        # Describe all or specified reserved Elasticache nodes
+        # http://docs.aws.amazon.com/AmazonElastiCache/latest/APIReference/API_DescribeReservedCacheNodes.html
+        # ==== Parameters
+        # * ReservedCacheNodeId <~String> - ID of node to retrieve information for. If absent, information for all nodes is returned.
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        def describe_reserved_cache_nodes(identifier=nil, opts={})
+          params = {}
+          params['ReservedCacheNodeId'] = identifier if identifier
+          if opts[:marker]
+            params['Marker'] = opts[:marker]
+          end
+          if opts[:max_records]
+            params['MaxRecords'] = opts[:max_records]
+          end
+          
+          request({
+            'Action'  => 'DescribeReservedCacheNodes',
+            :parser   => Fog::Parsers::AWS::Elasticache::DescribeReservedCacheNodes.new
+          }.merge(params))
+        end
+
+      end
+
+      class Mock
+
+        def describe_db_reserved_instances(identifier=nil, opts={})
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

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

@@ -2,16 +2,14 @@ module Fog
   module Storage
     class AWS
       class Real
-
+        # 
         # Abort a multipart upload
         #
-        # ==== Parameters
-        # * bucket_name<~String> - Name of bucket to abort multipart upload on
-        # * object_name<~String> - Name of object to abort multipart upload on
-        # * upload_id<~String> - Id of upload to add part to
+        # @param [String] bucket_name Name of bucket to abort multipart upload on
+        # @param [String] object_name Name of object to abort multipart upload on
+        # @param [String] upload_id Id of upload to add part to
         #
-        # ==== See Also
-        # http://docs.amazonwebservices.com/AmazonS3/latest/API/mpUploadAbort.html
+        # @see http://docs.amazonwebservices.com/AmazonS3/latest/API/mpUploadAbort.html
         #
         def abort_multipart_upload(bucket_name, object_name, upload_id)
           request({

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

@@ -7,23 +7,19 @@ module Fog
 
         # Complete a multipart upload
         #
-        # ==== Parameters
-        # * bucket_name<~String> - Name of bucket to complete multipart upload for
-        # * object_name<~String> - Name of object to complete multipart upload for
-        # * upload_id<~String> - Id of upload to add part to
-        # * parts<~Array>: Array of etags for parts
-        #   * :etag<~String> - Etag for this part
+        # @param [String] bucket_name Name of bucket to complete multipart upload for
+        # @param [String] object_name Name of object to complete multipart upload for
+        # @param [String] upload_id Id of upload to add part to
+        # @param [Array<String>] parts Array of etags as Strings for parts
         #
-        # ==== Returns
-        # * response<~Excon::Response>:
-        #   * headers<~Hash>:
-        #     * 'Bucket'<~String> - bucket of new object
-        #     * 'ETag'<~String> - etag of new object (will be needed to complete upload)
-        #     * 'Key'<~String> - key of new object
-        #     * 'Location'<~String> - location of new object
+        # @return [Excon::Response]
+        #   * headers [Hash]:
+        #     * Bucket [String] - bucket of new object
+        #     * ETag [String] - etag of new object (will be needed to complete upload)
+        #     * Key [String] - key of new object
+        #     * Location [String] - location of new object
         #
-        # ==== See Also
-        # http://docs.amazonwebservices.com/AmazonS3/latest/API/mpUploadComplete.html
+        # @see http://docs.amazonwebservices.com/AmazonS3/latest/API/mpUploadComplete.html
         #
         def complete_multipart_upload(bucket_name, object_name, upload_id, parts)
           data = "<CompleteMultipartUpload>"
@@ -49,4 +45,4 @@ module Fog
       end # Real
     end # Storage
   end # AWS
-end # Fog
+end # Fog