Merge pull request #797 from szechyjs/s3_path_style

Add config option to use path style S3 URLs

lib/omnibus/config.rb

@@ -315,6 +315,11 @@ module Omnibus
     # @return [String, nil]
     default(:s3_endpoint, nil)
 
+    # Use path style URLs instead of subdomains for S3 URLs
+    #
+    # @return [true, false]
+    default(:s3_force_path_style, false)
+
     # Enable or disable S3 Accelerate support
     #
     # @return [true, false]

lib/omnibus/s3_cache.rb

@@ -144,6 +144,7 @@ module Omnibus
           bucket_name:              Config.s3_bucket,
           endpoint:                 Config.s3_endpoint,
           use_accelerate_endpoint:  Config.s3_accelerate,
+          force_path_style:         Config.s3_force_path_style,
         }
 
         if Config.s3_profile

lib/omnibus/s3_helpers.rb

@@ -38,6 +38,7 @@ module Omnibus
       #     bucket_name:              Config.s3_bucket,
       #     endpoint:                 Config.s3_endpoint,
       #     use_accelerate_endpoint:  Config.s3_accelerate
+      #     force_path_style:         Config.s3_force_path_style
       #   }
       #
       # @return [Hash<String, String>]
@@ -68,6 +69,7 @@ module Omnibus
       def resource_params
         params = {
           use_accelerate_endpoint:  s3_configuration[:use_accelerate_endpoint],
+          force_path_style: s3_configuration[:force_path_style],
         }
 
         if s3_configuration[:use_accelerate_endpoint]

spec/unit/fetchers/net_fetcher_spec.rb

@@ -200,6 +200,17 @@ module Omnibus
           end
         end
 
+        context "custom endpoint with path style urls" do
+          before do
+            Config.s3_force_path_style(true)
+            Config.s3_endpoint("http://example.com")
+          end
+
+          it "returns the url using path style" do
+            expect(subject.send(:download_url)).to eq("http://example.com/mybucket/file-1.2.3-abcd1234")
+          end
+        end
+
         context "s3 transfer acceleration" do
           before { Config.s3_accelerate(true) }