fog 1.10.1 → 1.11.0

data/lib/fog/aws/parsers/iam/list_users.rb

@@ -14,6 +14,8 @@ module Fog
             case name
             when 'Arn', 'UserId', 'UserName', 'Path'
               @user[name] = value
+            when 'CreateDate'
+              @user[name] = Time.parse(value)
             when 'member'
               @response['Users'] << @user
               @user = {}

data/lib/fog/aws/requests/cdn/delete_streaming_distribution.rb

@@ -5,8 +5,8 @@ module Fog
 
         # Delete a streaming distribution from CloudFront.
         #
-        # @param distribution_id [String] Id of distribution to delete.
-        # @parma etag [String] Etag of that distribution from earlier get or put
+        # @param [String] distribution_id Id of distribution to delete.
+        # @param [String] etag Etag of that distribution from earlier get or put
         #
         # @see http://docs.amazonwebservices.com/AmazonCloudFront/latest/APIReference/DeleteStreamingDistribution.html
         

data/lib/fog/aws/requests/cdn/put_distribution_config.rb

@@ -7,9 +7,9 @@ module Fog
 
         # Update a distribution in CloudFront.
         #
-        # @parm distribution_id [String] Id of distribution to update config for.
+        # @param distribution_id [String] Id of distribution to update config for.
         # @param options [Hash] Config for distribution.
-        # 
+        #
         #   REQUIRED:
         #   * S3Origin [Hash]:
         #     * DNSName [String] - origin to associate with distribution, ie 'mybucket.s3.amazonaws.com'.
@@ -117,4 +117,4 @@ module Fog
 
     end
   end
-end
+end

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

@@ -7,8 +7,8 @@ module Fog
 
         # Update a stack.
         #
-        # @parm stack_name [String] Name of the stack to update.
-        # @parm options [Hash]
+        # @param [String] stack_name Name of the stack to update.
+        # @param [Hash] options
         #   * TemplateBody [String] Structure containing the template body.
         #   or (one of the two Template parameters is required)
         #   * TemplateURL [String] URL of file containing the template body.
@@ -20,7 +20,7 @@ module Fog
         #     * StackId [String] - Id of the stack being updated
         #
         # @see http://docs.amazonwebservices.com/AWSCloudFormation/latest/APIReference/API_UpdateStack.html
-        
+        #
         def update_stack(stack_name, options = {})
           params = {
             'StackName' => stack_name,

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

@@ -7,17 +7,17 @@ module Fog
 
         # Describe stacks.
         #
-        # @para options [Hash]
-        # @option options TemplateBody [String] template structure
-        # @option options TemplateURL [String] template url
+        # @param [Hash] options
+        # @option options [String] TemplateBody template structure
+        # @option options [String] TemplateURL template url
         #
         # @return [Excon::Response]
         #   * body [Hash]:
         #     * Description [String] - description found within the template
         #     * Parameters [String] - list of template parameter structures
         #
-        # http://docs.amazonwebservices.com/AWSCloudFormation/latest/APIReference/API_ValidateTemplate.html
-        
+        # @see http://docs.amazonwebservices.com/AWSCloudFormation/latest/APIReference/API_ValidateTemplate.html
+        #
         def validate_template(options = {})
           request({
             'Action'    => 'ValidateTemplate',

data/lib/fog/aws/requests/iam/create_user.rb

@@ -44,10 +44,11 @@ module Fog
             Excon::Response.new.tap do |response|
               response.status = 200
               response.body = { 'User' => {
-                                           "UserId"   => data[:users][user_name][:user_id],
-                                           "Path"     => path,
-                                           "UserName" => user_name,
-                                           "Arn"      => (data[:users][user_name][:arn]).strip
+                                           "UserId"     => data[:users][user_name][:user_id],
+                                           "Path"       => path,
+                                           "UserName"   => user_name,
+                                           "Arn"        => (data[:users][user_name][:arn]).strip,
+                                           "CreateDate" => data[:users][user_name][:created_at]
                                            },
                                 'RequestId' => Fog::AWS::Mock.request_id
                                }

data/lib/fog/aws/requests/iam/get_user.rb

@@ -41,10 +41,11 @@ module Fog
           ) unless self.data[:users].key?(user)
           Excon::Response.new.tap do |response|
             response.body = {'User' =>  { 
-                                          'UserId'   => data[:users][user][:user_id],
-                                          'Path'     => data[:users][user][:path],
-                                          'UserName' => user,
-                                          'Arn'      => (data[:users][user][:arn]).strip 
+                                          'UserId'     => data[:users][user][:user_id],
+                                          'Path'       => data[:users][user][:path],
+                                          'UserName'   => user,
+                                          'Arn'        => (data[:users][user][:arn]).strip,
+                                          'CreateDate' => data[:users][user][:created_at]
                                         },
                              'RequestId'   => Fog::AWS::Mock.request_id }
             response.status = 200

data/lib/fog/aws/requests/iam/list_users.rb

@@ -43,10 +43,11 @@ module Fog
           #FIXME: none of the options are currently supported
           Excon::Response.new.tap do |response|
             response.body = {'Users' => data[:users].map do |user, data|
-                                          { 'UserId'   => data[:user_id],
-                                            'Path'     => data[:path],
-                                            'UserName' => user,
-                                            'Arn'      => (data[:arn]).strip }
+                                          { 'UserId'     => data[:user_id],
+                                            'Path'       => data[:path],
+                                            'UserName'   => user,
+                                            'Arn'        => (data[:arn]).strip,
+                                            'CreateDate' => data[:created_at]}
                                         end,
                              'IsTruncated' => false,
                              'RequestId'   => Fog::AWS::Mock.request_id }

data/lib/fog/aws/requests/rds/create_db_instance.rb

@@ -5,31 +5,31 @@ module Fog
 
         require 'fog/aws/parsers/rds/create_db_instance'
 
-        # create a db instance
-        # http://docs.amazonwebservices.com/AmazonRDS/latest/APIReference/API_CreateDBInstance.html
-        # ==== Parameters
-        # * DBInstanceIdentifier <~String> - name of the db instance to modify
-        #
-        # * AllocatedStorage  <~Integer> Storage space, in GB
-        # * AutoMinorVersionUpgrade <~Boolean> Indicates that minor version upgrades will be applied automatically to the DB Instance during the maintenance window
-        # * AvailabilityZone <~String> The availability zone to create the instance in
-        # * BackupRetentionPeriod  <~Integer> 0-8 The number of days to retain automated backups.
-        # * DBInstanceClass <~String> The new compute and memory capacity of the DB Instance
-        # * DBName <~String> The name of the database to create when the DB Instance is created
-        # * DBParameterGroupName <~String> The name of the DB Parameter Group to apply to this DB Instance
-        # * DBSecurityGroups <~Array> A list of DB Security Groups to authorize on this DB Instance
-        # * Engine <~String> The name of the database engine to be used for this instance.
-        # * EngineVersion <~String> The version number of the database engine to use.
-        # * MasterUsername <~String> The db master user
-        # * MasterUserPassword  <~String> The new password for the DB Instance master user
-        # * MultiAZ <~Boolean> Specifies if the DB Instance is a Multi-AZ deployment
-        # * Port <~Integer> The port number on which the database accepts connections.
-        # * PreferredBackupWindow <~String> The daily time range during which automated backups are created if automated backups are enabled
-        # * PreferredMaintenanceWindow <~String> The weekly time range (in UTC) during which system maintenance can occur, which may result in an outage
-        # * DBSubnetGroupName <~String> The name, if any, of the VPC subnet for this RDS instance
-        # ==== Returns
-        # * response<~Excon::Response>:
-        #   * body<~Hash>:
+        # Create a db instance
+        # 
+        # @param DBInstanceIdentifier [String] name of the db instance to modify
+        # @param AllocatedStorage [Integer] Storage space, in GB
+        # @param AutoMinorVersionUpgrade [Boolean] Indicates that minor version upgrades will be applied automatically to the DB Instance during the maintenance window
+        # @param AvailabilityZone [String] The availability zone to create the instance in
+        # @param BackupRetentionPeriod [Integer] 0-8 The number of days to retain automated backups.
+        # @param DBInstanceClass [String] The new compute and memory capacity of the DB Instance
+        # @param DBName [String] The name of the database to create when the DB Instance is created
+        # @param DBParameterGroupName [String] The name of the DB Parameter Group to apply to this DB Instance
+        # @param DBSecurityGroups [Array] A list of DB Security Groups to authorize on this DB Instance
+        # @param Engine [String] The name of the database engine to be used for this instance.
+        # @param EngineVersion [String] The version number of the database engine to use.
+        # @param MasterUsername [String] The db master user
+        # @param MasterUserPassword [String] The new password for the DB Instance master user
+        # @param MultiAZ [Boolean] Specifies if the DB Instance is a Multi-AZ deployment
+        # @param Port [Integer] The port number on which the database accepts connections.
+        # @param PreferredBackupWindow [String] The daily time range during which automated backups are created if automated backups are enabled
+        # @param PreferredMaintenanceWindow [String] The weekly time range (in UTC) during which system maintenance can occur, which may result in an outage
+        # @param DBSubnetGroupName [String] The name, if any, of the VPC subnet for this RDS instance
+        # 
+        # @return [Excon::Response]:
+        #   * body [Hash]:
+        # 
+        # @see http://docs.amazonwebservices.com/AmazonRDS/latest/APIReference/API_CreateDBInstance.html
         def create_db_instance(db_name, options={})
 
           if security_groups = options.delete('DBSecurityGroups')

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

@@ -15,9 +15,9 @@ module Fog
           request({
             :expects    => 204,
             :headers    => {},
-            :host       => "#{bucket_name}.#{@host}",
+            :bucket_name => bucket_name,
+            :object_name => object_name,
             :method     => 'DELETE',
-            :path       => CGI.escape(object_name),
             :query      => {'uploadId' => upload_id}
           })
         end
@@ -25,4 +25,4 @@ module Fog
       end # Real
     end # Storage
   end # AWS
-end # Fog
+end # Fog

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

@@ -34,10 +34,10 @@ module Fog
             :body       => data,
             :expects    => 200,
             :headers    => { 'Content-Length' => data.length },
-            :host       => "#{bucket_name}.#{@host}",
+            :bucket_name => bucket_name,
+            :object_name => object_name,
             :method     => 'POST',
             :parser     => Fog::Parsers::Storage::AWS::CompleteMultipartUpload.new,
-            :path       => CGI.escape(object_name),
             :query      => {'uploadId' => upload_id}
           })
         end

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

@@ -33,10 +33,10 @@ module Fog
           request({
             :expects  => 200,
             :headers  => headers,
-            :host     => "#{target_bucket_name}.#{@host}",
+            :bucket_name => target_bucket_name,
+            :object_name => target_object_name,
             :method   => 'PUT',
             :parser   => Fog::Parsers::Storage::AWS::CopyObject.new,
-            :path     => CGI.escape(target_object_name)
           })
         end
 

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

@@ -16,7 +16,7 @@ module Fog
           request({
             :expects  => 204,
             :headers  => {},
-            :host     => "#{bucket_name}.#{@host}",
+            :bucket_name => bucket_name,
             :method   => 'DELETE'
           })
         end

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

@@ -16,7 +16,7 @@ module Fog
           request({
             :expects  => 204,
             :headers  => {},
-            :host     => "#{bucket_name}.#{@host}",
+            :bucket_name => bucket_name,
             :method   => 'DELETE',
             :query    => {'cors' => nil}
           })

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

@@ -16,7 +16,7 @@ module Fog
           request({
                     :expects  => 204,
                     :headers  => {},
-                    :host     => "#{bucket_name}.#{@host}",
+                    :bucket_name => bucket_name,
                     :method   => 'DELETE',
                     :query    => {'lifecycle' => nil}
                   })

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

@@ -16,7 +16,7 @@ module Fog
           request({
             :expects  => 204,
             :headers  => {},
-            :host     => "#{bucket_name}.#{@host}",
+            :bucket_name => bucket_name,
             :method   => 'DELETE',
             :query    => {'policy' => nil}
           })

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

@@ -16,7 +16,7 @@ module Fog
           request({
             :expects  => 204,
             :headers  => {},
-            :host     => "#{bucket_name}.#{@host}",
+            :bucket_name => bucket_name,
             :method   => 'DELETE',
             :query    => {'website' => nil}
           })

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

@@ -55,7 +55,7 @@ module Fog
             :body       => data,
             :expects    => 200,
             :headers    => headers,
-            :host       => "#{bucket_name}.#{@host}",
+            :bucket_name => bucket_name,
             :method     => 'POST',
             :parser     => Fog::Parsers::Storage::AWS::DeleteMultipleObjects.new,
             :query      => {'delete' => nil}

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

@@ -24,7 +24,7 @@ module Fog
           request({
             :expects    => 204,
             :headers    => headers,
-            :host       => "#{bucket_name}.#{@host}",
+            :bucket_name => bucket_name,
             :idempotent => true,
             :method     => 'DELETE',
             :path       => path

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

@@ -44,7 +44,7 @@ module Fog
           request({
             :expects  => 200,
             :headers  => {},
-            :host     => "#{bucket_name}.#{@host}",
+            :bucket_name => bucket_name,
             :idempotent => true,
             :method   => 'GET',
             :parser   => Fog::Parsers::Storage::AWS::GetBucket.new,

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

@@ -33,7 +33,7 @@ module Fog
           request({
             :expects    => 200,
             :headers    => {},
-            :host       => "#{bucket_name}.#{@host}",
+            :bucket_name => bucket_name,
             :idempotent => true,
             :method     => 'GET',
             :parser     => Fog::Parsers::Storage::AWS::AccessControlList.new,

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

@@ -29,7 +29,7 @@ module Fog
           request({
             :expects    => 200,
             :headers    => {},
-            :host       => "#{bucket_name}.#{@host}",
+            :bucket_name => bucket_name,
             :idempotent => true,
             :method     => 'GET',
             :parser     => Fog::Parsers::Storage::AWS::CorsConfiguration.new,

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

@@ -23,7 +23,7 @@ module Fog
           request({
                     :expects  => 200,
                     :headers  => {},
-                    :host     => "#{bucket_name}.#{@host}",
+                    :bucket_name => bucket_name,
                     :idempotent => true,
                     :method   => 'GET',
                     :parser   => Fog::Parsers::Storage::AWS::GetBucketLifecycle.new,

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

@@ -19,7 +19,7 @@ module Fog
           request({
             :expects  => 200,
             :headers  => {},
-            :host     => "#{bucket_name}.#{@host}",
+            :bucket_name => bucket_name,
             :idempotent => true,
             :method   => 'GET',
             :parser   => Fog::Parsers::Storage::AWS::GetBucketLocation.new,

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

@@ -33,7 +33,7 @@ module Fog
           request({
             :expects    => 200,
             :headers    => {},
-            :host       => "#{bucket_name}.#{@host}",
+            :bucket_name => bucket_name,
             :idempotent => true,
             :method     => 'GET',
             :parser     => Fog::Parsers::Storage::AWS::GetBucketLogging.new,

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

@@ -55,7 +55,7 @@ module Fog
           request({
             :expects  => 200,
             :headers  => {},
-            :host     => "#{bucket_name}.#{@host}",
+            :bucket_name => bucket_name,
             :idempotent => true,
             :method   => 'GET',
             :parser   => Fog::Parsers::Storage::AWS::GetBucketObjectVersions.new,

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

@@ -19,7 +19,7 @@ module Fog
           response = request({
             :expects    => 200,
             :headers    => {},
-            :host       => "#{bucket_name}.#{@host}",
+            :bucket_name => bucket_name,
             :idempotent => true,
             :method     => 'GET',
             :query      => {'policy' => nil}

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

@@ -23,7 +23,7 @@ module Fog
           request({
             :expects    => 200,
             :headers    => {},
-            :host       => "#{bucket_name}.#{@host}",
+            :bucket_name => bucket_name,
             :idempotent => true,
             :method     => 'GET',
             :parser     => Fog::Parsers::Storage::AWS::GetBucketVersioning.new,

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

@@ -26,7 +26,7 @@ module Fog
           request({
             :expects    => 200,
             :headers    => {},
-            :host       => "#{bucket_name}.#{@host}",
+            :bucket_name => bucket_name,
             :idempotent => true,
             :method     => 'GET',
             :parser     => Fog::Parsers::Storage::AWS::GetBucketWebsite.new,

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

@@ -55,10 +55,10 @@ module Fog
 
           request(params.merge!({
             :expects  => [ 200, 206 ],
-            :host     => "#{bucket_name}.#{@host}",
+            :bucket_name => bucket_name,
+            :object_name => object_name,
             :idempotent => true,
             :method   => 'GET',
-            :path     => CGI.escape(object_name)
           }))
         end
 

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

@@ -43,11 +43,11 @@ module Fog
           request({
             :expects    => 200,
             :headers    => {},
-            :host       => "#{bucket_name}.#{@host}",
+            :bucket_name => bucket_name,
+            :object_name => object_name,
             :idempotent => true,
             :method     => 'GET',
             :parser     => Fog::Parsers::Storage::AWS::AccessControlList.new,
-            :path       => CGI.escape(object_name),
             :query      => query
           })
         end

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

@@ -5,25 +5,7 @@ module Fog
       module GetObjectHttpUrl
 
         def get_object_http_url(bucket_name, object_name, expires, options = {})
-          unless bucket_name
-            raise ArgumentError.new('bucket_name is required')
-          end
-          unless object_name
-            raise ArgumentError.new('object_name is required')
-          end
-          host, path = if bucket_name =~ /^(?:[a-z]|\d(?!\d{0,2}(?:\.\d{1,3}){3}$))(?:[a-z0-9]|\.(?![\.\-])|\-(?![\.])){1,61}[a-z0-9]$/
-            ["#{bucket_name}.#{@host}", object_name]
-          else
-            [@host, "#{bucket_name}/#{object_name}"]
-          end
-          http_url({
-            :headers  => {},
-            :host     => host,
-            :port     => @port,
-            :method   => 'GET',
-            :path     => path,
-            :query    => options[:query]
-          }, expires)
+          get_object_url(bucket_name, object_name, expires, options.merge(:scheme => 'http'))
         end
 
       end