De/Encrypt ansible-vault files when using "Resolve Conflicts"

[h1nds1ght]

First of all thank you for your great plugin! It really makes handling of ansible vault files in PHPStorm very easy.

I also use the new feature by passing a vault password via the ANSIBLE_VAULT_PASSWORD_FILE environment variable, which works great.

But nevertheless there is one thing I miss so far. Maybe you know the problem, when merging 2 ansible vault files, it is hard to detect the differences. Normally if a merge conflict appears I use the "Resolve Conflicts" Feature of PHPStorm:

Now, when I open this screen for a merge conflict Ansible-Vault file, everything (of course) is encrypted.

So my question is:

Would it be possible, when for example ANSIBLE_VAULT_PASSWORD_FILE is set and the vault files can be decrypted sucessfully with it to display it decrypted? And after solving the conflict the resulting file of course needs to be encrypted again.

[sadv1r]

Thank you for the kind words I am happy you like it, and thank you for feature request.

I had some thoughts about showing decrypted vault data, for example like shown here.
At the same time I don't really sure if this feature is good, cause Vault may contain production data and some users don't want it to be shown without password when they don't expect it. It doesn't mean that this feature will not be implemented in some way, but I need more information about potential side effects

#26 #47

[retoo]

for the time being you users should consider using https://gist.githubusercontent.com/benzado/7bf5aa15e15d2d0d0380/raw/2fbe1938832529c3730bf09f154a25446e87ae63/vault-merge.sh