dpl 1.7.23.travis.1059.4 → 1.7.23.travis.1061.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGVjOTI1YTJmODhmYjQyNzdhOGMwOWFkYzFlYzA5NDBjOTA0YzU2MA==
+    NzQ0ZWU2YzNjNDkwMzMwMzZjZGNiYzk5MzgwMGEzNTc4OTQzOGMzZA==
   data.tar.gz: !binary |-
-    MDAwZTU4NWNhMmRjMGYxYTk4NDgxYmY4MWU3OTA4NTNkNDhmNGYzYQ==
+    YzU5OGU5YzQxODllMTZjMmRhZGNiM2MyYmVhNmU4N2EwZmY4ZTQyNQ==
 SHA512:
   metadata.gz: !binary |-
-    ZjRiZDM0YTk5MWM3NTBlM2VhODE4N2YyMzQ4MDgxYmE0YzJlYmJjZTFmOTMz
-    NDZhMjBjOTQ0ZmMwYmI1ZTA2Y2FjNTk1OWZlMWU0OGY2OTgzZWY1ODllYTdk
-    MWJiYWJmYTEyYmQ3MGNhZWVlNDkxNDY4ZGVlNTNjNTIzOGY1ZGQ=
+    YjA2MTQ0NDU1OTZiMjY4MjBmZTA3ZWYwMmRhZGFkNmIxOGNhOGEzNDliMWU3
+    YWI0MjlhNDcxMzA2ZGJhZWY3MGJiYWM2ZDY4M2FiODIwMjAwMzg1MjQyYTRl
+    MTRiMjFjMTM1NGRmMjE4ZTVlZGRkOTAyMDE5ZmZjN2ZkN2U4NDE=
   data.tar.gz: !binary |-
-    NzE4YjE0ZDFlMTY5NWRkNzA5N2UyMGNjM2UxYWMyMTk1ZmNkNjhmNDQ3ZTk1
-    N2YyNWRiOTZmNjYzMjVmZTNmYjgzOWU1MzFmNGQ1NzQxMDk0NzJjMTc3Yzk4
-    MTI2NGNkNTlkY2YzMGRkMzRjNDQ2NmMyY2U1MjFkYWIxMzQyYWE=
+    OWZkZGE0N2MyZWFmMWQ0ZTEzYjYyNGY5NGNmMzNkNTRiMzg4NDNkYjA2N2E4
+    M2UyMzE1NWM3NDMyNDdmZWQ0ZTBmYTZjZWMwODM4MDQzZWJmOTRhNzJiZGJi
+    MWUyNTZmZGRhMDYyZWY4NTQ3N2UzNjkyMjE4OWQ0Njk2ODhmNzE=

data/Gemfile

@@ -27,7 +27,7 @@ group :rubygems do
 end
 
 group :sss do
-  gem 'aws-sdk-v1'
+  gem 'aws-sdk', '>= 2.0.18.pre'
   gem 'mime-types'
 end
 

data/README.md

@@ -331,7 +331,6 @@ For authentication you can also use Travis CI secure environment variable:
 * **secret-access-key**: AWS Secret Key. Can be obtained from [here](https://console.aws.amazon.com/iam/home?#security_credential).
 * **bucket**: S3 Bucket.
 * **region**: S3 Region. Defaults to us-east-1.
-* **endpoint**: S3 Endpoint. Defaults to s3.amazonaws.com.
 * **upload-dir**: S3 directory to upload to. Defaults to root directory.
 * **local-dir**: Local directory to upload from. Can be set from a global perspective (~/travis/build) or relative perspective (build) Defaults to project root.
 * **detect-encoding**: Set HTTP header `Content-Encoding` for files compressed with `gzip` and `compress` utilities. Defaults to not set.

data/lib/dpl/provider/s3.rb

@@ -3,11 +3,11 @@ require 'json'
 module DPL
   class Provider
     class S3 < Provider
-      requires 'aws-sdk-v1'
+      requires 'aws-sdk'
       requires 'mime-types'
 
       def api
-        @api ||= AWS::S3.new(endpoint: options[:endpoint] || 's3.amazonaws.com')
+        @api ||= ::Aws::S3::Resource.new(s3_options)
       end
 
       def needs_key?
@@ -15,7 +15,7 @@ module DPL
       end
 
       def check_app
-
+        log 'Warning: The endpoint option is no longer used and can be removed.' if options[:endpoint]
       end
 
       def access_key_id
@@ -26,12 +26,14 @@ module DPL
         options[:secret_access_key] || context.env['AWS_SECRET_ACCESS_KEY'] || raise(Error, "missing secret_access_key")
       end
 
-      def setup_auth
-        AWS.config(:access_key_id => option(:access_key_id), :secret_access_key => option(:secret_access_key), :region => options[:region]||'us-east-1')
+      def s3_options
+        {
+          region:      options[:region] || 'us-east-1',
+          credentials: ::Aws::Credentials.new(access_key_id, secret_access_key)
+        }
       end
 
       def check_auth
-        setup_auth
         log "Logging in with Access Key: #{option(:access_key_id)[-4..-1].rjust(20, '*')}"
       end
 
@@ -47,29 +49,33 @@ module DPL
             content_type = MIME::Types.type_for(filename).first.to_s
             opts         = { :content_type => content_type }.merge(encoding_option_for(filename))
             opts[:cache_control] = get_option_value_by_filename(options[:cache_control], filename) if options[:cache_control]
-            opts[:acl]           = options[:acl] if options[:acl]
+            opts[:acl]           = options[:acl].gsub(/_/, '-') if options[:acl]
             opts[:expires]       = get_option_value_by_filename(options[:expires], filename) if options[:expires]
             unless File.directory?(filename)
               log "uploading %p" % filename
-              api.buckets[option(:bucket)].objects.create(upload_path(filename), File.read(filename), opts)
+              api.bucket(option(:bucket)).object(upload_path(filename)).upload_file(filename, opts)
             end
           end
         end
 
         if suffix = options[:index_document_suffix]
-          api.buckets[option(:bucket)].configure_website do |cfg|
-            cfg.index_document_suffix = suffix
-          end
+          api.bucket(option(:bucket)).website.put(
+            website_configuration: {
+              index_document: {
+                suffix: suffix
+              }
+            }
+          )
         end
       end
 
       def deploy
         super
-      rescue AWS::S3::Errors::InvalidAccessKeyId
+      rescue ::Aws::S3::Errors::InvalidAccessKeyId
         raise Error, "Invalid S3 Access Key Id, Stopping Deploy"
-      rescue AWS::S3::Errors::SignatureDoesNotMatch
+      rescue ::Aws::S3::Errors::ChecksumError
         raise Error, "Aws Secret Key does not match Access Key Id, Stopping Deploy"
-      rescue AWS::S3::Errors::AccessDenied
+      rescue ::Aws::S3::Errors::AccessDenied
         raise Error, "Oops, It looks like you tried to write to a bucket that isn't yours or doesn't exist yet. Please create the bucket before trying to write to it."
       end
 

data/spec/provider/s3_spec.rb

@@ -4,17 +4,56 @@ require 'dpl/provider/s3'
 
 describe DPL::Provider::S3 do
 
-  before (:each) do
-    AWS.stub!
+  subject :provider do
+    described_class.new(DummyContext.new, :access_key_id => 'qwertyuiopasdfghjklz', :secret_access_key => 'qwertyuiopasdfghjklzqwertyuiopasdfghjklz', :bucket => 'my-bucket')
+  end
+
+  describe '#s3_options' do
+    context 'without region' do
+      example do
+        options = provider.s3_options
+        expect(options[:region]).to eq('us-east-1')
+      end
+    end
+
+    context 'with region' do
+      example do
+        region = 'us-west-1'
+        provider.options.update(:region => region)
+        options = provider.s3_options
+        expect(options[:region]).to eq(region)
+      end
+    end
   end
+end
+
+describe DPL::Provider::S3 do
+
+  access_key_id = 'qwertyuiopasdfghjklz'
+  secret_access_key = 'qwertyuiopasdfghjklzqwertyuiopasdfghjklz'
+  region = 'us-east-1'
+  bucket = 'my-bucket'
+
+  client_options = {
+    stub_responses: true,
+    region: region,
+    credentials: Aws::Credentials.new(access_key_id, secret_access_key)
+  }
 
   subject :provider do
-    described_class.new(DummyContext.new, :access_key_id => 'qwertyuiopasdfghjklz', :secret_access_key => 'qwertyuiopasdfghjklzqwertyuiopasdfghjklz', :bucket => 'my-bucket')
+    described_class.new(DummyContext.new, {
+      access_key_id: access_key_id,
+      secret_access_key: secret_access_key,
+      bucket: bucket
+    })
+  end
+
+  before :each do
+    provider.stub(:s3_options).and_return(client_options)
   end
 
   describe "#check_auth" do
     example do
-      expect(provider).to receive(:setup_auth)
       expect(provider).to receive(:log).with("Logging in with Access Key: ****************jklz")
       provider.check_auth
     end
@@ -35,19 +74,6 @@ describe DPL::Provider::S3 do
     end
   end
 
-  describe "#setup_auth" do
-    example "Without :region" do
-      expect(AWS).to receive(:config).with(:access_key_id => 'qwertyuiopasdfghjklz', :secret_access_key => 'qwertyuiopasdfghjklzqwertyuiopasdfghjklz', :region => 'us-east-1').once.and_call_original
-      provider.setup_auth
-    end
-    example "With :region" do
-      provider.options.update(:region => 'us-west-2')
-
-      expect(AWS).to receive(:config).with(:access_key_id => 'qwertyuiopasdfghjklz', :secret_access_key => 'qwertyuiopasdfghjklzqwertyuiopasdfghjklz', :region => 'us-west-2').once
-      provider.setup_auth
-    end
-  end
-
   describe "#needs_key?" do
     example do
       expect(provider.needs_key?).to eq(false)
@@ -69,14 +95,14 @@ describe DPL::Provider::S3 do
 
     example "Sends MIME type" do
       expect(Dir).to receive(:glob).and_yield(__FILE__)
-      expect_any_instance_of(AWS::S3::ObjectCollection).to receive(:create).with(anything(), anything(), hash_including(:content_type => 'application/x-ruby'))
+      expect_any_instance_of(Aws::S3::Object).to receive(:upload_file).with(anything(), hash_including(:content_type => 'application/x-ruby'))
       provider.push_app
     end
 
     example "Sets Cache and Expiration" do
       provider.options.update(:cache_control => "max-age=99999999", :expires => "2012-12-21 00:00:00 -0000")
       expect(Dir).to receive(:glob).and_yield(__FILE__)
-      expect_any_instance_of(AWS::S3::ObjectCollection).to receive(:create).with(anything(), anything(), hash_including(:cache_control => 'max-age=99999999', :expires => '2012-12-21 00:00:00 -0000'))
+      expect_any_instance_of(Aws::S3::Object).to receive(:upload_file).with(anything(), hash_including(:cache_control => 'max-age=99999999', :expires => '2012-12-21 00:00:00 -0000'))
       provider.push_app
     end
 
@@ -84,9 +110,8 @@ describe DPL::Provider::S3 do
       option_list = []
       provider.options.update(:cache_control => ["max-age=99999999", "no-cache" => ["foo.html", "bar.txt"], "max-age=9999" => "*.txt"], :expires => ["2012-12-21 00:00:00 -0000", "1970-01-01 00:00:00 -0000" => "*.html"])
       expect(Dir).to receive(:glob).and_yield("foo.html").and_yield("bar.txt").and_yield("baz.js")
-      expect(File).to receive(:read).exactly(3).times.and_return("")
-      allow_any_instance_of(AWS::S3::ObjectCollection).to receive(:create) do |_instance, key, _data, options|
-        option_list << { key: key, options: options }
+      allow_any_instance_of(Aws::S3::Object).to receive(:upload_file) do |obj, _data, options|
+        option_list << { key: obj.key, options: options }
       end
       provider.push_app
       expect(option_list).to match_array([
@@ -99,13 +124,14 @@ describe DPL::Provider::S3 do
     example "Sets ACL" do
       provider.options.update(:acl => "public_read")
       expect(Dir).to receive(:glob).and_yield(__FILE__)
-      expect_any_instance_of(AWS::S3::ObjectCollection).to receive(:create).with(anything(), anything(), hash_including(:acl => "public_read"))
+      expect_any_instance_of(Aws::S3::Object).to receive(:upload_file).with(anything(), hash_including(:acl => "public-read"))
       provider.push_app
     end
 
     example "Sets Website Index Document" do
       provider.options.update(:index_document_suffix => "test/index.html")
       expect(Dir).to receive(:glob).and_yield(__FILE__)
+      expect_any_instance_of(Aws::S3::BucketWebsite).to receive(:put).with(:website_configuration => { :index_document => { :suffix => "test/index.html" } })
       provider.push_app
     end
 
@@ -114,8 +140,7 @@ describe DPL::Provider::S3 do
       provider.options.update(:detect_encoding => true)
       expect(Dir).to receive(:glob).and_yield(path)
       expect(provider).to receive(:`).at_least(1).times.with("file #{path}").and_return('gzip compressed')
-      expect(File).to receive(:read).with(path).and_return("")
-      expect_any_instance_of(AWS::S3::ObjectCollection).to receive(:create).with(anything(), anything(), hash_including(:content_encoding => 'gzip'))
+      expect_any_instance_of(Aws::S3::Object).to receive(:upload_file).with(anything(), hash_including(:content_encoding => 'gzip'))
       provider.push_app
     end
 
@@ -126,15 +151,11 @@ describe DPL::Provider::S3 do
     end
   end
 
-  describe "#api" do
-    example "Without Endpoint" do
-      expect(AWS::S3).to receive(:new).with(:endpoint => 's3.amazonaws.com')
-      provider.api
-    end
+  describe "#check_app" do
     example "With Endpoint" do
       provider.options.update(:endpoint => 's3test.com.s3-website-us-west-2.amazonaws.com')
-      expect(AWS::S3).to receive(:new).with(:endpoint => 's3test.com.s3-website-us-west-2.amazonaws.com')
-      provider.api
+      expect(provider).to receive(:log).with('Warning: The endpoint option is no longer used and can be removed.')
+      provider.check_app
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.7.23.travis.1059.4
+  version: 1.7.23.travis.1061.4
 platform: ruby
 authors:
 - Konstantin Haase