Merge lp:~joetalbott/adt-cloud-service/check_trailing_slash into lp:adt-cloud-service

[Joe Talbott]

Ensure there's a trailing slash on swift urls before appending to them.

Ensure there's a trailing slash on swift urls before appending to them.

[lp:~joetalbott/adt-cloud-service/check_trailing_slash]

25. By Joe Talbott on 2015-04-16

Make trailing slash check a bit more readable.

26. By Joe Talbott on 2015-04-16

Make trailing slash checking even easier to read.

27. By Joe Talbott on 2015-04-16

Even more better.

[Celso Providelo (cprov)]

review: Approve

=== modified file 'adt_cloud_service/v1.py'
--- adt_cloud_service/v1.py	2015-04-15 16:55:51 +0000
+++ adt_cloud_service/v1.py	2015-04-16 18:36:46 +0000
@@ -60,13 +60,14 @@
 
     req_id = current_app.extensions['rabbit'].queue_test(rabbit_request)
     results_path = 'adt-{}/results.tgz'.format(req_id)
+    swift_url = current_app.config['SWIFT_URL']
+    if swift_url.endswith('/'):
+        swift_url += "/"
     return jsonify(
         {
             'status': 'request processed',
             'request_id': req_id,
-            'result_url': urllib.parse.urljoin(
-                current_app.config['SWIFT_URL'], results_path
-            )
+            'result_url': urllib.parse.urljoin(swift_url, results_path)
         }
     )
     return repr(request.form)