From f383de0f99953fd738e71b2d2c99165e4f50690b Mon Sep 17 00:00:00 2001
From: Bhavin Patel <bhavin.j.patel91@gmail.com>
Date: Tue, 2 Jul 2024 11:47:04 -0700
Subject: [PATCH] Update .gitignore to exclude dist directory

---
 .github/workflows/auto-update.yml  | 68 +++++++++++++++---------------
 .github/workflows/unit-testing.yml | 10 +++--
 .gitignore                         |  5 ++-
 3 files changed, 44 insertions(+), 39 deletions(-)

diff --git a/.github/workflows/auto-update.yml b/.github/workflows/auto-update.yml
index 3bac079e4a..1ee9307b28 100644
--- a/.github/workflows/auto-update.yml
+++ b/.github/workflows/auto-update.yml
@@ -1,37 +1,37 @@
-name: auto-update
-on:
-  push: {}
-jobs:
+# name: auto-update
+# on:
+#   push: {}
+# jobs:
   
-  validate-tag-if-present:
-    runs-on: ubuntu-latest
+#   validate-tag-if-present:
+#     runs-on: ubuntu-latest
 
-    steps:
-      - name: TAGGED, Validate that the tag is in the correct format
+#     steps:
+#       - name: TAGGED, Validate that the tag is in the correct format
         
-        run: |
-          echo "The GITHUB_REF: $GITHUB_REF"
-          #First check to see if the release is a tag
-          if [[ $GITHUB_REF =~ refs/tags/* ]]; then
-            #Yes, this is a tag, so we need to test to make sure that the tag
-            #is in the correct format (like v1.10.20)
-            if [[ $GITHUB_REF =~ refs/tags/v[0-9]+.[0-9]+.[0-9]+ ]]; then
-              echo "PASS: Tagged release with good format"
-              exit 0
-            else
-              echo "FAIL: Tagged release with bad format"
-              exit 1
-            fi
-          else
-          echo "PASS: Not a tagged release"
-          exit 0
-          fi                          
-  autoupdate:
-    name: autoupdate
-    runs-on: ubuntu-latest
-    steps:
-      - uses: docker://chinthakagodawita/autoupdate-action:v1
-        env:
-          GITHUB_TOKEN: "${{ secrets.SECURITY_CONTENT_ADMIN_TASKS }}"
-          DRY_RUN: "false"
-          MERGE_MSG: "Branch was auto-updated."
+#         run: |
+#           echo "The GITHUB_REF: $GITHUB_REF"
+#           #First check to see if the release is a tag
+#           if [[ $GITHUB_REF =~ refs/tags/* ]]; then
+#             #Yes, this is a tag, so we need to test to make sure that the tag
+#             #is in the correct format (like v1.10.20)
+#             if [[ $GITHUB_REF =~ refs/tags/v[0-9]+.[0-9]+.[0-9]+ ]]; then
+#               echo "PASS: Tagged release with good format"
+#               exit 0
+#             else
+#               echo "FAIL: Tagged release with bad format"
+#               exit 1
+#             fi
+#           else
+#           echo "PASS: Not a tagged release"
+#           exit 0
+#           fi                          
+#   autoupdate:
+#     name: autoupdate
+#     runs-on: ubuntu-latest
+#     steps:
+#       - uses: docker://chinthakagodawita/autoupdate-action:v1
+#         env:
+#           GITHUB_TOKEN: "${{ secrets.SECURITY_CONTENT_ADMIN_TASKS }}"
+#           DRY_RUN: "false"
+#           MERGE_MSG: "Branch was auto-updated."
diff --git a/.github/workflows/unit-testing.yml b/.github/workflows/unit-testing.yml
index 210bd0599c..b86eee1031 100644
--- a/.github/workflows/unit-testing.yml
+++ b/.github/workflows/unit-testing.yml
@@ -30,7 +30,6 @@ jobs:
   #         exit 0
   #         fi                    
   
-
   docker-detection-testing-setup:
     runs-on: ubuntu-latest
     if: "!contains(github.ref, 'refs/tags/')" #don't run on tags - future steps won't run either since they depend on this job
@@ -59,13 +58,16 @@ jobs:
             pip install contentctl
             git clone --depth=1 --single-branch --branch=master https://github.com/redcanaryco/atomic-red-team.git
         
-        - name: Variable names
+        - name: print variable names
           run: |
             source .venv/bin/activate
-
             echo "github.event.issue.pull_request    : [${{ github.event.issue.pull_request }}]"
             echo "github.event.pull_request.number   : [${{ github.event.pull_request.number }}]"
             echo "steps.vars.outputs.branch          : [${{ steps.vars.outputs.branch }}]"
             echo "github.event.pull_request.head.ref : [${{ github.event.pull_request.head.ref }}]"
             echo "github.event_name                  : [${{ github.event_name }}]"
-     
\ No newline at end of file
+        
+        - name: Run ContentCTL test for changes against develop
+          run: |
+            source .venv/bin/activate
+            contentctl test --post-test-behavior never_pause mode:changes --mode.target-branch develop
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index cfea793841..8e97383fd1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,9 @@
 # Ignore example files from contentctl tool
 apps/
-dist/
+/dist/DA-ESS-ContentUpdate/**/*.xml
+/dist/DA-ESS-ContentUpdate/**/*.conf
+/dist/api/*.json
+/dist/ssa/srs/*.yml
 test_results/
 detections/*/.yml.example
 stories/*.yml.example