fog 1.6.0 → 1.7.0

data/lib/fog/aws/parsers/rds/event_list.rb

@@ -0,0 +1,40 @@
+module Fog
+  module Parsers
+    module AWS
+      module RDS 
+        require 'fog/aws/parsers/rds/base'
+
+        class EventListParser < Base
+
+          def reset
+            super
+            @response['Events'] = []
+          end
+
+          def start_element(name, attrs = [])
+            super
+            case name
+            when 'Event'; then @event = {}
+            end
+
+          end
+
+          def end_element(name)
+            case name
+            when 'Date'
+              @event[name] = DateTime.parse(value.strip)
+            when 'Message', 'SourceIdentifier', 'SourceType'
+              @event[name] = value ? value.strip : name
+            when 'Event'
+              @response['Events'] << @event unless @event.empty?
+            when 'IsTruncated', 'Marker', 'NextMarker'
+              @response[name] = value
+            else
+              super
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/rds/subnet_group_parser.rb

@@ -0,0 +1,38 @@
+module Fog
+  module Parsers
+    module AWS
+      module RDS
+
+        class SubnetGroupParser < Fog::Parsers::Base
+
+          def reset
+            @db_subnet_group = fresh_subnet_group
+          end
+
+          def start_element(name, attrs = [])
+            super
+          end
+
+          def end_element(name)
+            case name
+            when 'VpcId' then @db_subnet_group['VpcId'] = value
+            when 'SubnetGroupStatus' then @db_subnet_group['SubnetGroupStatus'] = value
+            when 'DBSubnetGroupDescription' then @db_subnet_group['DBSubnetGroupDescription'] = value
+            when 'DBSubnetGroupName' then @db_subnet_group['DBSubnetGroupName'] = value
+            when 'SubnetIdentifier' then @db_subnet_group['Subnets'] << value
+            when 'Marker'
+              @response['DescribeDBSubnetGroupsResult']['Marker'] = value
+            when 'RequestId'
+              @response['ResponseMetadata'][name] = value
+            end
+          end
+
+          def fresh_subnet_group
+            {'Subnets' => []}
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/rds/tag_list_parser.rb

@@ -0,0 +1,35 @@
+module Fog
+  module Parsers
+    module AWS
+      module RDS
+        # parses an XML-formatted list of resource tags from AWS
+        class TagListParser < Fog::Parsers::Base
+
+          # each tag is modeled as a String pair (2-element Array)
+          def reset
+            @this_key   = nil
+            @this_value = nil
+            @tags       = Hash.new
+            @response   = {'ListTagsForResourceResult' => {'TagList' => {}}}
+          end
+
+          def end_element(name)
+            super
+            case name
+            when 'Tag'
+              @tags[@this_key] = @this_value
+              @this_key, @this_value = nil, nil
+            when 'Key'
+              @this_key = value
+            when 'Value'
+              @this_value = value
+            when 'TagList'
+              @response['ListTagsForResourceResult']['TagList'] = @tags
+            end
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/rds.rb

@@ -6,14 +6,14 @@ module Fog
       extend Fog::AWS::CredentialFetcher::ServiceMethods
 
       class IdentifierTaken < Fog::Errors::Error; end
-      
+
       class AuthorizationAlreadyExists < Fog::Errors::Error; end
 
       requires :aws_access_key_id, :aws_secret_access_key
       recognizes :region, :host, :path, :port, :scheme, :persistent, :use_iam_profile, :aws_session_token, :aws_credentials_expire_at
 
       request_path 'fog/aws/requests/rds'
-
+      request :describe_events
       request :create_db_instance
       request :modify_db_instance
       request :describe_db_instances
@@ -23,11 +23,14 @@ module Fog
       request :describe_db_engine_versions
       request :describe_db_reserved_instances
 
+      request :add_tags_to_resource
+      request :list_tags_for_resource
+      request :remove_tags_from_resource
+
       request :describe_db_snapshots
       request :create_db_snapshot
       request :delete_db_snapshot
 
-
       request :create_db_parameter_group
       request :delete_db_parameter_group
       request :modify_db_parameter_group
@@ -44,6 +47,10 @@ module Fog
       request :restore_db_instance_from_db_snapshot
       request :restore_db_instance_to_point_in_time
 
+      request :create_db_subnet_group
+      request :describe_db_subnet_groups
+      # TODO: :delete_db_subnet_group, :modify_db_subnet_group
+
       model_path 'fog/aws/models/rds'
       model       :server
       collection  :servers
@@ -58,6 +65,9 @@ module Fog
       model       :security_group
       collection  :security_groups
 
+      model       :subnet_group
+      collection  :subnet_groups
+
       class Mock
 
         def self.data
@@ -66,6 +76,7 @@ module Fog
               region_hash[key] = {
                 :servers => {},
                 :security_groups => {},
+                :subnet_groups => {},
                 :snapshots => {},
                 :parameter_groups => {"default.mysql5.1" => { "DBParameterGroupFamily"=>"mysql5.1",
                                                               "Description"=>"Default parameter group for mysql5.1",
@@ -111,6 +122,8 @@ module Fog
       end
 
       class Real
+        attr_reader :region
+
         include Fog::AWS::CredentialFetcher::ConnectionMethods
         # Initialize connection to ELB
         #
@@ -135,8 +148,8 @@ module Fog
           setup_credentials(options)
           @connection_options     = options[:connection_options] || {}
 
-          options[:region] ||= 'us-east-1'
-          @host = options[:host] || "rds.#{options[:region]}.amazonaws.com"
+          @region     = options[:region]      || 'us-east-1'
+          @host       = options[:host]        || "rds.#{@region}.amazonaws.com"
           @path       = options[:path]        || '/'
           @persistent = options[:persistent]  || false
           @port       = options[:port]        || 443
@@ -144,6 +157,10 @@ module Fog
           @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
         end
 
+        def owner_id
+          @owner_id ||= Fog::AWS[:rds].security_groups.get('default').owner_id
+        end
+
         def reload
           @connection.reset
         end
@@ -156,7 +173,7 @@ module Fog
           @aws_session_token     = options[:aws_session_token]
           @aws_credentials_expire_at = options[:aws_credentials_expire_at]
 
-          @hmac = Fog::HMAC.new('sha256', @aws_secret_access_key)          
+          @hmac = Fog::HMAC.new('sha256', @aws_secret_access_key)
         end
 
         def request(params)
@@ -174,7 +191,7 @@ module Fog
               :host               => @host,
               :path               => @path,
               :port               => @port,
-              :version            => '2012-01-15' #'2011-04-01'
+              :version            => '2012-09-17' #'2011-04-01'
             }
           )
 

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

@@ -23,20 +23,36 @@ module Fog
         #   * 'DefaultCooldown'<~Integer> - The amount of time, in seconds,
         #     after a scaling activity completes before any further trigger-
         #     related scaling activities can start.
-        #   * 'DesiredCapacity'<~Integer> - The number of EC2 instances that
-        #     should be running in the group. For more information, see
-        #     set_desired_capacity.
+        #   * 'DesiredCapacity'<~Integer> - The number of Amazon EC2 instances
+        #     that should be running in the group.
         #   * 'HealthCheckGracePeriod'<~Integer> - Length of time in seconds
-        #     after a new EC2 instance comes into service that Auto Scaling
-        #     starts checking its health.
+        #     after a new Amazon EC2 instance comes into service that Auto
+        #     Scaling starts checking its health.
         #   * 'HealthCheckType'<~String> - The service you want the health
         #     status from, Amazon EC2 or Elastic Load Balancer. Valid values
         #     are "EC2" or "ELB".
         #   * 'LoadBalancerNames'<~Array> - A list of LoadBalancers to use.
         #   * 'PlacementGroup'<~String> - Physical location of your cluster
         #      placement group created in Amazon EC2.
-        #   * 'VPCZoneIdentifier'<~String> - Subnet identifier of the Virtual
-        #     Private Cloud.
+        #   * 'Tags'<~Array>:
+        #     * tag<~Hash>:
+        #       * 'Key'<~String> - The key of the tag.
+        #       * 'PropagateAtLaunch'<~Boolean> - Specifies whether the new tag
+        #         will be applied to instances launched after the tag is
+        #         created. The same behavior applies to updates: If you change
+        #         a tag, the changed tag will be applied to all instances
+        #         launched after you made the change.
+        #       * 'ResourceId'<~String>: The name of the AutoScaling group.
+        #       * 'ResourceType'<~String>: The kind of resource to which the
+        #         tag is applied. Currently, Auto Scaling supports the
+        #         auto-scaling-group resource type.
+        #       * 'Value'<~String>: The value of the tag.
+        #   * 'TerminationPolicies'<~Array> - A standalone termination policy
+        #     or a list of termination policies used to select the instance to
+        #     terminate. The policies are executed in the order that they are
+        #     listed.
+        #   * 'VPCZoneIdentifier'<~String> - A comma-separated list of subnet
+        #     identifiers of Amazon Virtual Private Clouds (Amazon VPCs).
         #
         # ==== Returns
         # * response<~Excon::Response>:
@@ -56,10 +72,13 @@ module Fog
           if tags = options.delete('Tags')
             tags.each_with_index do |tag, i|
               tag.each do |key, value|
-                options["Tags.member.#{i + 1}.#{key.to_s.capitalize}"] = value
+                options["Tags.member.#{i+1}.#{key}"] = value unless value.nil?
               end
             end
           end
+          if termination_policies = options.delete('TerminationPolicies')
+            options.merge!(AWS.indexed_param('TerminationPolicies.member.%d', [*termination_policies]))
+          end
           request({
             'Action'                  => 'CreateAutoScalingGroup',
             'AutoScalingGroupName'    => auto_scaling_group_name,
@@ -75,18 +94,18 @@ module Fog
       class Mock
 
         def create_auto_scaling_group(auto_scaling_group_name, availability_zones, launch_configuration_name, max_size, min_size, options = {})
-          if data[:auto_scaling_groups].has_key?(auto_scaling_group_name)
+          if self.data[:auto_scaling_groups].has_key?(auto_scaling_group_name)
             raise Fog::AWS::AutoScaling::IdentifierTaken.new("AutoScalingGroup by this name already exists - A group with the name #{auto_scaling_group_name} already exists")
           end
-          unless data[:launch_configurations].has_key?(launch_configuration_name)
+          unless self.data[:launch_configurations].has_key?(launch_configuration_name)
             raise Fog::AWS::AutoScaling::ValidationError.new('Launch configuration name not found - null')
           end
-          data[:auto_scaling_groups][auto_scaling_group_name] = {
-            'AutoScalingGroupARN'     => "arn:aws:autoscaling:eu-west-1:000000000000:autoScalingGroup:00000000-0000-0000-0000-000000000000:autoScalingGroupName/#{auto_scaling_group_name}",
-            'AutoScalingGroupName'    => launch_configuration_name,
-            'AvailabilityZones'       => availability_zones.to_a,
+          self.data[:auto_scaling_groups][auto_scaling_group_name] = {
+            'AutoScalingGroupARN'     => Fog::AWS::Mock.arn('autoscaling', self.data[:owner_id], "autoScalingGroup:00000000-0000-0000-0000-000000000000:autoScalingGroupName/#{auto_scaling_group_name}", @region),
+            'AutoScalingGroupName'    => auto_scaling_group_name,
+            'AvailabilityZones'       => [*availability_zones],
             'CreatedTime'             => Time.now.utc,
-            'DefaultCooldown'         => 0,
+            'DefaultCooldown'         => 300,
             'DesiredCapacity'         => 0,
             'EnabledMetrics'          => [],
             'HealthCheckGracePeriod'  => 0,
@@ -98,7 +117,8 @@ module Fog
             'MinSize'                 => min_size,
             'PlacementGroup'          => nil,
             'SuspendedProcesses'      => [],
-            'TerminationPolicies'     => [],
+            'Tags'                    => [],
+            'TerminationPolicies'     => ['Default'],
             'VPCZoneIdentifier'       => nil
           }.merge!(options)
 

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

@@ -6,7 +6,7 @@ module Fog
 
         require 'fog/aws/parsers/auto_scaling/basic'
 
-        # Creates a new launch configuration. Once created, the new launch
+        # Creates a new launch configuration. When created, the new launch
         # configuration is available for immediate use.
         #
         # ==== Parameters
@@ -23,17 +23,24 @@ module Fog
         #     * 'Ebs.VolumeSize'<~Integer> - The volume size, in GigaBytes.
         #     * 'VirtualName'<~String> - The virtual name associated with the
         #       device.
-        #   * 'IamInstanceProfile'<~String> The name or the Amazon Resource Name (ARN) of the instance profile associated with the IAM role for the instance
-        #   * 'InstanceMonitoring.Enabled'<~Boolean> - Enable/Disable detailed monitoring, default is enabled
+        #   * 'IamInstanceProfile'<~String> The name or the Amazon Resource
+        #     Name (ARN) of the instance profile associated with the IAM role
+        #     for the instance.
+        #   * 'InstanceMonitoring.Enabled'<~Boolean> - Enables detailed
+        #     monitoring, which is enabled by default.
         #   * 'KernelId'<~String> - The ID of the kernel associated with the
-        #     EC2 AMI.
-        #   * 'KeyName'<~String> - The name of the EC2 key pair.
+        #     Amazon EC2 AMI.
+        #   * 'KeyName'<~String> - The name of the Amazon EC2 key pair.
         #   * 'RamdiskId'<~String> - The ID of the RAM disk associated with the
-        #     EC2 AMI.
+        #     Amazon EC2 AMI.
         #   * 'SecurityGroups'<~Array> - The names of the security groups with
-        #     which to associate EC2 instances.
-        #   * 'UserData'<~String> - User data available to the launched EC2
-        #     instances.
+        #     which to associate Amazon EC2 or Amazon VPC instances.
+        #   * 'SpotPrice'<~String> - The maximum hourly price to be paid for
+        #     any Spot Instance launched to fulfill the request. Spot Instances
+        #     are launched when the price you specify exceeds the current Spot
+        #     market price.
+        #   * 'UserData'<~String> - The user data available to the launched
+        #     Amazon EC2 instances.
         #
         # ==== Returns
         # * response<~Excon::Response>:
@@ -72,10 +79,10 @@ module Fog
       class Mock
 
         def create_launch_configuration(image_id, instance_type, launch_configuration_name, options = {})
-          if data[:launch_configurations].has_key?(launch_configuration_name)
+          if self.data[:launch_configurations].has_key?(launch_configuration_name)
             raise Fog::AWS::AutoScaling::IdentifierTaken.new("Launch Configuration by this name already exists - A launch configuration already exists with the name #{launch_configuration_name}")
           end
-          data[:launch_configurations][launch_configuration_name] = {
+          self.data[:launch_configurations][launch_configuration_name] = {
             'BlockDeviceMappings'     => [],
             'CreatedTime'             => Time.now.utc,
             'ImageId'                 => image_id,
@@ -83,7 +90,7 @@ module Fog
             'InstanceType'            => instance_type,
             'KernelId'                => nil,
             'KeyName'                 => nil,
-            'LaunchConfigurationARN'  => "arn:aws:autoscaling:eu-west-1:000000000000:launchConfiguration:00000000-0000-0000-0000-000000000000:launchConfigurationName/#{launch_configuration_name}",
+            'LaunchConfigurationARN'  => Fog::AWS::Mock.arn('autoscaling', self.data[:owner_id], "launchConfiguration:00000000-0000-0000-0000-000000000000:launchConfigurationName/#{launch_configuration_name}", @region),
             'LaunchConfigurationName' => launch_configuration_name,
             'RamdiskId'               => nil,
             'SecurityGroups'          => [],

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

@@ -0,0 +1,63 @@
+module Fog
+  module AWS
+    class AutoScaling
+
+      class Real
+
+        require 'fog/aws/parsers/auto_scaling/basic'
+
+        # Creates new tags or updates existing tags for an Auto Scaling group.
+        #
+        # ==== Parameters
+        # * tags<~Array>:
+        #   * tag<~Hash>:
+        #     * Key<~String> - The key of the tag.
+        #     * PropagateAtLaunch<~Boolean> - Specifies whether the new tag
+        #       will be applied to instances launched after the tag is created.
+        #       The same behavior applies to updates: If you change a tag, the
+        #       changed tag will be applied to all instances launched after you
+        #       made the change.
+        #     * ResourceId<~String> - The name of the Auto Scaling group.
+        #     * ResourceType<~String> - The kind of resource to which the tag
+        #       is applied. Currently, Auto Scaling supports the
+        #       auto-scaling-group resource type.
+        #     * Value<~String> - The value of the tag.
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'ResponseMetadata'<~Hash>:
+        #       * 'RequestId'<~String> - Id of request
+        #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/AutoScaling/latest/APIReference/API_CreateOrUpdateTags.html
+        #
+        def create_or_update_tags(tags)
+          params = {}
+          tags.each_with_index do |tag, i|
+            tag.each do |key, value|
+              params["Tags.member.#{i+1}.#{key}"] = value unless value.nil?
+            end
+          end
+          request({
+            'Action' => 'CreateOrUpdateTags',
+            :parser  => Fog::Parsers::AWS::AutoScaling::Basic.new
+          }.merge!(params))
+        end
+
+      end
+
+      class Mock
+
+        def create_or_update_tags(tags)
+          if tags.to_a.empty?
+            raise Fog::AWS::AutoScaling::ValidationError.new("1 validation error detected: Value null at 'tags' failed to satisfy constraint: Member must not be null")
+          end
+          raise Fog::Mock::NotImplementedError
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -12,6 +12,11 @@ module Fog
         # ==== Parameters
         # * auto_scaling_group_name<~String> - The name of the Auto Scaling
         #   group.
+        # * options<~Hash>:
+        #   * 'ForceDelete'<~Boolean> - Starting with API version 2011-01-01,
+        #     specifies that the Auto Scaling group will be deleted along with
+        #     all instances associated with the group, without waiting for all
+        #     instances to be terminated.
         #
         # ==== Returns
         # * response<~Excon::Response>:
@@ -22,23 +27,25 @@ module Fog
         # ==== See Also
         # http://docs.amazonwebservices.com/AutoScaling/latest/APIReference/API_DeleteAutoScalingGroup.html
         #
-        def delete_auto_scaling_group(auto_scaling_group_name)
+        def delete_auto_scaling_group(auto_scaling_group_name, options = {})
           request({
             'Action'               => 'DeleteAutoScalingGroup',
             'AutoScalingGroupName' => auto_scaling_group_name,
             :parser                => Fog::Parsers::AWS::AutoScaling::Basic.new
-          })
+          }.merge!(options))
         end
 
       end
 
       class Mock
 
-        def delete_auto_scaling_group(auto_scaling_group_name)
+        def delete_auto_scaling_group(auto_scaling_group_name, options = {})
           unless self.data[:auto_scaling_groups].delete(auto_scaling_group_name)
             raise Fog::AWS::AutoScaling::ValidationError, "The auto scaling group '#{auto_scaling_group_name}' does not exist."
           end
 
+          self.data[:notification_configurations].delete(auto_scaling_group_name)
+
           response = Excon::Response.new
           response.status = 200
           response.body = {