dpl 1.8.33.travis.2043.5 → 1.8.33.travis.2048.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64dcad194e406a8e0b3f774f84d907802f286078
-  data.tar.gz: c37f071970e16bb74efb84fce8fb678c2bdeb023
+  metadata.gz: 94eaa89e30d693a6e71a6cf33f6decbefb3c39c6
+  data.tar.gz: b9e874e25b2b74f510cb2809accda9594244d7d6
 SHA512:
-  metadata.gz: 995e3de5a3db67c1128220ba9bea6bd8e67fcdb73e21a241cb4b7ecb6607335db859e4f5b22f44108bf91492704689ce8bc7984e3cf6aac56ab3d7d7b54db1f0
-  data.tar.gz: 4390f727602c221af13bb2719f64d33155bf3bb046c8f3ee40fb9f058803b06e99b6e8470542faef59a50ff144004b2a9534a3525f5df999ffa565a899516d7c
+  metadata.gz: edbd02e1311a6a921580251ff95af76f1847fd38b6c4c758eee65de8d497ae0dd07ec169e4d3bae7b389ada7af259e1f1433542aeab121aea77f72983afce963
+  data.tar.gz: 3c33befa02377155159e082347c75e82aa46f09ed5e783529d0ec499bda9e41ed6c59102c5296a7e4557a0ccf3b752698a2358ef5674a332bdcd5d271810a5ea

data/lib/dpl/provider/elastic_beanstalk.rb

@@ -99,11 +99,11 @@ module DPL
       end
 
       def bucket_exists?
-        s3.buckets.map(&:name).include? bucket_name
+        s3.bucket(bucket_name).exists?
       end
 
       def create_bucket
-        s3.buckets.create(bucket_name)
+        s3.bucket(bucket_name).create
       end
 
       def files_to_pack

data/spec/provider/elastic_beanstalk_spec.rb

@@ -23,7 +23,7 @@ describe DPL::Provider::ElasticBeanstalk do
 
   let(:s3_mock) do
     hash_dbl = double("Hash", :[] => bucket_mock, :map => [])
-    double("Aws::S3", buckets: hash_dbl, config: hash_dbl)
+    double("Aws::S3", bucket: hash_dbl, config: hash_dbl)
   end
 
   let(:io_double) do
@@ -69,7 +69,8 @@ describe DPL::Provider::ElasticBeanstalk do
     end
 
     example 'bucket exists already' do
-      allow(s3_mock.buckets).to receive(:map).and_return([bucket_name])
+      allow(s3_mock).to receive(:bucket).with(bucket_name).and_return(bucket_mock)
+      allow(bucket_mock).to receive(:exists?).and_return(true)
       allow(bucket_mock).to receive(:object).with("some/app/file.zip").and_return(s3_obj_double)
 
       expect(provider).to receive(:s3).and_return(s3_mock).twice
@@ -85,7 +86,8 @@ describe DPL::Provider::ElasticBeanstalk do
     end
 
     example 'bucket doesnt exist yet' do
-      allow(s3_mock.buckets).to receive(:map).and_return([])
+      allow(s3_mock).to receive(:bucket).with(bucket_name).and_return(bucket_mock)
+      allow(bucket_mock).to receive(:exists?).and_return(false)
       allow(bucket_mock).to receive(:object).with("some/app/file.zip").and_return(s3_obj_double)
 
       expect(provider).to receive(:s3).and_return(s3_mock).twice
@@ -104,11 +106,12 @@ describe DPL::Provider::ElasticBeanstalk do
       let(:only_create_app_version) { true }
 
       example 'verify the app is not updated' do
-        allow(s3_mock.buckets).to receive(:map).and_return([])
+        allow(s3_mock).to receive(:bucket).with(bucket_name).and_return(bucket_mock)
+        allow(bucket_mock).to receive(:exists?).and_return(false)
+        allow(bucket_mock).to receive(:create)
         allow(bucket_mock).to receive(:object).with("some/app/file.zip").and_return(s3_obj_double)
 
-        expect(provider).to receive(:s3).and_return(s3_mock).twice
-        expect(provider).to receive(:create_bucket)
+        expect(provider).to receive(:s3).and_return(s3_mock).at_least(3).times
         expect(provider).to receive(:create_zip).and_return('/path/to/file.zip')
         expect(provider).to receive(:archive_name).and_return('file.zip')
         expect(provider).to receive(:upload).with('file.zip', '/path/to/file.zip').and_call_original
@@ -122,11 +125,12 @@ describe DPL::Provider::ElasticBeanstalk do
 
     context 'When the bucket_path option is not set' do
       example 'Does not prepend bucket_path to the s3 bucket' do
+        allow(s3_mock).to receive(:bucket).with(bucket_name).and_return(bucket_mock)
         allow(bucket_mock).to receive(:object).with("file.zip").and_return(s3_obj_double)
-        allow(s3_mock.buckets).to receive(:map).and_return([bucket_name])
+        allow(bucket_mock).to receive(:exists?).and_return(false)
+        allow(bucket_mock).to receive(:create)
 
-        expect(provider_without_bucket_path).to receive(:s3).and_return(s3_mock).twice
-        expect(provider_without_bucket_path).not_to receive(:create_bucket)
+        expect(provider_without_bucket_path).to receive(:s3).and_return(s3_mock).at_least(3).times
         expect(provider_without_bucket_path).to receive(:create_zip).and_return('/path/to/file.zip')
         expect(provider_without_bucket_path).to receive(:archive_name).and_return('file.zip')
         expect(provider_without_bucket_path).to receive(:bucket_path).and_return(nil)
@@ -143,10 +147,11 @@ describe DPL::Provider::ElasticBeanstalk do
       let(:wait_until_deployed) { true }
 
       example 'Waits until deployment completes' do
+        allow(bucket_mock).to receive(:exists?).and_return(false)
+        allow(bucket_mock).to receive(:create)
         allow(bucket_mock).to receive(:object).with("some/app/file.zip").and_return(s3_obj_double)
 
-        expect(provider).to receive(:s3).and_return(s3_mock).twice
-        expect(provider).to receive(:create_bucket)
+        expect(provider).to receive(:s3).and_return(s3_mock).at_least(3).times
         expect(provider).to receive(:create_zip).and_return('/path/to/file.zip')
         expect(provider).to receive(:archive_name).and_return('file.zip')
         expect(provider).to receive(:upload).with('file.zip', '/path/to/file.zip').and_call_original
@@ -162,8 +167,9 @@ describe DPL::Provider::ElasticBeanstalk do
     context "when zip_file option is given" do
       before :each do
         allow(bucket_mock).to receive(:object).with("some/app/file.zip").and_return(s3_obj_double)
-        expect(provider).to receive(:s3).and_return(s3_mock).twice
-        expect(provider).to receive(:create_bucket)
+        allow(bucket_mock).to receive(:exists?).and_return(false)
+        allow(bucket_mock).to receive(:create)
+        expect(provider).to receive(:s3).and_return(s3_mock).at_least(3).times
         expect(provider).to receive(:archive_name).and_return('file.zip')
         expect(provider).to receive(:sleep).with(5)
         expect(provider).to receive(:create_app_version).with(s3_obj_double).and_return(app_version)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.8.33.travis.2043.5
+  version: 1.8.33.travis.2048.5
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-24 00:00:00.000000000 Z
+date: 2017-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec