fog-maestrodev 1.7.0.20121114190951 → 1.8.0.20130109172219

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

@@ -60,7 +60,7 @@ module Fog
 
         def get(key, options = {}, &block)
           requires :directory
-          data = connection.get_object(directory.key, key, options, &block)
+          data = service.get_object(directory.key, key, options, &block)
           file_data = data.headers.merge({
             :body => data.body,
             :key  => key
@@ -80,22 +80,22 @@ module Fog
 
         def get_url(key, expires, options = {})
           requires :directory
-          connection.get_object_url(directory.key, key, expires, options)
+          service.get_object_url(directory.key, key, expires, options)
         end
 
         def get_http_url(key, expires, options = {})
           requires :directory
-          connection.get_object_http_url(directory.key, key, expires, options)
+          service.get_object_http_url(directory.key, key, expires, options)
         end
 
         def get_https_url(key, expires, options = {})
           requires :directory
-          connection.get_object_https_url(directory.key, key, expires, options)
+          service.get_object_https_url(directory.key, key, expires, options)
         end
 
         def head(key, options = {})
           requires :directory
-          data = connection.head_object(directory.key, key, options)
+          data = service.head_object(directory.key, key, options)
           file_data = data.headers.merge({
             :key => key
           })

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

@@ -24,9 +24,9 @@ module Fog
 
         def destroy
           if collection.file
-            collection.connection.delete_object(collection.file.directory.key, key, 'versionId' => version)
+            collection.service.delete_object(collection.file.directory.key, key, 'versionId' => version)
           else
-            collection.connection.delete_object(collection.directory.key, key, 'versionId' => version)
+            collection.service.delete_object(collection.directory.key, key, 'versionId' => version)
           end
         end
       end

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

@@ -14,9 +14,9 @@ module Fog
 
         def all(options = {})
           data = if file
-            connection.get_bucket_object_versions(file.directory.key, options.merge('prefix' => file.key)).body['Versions']
+            service.get_bucket_object_versions(file.directory.key, options.merge('prefix' => file.key)).body['Versions']
           else
-            connection.get_bucket_object_versions(directory.key, options).body['Versions']
+            service.get_bucket_object_versions(directory.key, options).body['Versions']
           end
 
           load(data)
@@ -35,4 +35,4 @@ module Fog
 
     end
   end
-end
+end

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

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

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

@@ -41,7 +41,9 @@ module Fog
             when *@contexts
               @context.pop
             when 'code'
-              @instance[@context.last][name] = value.to_i
+              @instance[@context.last][name] = @context.last == 'stateReason' ? value : value.to_i
+            when 'message'
+              @instance[@context.last][name] = value
             when 'deleteOnTermination'
               @block_device_mapping[name] = (value == 'true')
             when 'deviceName', 'status', 'volumeId'

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

@@ -12,7 +12,7 @@ module Fog
 
           def end_element(name)
             case name
-            when 'availabilityZone', 'currencyCode', 'instanceType', 'instanceTenancy', 'productDescription', 'reservedInstancesOfferingId'
+            when 'availabilityZone', 'currencyCode', 'instanceType', 'offeringType', 'instanceTenancy', 'productDescription', 'reservedInstancesOfferingId'
               @reserved_instances_offering[name] = value
             when 'duration'
               @reserved_instances_offering[name] = value.to_i

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/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/delete_multiple_objects.rb

@@ -0,0 +1,50 @@
+module Fog
+  module Parsers
+    module Storage
+      module AWS
+
+        class DeleteMultipleObjects < Fog::Parsers::Base
+
+          def reset
+            @deleted = { 'Deleted' => {} }
+            @error = { 'Error' => {} }
+            @response = { 'DeleteResult' => [] }
+          end
+
+          def start_element(name, attrs = [])
+            super
+            case name
+            when 'Deleted'
+              @in_deleted = true
+            end
+          end
+
+          def end_element(name)
+            case name
+            when 'Deleted'
+              @response['DeleteResult'] << @deleted
+              @deleted = { 'Deleted' => {} }
+              @in_deleted = false
+            when 'Error'
+              @response['DeleteResult'] << @error
+              @error = { 'Error' => {} }
+            when 'Key', 'VersionId'
+              if @in_deleted
+                @deleted['Deleted'][name] = value
+              else
+                @error['Error'][name] = value
+              end
+            when 'DeleteMarker', 'DeletemarkerVersionId'
+              @deleted['Deleted'][name] = value
+            when 'Code', 'Message'
+              @error['Error'][name] = value
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end
+

data/lib/fog/aws/rds.rb

@@ -101,7 +101,7 @@ module Fog
           @use_iam_profile = options[:use_iam_profile]
           @region = options[:region] || 'us-east-1'
 
-          unless ['ap-northeast-1', 'ap-southeast-1', 'eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'sa-east-1'].include?(@region)
+          unless ['ap-northeast-1', 'ap-southeast-1', 'ap-southeast-2', 'eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'sa-east-1'].include?(@region)
             raise ArgumentError, "Unknown region: #{@region.inspect}"
           end
 
@@ -158,7 +158,7 @@ module Fog
         end
 
         def owner_id
-          @owner_id ||= Fog::AWS[:rds].security_groups.get('default').owner_id
+          @owner_id ||= security_groups.get('default').owner_id
         end
 
         def reload

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_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/compute/describe_availability_zones.rb

@@ -71,6 +71,9 @@ module Fog
 
             {"messageSet" => [], "regionName" => "ap-southeast-1", "zoneName" => "ap-southeast-1a", "zoneState" => "available"},
             {"messageSet" => [], "regionName" => "ap-southeast-1", "zoneName" => "ap-southeast-1b", "zoneState" => "available"},
+
+            {"messageSet" => [], "regionName" => "ap-southeast-2", "zoneName" => "ap-southeast-2a", "zoneState" => "available"},
+            {"messageSet" => [], "regionName" => "ap-southeast-2", "zoneName" => "ap-southeast-2b", "zoneState" => "available"},
           ]
 
           availability_zone_info = all_zones.select { |zoneinfo| zoneinfo["regionName"] == @region }

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

@@ -18,7 +18,9 @@ module Fog
         #       * 'availabilityZone'<~String> - availability zone of offering
         #       * 'duration'<~Integer> - duration, in seconds, of offering
         #       * 'fixedPrice'<~Float> - purchase price of offering
+        #       * 'includeMarketplace'<~Boolean> - whether or not to include marketplace offerings
         #       * 'instanceType'<~String> - instance type of offering
+        #       * 'offeringType'<~String> - type of offering, in ['Heavy Utilization', 'Medium Utilization', 'Light Utilization']
         #       * 'productDescription'<~String> - description of offering
         #       * 'reservedInstancesOfferingId'<~String> - id of offering
         #       * 'usagePrice'<~Float> - usage price of offering, per hour
@@ -41,14 +43,15 @@ module Fog
 
           self.data[:reserved_instances_offerings] ||= [{
             'reservedInstancesOfferingId' => Fog::AWS::Mock.reserved_instances_offering_id,
-            'instanceType'        => 'm1.small',
-            'availabilityZone'    => 'us-east-1d',
-            'duration'            => 31536000,
-            'fixedPrice'          => 350.0,
-            'usagePrice'          => 0.03,
-            'productDescription'  => 'Linux/UNIX',
-            'instanceTenancy'     => 'default',
-            'currencyCode'         => 'USD'
+            'instanceType'                => 'm1.small',
+            'availabilityZone'            => 'us-east-1d',
+            'duration'                    => 31536000,
+            'fixedPrice'                  => 350.0,
+            'offeringType'                => 'Medium Utilization',
+            'usagePrice'                  => 0.03,
+            'productDescription'          => 'Linux/UNIX',
+            'instanceTenancy'             => 'default',
+            'currencyCode'                => 'USD'
           }]
 
           response.body = {

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

@@ -0,0 +1,51 @@
+module Fog
+  module Compute
+    class AWS
+      class Real
+
+        require 'fog/aws/parsers/compute/basic'
+
+        # Modifies a volume attribute.
+        #
+        # ==== Parameters
+        # * volume_id<~String> - The ID of the volume.
+        # * auto_enable_io_value<~Boolean> - This attribute exists to auto-enable the I/O operations to the volume.
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'requestId'<~String> - Id of request
+        #     * 'return'<~Boolean> - success?
+        #
+        # {Amazon API Reference}[http://http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-ModifyVolumeAttribute.html]
+        def modify_volume_attribute(volume_id=nil, auto_enable_io_value=false)
+          request(
+            'Action'             => 'ModifyVolumeAttribute',
+            'VolumeId'           => volume_id,
+            'AutoEnableIO.Value' => auto_enable_io_value,
+            :idempotent          => true,
+            :parser              => Fog::Parsers::Compute::AWS::Basic.new
+          )
+        end
+
+      end
+
+      class Mock
+
+        def modify_volume_attribute(volume_id=nil, auto_enable_io_value=false)
+          response = Excon::Response.new
+          if volume = self.data[:volumes][volume_id]
+            response.status = 200
+            response.body = {
+              'requestId' => Fog::AWS::Mock.request_id,
+              'return'    => true
+            }
+            response
+          else
+            raise Fog::Compute::AWS::NotFound.new("The volume '#{volume_id}' does not exist.")
+          end
+        end
+      end
+    end
+  end
+end