diff options
| author | Mike Vink <mike.vink@stater.nl> | 2023-04-20 16:00:18 +0200 |
|---|---|---|
| committer | Mike Vink <mike.vink@stater.nl> | 2023-04-20 16:00:18 +0200 |
| commit | 7838c2d394522a80888856af6f7b5a02c1634ac8 (patch) | |
| tree | 33e8c6a11f99241cd01ca45bb0718d31ff5dd8fc | |
| parent | 6ec4598c514d75bef4094be00eae9e2041eef960 (diff) | |
fixup
| -rw-r--r-- | home.nix | 1 | ||||
| -rw-r--r-- | shell-scripts/awx | 8 | ||||
| -rwxr-xr-x | shell-scripts/filter-ansi | 2 | ||||
| -rwxr-xr-x | shell-scripts/terragrunt | 2 |
4 files changed, 12 insertions, 1 deletions
@@ -69,6 +69,7 @@ services.gpg-agent = { enable = true; defaultCacheTtl = 34560000; + maxCacheTtl = 34560000; }; programs.password-store = { enable = true; diff --git a/shell-scripts/awx b/shell-scripts/awx new file mode 100644 index 0000000..d7247bc --- /dev/null +++ b/shell-scripts/awx @@ -0,0 +1,8 @@ +#!/bin/bash +# Removes ansi escape codes from ansible outputs +error () { + echo "$1" + exit 1 +} +command -v awx || error "awx cli not found" +awx "$@" | filter-ansi diff --git a/shell-scripts/filter-ansi b/shell-scripts/filter-ansi new file mode 100755 index 0000000..62999a9 --- /dev/null +++ b/shell-scripts/filter-ansi @@ -0,0 +1,2 @@ +#!@bash@/bin/bash +cat - | sed -e 's/\x1b\[[0-9;]*m//g' diff --git a/shell-scripts/terragrunt b/shell-scripts/terragrunt index 75b710a..b7a512b 100755 --- a/shell-scripts/terragrunt +++ b/shell-scripts/terragrunt @@ -84,7 +84,7 @@ WORKDIR="$ENVIRONMENTS/$ENV/$MODULE" # echo "docker run --rm -i $TTY $VARIABLES -v $HOME/.terragrunt-cache:/tmp -v $HOME/.azure:/root/.azure -v $HOME/.netrc:/root/.netrc $TERRAGRUNT_EXTRA_MOUNTS -v ${REPO}:${REPO} -w ${WORKDIR} $TERRAGRUNT_CONTAINER terragrunt ${TERRAGRUNT_ARGS[@]} | grep -E '(^.*[#~+-] .*|^[[:punct:]]|Plan|Enter)'" echo $VARIABLES if [[ $FULL -eq 0 ]]; then - docker run --rm -i $TTY $VARIABLES -v $HOME/.terragrunt-cache:/tmp -v $HOME/.azure:/root/.azure -v $HOME/.netrc:/root/.netrc $EXTRA_MOUNTS -v ${REPO}:${REPO} -w ${WORKDIR} $TERRAGRUNT_CONTAINER terragrunt ${TERRAGRUNT_ARGS[@]} | grep -E '(^ .*[#~+-] .*|^[[:punct:]]|Plan|^\S.*)' + docker run --rm -i $TTY $VARIABLES -v $HOME/.terragrunt-cache:/tmp -v $HOME/.azure:/root/.azure -v $HOME/.netrc:/root/.netrc $EXTRA_MOUNTS -v ${REPO}:${REPO} -w ${WORKDIR} $TERRAGRUNT_CONTAINER terragrunt ${TERRAGRUNT_ARGS[@]} | filter-ansi | grep -E '(^ .*[#~+-] .*|^[[:punct:]]|Plan|^\S.*)' else docker run --rm -i $TTY $VARIABLES -v $HOME/.terragrunt-cache:/tmp -v $HOME/.azure:/root/.azure -v $HOME/.netrc:/root/.netrc $EXTRA_MOUNTS -v ${REPO}:${REPO} -w ${WORKDIR} $TERRAGRUNT_CONTAINER terragrunt ${TERRAGRUNT_ARGS[@]} fi |