[HotFix] [SVCS-913] Fix Conflict Handling For Dropbox Contiguous Upload

[cslzchen]

Ticket

https://openscience.atlassian.net/browse/SVCS-913

Purpose

A bug was introduced during dropbox chunked upload where the argument conflict is not passed along from _upload()to _contiguous_upload() and _chunked_upload(). This bug led to all requests made to the dropbox upload API missing the mode parameter in the required header Dropbox-API-Arg.

See https://github.com/CenterForOpenScience/waterbutler/pull/347/files#diff-c3a345e63f19827819cde3a30cae89d6L262 and https://github.com/CenterForOpenScience/waterbutler/pull/347/files#diff-c3a345e63f19827819cde3a30cae89d6L255

Changes

• _contiguous_upload() now takes in the conflict argument from _upload()
• _chunked_upload() now takes in the conflict argument from _upload() and passed along to the _complete_session()
• Move path_arg from _upload() to _contiguous_upload()
• Update existing upload_args in _chunked_upload()
• Update the DocStrings

Side effects

No

QA Notes

Should this be Dev QA? @felliott

Deployment Notes

No

[coveralls]

Coverage increased (+0.002%) to 91.841% when pulling 094d79005904cc03ec1dc60ca9174e8c79843eeb on cslzchen:hotfix/dropbox-api-arg into 848283eaf4b558d1e7a2afb145dadf166a5a1199 on CenterForOpenScience:master.

[cslzchen]

@felliott

• [x] Apply the fix to chunked upload as well
• [x] Locally tested that chunked upload replacing existing file works as expected
• [x] Created a ticket for better documentation.