From 7f11fc634bdda9eb70a9cf8ee78bff07a577330e Mon Sep 17 00:00:00 2001
From: Nicholas McDonnell <50747025+mcdonnnj@users.noreply.github.com>
Date: Mon, 24 Jan 2022 15:05:11 -0500
Subject: [PATCH] Normalize individual cisagov_*.yml files

Add functionality to the update_software_list workflow to normalize the
component files for every push. This will ensure that they are kept in
a manner consistent with how the primary cisagov.yml file stores data.
---
 .github/workflows/update_software_list.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/update_software_list.yml b/.github/workflows/update_software_list.yml
index 6350ccc..77b125e 100644
--- a/.github/workflows/update_software_list.yml
+++ b/.github/workflows/update_software_list.yml
@@ -68,6 +68,12 @@ jobs:
         run: pip install --upgrade --requirement config/requirements.txt
       - name: Create the branch for test validation
         run: git switch --create ${{ needs.setup.outputs.testing_branch }}
+      - name: Normalize individual cisagov_*.yml files
+        run: |
+          for file in data/cisagov_*yml; do \
+            normalize-yml --cisagov-format "$file" > "$file".tmp; \
+            mv --force "$file".tmp "$file"; \
+          done
       - name: Update the comprehensive cisagov YAML file
         run: normalize-yml --cisagov-format data/cisagov_*.yml > data/cisagov.yml
       - name: Generate a normalized YAML file from all source YAML files
@@ -84,7 +90,7 @@ jobs:
           commit_user_name: ${{ needs.setup.outputs.git_user }}
           commit_user_email: ${{ needs.setup.outputs.git_email }}
           commit_author: ${{ needs.setup.outputs.git_author }}
-          file_pattern: SOFTWARE-LIST.md data/cisagov.yml
+          file_pattern: SOFTWARE-LIST.md data/cisagov*.yml
   merge_list_update:
     runs-on: ubuntu-latest
     needs: