dpl 1.8.32.travis.1949.5 → 1.8.32.travis.1950.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fad357af3207b1973843a10be41c1824a821e8be
-  data.tar.gz: 3dd571a615255b27304801f53db6f19de047fc4e
+  metadata.gz: 300ef455e344f5471132a6df110e5a6760c66094
+  data.tar.gz: b48aaf52eea60bfc5462b18d1d1a56ec70ecf239
 SHA512:
-  metadata.gz: 5ce1543fd186579f5743af1aa049dfcb4df83101bdfaa35556882cb4c372a2b2e0ea9ee35da21c61af0e07d794abb1db231e685ee66886b53abc7edd23028339
-  data.tar.gz: aa65ef2a16855d9c2d735046e5fc885cb75f885ef0dc3e4ec11dc44f0b8d497c45e74450e800fee1cb515697f334290dd1396a795640a0522b2deb836c24f3de
+  metadata.gz: a4a5d47be5d641d18ea3fa810f5f18c809ea3ff28d17e8975e47d82d2dfeff016161d36c96b2673ee1a5eeeeef90af1aa04b2835f31f98fcbc3c479161eb8afa
+  data.tar.gz: 30c9c127ebeee2e643d2220ae4a0539201a0ea11dd518f7d27db94398a44a7d16f5d36bbefed2a0cf6a686cb7189820f49ed41d80678844cccc8af2a6afd48db

data/Gemfile

@@ -49,6 +49,7 @@ group :cloud_files do
   gem 'fog-google', '< 0.1.1', platforms: :mri_19
   gem 'fog-profitbricks', '< 2.0', platforms: :mri_19
   gem 'fog'
+  gem 'nokogiri', '~> 1.6.8.1'
 end
 
 group :releases do
@@ -61,9 +62,8 @@ group :gcs do
 end
 
 group :elastic_beanstalk do
+  gem 'aws-sdk', '~> 2.6.32'
   gem 'rubyzip', '~> 1.1'
-  gem 'nokogiri', '~>1.6.8'
-  gem 'aws-sdk-v1'
 end
 
 group :bitballoon do

data/lib/dpl/provider/elastic_beanstalk.rb

@@ -5,8 +5,7 @@ module DPL
     class ElasticBeanstalk < Provider
       experimental 'AWS Elastic Beanstalk'
 
-      requires 'nokogiri', version: '1.6.8.1'
-      requires 'aws-sdk-v1'
+      requires 'aws-sdk'
       requires 'rubyzip', :load => 'zip'
 
       DEFAULT_REGION = 'us-east-1'
@@ -24,7 +23,11 @@ module DPL
       end
 
       def check_auth
-        AWS.config(access_key_id: access_key_id, secret_access_key: secret_access_key, region: region)
+        options = {
+          :region      => region,
+          :credentials => Aws::Credentials.new(access_key_id, secret_access_key)
+        }
+        Aws.config.update(options)
       end
 
       def check_app
@@ -88,11 +91,11 @@ module DPL
       end
 
       def s3
-        @s3 ||= AWS::S3.new
+        @s3 ||= Aws::S3::Resource.new
       end
 
       def eb
-        @eb ||= AWS::ElasticBeanstalk.new.client
+        @eb ||= Aws::ElasticBeanstalk::Client.new
       end
 
       def bucket_exists?
@@ -121,9 +124,12 @@ module DPL
       end
 
       def upload(key, file)
-        obj = s3.buckets[bucket_name]
-        obj = bucket_path ? obj.objects["#{bucket_path}#{key}"] : obj.objects[key]
-        obj.write(Pathname.new(file))
+        options = {
+          :body => Pathname.new(file).open
+        }
+        bucket = s3.bucket(bucket_name)
+        obj = bucket_path ? bucket.object("#{bucket_path}#{key}") : bucket.object(key)
+        obj.put(options)
         obj
       end
 

data/spec/provider/elastic_beanstalk_spec.rb

@@ -1,14 +1,10 @@
 require 'spec_helper'
-require 'aws-sdk-v1'
+require 'aws-sdk'
 require 'dpl/provider'
 require 'dpl/provider/elastic_beanstalk'
 
 describe DPL::Provider::ElasticBeanstalk do
 
-  before (:each) do
-    AWS.stub!
-  end
-
   let(:access_key_id) { 'qwertyuiopasdfghjklz' }
   let(:secret_access_key) { 'qwertyuiopasdfghjklzqwertyuiopasdfghjklz' }
   let(:region) { 'us-west-2' }
@@ -27,7 +23,15 @@ describe DPL::Provider::ElasticBeanstalk do
 
   let(:s3_mock) do
     hash_dbl = double("Hash", :[] => bucket_mock, :map => [])
-    double("AWS::S3", buckets: hash_dbl)
+    double("Aws::S3", buckets: hash_dbl, config: hash_dbl)
+  end
+
+  let(:io_double) do
+    double('IO', open: Object.new)
+  end
+
+  let(:s3_obj_double) do
+    double("Aws::S3::Object", put: Object.new)
   end
 
   subject :provider do
@@ -48,40 +52,49 @@ describe DPL::Provider::ElasticBeanstalk do
 
   describe "#check_auth" do
     example do
-      expect(AWS).to receive(:config).with(access_key_id: access_key_id, secret_access_key: secret_access_key, region: region)
+      expect(Aws.config).to receive(:update)
       provider.check_auth
     end
   end
 
   describe "#push_app" do
 
-    let(:bucket_name) { "travis-elasticbeanstalk-test-builds-#{region}" }
     let(:app_version) { Object.new }
 
+    before :each do
+      allow(io_double).to receive(:open)
+      allow(s3_obj_double).to receive(:put).with(anything).and_return(Object.new)
+      allow(s3_mock).to receive(:bucket).with(bucket_name).and_return(bucket_mock)
+      expect(Pathname).to receive(:new).with('/path/to/file.zip').and_return(io_double)
+    end
+
     example 'bucket exists already' do
       allow(s3_mock.buckets).to receive(:map).and_return([bucket_name])
+      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).not_to receive(:create_bucket)
       expect(provider).to receive(:create_zip).and_return('/path/to/file.zip')
       expect(provider).to receive(:archive_name).and_return('file.zip')
-      expect(bucket_mock.objects).to receive(:[]).with("#{bucket_path}/file.zip").and_return(bucket_mock)
       expect(provider).to receive(:upload).with('file.zip', '/path/to/file.zip').and_call_original
       expect(provider).to receive(:sleep).with(5)
-      expect(provider).to receive(:create_app_version).with(bucket_mock).and_return(app_version)
+      expect(provider).to receive(:create_app_version).with(s3_obj_double).and_return(app_version)
       expect(provider).to receive(:update_app).with(app_version)
 
       provider.push_app
     end
 
     example 'bucket doesnt exist yet' do
+      allow(s3_mock.buckets).to receive(:map).and_return([])
+      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(: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
       expect(provider).to receive(:sleep).with(5)
-      expect(provider).to receive(:create_app_version).with(bucket_mock).and_return(app_version)
+      expect(provider).to receive(:create_app_version).with(s3_obj_double).and_return(app_version)
       expect(provider).to receive(:update_app).with(app_version)
 
       provider.push_app
@@ -91,6 +104,8 @@ 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(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)
@@ -98,7 +113,7 @@ describe DPL::Provider::ElasticBeanstalk do
         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
         expect(provider).to receive(:sleep).with(5)
-        expect(provider).to receive(:create_app_version).with(bucket_mock).and_return(app_version)
+        expect(provider).to receive(:create_app_version).with(s3_obj_double).and_return(app_version)
         expect(provider).not_to receive(:update_app).with(app_version)
 
         provider.push_app
@@ -107,6 +122,7 @@ 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(bucket_mock).to receive(:object).with("file.zip").and_return(s3_obj_double)
         allow(s3_mock.buckets).to receive(:map).and_return([bucket_name])
 
         expect(provider_without_bucket_path).to receive(:s3).and_return(s3_mock).twice
@@ -114,10 +130,9 @@ describe DPL::Provider::ElasticBeanstalk do
         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)
-        expect(bucket_mock.objects).to receive(:[]).with("file.zip").and_return(bucket_mock)
         expect(provider_without_bucket_path).to receive(:upload).with('file.zip', '/path/to/file.zip').and_call_original
         expect(provider_without_bucket_path).to receive(:sleep).with(5)
-        expect(provider_without_bucket_path).to receive(:create_app_version).with(bucket_mock).and_return(app_version)
+        expect(provider_without_bucket_path).to receive(:create_app_version).with(s3_obj_double).and_return(app_version)
         expect(provider_without_bucket_path).to receive(:update_app).with(app_version)
 
         provider_without_bucket_path.push_app
@@ -128,13 +143,15 @@ describe DPL::Provider::ElasticBeanstalk do
       let(:wait_until_deployed) { true }
 
       example 'Waits until deployment completes' 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)
         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
         expect(provider).to receive(:sleep).with(5)
-        expect(provider).to receive(:create_app_version).with(bucket_mock).and_return(app_version)
+        expect(provider).to receive(:create_app_version).with(s3_obj_double).and_return(app_version)
         expect(provider).to receive(:update_app).with(app_version)
         expect(provider).to receive(:wait_until_deployed)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.8.32.travis.1949.5
+  version: 1.8.32.travis.1950.5
 platform: ruby
 authors:
 - Konstantin Haase