From b84053019a496f460a75cc8c336b6ca64cc423e6 Mon Sep 17 00:00:00 2001 From: Abhijit Menon-Sen Date: Wed, 26 Aug 2015 19:54:59 +0530 Subject: [PATCH] Make the filename the first argument to rekey_file --- lib/ansible/cli/vault.py | 2 +- lib/ansible/parsing/vault/__init__.py | 2 +- test/units/parsing/vault/test_vault_editor.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/ansible/cli/vault.py b/lib/ansible/cli/vault.py index d28abacd5ac..bae7377750b 100644 --- a/lib/ansible/cli/vault.py +++ b/lib/ansible/cli/vault.py @@ -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) 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) diff --git a/lib/ansible/parsing/vault/__init__.py b/lib/ansible/parsing/vault/__init__.py index c9f2c4a4f66..c9d4372e7b5 100644 --- a/lib/ansible/parsing/vault/__init__.py +++ b/lib/ansible/parsing/vault/__init__.py @@ -336,7 +336,7 @@ class VaultEditor: else: raise AnsibleError("%s is already encrypted" % filename) - def rekey_file(self, new_password, filename): + def rekey_file(self, filename, new_password): check_prereqs() diff --git a/test/units/parsing/vault/test_vault_editor.py b/test/units/parsing/vault/test_vault_editor.py index d1fa0d07a05..e943b008685 100644 --- a/test/units/parsing/vault/test_vault_editor.py +++ b/test/units/parsing/vault/test_vault_editor.py @@ -185,7 +185,7 @@ class TestVaultEditor(unittest.TestCase): # make sure the password functions for the cipher error_hit = False try: - ve.rekey_file('ansible2', v10_file.name) + ve.rekey_file(v10_file.name, 'ansible2') except errors.AnsibleError as e: error_hit = True