miasma-aws 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a36b7462b9d20c66ddf295b05ebdf6e040347506
-  data.tar.gz: 0f5d54d5fe39d9875113c9780129bf00b5ecfa10
+  metadata.gz: a3da765abdba597864cae9b1fe0b1c81900c2a94
+  data.tar.gz: b98aab91fd9511e26ca5dbc42a8a6b8dc1730f41
 SHA512:
-  metadata.gz: 8e3d201264bee490fb391aa998fc57590d270543f4d82556444fcc875f2838b61eb2187a2f29e859a0a8279865bf278c99be651a93f554428a3692c808bc6683
-  data.tar.gz: 9ff5d373105120f4ecc53a94cb0cb3847c1d426b5bf845edd1774b91cad1d917a51d045a0fe4a327400e083c71512c5d57c1dae6d9e363123dd8718aeb1a32e4
+  metadata.gz: e1ae3d106af0bcc11a2893a8efab2eabe9980090203409ccfb8127e09afb63df62887ea71a0ae55f7656a06903e59ac3b736bd9d101075f4f6613442a3316228
+  data.tar.gz: 5f49561b607f000311ec3f530426f2898ca1e9278d0bcb5e472811539df9aeef34e32fc7ff378d2d49ed7fe25bd80fa5813410680fcf400d1b08f7c9802c547e

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v0.1.6
+* Fix state assignment when undefined within orchestration stacks
+* Fix multi-part S3 uploads
+
 ## v0.1.4
 * Fix values set within load balancer reload
 * Ensure state is valid for orchestration stack prior to set

data/lib/miasma-aws/version.rb

@@ -1,4 +1,4 @@
 module MiasmaAws
   # Current library version
-  VERSION = Gem::Version.new('0.1.4')
+  VERSION = Gem::Version.new('0.1.6')
 end

data/lib/miasma/contrib/aws.rb

@@ -394,18 +394,21 @@ module Miasma
         # @param http_method [Symbol]
         # @param request_args [Array]
         # @return [HTTP::Response]
-        # @note if http_method is :post, params will be automatically
-        #  removed and placed into :form
         def make_request(connection, http_method, request_args)
           dest, options = request_args
           path = URI.parse(dest).path
           options = options ? options.to_smash : Smash.new
-          options[:params] = options.fetch(:params, Smash.new).to_smash.deep_merge('Version' => self.class::API_VERSION)
-          if(http_method.to_sym == :post)
+          if(self.class::API_VERSION)
             if(options[:form])
-              options[:form].merge(options.delete(:params))
+              options.set(:form, 'Version', self.class::API_VERSION)
             else
-              options[:form] = options.delete(:params)
+              options[:params] = options.fetch(
+                :params, Smash.new
+              ).to_smash.deep_merge(
+                Smash.new(
+                  'Version' => self.class::API_VERSION
+                )
+              )
             end
           end
           update_request(connection, options)

data/lib/miasma/contrib/aws/orchestration.rb

@@ -75,8 +75,8 @@ module Miasma
             state = stk['StackStatus'].downcase.to_sym
             unless(Miasma::Models::Orchestration::VALID_RESOURCE_STATES.include?(state))
               parts = state.to_s.split('_')
-              state = [state.first, *state.slice(-2, state.size)].join('_').to_sym
-              unless(Miasma::Models::Orchestration::VALID_RESOURCE_STATES.include?(state))
+              state = [parts.first, *parts.slice(-2, parts.size)].join('_').to_sym
+              unless(Miasma::Models::Orchestration::VALID_RESOURCE_STATES.include?(parts))
                 state = :unknown
               end
             end
@@ -136,7 +136,7 @@ module Miasma
             result = request(
               :path => '/',
               :method => :post,
-              :params => Smash.new(
+              :form => Smash.new(
                 'Action' => 'UpdateStack'
               ).merge(params)
             )
@@ -148,7 +148,7 @@ module Miasma
             result = request(
               :path => '/',
               :method => :post,
-              :params => Smash.new(
+              :form => Smash.new(
                 'Action' => 'CreateStack',
                 'DisableRollback' => !!stack.disable_rollback
               ).merge(params)
@@ -227,7 +227,7 @@ module Miasma
             result = request(
               :method => :post,
               :path => '/',
-              :params => Smash.new(
+              :form => Smash.new(
                 'Action' => 'ValidateTemplate',
                 'TemplateBody' => MultiJson.dump(stack.template)
               )

data/lib/miasma/contrib/aws/storage.rb

@@ -9,7 +9,7 @@ module Miasma
 
         # Service name of the API
         API_SERVICE = 's3'
-        # Supported version of the AutoScaling API
+        # Supported version of the Storage API
         API_VERSION = '2006-03-01'
 
         include Contrib::AwsApiCore::ApiCommon
@@ -191,7 +191,7 @@ module Miasma
           if(file.dirty?)
             file.load_data(file.attributes)
             args = Smash.new
-            args[:headers] = Smash[
+            headers = Smash[
               Smash.new(
                 :content_type => 'Content-Type',
                 :content_disposition => 'Content-Disposition',
@@ -202,73 +202,90 @@ module Miasma
                 end
               end.compact
             ]
-            if(file.attributes[:body].is_a?(IO) && file.body.size >= Storage::MAX_BODY_SIZE_FOR_STRINGIFY)
+            unless(headers.empty?)
+              args[:headers] = headers
+            end
+            if(file.attributes[:body].respond_to?(:read) && file.attributes[:body].size >= Storage::MAX_BODY_SIZE_FOR_STRINGIFY)
               upload_id = request(
                 args.merge(
                   Smash.new(
+                    :method => :post,
                     :path => file_path(file),
-                    :endpoint => bucket_endpoint(bucket),
+                    :endpoint => bucket_endpoint(file.bucket),
                     :params => {
                       :uploads => true
                     }
                   )
                 )
               ).get(:body, 'InitiateMultipartUploadResult', 'UploadId')
-              count = 1
-              parts = []
-              file.body.rewind
-              while(content = file.body.read(Storage::READ_BODY_CHUNK_SIZE))
-                parts << [
-                  count,
-                  request(
-                    :method => :put,
-                    :path => file_path(file),
-                    :endpoint => bucket_endpoint(bucket),
-                    :headers => Smash.new(
-                      'Content-Length' => content.size,
-                      'Content-MD5' => Digest::MD5.hexdigest(content)
-                    ),
-                    :params => Smash.new(
-                      'partNumber' => count,
-                      'uploadId' => upload_id
-                    ),
-                    :body => content
-                  ).get(:body, :headers, :etag)
-                ]
-                count += 1
-              end
-              complete = SimpleXml.xml_out(
-                Smash.new(
-                  'CompleteMultipartUpload' => {
-                    'Part' => parts.map{|part|
-                      {'PartNumber' => part.first, 'ETag' => part.last}
+              begin
+                count = 1
+                parts = []
+                file.body.rewind
+                while(content = file.body.read(Storage::READ_BODY_CHUNK_SIZE))
+                  parts << [
+                    count,
+                    request(
+                      :method => :put,
+                      :path => file_path(file),
+                      :endpoint => bucket_endpoint(file.bucket),
+                      :headers => Smash.new(
+                        'Content-Length' => content.size,
+                        'Content-MD5' => Base64.urlsafe_encode64(Digest::MD5.digest(content))
+                      ),
+                      :params => Smash.new(
+                        'partNumber' => count,
+                        'uploadId' => upload_id
+                      ),
+                      :body => content
+                    ).get(:headers, :etag)
+                  ]
+                  count += 1
+                end
+                complete = XmlSimple.xml_out(
+                  Smash.new(
+                    'CompleteMultipartUpload' => {
+                      'Part' => parts.map{|part|
+                        {'PartNumber' => part.first, 'ETag' => part.last}
+                      }
                     }
-                  }
-                ),
-                'AttrPrefix' => true,
-                'KeepRoot' => true
-              )
-              result = request(
-                :method => :post,
-                :path => file_path(file),
-                :endpoint => bucket_endpoint(file.bucket),
-                :params => Smash.new(
-                  'UploadId' => upload_id
-                ),
-                :headers => Smash.new(
-                  'Content-Length' => complete.size
-                ),
-                :body => complete
-              )
-              file.etag = result.get(:body, 'CompleteMultipartUploadResult', 'ETag')
+                  ),
+                  'AttrPrefix' => true,
+                  'KeepRoot' => true
+                )
+                result = request(
+                  :method => :post,
+                  :path => file_path(file),
+                  :endpoint => bucket_endpoint(file.bucket),
+                  :params => Smash.new(
+                    'uploadId' => upload_id
+                  ),
+                  :headers => Smash.new(
+                    'Content-Length' => complete.size
+                  ),
+                  :body => complete
+                )
+                file.etag = result.get(:body, 'CompleteMultipartUploadResult', 'ETag')
+              rescue
+                request(
+                  :method => :delete,
+                  :path => file_path(file),
+                  :endpoint => bucket_endpoint(file.bucket),
+                  :params => {
+                    'uploadId' => upload_id
+                  },
+                  :expects => 204
+                )
+                raise
+              end
             else
               if(file.attributes[:body].respond_to?(:readpartial))
-                args[:headers]['Content-Length'] = file.body.size.to_s
+                args.set(:headers, 'Content-Length', file.body.size.to_s)
                 file.body.rewind
                 args[:body] = file.body.readpartial(file.body.size)
                 file.body.rewind
               else
-                args[:headers]['Content-Length'] = 0
+                args.set(:headers, 'Content-Length', 0)
               end
               result = request(
                 args.merge(

data/miasma-aws.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.description = 'Smoggy AWS API'
   s.license = 'Apache 2.0'
   s.require_path = 'lib'
-  s.add_development_dependency 'miasma', '>= 0.2.16'
+  s.add_development_dependency 'miasma', '>= 0.2.18'
   s.add_development_dependency 'pry'
   s.add_development_dependency 'minitest'
   s.add_development_dependency 'vcr'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miasma-aws
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-05 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: miasma
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.16
+        version: 0.2.18
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.16
+        version: 0.2.18
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement