Skip to content

Make stack-diff output prettier #321

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

Merged
merged 2 commits into from
May 4, 2022
Merged

Make stack-diff output prettier #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3f2f73
Update stack-diff diff
rnhurt Apr 27, 2022
4e9d717
Simplify if statements
mbailey May 4, 2022
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
5 changes: 5 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,11 @@ postgres02 DELETE_COMPLETE 2011-05-23T15:47:44Z NEVER_UPDATED NOT_NESTED
* [bash](https://www.gnu.org/software/bash/)
* [jq-1.4](http://stedolan.github.io/jq/download/) or later (for stack-diff)

### Optional Packages

* [colordiff](https://www.colordiff.org/) to show stack-diff in color
* [icdiff](https://github.com/jeffkaufman/icdiff) to show stack-diff in color and side-by-side

### Installation

As shown below, you may simply clone the GitHub repo and source the files required.
Expand Down
8 changes: 6 additions & 2 deletions lib/stack-functions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -840,7 +840,9 @@ _bma_stack_diff_template() {
if ! aws cloudformation describe-stacks --stack-name "$stack" 1>/dev/null; then
return 1;
fi
if [ "x$( type -P colordiff )" != "x" ]; then
if command -v icdiff; then
local DIFF_CMD=icdiff
elif command -v colordiff; then
local DIFF_CMD=colordiff
else
local DIFF_CMD=diff
Expand Down Expand Up @@ -876,7 +878,9 @@ _bma_stack_diff_params() {
if [ ! -f "$params" ]; then
return 1
fi
if [ "x$( type -P colordiff )" != "x" ]; then
if command -v icdiff; then
local DIFF_CMD=icdiff
elif command -v colordiff; then
local DIFF_CMD=colordiff
else
local DIFF_CMD=diff
Expand Down