fog 0.3.17 → 0.3.18

data/lib/fog/aws/models/compute/volume.rb

@@ -8,17 +8,18 @@ module Fog
         extend Fog::Deprecation
         deprecate(:status, :state)
 
-        identity  :id,                :aliases => 'volumeId'
+        identity  :id,                    :aliases => 'volumeId'
 
-        attribute :attached_at,       :aliases => 'attachTime'
-        attribute :availability_zone, :aliases => 'availabilityZone'
-        attribute :created_at,        :aliases => 'createTime'
+        attribute :attached_at,           :aliases => 'attachTime'
+        attribute :availability_zone,     :aliases => 'availabilityZone'
+        attribute :created_at,            :aliases => 'createTime'
+        attribute :delete_on_termination, :aliases => 'deleteOnTermination'
         attribute :device
-        attribute :server_id,         :aliases => 'instanceId'
+        attribute :server_id,             :aliases => 'instanceId'
         attribute :size
-        attribute :snapshot_id,       :aliases => 'snapshotId'
-        attribute :state,             :aliases => 'status'
-        attribute :tags,              :aliases => 'tagSet'
+        attribute :snapshot_id,           :aliases => 'snapshotId'
+        attribute :state,                 :aliases => 'status'
+        attribute :tags,                  :aliases => 'tagSet'
 
         def initialize(attributes = {})
           # assign server first to prevent race condition with new_record?

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

@@ -5,17 +5,24 @@ module Fog
     class Storage
 
       class File < Fog::Model
+        extend Fog::Deprecation
+        deprecate(:size, :content_length)
+        deprecate(:size=, :content_length=)
 
         identity  :key,             :aliases => 'Key'
 
         attr_writer :body
-        attribute :content_length,  :aliases => 'Content-Length'
-        attribute :content_type,    :aliases => 'Content-Type'
-        attribute :etag,            :aliases => ['Etag', 'ETag']
-        attribute :last_modified,   :aliases => ['Last-Modified', 'LastModified']
-        attribute :owner,           :aliases => 'Owner'
-        attribute :size,            :aliases => 'Size'
-        attribute :storage_class,   :aliases => 'StorageClass'
+        attribute :cache_control,       :aliases => 'Cache-Control'
+        attribute :content_disposition, :aliases => 'Content-Disposition'
+        attribute :content_encoding,    :aliases => 'Content-Encoding'
+        attribute :content_length,      :aliases => ['Content-Length', 'Size'], :type => :integer
+        attribute :content_md5,         :aliases => 'Content-MD5'
+        attribute :content_type,        :aliases => 'Content-Type'
+        attribute :etag,                :aliases => ['Etag', 'ETag']
+        attribute :expires,             :aliases => 'Expires'
+        attribute :last_modified,       :aliases => ['Last-Modified', 'LastModified'], :type => :time
+        attribute :owner,               :aliases => 'Owner'
+        attribute :storage_class,       :aliases => ['x-amz-storage-class', 'StorageClass']
 
         def acl=(new_acl)
           valid_acls = ['private', 'public-read', 'public-read-write', 'authenticated-read']
@@ -80,14 +87,17 @@ module Fog
           if options != {}
             Formatador.display_line("[yellow][WARN] options param is deprecated, use acl= instead[/] [light_black](#{caller.first})[/]")
           end
-          if @acl
-            options['x-amz-acl'] ||= @acl
-          end
-          if content_type
-            options['Content-Type'] = content_type
-          end
+          options['x-amz-acl'] ||= @acl if @acl
+          options['Cache-Control'] = cache_control if cache_control
+          options['Content-Disposition'] = content_disposition if content_disposition
+          options['Content-Encoding'] = content_encoding if content_encoding
+          options['Content-MD5'] = content_md5 if content_md5
+          options['Content-Type'] = content_type if content_type
+          options['Expires'] = expires if expires
+          options['x-amz-storage-class'] = storage_class if storage_class
+
           data = connection.put_object(directory.key, @key, @body, options)
-          @etag = data.headers['ETag']
+          merge_attributes(data.headers)
           true
         end
 

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

@@ -41,15 +41,10 @@ module Fog
         def get(key, options = {}, &block)
           requires :directory
           data = connection.get_object(directory.key, key, options, &block)
-          file_data = {
+          file_data = data.headers.merge({
             :body => data.body,
             :key  => key
-          }
-          for key, value in data.headers
-            if ['Content-Length', 'Content-Type', 'ETag', 'Last-Modified'].include?(key)
-              file_data[key] = value
-            end
-          end
+          })
           new(file_data)
         rescue Excon::Errors::NotFound
           nil
@@ -63,14 +58,9 @@ module Fog
         def head(key, options = {})
           requires :directory
           data = connection.head_object(directory.key, key, options)
-          file_data = {
+          file_data = data.headers.merge({
             :key => key
-          }
-          for key, value in data.headers
-            if ['Content-Length', 'Content-Type', 'ETag', 'Last-Modified'].include?(key)
-              file_data[key] = value
-            end
-          end
+          })
           new(file_data)
         rescue Excon::Errors::NotFound
           nil

data/lib/fog/aws/parsers/cdn/distribution.rb

@@ -9,6 +9,15 @@ module Fog
             @response = { 'DistributionConfig' => { 'CNAME' => [], 'Logging' => {}, 'TrustedSigners' => [] } }
           end
 
+          def start_element(name, attrs = [])
+            super
+            case name
+            when 'CustomOrigin', 'S3Origin'
+              @origin = name
+              @response['DistributionConfig'][@origin] = {}
+            end
+          end
+
           def end_element(name)
             case name
             when 'AwsAccountNumber'
@@ -17,16 +26,22 @@ module Fog
               @response['DistributionConfig']['Logging'][name] = @value
             when 'CNAME'
               @response['DistributionConfig']['CNAME'] << @value
+            when 'DNSName', 'OriginAccessIdentity', 'OriginProtocolPolicy'
+              @response['DistributionConfig'][@origin][name] = @value
             when 'DomainName', 'Id', 'Status'
               @response[name] = @value
             when 'CallerReference', 'Comment', 'DefaultRootObject', 'Origin', 'OriginAccessIdentity'
-              @response['DistributionConfig'][name] << @value
+              @response['DistributionConfig'][name] = @value
             when 'Enabled'
               if @value == 'true'
                 @response['DistributionConfig'][name] = true
               else
                 @response['DistributionConfig'][name] = false
               end
+            when 'HTTPPort', 'HTTPSPort'
+              @response['DistributionConfig'][@origin][name] = @value.to_i
+            when 'InProgressInvalidationBatches'
+              @response[name] = @value.to_i
             when 'LastModifiedTime'
               @response[name] = Time.parse(@value)
             when 'Protocol'

data/lib/fog/aws/parsers/cdn/get_distribution_list.rb

@@ -10,6 +10,15 @@ module Fog
             @response = { 'DistributionSummary' => [] }
           end
 
+          def start_element(name, attrs = [])
+            super
+            case name
+            when 'CustomOrigin', 'S3Origin'
+              @origin = name
+              @distribution_summary[@origin] = {}
+            end
+          end
+
           def end_element(name)
             case name
             when 'DistributionSummary'
@@ -19,12 +28,16 @@ module Fog
               @distribution_summary[name] = @value
             when 'CNAME'
               @distribution_summary[name] << @value
+            when 'DNSName', 'OriginAccessIdentity', 'OriginProtocolPolicy'
+              @distribution_summary[@origin][name] = @value
             when 'Enabled'
               if @value == 'true'
                 @distribution_summary[name] = true
               else
                 @distribution_summary[name] = false
               end
+            when 'HTTPPort', 'HTTPSPort'
+              @distribution_summary[@origin][name] = @value.to_i
             when 'LastModifiedTime'
               @distribution_summary[name] = Time.parse(@value)
             when 'IsTruncated'

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

@@ -30,6 +30,8 @@ module Fog
                 @in_attachment_set = false
               when 'attachTime'
                 @attachment[name] = Time.parse(@value)
+              when 'deleteOnTermination'
+                @attachment[name] = @value == 'true'
               when 'device', 'instanceId', 'status', 'volumeId'
                 @attachment[name] = @value
               when 'item'

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

@@ -3,7 +3,7 @@ module Fog
     module AWS
       module IAM
 
-        class CreateGroups < Fog::Parsers::Base
+        class CreateGroup < Fog::Parsers::Base
 
           def reset
             @response = { 'Group' => {} }
@@ -14,7 +14,7 @@ module Fog
             when 'Arn', 'GroupId', 'GroupName', 'Path'
               @response['Group'][name] = @value
             when 'RequestId'
-              response[name] = @value
+              @response[name] = @value
             end
           end
 

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

@@ -0,0 +1,26 @@
+module Fog
+  module Parsers
+    module AWS
+      module IAM
+
+        class CreateUser < Fog::Parsers::Base
+
+          def reset
+            @response = { 'User' => {} }
+          end
+
+          def end_element(name)
+            case name
+            when 'Arn', 'UserId', 'UserName', 'Path'
+              @response['User'][name] = @value
+            when 'RequestId'
+              @response[name] = @value
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+module Fog
+  module Parsers
+    module AWS
+      module IAM
+
+        class ListGroups < Fog::Parsers::Base
+
+          def reset
+            @response = { 'PolicyNames' => [] }
+          end
+
+          def end_element(name)
+            case name
+            when 'member'
+              @response['PolicyNames'] << @value
+            when 'IsTruncated'
+              response[name] = (@value == 'true')
+            when 'Marker', 'RequestId'
+              response[name] = @value
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

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

@@ -19,7 +19,7 @@ module Fog
               @group = {}
             when 'IsTruncated'
               response[name] = (@value == 'true')
-            when 'RequestId'
+            when 'Marker', 'RequestId'
               response[name] = @value
             end
           end

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

@@ -0,0 +1,24 @@
+module Fog
+  module Parsers
+    module AWS
+      module Storage
+
+        class CompleteMultipartUpload < Fog::Parsers::Base
+
+          def reset
+            @response = {}
+          end
+
+          def end_element(name)
+            case name
+            when 'Bucket', 'ETag', 'Key', 'Location'
+              @response[name] = @value
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+module Fog
+  module Parsers
+    module AWS
+      module Storage
+
+        class InitiateMultipartUpload < Fog::Parsers::Base
+
+          def reset
+            @response = {}
+          end
+
+          def end_element(name)
+            case name
+            when 'Bucket', 'Key', 'UploadId'
+              @response[name] = @value
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,56 @@
+module Fog
+  module Parsers
+    module AWS
+      module Storage
+
+        class ListMultipartUploads < Fog::Parsers::Base
+
+          def reset
+            @upload = { 'Initiator' => {}, 'Owner' => {} }
+            @response = { 'Upload' => [] }
+          end
+
+          def start_element(name, attrs = [])
+            super
+            case name
+            when 'Initiator'
+              @in_initiator = true
+            when 'Owner'
+              @in_owner = true
+            end
+          end
+
+          def end_element(name)
+            case name
+            when 'Bucket', 'KeyMarker', 'NextKeyMarker', 'NextUploadIdMarker', 'UploadIdMarker'
+              @response[name] = @value
+            when 'DisplayName', 'ID'
+              if @in_initiator
+                @upload['Initiator'][name] = @value
+              elsif @in_owner
+                @upload['Owner'][name] = @value
+              end
+            when 'Initiated'
+              @upload[name] = Time.parse(@value)
+            when 'Initiator'
+              @in_initiator = false
+            when 'IsTruncated'
+              @response[name] = @value == 'true'
+            when 'Key', 'StorageClass', 'UploadId'
+              @upload[name] = @value
+            when 'MaxUploads'
+              @response[name] = @value.to_i
+            when 'Owner'
+              @in_owner = false
+            when 'Upload'
+              @response['Upload'] << @upload
+              @upload = { 'Initiator' => {}, 'Owner' => {} }
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,40 @@
+module Fog
+  module Parsers
+    module AWS
+      module Storage
+
+        class ListParts < Fog::Parsers::Base
+
+          def reset
+            @part = {}
+            @response = { 'Initiator' => {}, 'Part' => [] }
+          end
+
+          def end_element(name)
+            case name
+            when 'Bucket', 'Key', 'NextPartNumberMarker', 'PartNumberMarker', 'StorageClass', 'UploadId'
+              @response[name] = @value
+            when 'DisplayName', 'ID'
+              @response['Initiator'][name] = @value
+            when 'ETag'
+              @part[name] = @value
+            when 'IsTruncated'
+              @response[name] = @value == 'true'
+            when 'LastModified'
+              @part[name] = Time.parse(@value)
+            when 'MaxParts'
+              @response[name] = @value.to_i
+            when 'Part'
+              @response['Part'] << @part
+              @part = {}
+            when 'PartNumber', 'Size'
+              @part[name] = @value.to_i
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

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

@@ -13,7 +13,16 @@ module Fog
         # ==== Returns
         # * response<~Excon::Response>:
         #   * body<~Hash>:
-        #     * 'DomainName'<~String>: Domain name of distribution
+        #     * 'S3Origin'<~Hash>:
+        #       * 'DNSName'<~String> - origin to associate with distribution, ie 'mybucket.s3.amazonaws.com'
+        #       * 'OriginAccessIdentity'<~String> - Optional: Used when serving private content
+        #     or
+        #     * 'CustomOrigin'<~Hash>:
+        #       * 'DNSName'<~String> - origin to associate with distribution, ie 'www.example.com'
+        #       * 'HTTPPort'<~Integer> - HTTP port of origin, in [80, 443] or (1024...65535)
+        #       * 'HTTPSPort'<~Integer> - HTTPS port of origin, in [80, 443] or (1024...65535)
+        #       * 'OriginProtocolPolicy'<~String> - Policy on using http vs https, in ['http-only', 'match-viewer']
+        #
         #     * 'Id'<~String> - Id of distribution
         #     * 'LastModifiedTime'<~String> - Timestamp of last modification of distribution
         #     * 'Status'<~String> - Status of distribution
@@ -22,6 +31,7 @@ module Fog
         #       * 'CNAME'<~Array> - array of associated cnames
         #       * 'Comment'<~String> - comment associated with distribution
         #       * 'Enabled'<~Boolean> - whether or not distribution is enabled
+        #       * 'InProgressInvalidationBatches'<~Integer> - number of invalidation batches in progress
         #       * 'Logging'<~Hash>:
         #         * 'Bucket'<~String> - bucket logs are stored in
         #         * 'Prefix'<~String> - prefix logs are stored with