cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Also support output to stdout with no arguments

Browse source 
This allows "cat plaintext|ansible-vault encrypt > ciphertext".
This commit is contained in:
Abhijit Menon-Sen 2015-08-27 06:29:02 +05:30
parent e7eebb6954
commit b6de6e69a6
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/ansible/cli/vault.py
View file

@ -63,21 +63,22 @@ class VaultCLI(CLI):
self.options, self.args = self.parser.parse_args() self.options, self.args = self.parser.parse_args()
self.display.verbosity = self.options.verbosity self.display.verbosity = self.options.verbosity
if self.options.output_file: can_output = ['encrypt', 'decrypt']
if self.action not in ['encrypt','decrypt']:
raise AnsibleOptionsError("The --output option can be used only with ansible-vault encrypt/decrypt")
if self.action not in can_output:
if self.options.output_file:
raise AnsibleOptionsError("The --output option can be used only with ansible-vault %s" % '/'.join(can_output))
if len(self.args) == 0:
raise AnsibleOptionsError("Vault requires at least one filename as a parameter")
else:
# This restriction should remain in place until it's possible to # This restriction should remain in place until it's possible to
# load multiple YAML records from a single file, or it's too easy # load multiple YAML records from a single file, or it's too easy
# to create an encrypted file that can't be read back in. But in # to create an encrypted file that can't be read back in. But in
# the meanwhile, "cat a b c|ansible-vault encrypt --output x" is # the meanwhile, "cat a b c|ansible-vault encrypt --output x" is
# a workaround. # a workaround.
if len(self.args) > 1: if self.options.output_file and len(self.args) > 1:
raise AnsibleOptionsError("At most one input file may be used with the --output option") raise AnsibleOptionsError("At most one input file may be used with the --output option")
elif len(self.args) == 0:
raise AnsibleOptionsError("Vault requires at least one filename as a parameter")
def run(self): def run(self):
super(VaultCLI, self).run() super(VaultCLI, self).run()