summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update .gitreview for stable/mitakamitaka-eolstable/mitakaDoug Hellmann2016-03-141-0/+1
| | | | Change-Id: I20f71c1336ab4e9ed5ec057eb7215f1cdd273752
* Merge "Drop py33 support"3.0.0Jenkins2016-03-032-2/+1
|\
| * Drop py33 supportshu-mutou2016-02-232-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Python 3.3 support is being dropped since OpenStack Liberty." written in following URL. https://wiki.openstack.org/wiki/Python3 And already the infra team and the oslo team are dropping py33 support from their projects. Since we rely on oslo for a lot of our work, and depend on infra for our CI, we should drop py33 support too. Change-Id: Ia8f2b26e446175b0d892a11952ef3dc11dcdc73c Closes-Bug: #1526170
* | bumped version at request of release teamJohn Dickinson2016-03-021-3/+2
| | | | | | | | Change-Id: I81eb6575ef5de8ecc75e781f07ad090024589cec
* | Merge "download method shouldn't download all object"Jenkins2016-03-022-1/+17
|\ \
| * | download method shouldn't download all objectHu Bing2016-03-012-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in python-swiftclient/swiftclient/service.py, there is a method def download(self, container=None, objects=None, options=None): if container is specified but objects not, it download all objects in specified container. if both container and objects are specified, it download all specified objects in the container. when it comes to the case that, objects argument is specified, but it turned out to be empty array [ ], the download method download all the objects under specified container. this may be not reasonable. for example, the objects was not empty when it came from command line, but it's filtered, maybe by --prefix argument. at last, it turned out to be empty array. when calling download method with objects arguments being empty array, we should download nothing instead of all the objects under the specified container. Change-Id: I81aab935533a50b40679c8b3575f298c285233a8 Closes-bug: #1549881
* | | Merge "Drop testtools from test-requirements.txt"Jenkins2016-03-019-123/+114
|\ \ \
| * | | Drop testtools from test-requirements.txtTim Burke2016-02-129-123/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | My understanding is that it was mainly being used so we could have sane testing on py26. With py26 support being dropped, we no longer need it. Also drop discover from test-requirements.txt, as we don't seem to actually use it. Change-Id: Iee04c42890596d3b483c1473169480a3ae19aac8 Related-Change: I37116731db11449d0c374a6a83a3a43789a19d5f
* | | | Merge "Minor edits to the api page"Jenkins2016-02-291-66/+65
|\ \ \ \
| * | | | Minor edits to the api pageAlexandra2016-02-291-66/+65
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie65f73532e53a858ee9ab4b4634dcfcaf8a93c3b
* | | | | Merge "Fix wrong args for get_container with full listing"Jenkins2016-02-292-2/+24
|\ \ \ \ \
| * | | | | Fix wrong args for get_container with full listingAlistair Coles2016-02-222-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In client get_container(), when full_listing is true, the calls back to get_container() pass service_token as a positional arg which maps its value to the full_listing arg. It should use a keyword. Change-Id: Iac2af45df124ff33fcb7fbaf1ba959ef06c96378 Closes-Bug: #1496093
* | | | | | Merge "Have tox manage LANG environmental var"Jenkins2016-02-291-1/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Have tox manage LANG environmental varPaul Belanger2016-02-241-1/+3
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to do this because some of the py34 testing that python-swiftclient uses depends on this variable. The reason we don't see the issue in the gate, is because current bare-trusty images have this set on the jenkins shell user. When we move to just using DIBs, the variable won't be setup by default and python3 tests will fail. For more information: https://review.openstack.org/282898 Change-Id: Id9017f31b0543bccac9c07b83237b909e2bd2b0c Signed-off-by: Paul Belanger <pabelanger@redhat.com>
* | | | | Merge "authors/changelog updates for 2.8 release"Jenkins2016-02-273-2/+57
|\ \ \ \ \
| * | | | | authors/changelog updates for 2.8 releaseJohn Dickinson2016-02-263-2/+57
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I335c30fd7d0a0120c87fa60c5c142b8ed95c56bf
* | | | | | Merge "Force header keys/values to bytes/unicode before coercing to unicode"Jenkins2016-02-272-2/+7
|\ \ \ \ \ \
| * | | | | | Force header keys/values to bytes/unicode before coercing to unicodeTim Burke2016-02-262-2/+7
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, parse_header_string was only called with data coming out of requests, which would be either bytes or unicode. Now that we're sending it request headers as well (see related change), we need to be more defensive. If the value given is neither bytes nor unicode, convert it to a native string. This will allow developers using the client API to continue sending header dicts like {'X-Delete-After': 2} ...as in Swift's test/probe/test_object_expirer.py Change-Id: Ie57a93274507b184af5cad4260f244359a585f09 Related-Change: I43dd7254f7281d4db59b286aa2145643c64e1705
* | | | | | Fix test for redacting sensitive data in client.http_log()Joel Wright2016-02-262-10/+15
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test should have included utf8 encoded unicode data to test that encoded unicode data stored in headers was parsed correctly. Also fixes the docstring for swiftclient.safe_value() Change-Id: Id0def0b3af7a364f1257cc22f67b71c0cc5d8479
* | | | | Merge "Follow-up to patch 282363"Jenkins2016-02-263-9/+14
|\ \ \ \ \
| * | | | | Follow-up to patch 282363Tim Burke2016-02-253-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Improve some formatting * Be more explicit about how much will be revealed when * Rename redact_sensitive_tokens to redact_sensitive_headers, as it affects more than tokens. Change-Id: I02b375d914e9f0a210d038ecb31188d09a8ffce3
* | | | | | adding .manpages script to swift clientThiago da Silva2016-02-251-0/+18
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | this is the same script as in swift core Change-Id: Ib9ea882cf7c1ba1d663254d38c7ac163b55e45da
* | | | | Merge "Do not reveal auth token in swiftclient log messages by default"Jenkins2016-02-253-8/+141
|\ \ \ \ \ | |/ / / /
| * | | | Do not reveal auth token in swiftclient log messages by defaultJoel Wright2016-02-223-8/+141
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the swiftclient logs sensitive info in headers when logging HTTP requests. This patch hides sensitive info in headers such as 'X-Auth-Token' in a similar way to swift itself (we add a 'reveal_sensitive_prefix' configuration to the client). With this patch, tokens are truncated by removing the specified number of characters, after which '...' is appended to the logged token to indicate that it has been redacted. Co-Authored-By: Li Cheng <shcli@cn.ibm.com> Co-Authored-By: Zack M. Davis <zdavis@swiftstack.com> Change-Id: I43dd7254f7281d4db59b286aa2145643c64e1705 Closes-bug: #1516692
* | | | Merge "Update api docs title to make ToC better"Jenkins2016-02-241-3/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | Update api docs title to make ToC betterJohn Dickinson2016-02-221-3/+3
| |/ / | | | | | | | | | Change-Id: Ie8eeb3dd8eddf1868f0fa99911c459ae9f7b0091
* | | Merge "New python swiftclient doc"Jenkins2016-02-223-0/+79
|\ \ \ | |/ / |/| |
| * | New python swiftclient docAlexandra2016-02-103-0/+79
| | | | | | | | | | | | | | | | | | Updating with new ToC to be worked on at hackathon Change-Id: I55ee83626dd88fcc3e6352b3854b758dd7090590
* | | Merge "_RetryBody doesn't need to take explicit etag/content-length"Jenkins2016-02-182-11/+59
|\ \ \
| * | | _RetryBody doesn't need to take explicit etag/content-lengthTim Burke2016-01-112-11/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, don't try to do int(None) for chunk-encoded responses (like DLOs that are longer than a single container listing). Change-Id: Ibacd75d5ee46135d62388786903c895fda8ed3ba
* | | | Merge "Use "# noqa" instead of "#flake8: noqa""Jenkins2016-02-181-2/+2
|\ \ \ \
| * | | | Use "# noqa" instead of "#flake8: noqa"Chaozhe.Chen2016-02-091-2/+2
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | "# flake8: noqa" option disables all checks for the whole file. To disable one line we should use "# noqa". Change-Id: I7859eab30563d0eb91c5f055d1b523173b562e54 Closes-bug: #1540254
* | | | Merge "Display proper name when failing to create segments container"Jenkins2016-02-172-1/+49
|\ \ \ \ | |_|_|/ |/| | |
| * | | Display proper name when failing to create segments containerTim Burke2016-02-102-1/+49
| | | | | | | | | | | | | | | | | | | | | | | | Previously, we displayed the base container's name. Change-Id: I70f1949a44ba61158e31178e4536f229c37aab47
* | | | Merge "Add test for --debug taking precedence over --info"Jenkins2016-02-111-1/+19
|\ \ \ \
| * | | | Add test for --debug taking precedence over --infoAlistair Coles2016-02-111-1/+19
| | | | | | | | | | | | | | | | | | | | Change-Id: Ibf0903817852edb36389028383a35e0d65f88a26
* | | | | Merge "Fix debug and info option parsing"Jenkins2016-02-112-8/+22
|\ \ \ \ \ | |/ / / /
| * | | | Fix debug and info option parsingChristian Schwede2015-12-302-8/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The debug and info options need to be set before a subcommand method is called, otherwise they are simply ignored. This is kind of irritating - other options (for example -U, -A, -K) are usable after a positional command. This patch fixes this, and commands like these are no longer ignoring --debug or --info: swift stat --debug swift list container --info Co-Authored-By: Alistair Coles <alistair.coles@hpe.com> Change-Id: Ib19b05deef7a015881f1eed4a3946025e16bf922
* | | | | Merge "Support --os-identity-api-version option"Jenkins2016-02-112-15/+112
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Support --os-identity-api-version optionAlistair Coles2016-02-052-15/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for the auth-version to be specified using --os-identity-api-version or OS_IDENTITY_API_VERSION for compatibility with other openstack client command line options. The auth version used will be selected as follows: - if either --auth-version or --os-identity-api-version is set, use that value - otherwise use the value of ST_AUTH_VERSION, if set - otherwise use the value of OS_AUTH_VERSION, if set - otherwise (new behaviour) use the value of OS_IDENTITY_API_VERSION, if set - otherwise default to 1.0 Note that before this change the auth version might have defaulted to 1.0 despite OS_IDENTITY_API_VERSION being set, but with this change OS_IDENTITY_API_VERSION is preferred. Change-Id: Ifba4c4e43560ede3013337b8cdbc77dc2de6e8ff Closes-Bug: #1541273
* | | | | Merge "more tests for pseudo/dir"Jenkins2016-02-101-7/+24
|\ \ \ \ \
| * | | | | more tests for pseudo/dirClay Gerrard2016-02-091-7/+24
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idab172aefd8e69ca8e4d623918eba1bc1da91a42
* | | | | | Merge "Fix segmented upload to pseudo-dir via <container>"Jenkins2016-02-103-14/+51
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fix segmented upload to pseudo-dir via <container>James Nzomo2016-02-043-14/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fix ensures creation and use of the correct default segment container when pseudo-folder paths are passed via <container> arg. Change-Id: I90356b041dc9dfbd55eb341271975621759476b9 Closes-Bug: 1532981 Related-Bug: 1478210
* | | | | | Merge "Accept token and tenant_id for authenticating against KS"Jenkins2016-02-103-5/+11
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Accept token and tenant_id for authenticating against KSPratik Mallya2016-01-183-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow swiftclient to authenticate against keystone using tenant name/id and token only. Without this patch, the password is required, which may not always be available. Authentication against keystone is required to get the service catalog, which includes the endpoints for swift. Change-Id: I4477af445474c5fa97ff864c4942f1330b59e5d6 Closes-Bug: #1476002
* | | | | | Merge "Fix intermittent fail of test_delete_bulk_account"Jenkins2016-02-041-16/+25
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fix intermittent fail of test_delete_bulk_accountAlistair Coles2016-02-011-16/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test asserts calls made in specific order, but they are made from threads so may be in different order. Change-Id: I857ad3b909c3b635927fb1a39682d66d20c6fd59
* | | | | | Merge "Fix intermittent fail of test_delete_account"Jenkins2016-02-011-8/+10
|\ \ \ \ \ \
| * | | | | | Fix intermittent fail of test_delete_accountAlistair Coles2016-02-011-8/+10
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test asserts calls made in specific order, but they are made from threads so may be in different order. Change-Id: I1b6e7303fe0e6fb2afc7da3462b891feab90bc17 Closes-Bug: #1539536