report the correct 'Location' value form multipart uploads

basho · Mar 16, 2016 · 153da50 · 153da50 · borshop · Mar 17, 2016
1 parent 0770bd7
commit 153da50
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/riak_test/src/rtcs_dev.erl b/riak_test/src/rtcs_dev.erl
@@ -1,6 +1,6 @@
 %% -------------------------------------------------------------------
 %%
-%% Copyright (c) 2013 Basho Technologies, Inc.
+%% Copyright (c) 2013-2016 Basho Technologies, Inc.
 %%
 %% This file is provided to you under the Apache License,
 %% Version 2.0 (the "License"); you may not use this file

diff --git a/riak_test/tests/xml_response_test.erl b/riak_test/tests/xml_response_test.erl
@@ -24,8 +24,7 @@
 
 -include_lib("eunit/include/eunit.hrl").
 -include_lib("xmerl/include/xmerl.hrl").
-
--include("deps/erlcloud/include/erlcloud_aws.hrl").
+-include_lib("erlcloud/include/erlcloud_aws.hrl").
 
 -define(test_bucket(Label), "test-bucket-" Label).
 -define(test_key(Label),    "test-key-" Label).
@@ -46,7 +45,7 @@ verify_multipart_upload_response() ->
     rtcs:set_conf({cs, current, 1}, [{root_host, Host}]),
     {AdminConfig, _} = rtcs:setup(1),
     % erlcloud requires that 's3_host' matches our 'root_host'
-    % TODO: read this from the conf file
+    % TODO: rtcs:setup should read this from the conf file
     Config = AdminConfig#aws_config{s3_host = Host},
 
     lager:info("creating bucket ~p", [Bucket]),
@@ -68,7 +67,7 @@ perform_multipart_upload(Bucket, Key, NumParts, PartSize, Config) ->
     lager:info("uploading parts of '~s/~s'", [Bucket, Key]),
     EtagList = upload_and_assert_parts(
         Bucket, Key, UploadId, NumParts, PartSize, Config),
-    lager:info("ETags of '~s/~s': ~p", [Bucket, Key, EtagList]),
+    % lager:info("ETags of '~s/~s': ~p", [Bucket, Key, EtagList]),
 
     lager:info("completing upload of '~s/~s'", [Bucket, Key]),
     complete_multipart_upload(Bucket, Key, UploadId, EtagList, Config).

diff --git a/src/riak_cs_config.erl b/src/riak_cs_config.erl
@@ -1,6 +1,6 @@
 %% ---------------------------------------------------------------------
 %%
-%% Copyright (c) 2007-2013 Basho Technologies, Inc.  All Rights Reserved.
+%% Copyright (c) 2007-2016 Basho Technologies, Inc.  All Rights Reserved.
 %%
 %% This file is provided to you under the Apache License,
 %% Version 2.0 (the "License"); you may not use this file
@@ -66,7 +66,8 @@
          detailed_storage_calc/0,
          quota_modules/0,
          active_delete_threshold/0,
-         fast_user_get/0
+         fast_user_get/0,
+         root_host/0
         ]).
 
 %% Timeouts hitting Riak
@@ -428,6 +429,10 @@ active_delete_threshold() ->
 fast_user_get() ->
     get_env(riak_cs, fast_user_get, false).
 
+-spec root_host() -> string().
+root_host() ->
+    get_env(riak_cs, cs_root_host, ?ROOT_HOST).
+
 %% ===================================================================
 %% ALL Timeouts hitting Riak
 %% ===================================================================

diff --git a/src/riak_cs_wm_object_upload_part.erl b/src/riak_cs_wm_object_upload_part.erl
@@ -1,6 +1,6 @@
 %% ---------------------------------------------------------------------
 %%
-%% Copyright (c) 2007-2013 Basho Technologies, Inc.  All Rights Reserved.
+%% Copyright (c) 2007-2016 Basho Technologies, Inc.  All Rights Reserved.
 %%
 %% This file is provided to you under the Apache License,
 %% Version 2.0 (the "License"); you may not use this file
@@ -127,8 +127,7 @@ process_post(RD, Ctx=#context{local_context=LocalCtx, riak_client=RcPid}) ->
                     XmlDoc = {'CompleteMultipartUploadResult',
                               [{'xmlns', "http://s3.amazonaws.com/doc/2006-03-01/"}],
                               [
-                               %% TODO: use cs_root from app.config
-                               {'Location', [lists:append(["http://", binary_to_list(Bucket), ".s3.amazonaws.com/", Key])]},
+                               {'Location', [response_location(Bucket, Key)]},
                                {'Bucket', [Bucket]},
                                {'Key', [Key]},
                                {'ETag', [ETag]}
@@ -144,6 +143,10 @@ process_post(RD, Ctx=#context{local_context=LocalCtx, riak_client=RcPid}) ->
             end
     end.
 
+response_location(Bucket, Key) ->
+    lists:append(["http://",
+        binary:bin_to_list(Bucket), ".", riak_cs_config:root_host(), "/", Key]).
+
 -spec valid_entity_length(#wm_reqdata{}, #context{}) -> {boolean(), #wm_reqdata{}, #context{}}.
 valid_entity_length(RD, Ctx) ->
     MaxLen = riak_cs_lfs_utils:max_content_len(),