Skip to content

Fix Ansible 2.9 incompatibility #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix Ansible 2.9 incompatibility #18

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bbf8ecf
Fix order of arguments to ansible-vault
RobinDaugherty Apr 19, 2020
0860e91
Fix test for "ansible-vault view"
RobinDaugherty Apr 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bin/git-diff-ansible-vault
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ ensure_dependencies() {
command -v ansible-vault > /dev/null
test $? -eq 0 || abort 'Unable to find ansible-vault'

ansible-vault --help 2> /dev/null | grep ^Usage | grep -qE '\[.*view.*\]'
ansible-vault --help 2> /dev/null | grep -qE '\bview\b'
test $? -eq 0 || abort 'Unable to find `ansible-vault view`. Ansible 1.8 or later required.'
}

Expand Down Expand Up @@ -176,7 +176,7 @@ delete_tmp_vault_password_file() {
#

decrypted_vault_contents() {
ansible-vault --vault-password-file="$VAULT_PASSWORD_FILE" view <( echo "$1" )
ansible-vault view --vault-password-file="$VAULT_PASSWORD_FILE" <( echo "$1" )
test $? -eq 0 || warn "Unable to open vault: $FILE_PATH"
}

Expand Down