openstack
/
deb-python-barbicanclient
Code Issues Proposed changes

Merge "Fix doc referencing --payload-content-type"

This commit is contained in:
Jenkins 2017-03-10 14:58:09 +00:00 committed by Gerrit Code Review
parent f4dc0d6c88 b66ca10b85
commit 6d5a9e8390
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.rst
View File

@ -176,7 +176,7 @@ usage options
acl user add Add ACL users to a secret or container as identified by its href.
acl user remove Remove ACL users from a secret or container as identified by its href.
ca get Retrieve a CA by providing its URI.
ca list List cas.
ca list List CAs.
complete print bash completion command
secret container create Store a container in Barbican.
secret container delete Delete a container by providing its href.

6
barbicanclient/barbican_cli/secrets.py
View File

@ -42,13 +42,13 @@ class GetSecret(show.ShowOne):
help='if specified, retrieve the '
'unencrypted secret data; '
'the data type can be specified with '
'--payload-content-type.',
'--payload_content_type.',
action='store_true')
parser.add_argument('--payload', '-p',
help='if specified, retrieve the '
'unencrypted secret data; '
'the data type can be specified with '
'--payload-content-type. If the user'
'--payload_content_type. If the user'
' wishes to only retrieve the value of'
' the payload they must add '
'"-f value" to format returning only'
@ -57,7 +57,7 @@ class GetSecret(show.ShowOne):
parser.add_argument('--payload_content_type', '-t',
default='text/plain',
help='the content type of the decrypted'
' secret (default: %(default)s.')
' secret (default: %(default)s).')
return parser
def take_action(self, args):

15
doc/source/cli_usage.rst
View File

@ -69,16 +69,17 @@ varies from one to another. The help message for **get** can be seen below.
optional arguments:
-h, --help show this help message and exit
--decrypt, -d if specified, retrieve the unencrypted secret data;
the data type can be specified with --payload-content-
type.
the data type can be specified with
--payload_content_type.
--payload, -p if specified, retrieve the unencrypted secret data;
the data type can be specified with --payload-content-
type. If the user wishes to only retrieve the value of
the payload they must add "-f value" to format
returning only the value of the payload
the data type can be specified with
--payload_content_type. If the user wishes to only
retrieve the value of the payload they must add
"-f value" to format returning only the value of
the payload
--payload_content_type PAYLOAD_CONTENT_TYPE, -t PAYLOAD_CONTENT_TYPE
the content type of the decrypted secret (default:
text/plain.
text/plain).
output formatters:
output formatter options