fog 1.1.1 → 1.2.0

data/lib/fog/aws/parsers/sns/list_subscriptions.rb

@@ -13,12 +13,12 @@ module Fog
           def end_element(name)
             case name
             when "TopicArn", "Protocol", "SubscriptionArn", "Owner", "Endpoint"
-              @subscription[name] = @value.rstrip
+              @subscription[name] = @value.strip
             when "member"
               @response['Subscriptions'] << @subscription
               @subscription = {}
             when 'RequestId', 'NextToken'
-              @response[name] = @value.rstrip
+              @response[name] = @value.strip
             end
           end
         end

data/lib/fog/aws/parsers/sns/list_topics.rb

@@ -12,7 +12,7 @@ module Fog
           def end_element(name)
             case name
             when 'TopicArn'
-              @response['Topics'] << @value
+              @response['Topics'] << @value.strip
             when 'NextToken', 'RequestId'
               response[name] = @value
             end

data/lib/fog/aws/parsers/sns/subscribe.rb

@@ -12,7 +12,7 @@ module Fog
           def end_element(name)
             case name
             when 'SubscriptionArn', 'RequestId'
-              @response[name] = @value.rstrip
+              @response[name] = @value.strip
             end
           end
 

data/lib/fog/aws/parsers/sqs/receive_message.rb

@@ -24,7 +24,7 @@ module Fog
             when 'Value'
               case @current_attribute_name
               when 'ApproximateFirstReceiveTimestamp', 'SentTimestamp'
-                @message['Attributes'][@current_attribute_name] = Time.at(@value.to_i)
+                @message['Attributes'][@current_attribute_name] = Time.at(@value.to_i / 1000.0)
               when 'ApproximateReceiveCount'
                 @message['Attributes'][@current_attribute_name] = @value.to_i
               else

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

@@ -0,0 +1,32 @@
+module Fog
+  module Parsers
+    module Storage
+      module AWS
+
+        class GetBucketLifecycle < Fog::Parsers::Base
+
+          def reset
+            @rule = {}
+            @response = { 'Rules' => [] }
+          end
+
+          def end_element(name)
+            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 = {}
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

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

@@ -69,7 +69,7 @@ module Fog
               @response['MaxKeys'] = value.to_i
             when 'Size'
               @version['Size'] = value.to_i
-            when 'Key', 'KeyMarker', 'Name', 'Prefix', 'StorageClass', 'VersionId', 'VersionIdMarker'
+            when 'Key', 'KeyMarker', 'Name', 'NextKeyMarker', 'NextVersionIdMarker', 'Prefix', 'StorageClass', 'VersionId', 'VersionIdMarker'
               if @in_delete_marker
                 @delete_marker
               elsif @in_version

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

@@ -11,7 +11,7 @@ module Fog
 
           def end_element(name)
             case name
-            when 'Status'
+            when 'Status', 'MfaDelete'
               @response['VersioningConfiguration'][name] = value
             end
           end

data/lib/fog/aws/parsers/sts/get_session_token.rb

@@ -0,0 +1,31 @@
+module Fog
+  module Parsers
+    module AWS
+      module STS
+
+        class GetSessionToken < Fog::Parsers::Base
+					# http://docs.amazonwebservices.com/IAM/latest/UserGuide/index.html?CreatingFedTokens.html
+
+          def reset
+            @response = {}
+          end
+
+          def end_element(name)
+            case name
+            when 'SessionToken', 'SecretAccessKey', 'Expiration', 'AccessKeyId'
+              @response[name] = @value.strip
+            when 'Arn', 'FederatedUserId'
+              @response[name] = @value.strip
+            when 'PackedPolicySize'
+              @response[name] = @value
+            when 'RequestId'
+              @response[name] = @value
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/rds.rb

@@ -5,6 +5,8 @@ module Fog
     class RDS < Fog::Service
 
       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
@@ -57,9 +59,53 @@ module Fog
 
       class Mock
 
+        def self.data
+          @data ||= Hash.new do |hash, region|
+            owner_id = Fog::AWS::Mock.owner_id
+            hash[region] = Hash.new do |region_hash, key|
+              region_hash[key] = {
+                :servers => {},
+                :security_groups => {},
+                :snapshots => {},
+                :parameter_groups => {"default.mysql5.1" => { "DBParameterGroupFamily"=>"mysql5.1",
+                                                              "Description"=>"Default parameter group for mysql5.1",
+                                                              "DBParameterGroupName"=>"default.mysql5.1"
+                                                            },
+                                      "default.mysql5.5" => {"DBParameterGroupFamily"=>"mysql5.5",
+                                                            "Description"=>"Default parameter group for mysql5.5",
+                                                            "DBParameterGroupName"=>"default.mysql5.5"
+                                                            }
+                                      }
+                                 }
+            end
+          end
+        end
+        
+        def self.reset
+          @data = nil
+        end
+        
         def initialize(options={})
-          Fog::Mock.not_implemented
+        
+          @aws_access_key_id = options[:aws_access_key_id]
+        
+          @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'].include?(@region)
+            raise ArgumentError, "Unknown region: #{@region.inspect}"
+          end
+        
+        end
+        
+        def data
+          self.class.data[@region][@aws_access_key_id]
         end
+        
+        def reset_data
+          self.class.data[@region].delete(@aws_access_key_id)
+        end
+        
+        
 
       end
 
@@ -79,7 +125,7 @@ module Fog
         #
         # ==== Parameters
         # * options<~Hash> - config arguments for connection.  Defaults to {}.
-        #   * region<~String> - optional region to use, in ['eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'ap-southeast-1']
+        #   * region<~String> - optional region to use. For instance, 'eu-west-1', 'us-east-1' and etc.
         #
         # ==== Returns
         # * ELB object with connection to AWS.
@@ -90,22 +136,7 @@ module Fog
           @hmac = Fog::HMAC.new('sha256', @aws_secret_access_key)
 
           options[:region] ||= 'us-east-1'
-          @host = options[:host] || case options[:region]
-          when 'ap-northeast-1'
-            'rds.ap-northeast-1.amazonaws.com'
-          when 'ap-southeast-1'
-            'rds.ap-southeast-1.amazonaws.com'
-          when 'eu-west-1'
-            'rds.eu-west-1.amazonaws.com'
-          when 'us-east-1'
-            'rds.us-east-1.amazonaws.com'
-          when 'us-west-1'
-            'rds.us-west-1.amazonaws.com'
-          when 'us-west-2'
-            'rds.us-west-2.amazonaws.com'
-          else
-            raise ArgumentError, "Unknown region: #{options[:region].inspect}"
-          end
+          @host = options[:host] || "rds.#{options[:region]}.amazonaws.com"
           @path       = options[:path]        || '/'
           @persistent = options[:persistent]  || false
           @port       = options[:port]        || 443
@@ -152,6 +183,8 @@ module Fog
                 raise Fog::AWS::RDS::NotFound.slurp(error, match[2])
               when 'DBParameterGroupAlreadyExists'
                 raise Fog::AWS::RDS::IdentifierTaken.slurp(error, match[2])
+              when 'AuthorizationAlreadyExists'
+                raise Fog::AWS::RDS::AuthorizationAlreadyExists.slurp(error, match[2])
               else
                 raise
               end

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

@@ -38,7 +38,16 @@ module Fog
       class Mock
 
         def delete_launch_configuration(launch_configuration_name)
-          Fog::Mock.not_implemented
+          unless self.data[:launch_configurations].delete(launch_configuration_name)
+            raise Fog::AWS::AutoScaling::ValidationError, "Launch configuration name not found - Launch configuration #{launch_configuration_name} not found"
+          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/describe_launch_configurations.rb

@@ -86,16 +86,25 @@ module Fog
       class Mock
 
         def describe_launch_configurations(options = {})
-          results = { 'LaunchConfigurations' => [] }
-          data[:launch_configurations].each do |lc_name, lc_data|
-            results['LaunchConfigurations'] << {
-              'LaunchConfigurationName' => lc_name
-            }.merge!(lc_data)
-          end
+          launch_configuration_names = options.delete('LaunchConfigurationNames')
+          # even a nil object will turn into an empty array
+          lc = [*launch_configuration_names]
+
+          launch_configurations = 
+             if lc.any?
+               lc.map do |lc_name|
+                 l_conf = self.data[:launch_configurations].find { |name, data| name == lc_name }
+                 #raise Fog::AWS::AutoScaling::NotFound unless l_conf
+                 l_conf[1].dup if l_conf
+               end.compact
+             else
+               self.data[:launch_configurations].map { |lc, values| values.dup }
+             end
+
           response = Excon::Response.new
           response.status = 200
           response.body = {
-            'DescribeLaunchConfigurationsResult' => results,
+            'DescribeLaunchConfigurationsResult' => { 'LaunchConfigurations' => launch_configurations },
             'ResponseMetadata' => { 'RequestId' => Fog::AWS::Mock.request_id }
           }
           response

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

@@ -42,12 +42,17 @@ module Fog
         #             Scaling group to be updated.
         #         * 'DesiredCapacity'<~Integer> -The number of instances you
         #           prefer to maintain in your Auto Scaling group.
+        #         * 'EndTime'<~Time> - The time for this action to end.
         #         * 'MaxSize'<~Integer> - The maximum size of the Auto Scaling
         #           group.
         #         * 'MinSize'<~Integer> - The minimum size of the Auto Scaling
         #           group.
+        #         * 'Recurrence'<~String> - The time when recurring future 
+        #           actions will start. Start time is specified by the user 
+        #           following the Unix cron syntax format.
         #         * 'ScheduledActionARN'<~String> - The Amazon Resource Name
         #           (ARN) of this scheduled action.
+        #         * 'StartTime'<~Time> - The time for this action to start.
         #         * 'Time'<~Time> - The time that the action is scheduled to
         #           occur. This value can be up to one month in the future.
         #       * 'NextToken'<~String> - Acts as a paging mechanism for large

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

@@ -14,14 +14,19 @@ module Fog
         # * auto_scaling_group_name<~String> - The name or ARN of the Auto
         #   Scaling Group.
         # * scheduled_action_name<~String> - Name of this scaling action.
-        # * time<~Datetime> - The time for this action to start
+        # * time<~Datetime> - The time for this action to start (deprecated use StartTime EndTime and Recurrence)
         # * options<~Hash>:
         #   * 'DesiredCapacity'<~Integer> - The number of EC2 instances that
         #     should be running in this group.
+        #   * 'EndTime'<~DateTime> - The time for this action to end.
         #   * 'MaxSize'<~Integer> - The maximum size for the Auto Scaling
         #     group.
         #   * 'MinSize'<~Integer> - The minimum size for the Auto Scaling
         #     group.
+        #   * 'Recurrence'<~String> - The time when recurring future actions will start. Start time is specified 
+        #     by the user following the Unix cron syntax format. When StartTime and EndTime are specified with 
+        #     Recurrence, they form the boundaries of when the recurring action will start and stop.
+        #   * 'StartTime'<~DateTime> - The time for this action to start
         #
         # ==== Returns
         # * response<~Excon::Response>:
@@ -32,12 +37,17 @@ module Fog
         # ==== See Also
         # http://docs.amazonwebservices.com/AutoScaling/latest/APIReference/API_PutScheduledUpdateGroupAction.html
         #
-        def put_scheduled_update_group_action(auto_scaling_group_name, scheduled_action_name, time, options = {})
+        def put_scheduled_update_group_action(auto_scaling_group_name, scheduled_action_name, time=nil, options = {})
+          # The 'Time' paramenter is now an alias for StartTime and needs to be identical if specified.  
+          time = options['StartTime'].nil? ? time : options['StartTime']
+          if !time.nil?
+            time = time.class == Time ? time.utc.iso8601 : Time.parse(time).utc.iso8601
+          end
           request({
             'Action'               => 'PutScheduledUpdateGroupAction',
             'AutoScalingGroupName' => auto_scaling_group_name,
             'ScheduledActionName'  => scheduled_action_name,
-            'Time'                 => time.utc.strftime('%FT%T.%3NZ'),
+            'Time'                 => time,
             :parser                => Fog::Parsers::AWS::AutoScaling::Basic.new
           }.merge!(options))
         end

data/lib/fog/aws/requests/beanstalk/check_dns_availability.rb

@@ -0,0 +1,27 @@
+module Fog
+  module AWS
+    class ElasticBeanstalk
+      class Real
+
+        require 'fog/aws/parsers/beanstalk/check_dns_availability'
+
+        # Checks if the specified CNAME is available.
+        #
+        # ==== Options
+        # * CNAMEPrefix<~String>: The prefix used when this CNAME is reserved
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/elasticbeanstalk/latest/api/API_CheckDNSAvailability.html
+        #
+        def check_dns_availability(options)
+          request({
+                      'Operation'    => 'CheckDNSAvailability',
+                      :parser     => Fog::Parsers::AWS::ElasticBeanstalk::CheckDNSAvailability.new
+                  }.merge(options))
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/beanstalk/create_application.rb

@@ -0,0 +1,29 @@
+module Fog
+  module AWS
+    class ElasticBeanstalk
+      class Real
+
+        require 'fog/aws/parsers/beanstalk/create_application'
+
+        # Creates an application that has one configuration template named default and no application versions.
+        #
+        # ==== Options
+        # * ApplicationName<~String>: The name of the application.
+        # * Description<~String>: Describes the application.
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/elasticbeanstalk/latest/api/API_CreateApplication.html
+        #
+        def create_application(options={})
+          request({
+                      'Operation'    => 'CreateApplication',
+                      :parser     => Fog::Parsers::AWS::ElasticBeanstalk::CreateApplication.new
+                  }.merge(options))
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/beanstalk/create_application_version.rb

@@ -0,0 +1,41 @@
+module Fog
+  module AWS
+    class ElasticBeanstalk
+      class Real
+
+        require 'fog/aws/parsers/beanstalk/create_application_version'
+
+        # Creates an application version for the specified application.
+        #
+        # ==== Options
+        # * ApplicationName<~String>: The name of the application. If no application is found with this name,
+        #   and AutoCreateApplication is false, returns an InvalidParameterValue error.
+        # * AutoCreateApplication<~Boolean>: If true, create the application if it doesn't exist.
+        # * Description<~String>: Describes this version.
+        # * SourceBundle<~Hash>: The Amazon S3 bucket and key that identify the location of the source bundle
+        #     for this version.  Use keys 'S3Bucket' and 'S3Key' to describe location.
+        # * VersionLabel<~String>: A label identifying this version.
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/elasticbeanstalk/latest/api/API_CreateApplicationVersion.html
+        #
+        def create_application_version(options={})
+          if source_bundle = options.delete('SourceBundle')
+            # flatten hash
+            options.merge!({
+                               'SourceBundle.S3Bucket' => source_bundle['S3Bucket'],
+                               'SourceBundle.S3Key' => source_bundle['S3Key']
+                           })
+          end
+          request({
+                      'Operation'    => 'CreateApplicationVersion',
+                      :parser     => Fog::Parsers::AWS::ElasticBeanstalk::CreateApplicationVersion.new
+                  }.merge(options))
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/beanstalk/create_configuration_template.rb

@@ -0,0 +1,44 @@
+module Fog
+  module AWS
+    class ElasticBeanstalk
+      class Real
+
+        require 'fog/aws/parsers/beanstalk/create_configuration_template'
+
+        # Creates a configuration template. Templates are associated with a specific application and are used to
+        # deploy different versions of the application with the same configuration settings.
+        #
+        # ==== Options
+        # * ApplicationName<~String>: The name of the application to associate with this configuration template.
+        #   If no application is found with this name, AWS Elastic Beanstalk returns an InvalidParameterValue error.
+        # * Description<~String>: Describes this configuration.
+        # * EnvironmentId<~String>: The ID of the environment used with this configuration template.
+        # * OptionSettings<~Hash>: If specified, AWS Elastic Beanstalk sets the specified configuration option
+        #     to the requested value. The new value overrides the value obtained from the solution stack or the
+        #     source configuration template.
+        # * SolutionStackName<~String>: The name of the solution stack used by this configuration. The solution
+        #     stack specifies the operating system, architecture, and application server for a configuration template.
+        #     It determines the set of configuration options as well as the possible and default values.
+        # * SourceConfiguration<~String>: If specified, AWS Elastic Beanstalk uses the configuration values from the
+        #     specified configuration template to create a new configuration.
+        # * TemplateName<~String>: The name of the configuration template.
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/elasticbeanstalk/latest/api/API_CreateConfigurationTemplate.html
+        #
+        def create_configuration_template(options={})
+          if option_settings = options.delete('OptionSettings')
+            options.merge!(AWS.indexed_param('OptionSettings.member.%d', [*option_settings]))
+          end
+          request({
+                      'Operation'    => 'CreateConfigurationTemplate',
+                      :parser     => Fog::Parsers::AWS::ElasticBeanstalk::CreateConfigurationTemplate.new
+                  }.merge(options))
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/beanstalk/create_environment.rb

@@ -0,0 +1,50 @@
+module Fog
+  module AWS
+    class ElasticBeanstalk
+      class Real
+
+        require 'fog/aws/parsers/beanstalk/create_environment'
+
+        # Launches an environment for the specified application using the specified configuration.
+        #
+        # ==== Options
+        # * ApplicationName<~String>: If specified, AWS Elastic Beanstalk restricts the returned descriptions
+        #     to include only those that are associated with this application.
+        # * CNAMEPrefix<~String>: If specified, the environment attempts to use this value as the prefix for the CNAME.
+        #     If not specified, the environment uses the environment name.
+        # * Description<~String>: Describes this environment.
+        # * EnvironmentName<~String>: A unique name for the deployment environment. Used in the application URL.
+        # * OptionSettings<~Array>: If specified, AWS Elastic Beanstalk sets the specified configuration options to
+        #     the requested value in the configuration set for the new environment. These override the values obtained
+        #     from the solution stack or the configuration template.
+        # * OptionsToRemove<~Array>: A list of custom user-defined configuration options to remove from the
+        #     configuration set for this new environment.
+        # * SolutionStackName<~String>: This is an alternative to specifying a configuration name. If specified,
+        #     AWS Elastic Beanstalk sets the configuration values to the default values associated with the
+        #     specified solution stack.
+        # * TemplateName<~String>: The name of the configuration template to use in deployment. If no configuration
+        #     template is found with this name, AWS Elastic Beanstalk returns an InvalidParameterValue error.
+        # * VersionLabel<~String>: The name of the application version to deploy.
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/elasticbeanstalk/latest/api/API_CreateEnvironment.html
+        #
+        def create_environment(options={})
+          if option_settings = options.delete('OptionSettings')
+            options.merge!(AWS.indexed_param('OptionSettings.member.%d', [*option_settings]))
+          end
+          if options_to_remove = options.delete('OptionsToRemove')
+            options.merge!(AWS.indexed_param('OptionsToRemove.member.%d', [*options_to_remove]))
+          end
+          request({
+                      'Operation'    => 'CreateEnvironment',
+                      :parser     => Fog::Parsers::AWS::ElasticBeanstalk::CreateEnvironment.new
+                  }.merge(options))
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/beanstalk/create_storage_location.rb

@@ -0,0 +1,27 @@
+module Fog
+  module AWS
+    class ElasticBeanstalk
+      class Real
+
+        require 'fog/aws/parsers/beanstalk/create_storage_location'
+
+        # Creates the Amazon S3 storage location for the account.
+        #
+        # ==== Options
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/elasticbeanstalk/latest/api/API_CreateStorageLocation.html
+        #
+        def create_storage_location()
+          request({
+                      'Operation'    => 'CreateStorageLocation',
+                      :parser     => Fog::Parsers::AWS::ElasticBeanstalk::CreateStorageLocation.new
+                  })
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/beanstalk/delete_application.rb

@@ -0,0 +1,29 @@
+module Fog
+  module AWS
+    class ElasticBeanstalk
+      class Real
+
+        require 'fog/aws/parsers/beanstalk/empty'
+
+        # Deletes the specified application along with all associated versions and configurations.
+        #
+        # ==== Options
+        # * application_name<~String>: The name of the application to delete.
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/elasticbeanstalk/latest/api/API_DeleteApplication.html
+        #
+        def delete_application(application_name)
+          options = { 'ApplicationName' => application_name }
+          request({
+                      'Operation'    => 'DeleteApplication',
+                      :parser     => Fog::Parsers::AWS::ElasticBeanstalk::Empty.new
+                  }.merge(options))
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/beanstalk/delete_application_version.rb

@@ -0,0 +1,36 @@
+module Fog
+  module AWS
+    class ElasticBeanstalk
+      class Real
+
+        require 'fog/aws/parsers/beanstalk/empty'
+
+        # Deletes the specified version from the specified application.
+        #
+        # ==== Options
+        # * application_name<~String>: The name of the application to delete releases from.
+        # * version_label<~String>: The label of the version to delete.
+        # * delete_source_bundle<~Boolean>: Indicates whether to delete the associated source bundle from Amazon S3.
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/elasticbeanstalk/latest/api/API_DeleteApplication.html
+        #
+        def delete_application_version(application_name, version_label, delete_source_bundle = nil)
+          options = {
+              'ApplicationName' => application_name,
+              'VersionLabel' => version_label
+          }
+          options['DeleteSourceBundle'] = delete_source_bundle unless delete_source_bundle.nil?
+
+          request({
+                      'Operation'    => 'DeleteApplicationVersion',
+                      :parser     => Fog::Parsers::AWS::ElasticBeanstalk::Empty.new
+                  }.merge(options))
+        end
+      end
+    end
+  end
+end