ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Make the filename the first argument to rekey_file

Browse source
This commit is contained in:
Abhijit Menon-Sen 2015-08-26 19:54:59 +05:30
parent c4b2540ecc
commit b84053019a
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -128,6 +128,6 @@ class VaultCLI(CLI):
__, new_password = self.ask_vault_passwords(ask_vault_pass=False, ask_new_vault_pass=True, confirm_new=True) __, new_password = self.ask_vault_passwords(ask_vault_pass=False, ask_new_vault_pass=True, confirm_new=True)
for f in self.args: for f in self.args:
self.editor.rekey_file(new_password, f) self.editor.rekey_file(f, new_password)
self.display.display("Rekey successful", stderr=True) self.display.display("Rekey successful", stderr=True)

2
lib/ansible/parsing/vault/__init__.py
View file

@ -336,7 +336,7 @@ class VaultEditor:
else: else:
raise AnsibleError("%s is already encrypted" % filename) raise AnsibleError("%s is already encrypted" % filename)
def rekey_file(self, new_password, filename): def rekey_file(self, filename, new_password):
check_prereqs() check_prereqs()

2
test/units/parsing/vault/test_vault_editor.py
View file

@ -185,7 +185,7 @@ class TestVaultEditor(unittest.TestCase):
# make sure the password functions for the cipher # make sure the password functions for the cipher
error_hit = False error_hit = False
try: try:
ve.rekey_file('ansible2', v10_file.name) ve.rekey_file(v10_file.name, 'ansible2')
except errors.AnsibleError as e: except errors.AnsibleError as e:
error_hit = True error_hit = True