dpl 1.8.47.travis.2484.5 → 1.8.47.travis.2485.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa0e85e41ffa55b9fe35b524f00c9e7703a6fe34684f5183f54c11920bfc1228
-  data.tar.gz: fd06a51a7982c3caed35d1c85f775ac7ae09d2710938e12e0cd4f07231b37d4d
+  metadata.gz: a2698d9b83b3abe7dbee75e7209004d2865d70ca02ea4903f19ff4cadc19f212
+  data.tar.gz: 01c556f6646af1105a924708c0d39c95ca24a5d77b139260bf5f0614896acc8b
 SHA512:
-  metadata.gz: be8e6b9ea46179e8ffeb8d6ec5aca520fd7f7d23f7830e9bd43e5b990d2ef4ed24ba91cbad98fe8290ea60d6af668d1de3fc9b0b0f491248fdd4942f0c833826
-  data.tar.gz: b7e29b0c737ec2b65dee8d0bb523c47584adcf86fe6712b4fd50c6d86bb3b3ef61d8cb0b9ccf727c5a79b3a77361ef02affcbfe2a208f4f1819183c19694d021
+  metadata.gz: 02c6b15694c842413acd57745483dac4cf482a1984b672773c56e4a2348de1369a14bc055e81d27ece1890bc6d862c657dda5d4716a444665fd1a4b0dfffa002
+  data.tar.gz: e628c3094b866928938bf0c030bf8654b0a9d8c0df3e74e0a22389161af6dd7c855b91bef1667ae6789f3756d6d20caed6db788379d81290bd1e6402ddfb0fe4

data/lib/dpl/provider/code_deploy.rb

@@ -44,24 +44,29 @@ module DPL
       end
 
       def revision_version_info
-        s3obj = s3api.head_object({
+        s3api.head_object({
           bucket: option(:bucket),
           key: s3_key
         })
+      rescue Aws::Errors::ServiceError
+        {}
       end
 
       def s3_revision
-        s3info = revision_version_info
-        {
+        info = {
           revision_type: 'S3',
           s3_location: {
             bucket:      option(:bucket),
             bundle_type: bundle_type,
             key:         s3_key,
-            version:     s3info[:version_id],
-            e_tag:       s3info[:etag]
           }
         }
+        unless revision_version_info.empty?
+          info[:s3_location][:version] = revision_version_info[:version_id]
+          info[:s3_location][:e_tag]   = revision_version_info[:etag]
+        end
+
+        info
       end
 
       def github_revision
@@ -76,15 +81,17 @@ module DPL
 
       def push_app
         rev = revision()
-        if rev[:s3_location]
-          rev_info = rev[:s3_location]
+        rev_info = rev[:s3_location]
+
+        if rev_info && rev_info[:version]
           log "Registering app revision with version=#{rev_info[:version]}, etag=#{rev_info[:e_tag]}"
+          code_deploy.register_application_revision({
+            revision:               rev,
+            application_name:       options[:application] || option(:application_name),
+            description:            options[:description] || default_description
+          })
         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

@@ -164,27 +164,24 @@ describe DPL::Provider::CodeDeploy do
     key = "/some/key.#{bundle_type}"
 
     before(:each) do
-      head_data = provider.s3api.stub_data(:head_object, {
+      head_data = provider.s3api.stub(:head_object).and_return({
         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(:option).at_least(1).times.with(:bucket).and_return(bucket)
       expect(provider).to receive(:bundle_type).and_return(bundle_type)
-      expect(provider).to receive(:s3_key).and_return(key).twice
+      expect(provider).to receive(:s3_key).at_least(1).times.and_return(key)
     end
 
     example do
-      expect(provider.s3_revision).to eq({
-        revision_type: 'S3',
-        s3_location: {
+      expect(provider.s3_revision[:s3_location]).to include(
           bucket: bucket,
           bundle_type: bundle_type,
           key: key,
           version: 'object_version_id',
           e_tag: 'etag'
-        }
-      })
+        )
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.8.47.travis.2484.5
+  version: 1.8.47.travis.2485.5
 platform: ruby
 authors:
 - Konstantin Haase