dpl-s3 1.10.2.travis.2976.6 → 1.10.2.travis.2979.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd30bd24e01d18139b70d1a3a325f08ed69e6a21785fc2e18707ecd526005c69
-  data.tar.gz: 89db858beb7998087f8b35702b9afbaf09d0db00a684e0d01041f2d41c50c7db
+  metadata.gz: 2aa36d806b305e35eece1da326f24375d4103de6f2172f56ce98974bd4477e8e
+  data.tar.gz: c86dd1c62adf149e8cdc17b2f411e4b8c25cfce0fe231f86c516839765d3d479
 SHA512:
-  metadata.gz: 20c4586ed389dd1c6dc796da23a262b10082f8c0719bc9e5a68e5a449cc271f44e04856af9f4f4c3d38cc97f0bf48cc971c191acca6e58f9069ce56856c685a2
-  data.tar.gz: 1804904d64d6c14967b57170cb358d5278531a42380675c3267d2c639a4fe108e07ccb4c17a9341bbfd55a4e3358f0fca8ea85864e6b2e22e8b003230fe6f5d5
+  metadata.gz: a40869944d2f57f371dd469d90e5044324fb46dac0cbcde8d3c385cd12d0c0c65e5cf7ebb2bf4589311bd7b39d8d15921b8a17db51e631b91e115aea4bece8c8
+  data.tar.gz: 081b10aa0892dcfbcbb5acc177ae6c783c0b36f19aafa9c9e4e55a44cc39585c507cdc991551426daaef07b3b39930dc1cad5b414845b47dcf3f889532d751ea

data/lib/dpl/provider/s3.rb

@@ -1,6 +1,7 @@
 require 'json'
 require 'aws-sdk'
 require 'mime-types'
+require 'uri'
 
 Aws.eager_autoload!
 
@@ -44,7 +45,14 @@ module DPL
           credentials: ::Aws::Credentials.new(access_key_id, secret_access_key)
         }
 
-        defaults[:endpoint] = options[:endpoint] if options[:endpoint]
+        if options[:endpoint]
+          uri = URI.parse(options[:endpoint])
+          unless uri.scheme
+            log "S3 endpoint does not specify scheme; defaulting to HTTPS"
+            uri = URI("https://#{options[:endpoint]}")
+          end
+          defaults[:endpoint] = uri.to_s
+        end
 
         defaults
       end

data/spec/provider/s3_spec.rb

@@ -23,6 +23,24 @@ describe DPL::Provider::S3 do
         expect(options[:region]).to eq(region)
       end
     end
+
+    context 'with endpoint no https' do
+      example do
+        endpoint = 'myendpoint.com'
+        provider.options.update(:endpoint => endpoint)
+        options = provider.s3_options
+        expect(options[:endpoint]).to eq("https://#{endpoint}")
+      end
+    end
+
+    context 'with endpoint with https' do
+      example do
+        endpoint = 'https://myendpoint.com'
+        provider.options.update(:endpoint => endpoint)
+        options = provider.s3_options
+        expect(options[:endpoint]).to eq(endpoint)
+      end
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl-s3
 version: !ruby/object:Gem::Version
-  version: 1.10.2.travis.2976.6
+  version: 1.10.2.travis.2979.6
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-21 00:00:00.000000000 Z
+date: 2018-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dpl
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.2.travis.2976.6
+        version: 1.10.2.travis.2979.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.2.travis.2976.6
+        version: 1.10.2.travis.2979.6
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement