From ecdfc527d4338218f005684439214c2d126aa11b Mon Sep 17 00:00:00 2001
From: Nicholas McDonnell <50747025+mcdonnnj@users.noreply.github.com>
Date: Fri, 15 Jan 2021 10:34:34 -0500
Subject: [PATCH 1/7] Add the beautysh pre-commit hook

This hook performs auto-formatting (beautifying) of Bash scripts.
---
 .pre-commit-config.yaml |  7 +++++++
 setup-env               | 14 +++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 8a3c7eb..42a2c7a 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -48,6 +48,13 @@ repos:
           - --strict
 
   # Shell script hooks
+  - repo: https://github.com/lovesegfault/beautysh
+    rev: 6.0.1
+    hooks:
+      - id: beautysh
+        args:
+          - --indent-size
+          - '2'
   - repo: https://github.com/detailyang/pre-commit-shell
     rev: 1.0.5
     hooks:
diff --git a/setup-env b/setup-env
index 4d822c4..1579e04 100755
--- a/setup-env
+++ b/setup-env
@@ -50,14 +50,14 @@ while (( "$#" )); do
       shift
       ;;
     -*) # unsupported flags
-       echo "Error: Unsupported flag $1" >&2
-       exit 1
-       ;;
+      echo "Error: Unsupported flag $1" >&2
+      exit 1
+      ;;
     *) # preserve positional arguments
-       PARAMS="$PARAMS $1"
-       shift
-       ;;
-      esac
+      PARAMS="$PARAMS $1"
+      shift
+      ;;
+  esac
 done
 
 # set positional arguments in their proper place

From 6bd93ff6fbd1e9fe1a6e508d6a65225b63220a53 Mon Sep 17 00:00:00 2001
From: Nicholas McDonnell <50747025+mcdonnnj@users.noreply.github.com>
Date: Sun, 31 Jan 2021 19:24:54 -0500
Subject: [PATCH 2/7] Update pre-commit hooks with `pre-commit autoupdate`

---
 .pre-commit-config.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 8a3c7eb..e1da8e2 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -41,7 +41,7 @@ repos:
     hooks:
       - id: prettier
   - repo: https://github.com/adrienverge/yamllint
-    rev: v1.25.0
+    rev: v1.26.0
     hooks:
       - id: yamllint
         args:
@@ -75,17 +75,17 @@ repos:
     hooks:
       - id: isort
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.790
+    rev: v0.800
     hooks:
       - id: mypy
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.7.4
+    rev: v2.10.0
     hooks:
       - id: pyupgrade
 
   # Ansible hooks
   - repo: https://github.com/ansible-community/ansible-lint
-    rev: v4.3.7
+    rev: v5.0.0
     hooks:
       - id: ansible-lint
       # files: molecule/default/playbook.yml

From 6e33a4e5fb7e4e91e14971e33283902f11e3d9c1 Mon Sep 17 00:00:00 2001
From: Nicholas McDonnell <50747025+mcdonnnj@users.noreply.github.com>
Date: Tue, 16 Feb 2021 10:44:50 -0500
Subject: [PATCH 3/7] Add a requirements-dev.txt pip requirements file

Our other skeletons have this file, even if they are not Python projects. The
directions in CONTRIBUTING.md reference such a file, which can be misleading.
Rather than amending the CONTRIBUTING documentation, I feel it's better to
align with our other skeletons for consistency.
---
 requirements-dev.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 requirements-dev.txt

diff --git a/requirements-dev.txt b/requirements-dev.txt
new file mode 100644
index 0000000..d84ee68
--- /dev/null
+++ b/requirements-dev.txt
@@ -0,0 +1,2 @@
+--requirement requirements-test.txt
+ipython

From c97a883ada7ae0cbd50f790d4deb4e79639736dd Mon Sep 17 00:00:00 2001
From: Nicholas McDonnell <50747025+mcdonnnj@users.noreply.github.com>
Date: Tue, 16 Feb 2021 13:18:08 -0500
Subject: [PATCH 4/7] Revert ansible-lint version update

The v5 release of ansible-lint introduces breaking changes, so we are holding
off on updating until things are resolved. Conversation about this can be
tracked in https://github.com/cisagov/skeleton-ansible-role/issues/69.
---
 .pre-commit-config.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index e1da8e2..4fdfdff 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -85,7 +85,9 @@ repos:
 
   # Ansible hooks
   - repo: https://github.com/ansible-community/ansible-lint
-    rev: v5.0.0
+    # This is intentionally being held back because of issues in v5 per
+    # https://github.com/cisagov/skeleton-ansible-role/issues/69
+    rev: v4.3.7
     hooks:
       - id: ansible-lint
       # files: molecule/default/playbook.yml

From ab1bcd5ddea599ad614da235f6b43e72630d8e77 Mon Sep 17 00:00:00 2001
From: Nicholas McDonnell <50747025+mcdonnnj@users.noreply.github.com>
Date: Tue, 16 Feb 2021 17:47:35 -0500
Subject: [PATCH 5/7] Autoformat bump_version.sh with beautysh

---
 bump_version.sh | 58 ++++++++++++++++++++++++-------------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/bump_version.sh b/bump_version.sh
index 7c23343..81a394f 100755
--- a/bump_version.sh
+++ b/bump_version.sh
@@ -14,34 +14,34 @@ old_version=$(sed -n "s/^__version__ = \"\(.*\)\"$/\1/p" $VERSION_FILE)
 
 if [ $# -ne 1 ]
 then
-   echo "$HELP_INFORMATION"
+  echo "$HELP_INFORMATION"
 else
-    case $1 in
-        major|minor|patch|prerelease|build)
-            new_version=$(python -c "import semver; print(semver.bump_$1('$old_version'))")
-            echo Changing version from "$old_version" to "$new_version"
-            tmp_file=/tmp/version.$$
-            sed "s/$old_version/$new_version/" $VERSION_FILE > $tmp_file
-            mv $tmp_file $VERSION_FILE
-            git add $VERSION_FILE
-            git commit -m"Bumping version from $old_version to $new_version"
-            git push
-            ;;
-        finalize)
-            new_version=$(python -c "import semver; print(semver.finalize_version('$old_version'))")
-            echo Changing version from "$old_version" to "$new_version"
-            tmp_file=/tmp/version.$$
-            sed "s/$old_version/$new_version/" $VERSION_FILE > $tmp_file
-            mv $tmp_file $VERSION_FILE
-            git add $VERSION_FILE
-            git commit -m"Bumping version from $old_version to $new_version"
-            git push
-            ;;
-        show)
-            echo "$old_version"
-            ;;
-        *)
-            echo "$HELP_INFORMATION"
-            ;;
-    esac
+  case $1 in
+    major|minor|patch|prerelease|build)
+      new_version=$(python -c "import semver; print(semver.bump_$1('$old_version'))")
+      echo Changing version from "$old_version" to "$new_version"
+      tmp_file=/tmp/version.$$
+      sed "s/$old_version/$new_version/" $VERSION_FILE > $tmp_file
+      mv $tmp_file $VERSION_FILE
+      git add $VERSION_FILE
+      git commit -m"Bumping version from $old_version to $new_version"
+      git push
+      ;;
+    finalize)
+      new_version=$(python -c "import semver; print(semver.finalize_version('$old_version'))")
+      echo Changing version from "$old_version" to "$new_version"
+      tmp_file=/tmp/version.$$
+      sed "s/$old_version/$new_version/" $VERSION_FILE > $tmp_file
+      mv $tmp_file $VERSION_FILE
+      git add $VERSION_FILE
+      git commit -m"Bumping version from $old_version to $new_version"
+      git push
+      ;;
+    show)
+      echo "$old_version"
+      ;;
+    *)
+      echo "$HELP_INFORMATION"
+      ;;
+  esac
 fi

From ae83ed86e32b3a70e98881efae218e400d789267 Mon Sep 17 00:00:00 2001
From: Nicholas McDonnell <50747025+mcdonnnj@users.noreply.github.com>
Date: Tue, 16 Feb 2021 17:48:28 -0500
Subject: [PATCH 6/7] Autoformat push_readme.sh with beautysh

---
 push_readme.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/push_readme.sh b/push_readme.sh
index 13155cd..12e2340 100755
--- a/push_readme.sh
+++ b/push_readme.sh
@@ -11,19 +11,19 @@ set -o pipefail
 
 echo "Logging in and requesting JWT..."
 token=$(curl --silent --request POST \
-  --header "Content-Type: application/json" \
-  --data \
-  '{"username": "'"$DOCKER_USERNAME"'", "password": "'"$DOCKER_PASSWORD"'"}' \
+    --header "Content-Type: application/json" \
+    --data \
+    '{"username": "'"$DOCKER_USERNAME"'", "password": "'"$DOCKER_PASSWORD"'"}' \
   https://hub.docker.com/v2/users/login/ | jq --raw-output .token)
 
 echo "Pushing README file..."
 code=$(jq --null-input --arg msg "$(<README.md)" \
-  '{"registry":"registry-1.docker.io","full_description": $msg }' | \
-      curl --silent --output /dev/null --location --write-out "%{http_code}" \
-         https://hub.docker.com/v2/repositories/"${IMAGE_NAME}"/ \
-         --data @- --request PATCH \
-         --header "Content-Type: application/json" \
-         --header "Authorization: JWT ${token}")
+    '{"registry":"registry-1.docker.io","full_description": $msg }' | \
+    curl --silent --output /dev/null --location --write-out "%{http_code}" \
+    https://hub.docker.com/v2/repositories/"${IMAGE_NAME}"/ \
+    --data @- --request PATCH \
+    --header "Content-Type: application/json" \
+  --header "Authorization: JWT ${token}")
 
 if [[ "${code}" = "200" ]]; then
   printf "Successfully pushed README to Docker Hub"

From 5fd43ad5d7f82b0786dfd449447b18fa29cf53ed Mon Sep 17 00:00:00 2001
From: Nicholas McDonnell <50747025+mcdonnnj@users.noreply.github.com>
Date: Tue, 16 Feb 2021 22:39:33 -0500
Subject: [PATCH 7/7] Fix the agency name in the vendor label

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 8819053..1c48a45 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ ARG VERSION
 # https://github.com/opencontainers/image-spec/blob/master/annotations.md
 # Note: Additional labels are added by the build workflow.
 LABEL org.opencontainers.image.authors="mark.feldhousen@cisa.dhs.gov"
-LABEL org.opencontainers.image.vendor="Cyber and Infrastructure Security Agency"
+LABEL org.opencontainers.image.vendor="Cybersecurity and Infrastructure Security Agency"
 
 ARG CISA_UID=421
 ENV CISA_HOME="/home/cisa"