dpl 1.8.46.travis.2444.5 → 1.8.46.travis.2449.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f3b30584a77e5baacef99591ecf51e304b1ed4c264110828ce607e8119787c8
-  data.tar.gz: 79b0eace9dc64bea95e735a5dcd0363f736cc4ad9e033e76e04ec4cf65f2f8f6
+  metadata.gz: 96fb9abc3fc6d052902059b2d8b1b5053ee6ab2b3c77f165ab5781b7ba0ba778
+  data.tar.gz: 65a87f93837a415f656d05ab18a8babb3a1d5cda4653264be72da0c16ce12b27
 SHA512:
-  metadata.gz: 990c3a6936b3e6943eb3b7cd6e46b03e57e032967d6f18eec19b5ee947fb67b60f48845f287b1bf03d2436e682251d083b554f17b8d6ee48b003de35806b425a
-  data.tar.gz: 1175a06901503a46076f1f80570a98cc964b9e101cd0d9c3adc0b8ff41ea2d1c09f8583fef864ac67a4118f903ddadda640c4c9d53a17cc78784a9530fd5281d
+  metadata.gz: 52387ff08adc657282ac88979234d179b0bda756daf40bf78027246ab5f2c04ed05be0a4735d96eed346b2af80ca8d72431cb2a0a74c929af23e09bdef6aa551
+  data.tar.gz: 70312643c6ca282a022e82084c10e4561b8538d2d9cc94a19cd1b32afda099c0a3cdda6992d6ac9e009c28ca9d85b5342ba54db023d633e0001604928b7b1c82

data/lib/dpl/provider/code_deploy.rb

@@ -9,6 +9,10 @@ module DPL
         @code_deploy ||= Aws::CodeDeploy::Client.new(code_deploy_options)
       end
 
+      def s3api
+        @s3api ||= Aws::S3::Client.new(code_deploy_options)
+      end
+
       def code_deploy_options
         code_deploy_options = {
           region:      options[:region] || 'us-east-1',
@@ -39,13 +43,23 @@ module DPL
         end
       end
 
+      def revision_version_info
+          s3obj = s3api.head_object({
+              bucket: option(:bucket),
+              key: s3_key
+            })
+      end
+
       def s3_revision
+        s3info = revision_version_info
         {
           revision_type: 'S3',
           s3_location: {
             bucket:      option(:bucket),
             bundle_type: bundle_type,
-            key:         s3_key
+            key:         s3_key,
+            version:     s3info[:version_id],
+            e_tag:       s3info[:etag]
           }
         }
       end
@@ -61,6 +75,16 @@ module DPL
       end
 
       def push_app
+        rev = revision()
+        if rev[:s3_location]
+            rev_info = rev[:s3_location]
+            log "Registering app revision with version=#{rev_info[:version]}, etag=#{rev_info[:e_tag]}"
+        end
+        code_deploy.register_application_revision({
+            revision:               rev,
+            application_name:       options[:application] || option(:application_name),
+            description:            options[:description] || default_description
+        })
         data = code_deploy.create_deployment({
           revision:               revision,
           application_name:       options[:application]      || option(:application_name),

data/spec/provider/code_deploy_spec.rb

@@ -89,7 +89,9 @@ describe DPL::Provider::CodeDeploy do
       s3_location: {
         bucket:      'bucket',
         bundle_type: 'tar',
-        key:         'key'
+        key:         'key',
+        version:     'object_version_id',
+        e_tag:       'etag'
       }
     }
 
@@ -162,9 +164,14 @@ describe DPL::Provider::CodeDeploy do
     key = "/some/key.#{bundle_type}"
 
     before(:each) do
-      expect(provider).to receive(:option).with(:bucket).and_return(bucket)
+      head_data = provider.s3api.stub_data(:head_object, {
+          version_id: 'object_version_id',
+          etag: 'etag'
+      })
+      provider.s3api.stub_responses(:head_object, head_data)
+      expect(provider).to receive(:option).with(:bucket).and_return(bucket).twice
       expect(provider).to receive(:bundle_type).and_return(bundle_type)
-      expect(provider).to receive(:s3_key).and_return(key)
+      expect(provider).to receive(:s3_key).and_return(key).twice
     end
 
     example do
@@ -173,7 +180,9 @@ describe DPL::Provider::CodeDeploy do
         s3_location: {
           bucket: bucket,
           bundle_type: bundle_type,
-          key: key
+          key: key,
+	      version: 'object_version_id',
+	      e_tag: 'etag'
         }
       })
     end
@@ -357,4 +366,4 @@ describe DPL::Provider::CodeDeploy do
       provider.check_auth
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.8.46.travis.2444.5
+  version: 1.8.46.travis.2449.5
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-19 00:00:00.000000000 Z
+date: 2018-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec